* add icon for main window

pmo-trunk-r439

diff --git a/src/gtk2/Makefile.am b/src/gtk2/Makefile.am
index c0086e4..7c914b2 100644 (file)
--- a/src/gtk2/Makefile.am
+++ b/src/gtk2/Makefile.am
@@ -17,7 +17,8 @@ noinst_LTLIBRARIES=\
        libmodest-ui.la
 
 PIXMAP_FILES=\
-       pixmaps/*.png
+       pixmaps/*.png \
+       pixmaps/*.svg
 
 libmodest_ui_la_SOURCES=              \
        modest-ui.c                   \

diff --git a/src/gtk2/modest-icon-names.h b/src/gtk2/modest-icon-names.h
index c51d743..3c5a42b 100644 (file)
--- a/src/gtk2/modest-icon-names.h
+++ b/src/gtk2/modest-icon-names.h
@@ -42,6 +42,8 @@
 
 /* icons */
 
+#define MODEST_APP_ICON                                PIXMAP_PREFIX "internet-mail.svg"
+
 #define MODEST_HEADER_ICON_READ                        PIXMAP_PREFIX "qgn_list_messagin_mail.png"
 #define MODEST_HEADER_ICON_UNREAD              PIXMAP_PREFIX "qgn_list_messagin_mail_unread.png"
 #define MODEST_HEADER_ICON_DELETED             PIXMAP_PREFIX "qgn_list_messagin_mail_deleted.png"

diff --git a/src/gtk2/modest-main-window.c b/src/gtk2/modest-main-window.c
index 90db766..087af94 100644 (file)
--- a/src/gtk2/modest-main-window.c
+++ b/src/gtk2/modest-main-window.c
@@ -28,9 +28,13 @@
  */
 
 #include <modest-widget-memory.h>
+#include <modest-icon-factory.h>
+
 #include "modest-main-window.h"
 #include "modest-account-view-window.h"
 #include "modest-edit-msg-window.h"
+#include "modest-icon-names.h"
+
 
 /* 'private'/'protected' functions */
 static void modest_main_window_class_init    (ModestMainWindowClass *klass);
@@ -470,7 +474,9 @@ modest_main_window_new (ModestConf *conf, ModestAccountMgr *account_mgr,
        restore_sizes (MODEST_MAIN_WINDOW(obj));        
 
        gtk_window_set_title (GTK_WINDOW(obj), "Modest");
-
+       gtk_window_set_icon  (GTK_WINDOW(obj),
+                             modest_icon_factory_get_icon (MODEST_APP_ICON));
+       
        gtk_widget_show_all (main_vbox);
        
        g_signal_connect (G_OBJECT(obj), "delete-event",

diff --git a/src/gtk2/pixmaps/internet-mail.svg b/src/gtk2/pixmaps/internet-mail.svg
new file mode 100644 (file)
index 0000000..cfaed48
--- /dev/null
+++ b/src/gtk2/pixmaps/internet-mail.svg
@@ -0,0 +1,458 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="internet-mail.svg"
+   sodipodi:docbase="/home/jimmac/gfx/ximian/tango-desktop-theme/scalable/apps"
+   inkscape:version="0.41+cvs"
+   sodipodi:version="0.32"
+   id="svg5816"
+   height="48px"
+   width="48px">
+  <defs
+     id="defs3"><linearGradient
+   id="linearGradient28260">
+  <stop
+   style="stop-color:#9aa29a;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop28262" />
+
+
+  <stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop28264" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient28254">
+  <stop
+   id="stop28256"
+   offset="0.0000000"
+   style="stop-color:#9aa29a;stop-opacity:1.0000000;" />
+
+
+  <stop
+   id="stop28258"
+   offset="1.0000000"
+   style="stop-color:none" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient2274">
+  <stop
+   style="stop-color:#000000;stop-opacity:0.12871288;"
+   offset="0.0000000"
+   id="stop2276" />
+
+
+  <stop
+   style="stop-color:#000000;stop-opacity:0.0000000;"
+   offset="1.0000000"
+   id="stop2278" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient9749">
+  <stop
+   style="stop-color:#ffffff;stop-opacity:1;"
+   offset="0"
+   id="stop9751" />
+
+
+  <stop
+   style="stop-color:#ededed;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop9753" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient2152">
+  <stop
+   style="stop-color:#9aa29a;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop2154" />
+
+
+  <stop
+   style="stop-color:#b5beb5;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop2156" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient2166">
+  <stop
+   style="stop-color:#ffffff;stop-opacity:1;"
+   offset="0"
+   id="stop2168" />
+
+
+  <stop
+   style="stop-color:#dcdcdc;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop2170" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient18913">
+  <stop
+   style="stop-color:#ededed;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop18915" />
+
+
+  <stop
+   style="stop-color:#c8c8c8;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop18917" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient2136">
+  <stop
+   style="stop-color:#989690;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop2138" />
+
+
+  <stop
+   style="stop-color:#656460;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop2140" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient15107">
+  <stop
+   style="stop-color:#ffffff;stop-opacity:1.0000000;"
+   offset="0.0000000"
+   id="stop15109" />
+
+
+  <stop
+   style="stop-color:#e2e2e2;stop-opacity:1.0000000;"
+   offset="1.0000000"
+   id="stop15111" />
+
+
+</linearGradient>
+<linearGradient
+   id="linearGradient10691"
+   inkscape:collect="always">
+  <stop
+   id="stop10693"
+   offset="0"
+   style="stop-color:#000000;stop-opacity:1;" />
+
+
+  <stop
+   id="stop10695"
+   offset="1"
+   style="stop-color:#000000;stop-opacity:0;" />
+
+
+</linearGradient>
+<radialGradient
+   r="7.2284161"
+   fy="73.615714"
+   fx="6.7027131"
+   cy="73.615714"
+   cx="6.7027131"
+   gradientTransform="scale(1.902215,0.525703)"
+   gradientUnits="userSpaceOnUse"
+   id="radialGradient11382"
+   xlink:href="#linearGradient10691"
+   inkscape:collect="always" />
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+<linearGradient
+   y2="32.203162"
+   x2="9.7619219"
+   y1="37.784682"
+   x1="8.7803760"
+   gradientTransform="matrix(2.394900,0.000000,0.000000,0.781058,2.879512,0.343005)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27463"
+   xlink:href="#linearGradient2274"
+   inkscape:collect="always" />
+<linearGradient
+   y2="24.132717"
+   x2="21.111549"
+   y1="13.686079"
+   x1="11.233107"
+   gradientTransform="matrix(1.370928,0.000000,0.000000,1.443758,2.431133,-0.140786)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27468"
+   xlink:href="#linearGradient9749"
+   inkscape:collect="always" />
+<linearGradient
+   y2="52.090678"
+   x2="9.8855033"
+   y1="37.197018"
+   x1="8.9156475"
+   gradientTransform="matrix(2.454781,0.000000,0.000000,0.762004,2.879512,0.343005)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27471"
+   xlink:href="#linearGradient2152"
+   inkscape:collect="always" />
+<linearGradient
+   y2="52.090678"
+   x2="9.8855033"
+   y1="37.197018"
+   x1="8.9156475"
+   gradientTransform="matrix(2.454781,0.000000,0.000000,0.762004,2.879512,0.343005)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27474"
+   xlink:href="#linearGradient2152"
+   inkscape:collect="always" />
+<linearGradient
+   y2="29.568739"
+   x2="15.310744"
+   y1="15.148383"
+   x1="10.184240"
+   gradientTransform="matrix(1.819266,0.000000,0.000000,1.028193,2.879512,0.343005)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27477"
+   xlink:href="#linearGradient2166"
+   inkscape:collect="always" />
+<linearGradient
+   y2="17.876846"
+   x2="13.467486"
+   y1="7.2310905"
+   x1="5.8266134"
+   gradientTransform="matrix(1.570607,0.000000,0.000000,1.190976,2.879512,0.343005)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27483"
+   xlink:href="#linearGradient18913"
+   inkscape:collect="always" />
+<linearGradient
+   y2="26.022910"
+   x2="18.475286"
+   y1="4.7461626"
+   x1="11.572842"
+   gradientTransform="matrix(1.343475,0.000000,0.000000,1.417854,2.879511,0.314599)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27486"
+   xlink:href="#linearGradient15107"
+   inkscape:collect="always" />
+<linearGradient
+   y2="15.257116"
+   x2="30.599684"
+   y1="15.257116"
+   x1="2.0618774"
+   gradientTransform="matrix(1.343475,0.000000,0.000000,1.417854,2.879511,0.314599)"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient27488"
+   xlink:href="#linearGradient2136"
+   inkscape:collect="always" />
+</defs>
+  <sodipodi:namedview
+     inkscape:window-y="202"
+     inkscape:window-x="331"
+     inkscape:window-height="743"
+     inkscape:window-width="849"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:cy="18.816166"
+     inkscape:cx="28.384904"
+     inkscape:zoom="9.8994949"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF
+       id="RDF5">
+      <cc:Work
+         id="Work6"
+         rdf:about="">
+        <dc:format
+           id="format7">image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+           id="type9" />
+        <dc:title
+           id="title29050">Mail</dc:title>
+        <dc:creator
+           id="creator29052">
+          <cc:Agent
+             id="Agent29054">
+            <dc:title
+               id="title29056">Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor
+           id="contributor29058">
+          <cc:Agent
+             id="Agent29060">
+            <dc:title
+               id="title29062">Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/"
+           id="license29064" />
+        <dc:subject
+           id="subject29080">
+          <rdf:Bag
+             id="Bag29082">
+            <rdf:li
+               id="li29148">mail</rdf:li>
+            <rdf:li
+               id="li29150">e-mail</rdf:li>
+            <rdf:li
+               id="li29152">MUA</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         id="License29066"
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           id="permits29068"
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           id="permits29070"
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           id="requires29072"
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           id="requires29074"
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           id="permits29076"
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           id="requires29078"
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.45569620;color:#000000;fill:url(#radialGradient11382);fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+       id="path10699"
+       sodipodi:cx="12.750000"
+       sodipodi:cy="38.700001"
+       sodipodi:rx="13.750000"
+       sodipodi:ry="3.8000000"
+       d="M 26.500000 38.700001 A 13.750000 3.8000000 0 1 1  -1.0000000,38.700001 A 13.750000 3.8000000 0 1 1  26.500000 38.700001 z"
+       transform="matrix(1.800603,0.000000,0.000000,1.974782,1.083944,-38.01261)" />
+    <path
+       style="fill:url(#linearGradient27486);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient27488);stroke-width:0.85660440;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 6.3334395,16.972251 L 6.3334395,41.481799 L 43.305555,41.481799 L 43.244499,17.089859 C 43.241050,15.712272 31.395999,2.4121110 29.210877,2.4121110 L 20.659391,2.4121110 C 18.362072,2.4121110 6.3334395,15.673953 6.3334395,16.972251 z "
+       id="path12723"
+       sodipodi:nodetypes="ccczzzz" />
+    <path
+       style="fill:url(#linearGradient27483);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+       d="M 6.9230610,16.787103 C 6.5250222,16.356975 18.809966,3.0935378 20.667210,3.0935378 L 29.042965,3.0935378 C 30.790449,3.0935378 43.079567,16.221603 42.470079,16.978956 L 31.608858,30.475150 L 19.295373,30.156846 L 6.9230610,16.787103 z "
+       id="path18153"
+       sodipodi:nodetypes="czzzccz" />
+    <path
+       style="fill:#000000;fill-opacity:0.14619882;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 19.077530,30.017590 L 11.744526,21.271586 L 36.562951,14.335513 L 39.592221,20.551966 L 32.175956,29.992298"
+       id="path2164"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.14619882;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 18.291767,29.836259 L 10.809167,21.026146 L 35.456637,14.132812 L 38.630714,20.403811 L 31.390193,29.810968"
+       id="path2162"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:0.14619882;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 18.775313,29.957146 L 11.100386,21.296624 L 36.068405,14.232329 L 39.354114,20.824726 L 31.873739,29.931855"
+       id="path2160"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:url(#linearGradient27477);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 18.593984,30.440693 L 11.260975,21.694689 L 35.972554,14.801355 L 39.083369,21.188770 L 31.963198,30.174701"
+       id="path15105"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:url(#linearGradient27474);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 20.488434,29.064331 L 7.0924698,40.036319 L 21.001312,30.432013 L 30.019470,30.432013 L 42.438517,39.914206 L 30.575092,29.064331 L 20.488434,29.064331 z "
+       id="path14245"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient27471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
+       d="M 6.9634751,16.885144 L 18.479648,31.201334 L 19.548151,30.346532 L 6.9634751,16.885144 z "
+       id="path14339"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:url(#linearGradient27468);stroke-width:0.85660428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 7.3077115,17.131415 L 7.3388644,40.342421 L 42.283659,40.342421 L 42.221353,17.257512 C 42.219329,16.508413 31.005032,3.4591863 28.837233,3.4591863 L 20.941579,3.4591863 C 18.689313,3.4591863 7.3066655,16.351067 7.3077115,17.131415 z "
+       id="path15103"
+       sodipodi:nodetypes="ccczzzz" />
+    <path
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
+       d="M 20.957271,30.452732 L 9.0157722,38.723588 L 11.235205,38.729695 L 21.233330,31.860755 L 30.055238,30.437917 L 20.957271,30.452732 z "
+       id="path17393"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+       d="M 11.427536,21.670296 L 12.752479,23.080719 L 35.543311,16.196529 L 38.458445,21.878896 L 39.072496,21.166981 L 36.003081,14.789145 L 11.427536,21.670296 z "
+       id="path2174"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:url(#linearGradient27463);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+       d="M 13.308098,23.636340 L 19.334450,30.090093 L 20.531174,29.064331 L 30.617831,29.107071 L 31.429893,29.833651 L 35.404721,25.089502 C 34.250740,23.679081 13.308098,23.636340 13.308098,23.636340 z "
+       id="path2272"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path27492"
+       d="M 41.812936,17.847945 L 31.861315,30.479232 L 30.792812,29.624431 L 41.812936,17.847945 z "
+       style="color:#000000;fill:#b1b1b1;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
+  </g>
+</svg>