Hi Michael,
I've now added icons for all the menu sub items, and cleaned up that
part of the code. What do you think? Do you have access to the
oxygen icon set? If not, I've temporarily placed a copy of all these
icons at http://medusa.nmr.mpibpc.mpg.de/~edau/oxygen_icons.tar.bz2
(pending synchronisation). These are licenced under both the LGPL and
CC licences, so we are free to use all of them in relax. For the menu
items, I have used the 16x16 icons. For some of these, I've had to be
a bit creative in selecting them. Do you think there are better icons
to use for the current menu entries? I've tried to match KDE and
GNOME apps as much as possible for icon selection. Note that although
the oxygen icons are used in KDE, they are not part of KDE.
Regards,
Edward
---------- Forwarded message ----------
From: <edward@xxxxxxxxxxxxx>
Date: 2010/1/19
Subject: r10256 - in /branches/bieri_gui/gui_bieri: ./
oxygen_icons/16x16/actions/ oxygen_icons/16x16/categories/
relax_bitmaps/
To: relax-commits@xxxxxxx
Author: bugman
Date: Tue Jan 19 19:35:50 2010
New Revision: 10256
URL: http://svn.gna.org/viewcvs/relax?rev=10256&view=rev
Log:
Modified all the other menu sub entries to include icons using the
build_menu_sub_item() method.
All the oxygen icons required, as well as a 16x16 relax icon have been
added to the repository.
Added:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/document-properties.png
(with props)
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/edit-delete.png
(with props)
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/flag-blue.png
(with props)
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/help-contents.png
(with props)
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/mail-mark-unread-new.png
(with props)
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/categories/
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/categories/preferences-system.png
(with props)
branches/bieri_gui/gui_bieri/relax_bitmaps/
branches/bieri_gui/gui_bieri/relax_bitmaps/relax_16x16.png (with props)
Modified:
branches/bieri_gui/gui_bieri/relax_gui.py
Added:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/document-properties.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/document-properties.png?rev=10256&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/document-properties.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/edit-delete.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/edit-delete.png?rev=10256&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/edit-delete.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/flag-blue.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/flag-blue.png?rev=10256&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/flag-blue.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/help-contents.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/help-contents.png?rev=10256&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/help-contents.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/mail-mark-unread-new.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/mail-mark-unread-new.png?rev=10256&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/actions/mail-mark-unread-new.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/categories/preferences-system.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/oxygen_icons/16x16/categories/preferences-system.png?rev=10256&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
branches/bieri_gui/gui_bieri/oxygen_icons/16x16/categories/preferences-system.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: branches/bieri_gui/gui_bieri/relax_bitmaps/relax_16x16.png
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_bitmaps/relax_16x16.png?rev=10256&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/bieri_gui/gui_bieri/relax_bitmaps/relax_16x16.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: branches/bieri_gui/gui_bieri/relax_gui.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=10256&r1=10255&r2=10256&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Tue Jan 19 19:35:50 2010
@@ -131,10 +131,18 @@
# GUI icons.
ICON_PATH = sys.path[0]+sep+'gui_bieri'+sep+'oxygen_icons'+sep
+ABOUT_RELAX_ICON =
sys.path[0]+sep+'gui_bieri'+sep+'relax_bitmaps'+sep+'relax_16x16.png'
+ABOUT_RELAXGUI_ICON =
sys.path[0]+sep+'gui_bieri'+sep+'relax_bitmaps'+sep+'relax_16x16.png'
+CONTACT_ICON = ICON_PATH +
'16x16'+sep+'actions'+sep+'mail-mark-unread-new.png'
EXIT_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'system-shutdown.png'
+MANUAL_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'help-contents.png'
+NEW_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-new.png'
OPEN_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-open.png'
-NEW_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-new.png'
SAVE_AS_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'document-save-as.png'
+SETTINGS_ICON = ICON_PATH +
'16x16'+sep+'actions'+sep+'document-properties.png'
+SETTINGS_GLOBAL_ICON = ICON_PATH +
'16x16'+sep+'categories'+sep+'preferences-system.png'
+SETTINGS_RESET_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'edit-delete.png'
+REF_ICON = ICON_PATH + '16x16'+sep+'actions'+sep+'flag-blue.png'
#####################################################################################################################
@@ -201,29 +209,29 @@
# The 'Molecule' menu.
wxglade_tmp_menu = wx.Menu()
- wxglade_tmp_menu.Append(11, "Load &PDB File", "", wx.ITEM_NORMAL)
- wxglade_tmp_menu.Append(12, "Load Se&quence File", "",
wx.ITEM_NORMAL)
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=11,
text="Load &PDB File", icon=OPEN_ICON))
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=12,
text="Load se&quence file", icon=OPEN_ICON))
self.frame_1_menubar.Append(wxglade_tmp_menu, "&Molecule")
# The 'Settings' menu.
wxglade_tmp_menu = wx.Menu()
self.SetMenuBar(self.frame_1_menubar)
- wxglade_tmp_menu.Append(7, "&Global relax Settings", "",
wx.ITEM_NORMAL)
- wxglade_tmp_menu.Append(13, "&Parameter File Settings", "",
wx.ITEM_NORMAL)
- wxglade_tmp_menu.Append(14, "Reset a&ll Settings", "",
wx.ITEM_NORMAL)
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=7,
text="&Global relax settings", icon=SETTINGS_GLOBAL_ICON))
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=13,
text="&Parameter file settings", icon=SETTINGS_ICON))
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=14,
text="Reset a&ll settings", icon=SETTINGS_RESET_ICON))
self.frame_1_menubar.Append(wxglade_tmp_menu, "&Settings")
# The 'Extras' menu.
wxglade_tmp_menu = wx.Menu()
- wxglade_tmp_menu.Append(8, "&Contact relaxGUI", "", wx.ITEM_NORMAL)
- wxglade_tmp_menu.Append(9, "&References", "", wx.ITEM_NORMAL)
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=8,
text="&Contact relaxGUI", icon=CONTACT_ICON))
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=9,
text="&References", icon=REF_ICON))
self.frame_1_menubar.Append(wxglade_tmp_menu, "&Extras")
# The 'Help' menu.
wxglade_tmp_menu = wx.Menu()
- wxglade_tmp_menu.Append(10, "&Manual", "", wx.ITEM_NORMAL)
- wxglade_tmp_menu.Append(5, "About relaxG&UI", "", wx.ITEM_NORMAL)
- wxglade_tmp_menu.Append(6, "About rela&x", "", wx.ITEM_NORMAL)
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=10,
text="&Manual", icon=MANUAL_ICON))
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=5,
text="About relaxG&UI", icon=ABOUT_RELAXGUI_ICON))
+ wxglade_tmp_menu.AppendItem(self.build_menu_sub_item(id=6,
text="About rela&x", icon=ABOUT_RELAX_ICON))
self.frame_1_menubar.Append(wxglade_tmp_menu, "&Help")
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
Icons in the sub-menu entries (Fwd: r10256 - in /branches/bieri_gui/gui_bieri: ./ oxygen_icons/16x16/actions/ oxygen_icons/16x16/categories/ relax_bitmaps/)
