--- src/lib/ui.py 2007-01-02 23:06:28.000000000 -0900 +++ /usr/lib64/python2.6/site-packages/revelation/ui.py 2010-05-24 11:07:06.306115985 -0800 @@ -86,16 +86,16 @@ STOCK_ICONS = ( ( STOCK_REVELATION, "revelation", ( ICON_SIZE_APPLET, ICON_SIZE_LOGO, gtk.ICON_SIZE_DIALOG, gtk.ICON_SIZE_MENU )), ( STOCK_REVELATION_LOCKED, "revelation-locked", ( ICON_SIZE_APPLET, ICON_SIZE_LOGO, gtk.ICON_SIZE_DIALOG, gtk.ICON_SIZE_MENU )), - ( STOCK_ENTRY_CREDITCARD, "stock_creditcard", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), - ( STOCK_ENTRY_CRYPTOKEY, "stock_keyring", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), - ( STOCK_ENTRY_DATABASE, "stock_data-sources", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), - ( STOCK_ENTRY_DOOR, "stock_exit", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), - ( STOCK_ENTRY_EMAIL, "stock_mail", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), +# ( STOCK_ENTRY_CREDITCARD, "stock_creditcard", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), +# ( STOCK_ENTRY_CRYPTOKEY, "stock_keyring", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), +# ( STOCK_ENTRY_DATABASE, "stock_data-sources", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), +# ( STOCK_ENTRY_DOOR, "stock_exit", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), + ( STOCK_ENTRY_EMAIL, "gnome-stock-mail-new", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), ( STOCK_ENTRY_FTP, "system-file-manager", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), ( STOCK_ENTRY_GENERIC, "stock_lock", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), ( STOCK_ENTRY_PHONE, "stock_cell-phone", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), ( STOCK_ENTRY_SHELL, "gnome-terminal", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), - ( STOCK_ENTRY_WEBSITE, "stock_hyperlink-toolbar", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), + ( STOCK_ENTRY_WEBSITE, "web-browser", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), ( STOCK_ENTRY_FOLDER, "stock_folder", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), ( STOCK_ENTRY_FOLDER_OPEN, "stock_folder", ( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )), ) @@ -103,7 +103,7 @@ STOCK_ITEMS = ( ( STOCK_CONTINUE, _('_Continue'), "stock_test-mode" ), ( STOCK_DISCARD, _('_Discard'), gtk.STOCK_DELETE ), - ( STOCK_EDIT, _('_Edit'), "stock_edit" ), + ( STOCK_EDIT, _('_Edit'), "gtk-properties" ), ( STOCK_EXPORT, _('_Export'), gtk.STOCK_EXECUTE ), ( STOCK_FOLDER, '', "stock_folder" ), ( STOCK_GENERATE, _('_Generate'), gtk.STOCK_EXECUTE ), @@ -1257,8 +1257,9 @@ def __init__(self, stock, text = None): gtk.ImageMenuItem.__init__(self, stock) - self.label = self.get_children()[0] - self.image = self.get_children()[1] + children=self.get_children() + if len(children) > 0 : self.label = children[0] + if len(children) > 1 : self.image = children[1] if text is not None: self.set_text(text)