aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Monreal <mmonreal@svn.gnome.org>2007-11-10 17:37:27 +0800
committerMichael Monreal <mmonreal@src.gnome.org>2007-11-10 17:37:27 +0800
commitcfb0a3c19afa083d7abdd48e5900589c304a462f (patch)
tree2fa48539c3365651c71fcac97cbd2dcfce2c370b
parent0ed655c83ba6701df82572b5e41400e498ba6579 (diff)
downloadgsoc2013-evolution-cfb0a3c19afa083d7abdd48e5900589c304a462f.tar.gz
gsoc2013-evolution-cfb0a3c19afa083d7abdd48e5900589c304a462f.tar.zst
gsoc2013-evolution-cfb0a3c19afa083d7abdd48e5900589c304a462f.zip
** Fix for bug #209425
2007-11-10 Michael Monreal <mmonreal@svn.gnome.org> ** 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
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/calendar-commands.c16
-rw-r--r--calendar/gui/e-calendar-view.c2
-rw-r--r--data/icons/Makefile.am5
-rw-r--r--data/icons/hicolor_actions_16x16_go-today.pngbin0 -> 652 bytes
-rw-r--r--data/icons/hicolor_actions_16x16_go-today.svg306
-rw-r--r--data/icons/hicolor_actions_22x22_go-today.pngbin0 -> 1008 bytes
-rw-r--r--data/icons/hicolor_actions_22x22_go-today.svg354
-rw-r--r--data/icons/hicolor_actions_24x24_go-today.pngbin0 -> 1031 bytes
-rw-r--r--ui/ChangeLog7
-rw-r--r--ui/evolution-calendar.xml4
12 files changed, 702 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ff0ff1c3ec..121b26c70d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-10 Michael Monreal <mmonreal@svn.gnome.org>
+
+ ** 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 <mbarnes@redhat.com>
** 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 <mmonreal@svn.gnome.org>
+
+ ** 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 <mcrha@redhat.com>
** 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
--- /dev/null
+++ b/data/icons/hicolor_actions_16x16_go-today.png
Binary files 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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:ns="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg4908"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docname="go-today.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:docbase="/home/andreas/project/misc icons/16x16"
+ inkscape:export-filename="/home/andreas/project/misc icons/16x16/go-today.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4910">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5721">
+ <stop
+ style="stop-color:#3465a4;stop-opacity:1"
+ offset="0"
+ id="stop5723" />
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1"
+ offset="1"
+ id="stop5725" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3702">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop3704" />
+ <stop
+ id="stop3710"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop3706" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3702"
+ id="linearGradient2098"
+ gradientUnits="userSpaceOnUse"
+ x1="25.058096"
+ y1="47.027729"
+ x2="25.058096"
+ y2="39.999443" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3688"
+ id="radialGradient2096"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+ cx="4.9929786"
+ cy="43.5"
+ fx="4.9929786"
+ fy="43.5"
+ r="2.5" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3688">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop3690" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop3692" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3688"
+ id="radialGradient2094"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+ cx="4.9929786"
+ cy="43.5"
+ fx="4.9929786"
+ fy="43.5"
+ r="2.5" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6956">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop6958" />
+ <stop
+ style="stop-color:#d3d7cf;stop-opacity:1"
+ offset="1"
+ id="stop6960" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6956"
+ id="radialGradient10802"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.2933438,0,0,2.2505457,45.56813,-21.76062)"
+ cx="-15.113025"
+ cy="15.017189"
+ fx="-15.113025"
+ fy="15.017189"
+ r="9" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3177">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3179" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3181" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3177"
+ id="linearGradient3183"
+ x1="12.78919"
+ y1="0.21081063"
+ x2="16.43354"
+ y2="19.430988"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6825708,0,0,0.7003708,-0.1195141,-0.9647651)" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3167">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1;"
+ offset="0"
+ id="stop3169" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0;"
+ offset="1"
+ id="stop3171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3167"
+ id="linearGradient3186"
+ gradientUnits="userSpaceOnUse"
+ x1="5.6787376"
+ y1="-9.7172785"
+ x2="17.825142"
+ y2="11.213716"
+ gradientTransform="matrix(0.670403,0,0,0.9224329,25.939391,0.3499054)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5721"
+ id="linearGradient5727"
+ x1="10.871767"
+ y1="3.3058643"
+ x2="10.871767"
+ y2="5.0445838"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7899997,0,0,0.9324837,-0.569546,-0.6992715)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627417"
+ inkscape:cx="17.514125"
+ inkscape:cy="9.4044628"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ width="16px"
+ height="16px"
+ inkscape:window-width="1680"
+ inkscape:window-height="948"
+ inkscape:window-x="4"
+ inkscape:window-y="50">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5142" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4913">
+ <rdf:RDF>
+ <ns:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </ns:Work>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ style="opacity:1;fill:url(#radialGradient10802);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
+ id="rect5985"
+ width="14.971417"
+ height="14.911932"
+ x="0.50830561"
+ y="0.53378403"
+ rx="1.0218275"
+ ry="1.0218276" />
+ <rect
+ style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3157"
+ width="1.0358447"
+ height="14"
+ x="12.036077"
+ y="-15"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3159"
+ width="0.98726058"
+ height="13.926479"
+ x="9.0490665"
+ y="-15"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 4.5120991,3.9999763 L 4.5120991,15.013274"
+ id="path5093" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 8.4977778,4.0055439 L 8.4977778,14.932895"
+ id="path5767" />
+ <rect
+ style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3163"
+ width="1.0065687"
+ height="14"
+ x="6.0286293"
+ y="-15"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 12.500467,4.0280623 L 12.500467,14.84082"
+ id="path5769" />
+ <rect
+ style="opacity:0.51000001;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
+ id="rect6964"
+ width="12.958357"
+ height="12.923835"
+ x="1.5246743"
+ y="1.5249711"
+ rx="0"
+ ry="0" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient5727);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3143"
+ width="14.299527"
+ height="3"
+ x="1.0129728"
+ y="1" />
+ <path
+ style="opacity:0.22222224;fill:none;fill-opacity:1;stroke:url(#linearGradient3183);stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 1.5499625,4.1234083 L 1.4951763,1.4865324 L 14.555758,1.4865324 L 14.518807,3.9378305"
+ id="rect3175"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:#204a87;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 0.50096296,4 L 0.50096296,1.286519 C 0.50096296,0.85224263 0.86714896,0.50262681 1.322007,0.50262681 L 14.711327,0.50262681 C 15.166185,0.50262681 15.532371,0.85224263 15.532371,1.286519 L 15.532371,4"
+ id="rect10804"
+ sodipodi:nodetypes="cccccc" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2195"
+ width="6"
+ height="5"
+ x="3.5"
+ y="5.5" />
+ <rect
+ style="opacity:1;fill:#f57900;fill-opacity:1;stroke:#ce5c00;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3168"
+ width="4"
+ height="3"
+ x="4.5"
+ y="6.5" />
+ </g>
+</svg>
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
--- /dev/null
+++ b/data/icons/hicolor_actions_22x22_go-today.png
Binary files 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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:ns="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="22"
+ height="22"
+ id="svg4908"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docname="go-today.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:docbase="/home/andreas/project/misc icons/22x22/actions"
+ inkscape:export-filename="/home/andreas/project/misc icons/22x22/actions/go-today.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4910">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5721">
+ <stop
+ style="stop-color:#3465a4;stop-opacity:1"
+ offset="0"
+ id="stop5723" />
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1"
+ offset="1"
+ id="stop5725" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3702">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop3704" />
+ <stop
+ id="stop3710"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop3706" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3702"
+ id="linearGradient2098"
+ gradientUnits="userSpaceOnUse"
+ x1="25.058096"
+ y1="47.027729"
+ x2="25.058096"
+ y2="39.999443" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3688"
+ id="radialGradient2096"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+ cx="4.9929786"
+ cy="43.5"
+ fx="4.9929786"
+ fy="43.5"
+ r="2.5" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3688">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop3690" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop3692" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3688"
+ id="radialGradient2094"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+ cx="4.9929786"
+ cy="43.5"
+ fx="4.9929786"
+ fy="43.5"
+ r="2.5" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6956">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0"
+ id="stop6958" />
+ <stop
+ style="stop-color:#d3d7cf;stop-opacity:1"
+ offset="1"
+ id="stop6960" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6956"
+ id="radialGradient10802"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.9201066,0,0,2.732559,58.869544,-25.660551)"
+ cx="-15.113025"
+ cy="15.017189"
+ fx="-15.113025"
+ fy="15.017189"
+ r="9" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3177">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3179" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3181" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3177"
+ id="linearGradient3183"
+ x1="12.78919"
+ y1="0.21081063"
+ x2="16.43354"
+ y2="19.430988"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8932504,0,0,0.8425764,0.4073914,-0.5013004)" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3167">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1;"
+ offset="0"
+ id="stop3169" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0;"
+ offset="1"
+ id="stop3171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3167"
+ id="linearGradient3186"
+ gradientUnits="userSpaceOnUse"
+ x1="5.6787376"
+ y1="-9.7172785"
+ x2="17.825142"
+ y2="11.213716"
+ gradientTransform="matrix(0.670403,0,0,0.9224329,25.939391,0.3499054)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5721"
+ id="linearGradient5727"
+ x1="10.871767"
+ y1="3.3058643"
+ x2="10.871767"
+ y2="5.0445838"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627417"
+ inkscape:cx="11.512524"
+ inkscape:cy="13.131675"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ width="22px"
+ height="22px"
+ inkscape:window-width="1680"
+ inkscape:window-height="948"
+ inkscape:window-x="4"
+ inkscape:window-y="50">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5142" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4913">
+ <rdf:RDF>
+ <ns:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </ns:Work>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g2043"
+ inkscape:label="Shadow"
+ transform="matrix(0.55625,0,0,0.555556,-2.3342121,-4.4504485)">
+ <g
+ style="display:inline"
+ id="g2036"
+ inkscape:label="Shadow">
+ <g
+ id="g3712"
+ style="opacity:0.4"
+ transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+ <rect
+ y="40"
+ x="38"
+ height="7"
+ width="5"
+ id="rect2801"
+ style="opacity:1;fill:url(#radialGradient2094);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ transform="scale(-1,-1)"
+ y="-47"
+ x="-10"
+ height="7"
+ width="5"
+ id="rect3696"
+ style="opacity:1;fill:url(#radialGradient2096);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="40"
+ x="10"
+ height="7.0000005"
+ width="28"
+ id="rect3700"
+ style="opacity:1;fill:url(#linearGradient2098);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ </g>
+ <rect
+ style="opacity:1;fill:url(#radialGradient10802);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992000000000;stroke-opacity:1"
+ id="rect5985"
+ width="19.063053"
+ height="18.105713"
+ x="1.4950296"
+ y="1.408784"
+ rx="1.0218276"
+ ry="1.0218276" />
+ <rect
+ style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3157"
+ width="1.0448729"
+ height="18.114008"
+ x="16"
+ y="-20.08457"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3159"
+ width="1.0498569"
+ height="18.069815"
+ x="13"
+ y="-20.056538"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3161"
+ width="1.0498569"
+ height="18.158201"
+ x="10"
+ y="-20.100731"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3163"
+ width="1.0811069"
+ height="18.122005"
+ x="6.9838057"
+ y="-20.108728"
+ transform="matrix(0,1,-1,0,0,0)" />
+ <rect
+ style="opacity:0.51;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992000000000;stroke-opacity:1"
+ id="rect6964"
+ width="17.018353"
+ height="15.979198"
+ x="2.5578046"
+ y="2.5523908"
+ rx="0"
+ ry="0" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient5727);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3143"
+ width="18.100674"
+ height="3.2172143"
+ x="2.0031888"
+ y="1.822307" />
+ <path
+ style="opacity:0.22222224;fill:none;fill-opacity:1;stroke:url(#linearGradient3183);stroke-width:0.99999988;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 2.5921612,5.6199928 L 2.5204654,2.4477169 L 19.612275,2.4477169 L 19.563918,5.3967347"
+ id="rect3175"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:#204a87;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 1.5585793,5.0459528 L 1.5585793,2.5070581 C 1.5585793,1.956945 2.0221051,1.5140744 2.5978749,1.5140744 L 19.546389,1.5140744 C 20.122159,1.5140744 20.585685,1.956945 20.585685,2.5070581 L 20.585685,5.0459528"
+ id="rect10804"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 5.5166112,5.0157788 L 5.5166112,18.966709"
+ id="path5093" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 9.4940868,4.9819923 L 9.4940868,18.932922"
+ id="path5765" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 12.582476,5.0209826 L 12.582476,18.971913"
+ id="path5767" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#babdb6;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 16.510553,5.0097204 L 16.510553,18.960651"
+ id="path5769" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2203"
+ width="6"
+ height="5.0625"
+ x="4.5"
+ y="6.5" />
+ <rect
+ style="opacity:1;fill:#f57900;fill-opacity:1.0;stroke:#ce5c00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3176"
+ width="4"
+ height="3.0625"
+ x="5.5"
+ y="7.5" />
+ </g>
+</svg>
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
--- /dev/null
+++ b/data/icons/hicolor_actions_24x24_go-today.png
Binary files 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 <mmonreal@svn.gnome.org>
+
+ ** Fix for bug #209425
+
+ * evolution-calendar.xml:
+ Don't use gtk-home for the go-today action.
+
2007-11-01 Michael Monreal <mmonreal@svn.gnome.org>
** 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 @@
<cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/>
<cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
- <cmd name="CalendarToday" _tip="Select today" pixtype="stock" pixname="Home"/>
+ <cmd name="CalendarToday" _tip="Select today" pixtype="pixbuf"/>
<cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
<cmd name="CalendarGoto" _tip="Select a specific date" pixtype="pixbuf"/>
@@ -81,7 +81,7 @@
<separator f="" name="ecal2"/>
<toolitem name="Prev" verb="CalendarPrev" _label="Previous" pixtype="pixbuf"/>
- <toolitem name="Today" verb="CalendarToday" _label="Today"/>
+ <toolitem name="Today" verb="CalendarToday" _label="Today" pixtype="pixbuf"/>
<toolitem name="Next" verb="CalendarNext" _label="Next" pixtype="pixbuf"/>
<separator f="" name="ecal3"/>
generated by cgit (git 2.34.1) at 2024-11-17 22:10:17 +0800