From cfb0a3c19afa083d7abdd48e5900589c304a462f Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Sat, 10 Nov 2007 09:37:27 +0000 Subject: [PATCH] ** Fix for bug #209425 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. svn path=/trunk/; revision=34518 --- ChangeLog | 10 + calendar/ChangeLog | 8 + calendar/gui/calendar-commands.c | 16 +- calendar/gui/e-calendar-view.c | 2 +- data/icons/Makefile.am | 5 + data/icons/hicolor_actions_16x16_go-today.png | Bin 0 -> 652 bytes data/icons/hicolor_actions_16x16_go-today.svg | 306 +++++++++++++++ data/icons/hicolor_actions_22x22_go-today.png | Bin 0 -> 1008 bytes data/icons/hicolor_actions_22x22_go-today.svg | 354 ++++++++++++++++++ data/icons/hicolor_actions_24x24_go-today.png | Bin 0 -> 1031 bytes ui/ChangeLog | 7 + ui/evolution-calendar.xml | 4 +- 12 files changed, 702 insertions(+), 10 deletions(-) create mode 100644 data/icons/hicolor_actions_16x16_go-today.png create mode 100644 data/icons/hicolor_actions_16x16_go-today.svg create mode 100644 data/icons/hicolor_actions_22x22_go-today.png create mode 100644 data/icons/hicolor_actions_22x22_go-today.svg create mode 100644 data/icons/hicolor_actions_24x24_go-today.png 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 0000000000000000000000000000000000000000..414ac71303240d78c90a8172576a1092c1a21d26 GIT binary patch literal 652 zcmV;70(1R|P)z@ zvH!r{8VMudCTMMLM1%Dn>))W^aDZG6%$>_S+`V~%()t=A%Iv!ty3WQC5k!Q1VVdrE z0>u58FJw8_)k824siS7%C2$PvKJ?E47 zjK7*dL{QZ~n&vY;&j(`+s(U4@EVJ-oo-3CIYgqSUaw_fZGud%sZF?j%Hbe-8LZ04( z(3czlgt2srWTGDxw*uXjAfl`mR~Su=@V&Igdbz}pjWVOD5w^FtFvehv+ce`iNJX*% zSX%nR!l(J&xh0dGs9_&VKd(8z8h^3B3*kdy990T4d3xf#h$^bWo2d! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000000000000000000000000000000000..850f813722cb564f5f18244324664285d17a6513 GIT binary patch literal 1008 zcmVMH6cX}Hxp}=ro)^$+lRR^#%K(# zlasU0+Gl-xec%4}5$`1qeA_vW|3lNKO~Aq*32?fpS~ zwBkR;nbs86h>yKb*-G+s`$>YvroRO?3dQ)}fm@qH)|N|S3-HER%v-NtvwaU@3??<4uIw5+w}Gf;PE8GM$Q~e9Y%%xo~?AG;;|}( zK?D6ggLRz@_6-A`*n52JF-EbfHAY6kdyEl`LR9G(VE>mr9&ByW-#f_WdmYH5ht)!# zY~kFsA6UvR0I;%}ty_5MPAPxx>1T1)Nj{&i0iSA3)0j*GAdeo>dA3%#@ndO`fxaP@ zb6L7Bc42Kvip8aQ2K$Hcc)~;jQ55;A#sF#*V=ey_&N&3ZT8DE%UEX^zYCw)`o-u~q z-JPlwK9SqU7(n`I%~$M`JcKeMAZ?k1N2%Vv+QzHd3h+0B1k^9*qmt!dM+5 zFfug8Qg)Hv?p^{{T5KkBi_wvBy!QkyL7^-~b!$}>Yb~*lS-Zc1Hk`mVog`>(Wp(2& z&LwbVi#Z!$UFim}Ho)2dJ>rzAs5`scJlNVKj!P$D@lHM6naos;`uud=+|=|$RSILY z9=I*tPIGe;AgtuF^!4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0000000000000000000000000000000000000000..0862ab1fea7e0980e9e3c828ede20b3a4773b9a6 GIT binary patch literal 1031 zcmV+i1o-=jP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iFS; z4KX+`u+-B400W0fL_t(Y$F-GPPh3?L$A5e6ea;+)fnq}kT2o_{l(uq_yMWgC4fMrV z-%R=iY*V988f#5_@mZtsBluv98Y+~_0G)Cfq_idks&X?Cqck1n%-%lCFf#{8jbhiy z$vJzieb#@i|61#8c+8?I7uT-8Uk3z7^qIZ#*4w`y0C?@vhd*R~wik2xqj}c?&m?8x z+s`hyL;x!TlwX`lvDKyj8@J%mjE!8#*>Z5@vCbN1<(R{`_BONwE+vW<#h?*jRDK0*U$6k z&L1e??!85t&pwBUpp+t$nW43{1Emy;cQTx9I*0K*0A^=z(cadD!x0avIkhvg8|Jc` z-&6u<0Z|Skioma;v#mQ4S$9V-;IPi&tV3(Th?Fzb0?wheLJNfZGXU87ZIhMNWjfot zS-#SQdazwCV!Vzs*M1^BGX=oh{7fW(^zDNF%+t@}8Bb-i*@FNl>XTH*wE$3S>ra;kjdXnzWUL1}fRz(9q#EofsNSwzqCP$-P?@H{`F zcMi1Z$oQ6PpfwvC>m`a@EWzEiY?-21VLm1%$4XIG%6MwDf+C|H?gz-{^CV9+kVqr| zIQ`y_h|QH8Sn*H_`g#UP&rH+a+K%rPK*v%y>F*oFIfw7X$W>4z5sE}G#$cUg;ocHb zbqrH;9KW`n`K3E}UJS3;nx647Uf~8X#>W^Rk%-G^4c0f-SXo`h+QLLl-;UBSmKrHj zGC3Ntjf@VJDAHOE2WUt(Qd?UCDCROVbhLFMS|duBoSvY+ZxDqrl}^$1d>6hS0~Euf zL%i7kGR|3y@yJ(Ny~#ZXF>y2x6Kh(4Sm5n*k8 zA4TbjC=FvbO7AzvhajIpdIAG9AOyB7oUIm1hBm~bNZckuYOWfTk|HMk9cI-t<9~kKDz$#WniiD zOnwSTQvMPCSBV#&zW^(h08%tQ{GR}JfIN>|{sv(;FJK>j*);$F002ovPDHLkV1kk! B+pGWp literal 0 HcmV?d00001 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 @@ - +