diff --git a/ChangeLog b/ChangeLog index ff0ff1c3ec..121b26c70d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-11-10 Michael Monreal + + ** Fix for bug #209425 + + * data/icons/Makefile.am: + * data/icons/hicolor_actions_16x16_go-today.svg: + * data/icons/hicolor_actions_22x22_go-today.svg: + Don't use gtk-home for the go-today action. Add new + icons to the build. + 2007-11-03 Matthew Barnes ** Remove dead files from source control. The dates below diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e0adf45964..62342f187d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2007-11-10 Michael Monreal + + ** Fix for bug #209425 + + * gui/calendar-commands.c: + * gui/e-calendar-view.c: + Don't use gtk-home for the go-today action. + 2007-11-05 Milan Crha ** Fix for bug #491345 diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index b16a6991f4..7c6576bf2a 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -598,13 +598,14 @@ static EPixmap pixmaps [] = { E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/CalendarToday", "go-today", E_ICON_SIZE_MENU), E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), @@ -616,6 +617,7 @@ static EPixmap pixmaps [] = { E_PIXMAP ("/Toolbar/WeekView", "view-calendar-week", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MonthView", "view-calendar-month", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/ListView", "view-calendar-list", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/Today", "go-today", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index fae8a2cb8e..7f84d6e540 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1666,7 +1666,7 @@ static EPopupItem ecv_main_items [] = { /* FIXME: hook in this somehow */ { E_POPUP_SUBMENU, "60.view", N_("_Current View") }, - { E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, GTK_STOCK_HOME }, + { E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, "go-today" }, { E_POPUP_ITEM, "62.todate", N_("_Select Date..."), on_goto_date, NULL, GTK_STOCK_JUMP_TO }, }; diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 4fef3ec9f9..21a8b91488 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -10,16 +10,19 @@ public_icons = \ $(NULL) private_icons = \ + hicolor_actions_16x16_go-today.png \ hicolor_actions_16x16_view-calendar-day.png \ hicolor_actions_16x16_view-calendar-list.png \ hicolor_actions_16x16_view-calendar-month.png \ hicolor_actions_16x16_view-calendar-week.png \ hicolor_actions_16x16_view-calendar-workweek.png \ + hicolor_actions_22x22_go-today.png \ hicolor_actions_22x22_view-calendar-day.png \ hicolor_actions_22x22_view-calendar-list.png \ hicolor_actions_22x22_view-calendar-month.png \ hicolor_actions_22x22_view-calendar-week.png \ hicolor_actions_22x22_view-calendar-workweek.png \ + hicolor_actions_24x24_go-today.png \ hicolor_actions_24x24_view-calendar-day.png \ hicolor_actions_24x24_view-calendar-list.png \ hicolor_actions_24x24_view-calendar-month.png \ @@ -53,11 +56,13 @@ private_icons = \ $(NULL) noinst_DATA = \ + hicolor_actions_16x16_go-today.svg \ hicolor_actions_16x16_view-calendar-day.svg \ hicolor_actions_16x16_view-calendar-list.svg \ hicolor_actions_16x16_view-calendar-month.svg \ hicolor_actions_16x16_view-calendar-week.svg \ hicolor_actions_16x16_view-calendar-workweek.svg \ + hicolor_actions_22x22_go-today.svg \ hicolor_actions_22x22_view-calendar-day.svg \ hicolor_actions_22x22_view-calendar-list.svg \ hicolor_actions_22x22_view-calendar-month.svg \ diff --git a/data/icons/hicolor_actions_16x16_go-today.png b/data/icons/hicolor_actions_16x16_go-today.png new file mode 100644 index 0000000000..414ac71303 Binary files /dev/null and b/data/icons/hicolor_actions_16x16_go-today.png differ diff --git a/data/icons/hicolor_actions_16x16_go-today.svg b/data/icons/hicolor_actions_16x16_go-today.svg new file mode 100644 index 0000000000..a36c8582f5 --- /dev/null +++ b/data/icons/hicolor_actions_16x16_go-today.svg @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_22x22_go-today.png b/data/icons/hicolor_actions_22x22_go-today.png new file mode 100644 index 0000000000..850f813722 Binary files /dev/null and b/data/icons/hicolor_actions_22x22_go-today.png differ diff --git a/data/icons/hicolor_actions_22x22_go-today.svg b/data/icons/hicolor_actions_22x22_go-today.svg new file mode 100644 index 0000000000..0735b7b3e9 --- /dev/null +++ b/data/icons/hicolor_actions_22x22_go-today.svg @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_24x24_go-today.png b/data/icons/hicolor_actions_24x24_go-today.png new file mode 100644 index 0000000000..0862ab1fea Binary files /dev/null and b/data/icons/hicolor_actions_24x24_go-today.png differ diff --git a/ui/ChangeLog b/ui/ChangeLog index dc3abaa9bc..044080a002 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,10 @@ +2007-11-10 Michael Monreal + + ** Fix for bug #209425 + + * evolution-calendar.xml: + Don't use gtk-home for the go-today action. + 2007-11-01 Michael Monreal ** Fix for bug #492106 diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml index 662a9206c4..5d7a5d875b 100644 --- a/ui/evolution-calendar.xml +++ b/ui/evolution-calendar.xml @@ -6,7 +6,7 @@ - + @@ -81,7 +81,7 @@ - +