aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/dialogs
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-09-28 01:48:23 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-09-28 01:48:23 +0800
commit54d4e5e5f8ae9b2273377b1030a9822b4faecba2 (patch)
tree688034c8ef27aa7a6cab63e339e69e90e6e19249 /calendar/gui/dialogs
parent80dd682b542b9740670abcb9470185b7db8d49b8 (diff)
downloadgsoc2013-evolution-54d4e5e5f8ae9b2273377b1030a9822b4faecba2.tar.gz
gsoc2013-evolution-54d4e5e5f8ae9b2273377b1030a9822b4faecba2.tar.zst
gsoc2013-evolution-54d4e5e5f8ae9b2273377b1030a9822b4faecba2.zip
** Fixes bug #477045
2007-09-27 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #477045 * addressbook/gui/component/addressbook-component.c: * addressbook/gui/component/addressbook-view.c: * addressbook/gui/contact-editor/e-contact-editor-address.c: * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/widgets/e-addressbook-view.c: * addressbook/gui/widgets/eab-contact-display.c: * calendar/gui/calendar-commands.c: * calendar/gui/calendar-component.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/comp-editor.c: * calendar/gui/dialogs/event-editor.c: * calendar/gui/dialogs/task-editor.c: * calendar/gui/e-cal-popup.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-calendar-view.c: * calendar/gui/e-day-view.c: * calendar/gui/e-memo-table.c: * calendar/gui/e-week-view.c: * calendar/gui/memos-component.c: * calendar/gui/memos-control.c: * calendar/gui/tasks-component.c: * calendar/gui/tasks-control.c: * composer/e-msg-composer-select-file.c: * composer/e-msg-composer.c: * mail/em-folder-tree.c: * mail/em-folder-view.c: * mail/em-popup.c: * mail/mail-component.c: * mail/mail-mt.c: * mail/mail-send-recv.c: * mail/message-list.c: * plugins/exchange-folder-permission.c: * plugins/exchange-folder.c: * plugins/groupwise-features/share-folder-common.c: * shell/e-shell-window-commands.c: * ui/evolution-addressbook.xml: * ui/evolution-calendar.xml: * ui/evolution-composer-entries.xml: * ui/evolution-editor.xml: * ui/evolution-event-editor.xml: * ui/evolution-mail-list.xml: * ui/evolution-mail-message.xml: * ui/evolution-memos.xml: * ui/evolution-message-composer.xml: * ui/evolution-subscribe.xml: * ui/evolution-task-editor.xml: * ui/evolution-tasks.xml: * ui/evolution.xml: Use standard icon names where applicable. svn path=/trunk/; revision=34322
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r--calendar/gui/dialogs/cal-attachment-select-file.c2
-rw-r--r--calendar/gui/dialogs/comp-editor.c13
-rw-r--r--calendar/gui/dialogs/event-editor.c15
-rw-r--r--calendar/gui/dialogs/task-editor.c4
4 files changed, 23 insertions, 11 deletions
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 720abb10ef..aa57f95dc7 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -98,7 +98,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
gtk_window_set_modal ((GtkWindow *) selection, TRUE);
- icon_list = e_icon_factory_get_icon_list ("stock_mail-compose");
+ icon_list = e_icon_factory_get_icon_list ("mail-message-new");
if (icon_list) {
gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index d54c06347f..27555145d8 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = {
};
static EPixmap pixmaps[] = {
+ E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU),
+
+ E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
E_PIXMAP_END
};
@@ -2257,7 +2266,7 @@ make_icon_from_comp (ECalComponent *comp)
type = e_cal_component_get_vtype (comp);
switch (type) {
case E_CAL_COMPONENT_EVENT:
- return "stock_new-appointment";
+ return "appointment-new";
case E_CAL_COMPONENT_TODO:
return "stock_task";
case E_CAL_COMPONENT_JOURNAL:
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index d689ec6be9..eb86ea07b4 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -428,18 +428,19 @@ static EPixmap pixmaps[] = {
* icons is filled in at run-time in event_editor_init() are
* updated, too.
*/
+ E_PIXMAP ("/commands/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU),
+
E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/menu/Options/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU),
E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/menu/Options/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),
+
/* These two will have an absolute path to the png file filled
* in at run-time, see event_editor_init().
*/
E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/menu/Options/ActionFreeBusy", NULL, E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/ActionFreeBusy", NULL, E_ICON_SIZE_MENU),
E_PIXMAP_END
};
@@ -561,12 +562,12 @@ event_editor_init (EventEditor *ee)
editor->uic, "ActionFreeBusy",
menu_action_freebusy_cb, editor);
- /* NOTE: Make sure the 7 and 8 below correspond to the correct
+ /* NOTE: Make sure the 6 and 7 below correspond to the correct
* elements in the pixmaps array.
*/
- if (!pixmaps[7].name) {
+ if (!pixmaps[6].name) {
+ pixmaps[6].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
pixmaps[7].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
- pixmaps[8].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
}
e_pixmaps_update (editor->uic, pixmaps);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index f43adfe5f8..84512eaba1 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = {
};
static EPixmap pixmaps[] = {
+ E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/ViewTimeZone", "stock_timezone", E_ICON_SIZE_MENU),
+
E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};