diff options
| -rw-r--r-- | shell/ChangeLog | 3 | ||||
| -rw-r--r-- | shell/e-shell-window-commands.c | 17 |
2 files changed, 12 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 1024bb7fdd..9a08ff1114 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,8 @@ 2004-05-17 Jeffrey Stedfast <fejj@novell.com> + * e-shell-window-commands.c: Change E_PIXMAP() sizes over to + E_ICON_SIZE enum values. + * main.c: #include <gtk/gtkvbox.h> * e-shell-startup-wizard.c (make_importer_page): Use diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 6904db3c4b..a581314f8f 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -32,6 +32,7 @@ #include "evolution-shell-component-utils.h" +#include "e-util/e-icon-factory.h" #include "e-util/e-dialog-utils.h" #include "e-util/e-passwords.h" @@ -344,22 +345,22 @@ static BonoboUIVerb help_verbs [] = { }; static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/SendReceive", "stock_mail-send-receive", 16), - E_PIXMAP ("/Toolbar/SendReceive", "stock_mail-send-receive", 24), - E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", 16), - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", 16), - E_PIXMAP ("/menu/Tools/Settings", "gnome-settings", 16), - + E_PIXMAP ("/commands/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_MENU), + E_PIXMAP ("/Toolbar/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Tools/Settings", "gnome-settings", E_ICON_SIZE_MENU), + E_PIXMAP_END }; static EPixmap offline_pixmaps [] = { - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", 16), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), E_PIXMAP_END }; static EPixmap online_pixmaps [] = { - E_PIXMAP ("/menu/File/ToggleOffline", "stock_connect", 16), + E_PIXMAP ("/menu/File/ToggleOffline", "stock_connect", E_ICON_SIZE_MENU), E_PIXMAP_END }; |