Mailinglist Archive: zypp-commit (325 mails)

< Previous Next >
[zypp-commit] r7274 - in /trunk/updater-gnome: ./ images/16x16/apps/ images/16x16/status/ images/22x22/apps/ images/22x22/status/ src/ src/zypp/
  • From: joshkress@xxxxxxxxxxxxxxxx
  • Date: Mon, 17 Sep 2007 16:46:29 -0000
  • Message-id: <20070917164630.5A8741750B@xxxxxxxxxxxxxxxx>
Author: joshkress
Date: Mon Sep 17 18:46:29 2007
New Revision: 7274

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7274&view=rev
Log:
* Updated icons (jimmac@xxxxxxxxxx)
* Various fixes
* Tooltips
* i18n

Modified:
    trunk/updater-gnome/images/16x16/apps/opensuseupdater.png
    trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg
    trunk/updater-gnome/images/16x16/status/opensuseupdater_green.png
    trunk/updater-gnome/images/22x22/apps/opensuseupdater.png
    trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg
    trunk/updater-gnome/images/22x22/status/opensuseupdater_green.png
    trunk/updater-gnome/opensuse-updater-gnome.spec
    trunk/updater-gnome/src/updater-applet-callbacks.c
    trunk/updater-gnome/src/updater-applet-support.c
    trunk/updater-gnome/src/updater-applet-support.h
    trunk/updater-gnome/src/updater-applet.c
    trunk/updater-gnome/src/updater-backend.c
    trunk/updater-gnome/src/updater-callbacks.c
    trunk/updater-gnome/src/updater-support.c
    trunk/updater-gnome/src/updater.c
    trunk/updater-gnome/src/updater.h
    trunk/updater-gnome/src/zypp/updater-zypper-gui.c

Modified: trunk/updater-gnome/images/16x16/apps/opensuseupdater.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/16x16/apps/opensuseupdater.png?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg (original)
+++ trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg Mon Sep 17 18:46:29 2007
@@ -8,7 +8,7 @@
    xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/";
    xmlns:x="adobe:ns:meta/"
    xmlns:dc="http://purl.org/dc/elements/1.1/";
-   xmlns:cc="http://web.resource.org/cc/";
+   xmlns:cc="http://creativecommons.org/ns#";
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
    xmlns:svg="http://www.w3.org/2000/svg";
    xmlns:xlink="http://www.w3.org/1999/xlink";
@@ -25,14 +25,29 @@
    xml:space="preserve"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docname="gekko-head-updater.svg"
+   inkscape:version="0.45+devel"
+   sodipodi:docname="opensuseupdater.svg"
    sodipodi:docbase="/suse/jkress/Desktop/local-home/contexts/artwork/updater/16x16td"
    version="1.0"
    inkscape:export-filename="/suse/jkress/Desktop/local-home/contexts/artwork/updater/16x16td/gekko-head-updater.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"><svg:defs
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><svg:defs
    id="defs48"><svg:linearGradient
+   id="linearGradient5640"><svg:stop
+     style="stop-color:#305f03;stop-opacity:1"
+     offset="0"
+     id="stop5642" /><svg:stop
+     style="stop-color:#4e9a06;stop-opacity:0"
+     offset="1"
+     id="stop5644" /></svg:linearGradient><svg:linearGradient
+   id="linearGradient5057"><svg:stop
+     style="stop-color:#366b04;stop-opacity:1"
+     offset="0"
+     id="stop5059" /><svg:stop
+     style="stop-color:#4e9a06;stop-opacity:0"
+     offset="1"
+     id="stop5061" /></svg:linearGradient><svg:linearGradient
    id="linearGradient2667"><svg:stop
      id="stop2669"
      offset="0.0000000"
@@ -156,7 +171,7 @@
    x2="17.850138"
    y2="31.674618" /><svg:linearGradient
    inkscape:collect="always"
-   xlink:href="#linearGradient28718"
+   xlink:href="#linearGradient5640"
    id="linearGradient2792"
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(1.829088,0,0,2.407307,-3.407694,-20.89112)"
@@ -165,7 +180,7 @@
    x2="17.850138"
    y2="31.674618" /><svg:linearGradient
    inkscape:collect="always"
-   xlink:href="#linearGradient28718"
+   xlink:href="#linearGradient5057"
    id="linearGradient2794"
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(-1.829088,0,0,-2.407307,101.1885,82.06207)"
@@ -180,19 +195,23 @@
    guidetolerance="10.0"
    gridtolerance="10.0"
    objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
+   borderopacity="1"
+   bordercolor="#f2f2f2"
    pagecolor="#ffffff"
    id="base"
-   inkscape:zoom="56.75"
-   inkscape:cx="8"
-   inkscape:cy="8"
-   inkscape:window-x="0"
-   inkscape:window-y="24"
-   inkscape:current-layer="layer2"
+   inkscape:zoom="1"
+   inkscape:cx="45.809809"
+   inkscape:cy="13.590116"
+   inkscape:window-x="50"
+   inkscape:window-y="25"
+   inkscape:current-layer="layer1"
    width="16px"
    height="16px"
-   showgrid="true" />
+   showgrid="true"
+   borderlayer="true"
+   inkscape:showpageshadow="false"><inkscape:grid
+     type="xygrid"
+     id="grid5055" /></sodipodi:namedview>
        <svg:metadata
    id="metadata4">
                <ns:variableSets>
@@ -6659,14 +6678,14 @@
    inkscape:label="Gekko"
    style="display:inline"><svg:path
      sodipodi:type="arc"
-     style="opacity:1;fill:white;fill-opacity:1;stroke:#4e9a06;stroke-width:5.22695303;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4e9a06;stroke-width:5.22695303;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
      id="path1992"
      sodipodi:cx="66.991516"
      sodipodi:cy="6.0831733"
      sodipodi:rx="26.940676"
      sodipodi:ry="26.940676"
-     d="M 93.932192 6.0831733 A 26.940676 26.940676 0 1 1  40.05084,6.0831733 A 26.940676 26.940676 0 1 1  93.932192 6.0831733 z"
-     transform="matrix(1.164576,0,0,1.165725,-29.67734,22.82569)" /><svg:path
+     d="M 93.932192,6.0831733 A 26.940676,26.940676 0 1 1 40.05084,6.0831733 A 26.940676,26.940676 0 1 1 93.932192,6.0831733 z"
+     transform="matrix(1.23889,0,0,1.2330318,-34.179952,22.701729)" /><svg:path
      transform="matrix(1.116822,0,0,1.117924,-26.47823,23.11647)"
      d="M 93.932192 6.0831733 A 26.940676 26.940676 0 1 1  40.05084,6.0831733 A 26.940676 26.940676 0 1 1  93.932192 6.0831733 z"
      sodipodi:ry="26.940676"
@@ -6677,21 +6696,22 @@
      style="opacity:0;fill:#d3d7cf;fill-opacity:1;stroke:none;stroke-width:5.22695303;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
      sodipodi:type="arc" /><svg:path
      i:knockout="Off"
-     d="M 55.447936,31.099549 L 55.447936,31.099549 C 52.202918,30.981975 49.657958,28.24325 49.761322,24.987196 C 49.813005,23.413255 50.486439,21.958454 51.629713,20.883031 C 52.772987,19.812311 54.274905,19.252654 55.847299,19.312223 C 59.09545,19.425098 61.643543,22.155982 61.537047,25.415171 C 61.485365,26.987545 60.824458,28.437641 59.676484,29.517767 C 58.525381,30.591625 57.026595,31.148148 55.447936,31.099549 L 55.447936,31.099549 z M 56.812035,25.756924 C 58.259138,25.756924 59.430602,24.974655 59.430602,24.010537 C 59.430602,23.047986 58.259138,22.267286 56.812035,22.267286 C 55.371195,22.267286 54.199731,23.047986 54.199731,24.010537 C 54.199731,24.973089 55.371195,25.756924 56.812035,25.756924"
+     d="M 58.058541,27.211457 L 58.058541,27.211457 C 55.294356,27.169619 53.126496,26.195058 53.214545,25.036408 C 53.258569,24.476329 53.832216,23.958646 54.806085,23.575962 C 55.779955,23.194952 57.059323,22.995801 58.398726,23.016998 C 61.165582,23.057164 63.336107,24.028935 63.245392,25.1887 C 63.201367,25.748222 62.638391,26.264231 61.660519,26.648588 C 60.679982,27.030715 59.40328,27.228751 58.058541,27.211457 L 58.058541,27.211457 z"
      id="path19"
-     style="opacity:1;fill:#4e9a06;fill-opacity:1;display:inline" /><svg:path
+     style="opacity:1;fill:#4e9a06;fill-opacity:1;display:inline"
+     sodipodi:nodetypes="ccssssscc" /><svg:path
      style="opacity:1;fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;display:inline"
-     d="M 33.841103,8.4395168 L 33.682966,8.5028346 L 33.651339,8.629469 C 33.651339,8.629469 33.562721,12.733697 33.556456,13.188322 C 32.914276,12.97488 30.902219,12.340116 28.148146,11.573729 C 23.746188,16.421403 21.063576,22.842046 21.063576,29.904114 C 21.063576,36.77981 23.603391,43.085424 27.800244,47.886254 C 29.877605,46.370005 33.284547,46.745756 37.478271,47.221422 C 39.518939,47.455005 41.845689,47.739545 44.246565,47.791279 C 50.96056,47.832038 58.193457,46.577161 62.653795,44.625407 C 65.535468,43.366568 67.352217,42.541539 68.504888,41.491198 C 68.921481,41.147878 69.134876,40.600522 69.358833,40.003239 L 69.51697,39.591677 C 69.703336,39.108833 69.998867,38.09195 70.117893,37.533859 C 70.172709,37.284602 70.195285,37.003848 70.023011,36.869029 L 69.39046,36.995662 C 67.439062,38.172984 62.552277,40.388761 57.972917,40.478119 C 52.295703,40.595696 40.855529,34.762474 39.660571,34.146381 L 39.534062,34.019745 C 39.249024,33.336241 37.561665,29.275239 37.193623,28.416155 C 45.428332,33.843434 52.239139,36.845084 57.466878,37.31225 C 63.288178,37.829583 67.826425,34.650768 69.76999,33.291595 C 70.148991,33.037631 70.444786,32.830518 70.56068,32.785056 L 70.687189,32.595103 C 70.366129,30.550859 67.323371,20.636574 65.02586,18.253714 C 64.390008,17.604699 63.872506,16.956176 62.84356,16.354191 C 54.525844,11.500678 34.768253,8.5743375 33.841103,8.4395168 z M 55.063183,16.829073 C 55.340969,16.811403 55.635419,16.819667 55.917128,16.829073 C 60.576362,16.99838 64.23365,20.909319 64.077033,25.566874 C 63.990896,27.819617 63.037824,29.917503 61.388693,31.45539 C 59.739559,33.001116 57.585529,33.810065 55.316205,33.734817 C 50.6695,33.559238 47.034445,29.621342 47.187924,24.965356 C 47.267799,22.70791 48.223997,20.614725 49.876267,19.076841 C 51.31926,17.728446 53.118682,16.952762 55.063183,16.829073 z "
+     d="M 30.821895,3.4912394 L 30.624084,3.5704427 L 30.584522,3.7288476 C 30.584522,3.7288476 30.473671,8.8627607 30.465835,9.4314438 C 29.662542,9.1644526 27.145692,8.3704365 23.700666,7.4117753 C 18.194327,13.475653 14.838691,21.507133 14.838691,30.34096 C 14.838691,38.941658 18.015705,46.82925 23.265481,52.834531 C 25.864019,50.93788 30.125708,51.407901 35.37157,52.002904 C 37.924209,52.295089 40.834703,52.651015 43.837921,52.715729 C 52.23635,52.766713 61.283865,51.197008 66.86323,48.75559 C 70.467869,47.180929 72.740411,46.148913 74.182269,44.835058 C 74.703378,44.405605 74.97031,43.720926 75.250455,42.973794 L 75.448266,42.458978 C 75.681388,41.854996 76.051063,40.582993 76.199951,39.884886 C 76.268519,39.573095 76.296759,39.221904 76.081264,39.053261 L 75.290016,39.211664 C 72.849044,40.684357 66.736243,43.456037 61.007995,43.567814 C 53.906459,43.714889 39.596128,36.418205 38.101374,35.647544 L 37.943126,35.489137 C 37.586577,34.634153 35.475886,29.554311 35.015509,28.479696 C 45.316174,35.268593 53.835704,39.023309 60.374999,39.607679 C 67.65677,40.254803 73.33359,36.278474 75.764764,34.578306 C 76.238851,34.260627 76.608856,34.001552 76.753826,33.944685 L 76.912074,33.707075 C 76.510465,31.149963 72.704328,18.748343 69.830408,15.767662 C 69.035031,14.955819 68.387696,14.144592 67.100604,13.391579 C 56.696106,7.320397 31.981652,3.6598845 30.821895,3.4912394 z M 57.368255,13.985601 C 57.715733,13.963498 58.084056,13.973835 58.436441,13.985601 C 64.264602,14.197384 68.839445,19.089515 68.643536,24.915576 C 68.535788,27.733496 67.343606,30.357708 65.280734,32.281427 C 63.217859,34.214951 60.523417,35.226852 57.684756,35.132725 C 51.872267,34.913096 47.325235,29.987245 47.51722,24.163147 C 47.617134,21.339344 48.813227,18.721012 50.880025,16.797298 C 52.685042,15.110612 54.93591,14.140322 57.368255,13.985601 z"
      id="path21" /></svg:g><svg:g
    inkscape:groupmode="layer"
    id="layer1"
    inkscape:label="Arrows"
    style="opacity:1;display:inline"><svg:g
      id="g2788"
-     transform="matrix(1.197371,0.403462,-0.403065,1.19855,2.678399,-25.79821)"><svg:path
+     transform="matrix(1.2260742,0.4131337,-0.4127272,1.2272815,1.5706111,-27.149832)"><svg:path
        style="fill:url(#linearGradient2792);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4"
-       d="M 12.03499,14.373502 C 3.2851364,38.034895 19.847559,59.596988 46.028779,59.596988 C 29.531926,59.596988 16.11078,46.175973 16.11078,29.678993 C 16.11078,18.096098 22.886298,7.4635591 33.379095,2.5595841 L 2.6914245,10.045918 L 12.03499,14.373502 z "
+       d="M 12.03499,14.373502 C 3.2851364,38.034895 19.847559,59.596988 46.028779,59.596988 C 29.531926,59.596988 16.11078,46.175973 16.11078,29.678993 C 16.11078,18.096098 22.886298,7.4635591 33.379095,2.5595841 L 2.6914245,10.045918 L 12.03499,14.373502 z"
        id="path5902" /><svg:path
        id="path6369"
-       d="M 85.74584,46.797524 C 94.495695,23.13613 77.933272,1.5740425 51.752054,1.5740425 C 68.248907,1.5740425 81.670051,14.995053 81.670051,31.492032 C 81.670051,43.074927 74.894535,53.707469 64.401737,58.611444 L 95.089407,51.125108 L 85.74584,46.797524 z "
+       d="M 85.74584,46.797524 C 94.495695,23.13613 77.933272,1.5740425 51.752054,1.5740425 C 68.248907,1.5740425 81.670051,14.995053 81.670051,31.492032 C 81.670051,43.074927 74.894535,53.707469 64.401737,58.611444 L 95.089407,51.125108 L 85.74584,46.797524 z"
        style="fill:url(#linearGradient2794);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-miterlimit:4" /></svg:g></svg:g></svg:svg>
\ No newline at end of file

Modified: trunk/updater-gnome/images/16x16/status/opensuseupdater_green.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/16x16/status/opensuseupdater_green.png?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/updater-gnome/images/22x22/apps/opensuseupdater.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/22x22/apps/opensuseupdater.png?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg (original)
+++ trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg Mon Sep 17 18:46:29 2007
@@ -8,7 +8,7 @@
    xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/";
    xmlns:x="adobe:ns:meta/"
    xmlns:dc="http://purl.org/dc/elements/1.1/";
-   xmlns:cc="http://web.resource.org/cc/";
+   xmlns:cc="http://creativecommons.org/ns#";
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
    xmlns:svg="http://www.w3.org/2000/svg";
    xmlns:xlink="http://www.w3.org/1999/xlink";
@@ -25,14 +25,29 @@
    xml:space="preserve"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docname="gekko-head-updater.svg"
+   inkscape:version="0.45+devel"
+   sodipodi:docname="opensuseupdater.svg"
    sodipodi:docbase="/suse/jkress/Desktop/local-home/contexts/artwork/updater/22x22td"
    version="1.0"
    inkscape:export-filename="/suse/jkress/Desktop/local-home/contexts/artwork/updater/22x22td/gekko-head-updater.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"><svg:defs
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><svg:defs
    id="defs48"><svg:linearGradient
+   id="linearGradient5640"><svg:stop
+     style="stop-color:#305f03;stop-opacity:1"
+     offset="0"
+     id="stop5642" /><svg:stop
+     style="stop-color:#4e9a06;stop-opacity:0"
+     offset="1"
+     id="stop5644" /></svg:linearGradient><svg:linearGradient
+   id="linearGradient5634"><svg:stop
+     style="stop-color:#366b04;stop-opacity:1"
+     offset="0"
+     id="stop5636" /><svg:stop
+     style="stop-color:#4e9a06;stop-opacity:0"
+     offset="1"
+     id="stop5638" /></svg:linearGradient><svg:linearGradient
    id="linearGradient2667"><svg:stop
      id="stop2669"
      offset="0.0000000"
@@ -165,16 +180,16 @@
    x2="17.199417"
    y2="26.729263" /><svg:linearGradient
    inkscape:collect="always"
-   xlink:href="#linearGradient28718"
+   xlink:href="#linearGradient5640"
    id="linearGradient2792"
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(1.829088,0,0,2.407307,-3.407694,-20.89112)"
-   x1="12.190513"
-   y1="12.062389"
+   x1="10.43999"
+   y1="12.308476"
    x2="17.850138"
    y2="31.674618" /><svg:linearGradient
    inkscape:collect="always"
-   xlink:href="#linearGradient28718"
+   xlink:href="#linearGradient5634"
    id="linearGradient2794"
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(-1.829088,0,0,-2.407307,101.1885,82.06207)"
@@ -182,25 +197,29 @@
    y1="12.524661"
    x2="17.850138"
    y2="31.674618" /></svg:defs><sodipodi:namedview
-   inkscape:window-height="1126"
-   inkscape:window-width="1594"
+   inkscape:window-height="986"
+   inkscape:window-width="1137"
    inkscape:pageshadow="2"
    inkscape:pageopacity="0.0"
    guidetolerance="10.0"
    gridtolerance="10.0"
    objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
+   borderopacity="1"
+   bordercolor="#d0d0d0"
    pagecolor="#ffffff"
    id="base"
-   inkscape:zoom="41.272727"
-   inkscape:cx="11"
-   inkscape:cy="11"
-   inkscape:window-x="0"
-   inkscape:window-y="24"
+   inkscape:zoom="1"
+   inkscape:cx="20.94707"
+   inkscape:cy="0.7448737"
+   inkscape:window-x="50"
+   inkscape:window-y="25"
    inkscape:current-layer="layer1"
    width="22px"
-   height="22px" />
+   height="22px"
+   borderlayer="true"
+   inkscape:showpageshadow="false"><inkscape:grid
+     type="xygrid"
+     id="grid5632" /></sodipodi:namedview>
        <svg:metadata
    id="metadata4">
                <ns:variableSets>
@@ -6667,20 +6686,20 @@
    inkscape:label="Gekko"
    style="display:inline"><svg:path
      sodipodi:type="arc"
-     style="opacity:1;fill:white;fill-opacity:1;stroke:#4e9a06;stroke-width:3.7249763;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4e9a06;stroke-width:7.71480751;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
      id="path1992"
      sodipodi:cx="66.991516"
      sodipodi:cy="6.0831733"
      sodipodi:rx="26.940676"
      sodipodi:ry="26.940676"
-     d="M 93.932192 6.0831733 A 26.940676 26.940676 0 1 1  40.05084,6.0831733 A 26.940676 26.940676 0 1 1  93.932192 6.0831733 z"
-     transform="matrix(1.188477,0,0,1.189647,-31.27847,22.68017)" /><svg:path
+     d="M 93.932192,6.0831733 A 26.940676,26.940676 0 1 1 40.05084,6.0831733 A 26.940676,26.940676 0 1 1 93.932192,6.0831733 z"
+     transform="matrix(1.14866,0,0,1.1478211,-28.074488,23.524843)" /><svg:path
      i:knockout="Off"
-     d="M 56.195262,31.22387 L 56.195262,31.22387 C 52.609093,31.093936 49.796581,28.067289 49.910812,24.468925 C 49.967929,22.729515 50.712161,21.12177 51.975627,19.933288 C 53.239094,18.750003 54.898909,18.131509 56.636609,18.197341 C 60.226239,18.322082 63.042213,21.340064 62.924521,24.941893 C 62.867407,26.679571 62.137018,28.282116 60.868357,29.475795 C 59.596238,30.662548 57.939885,31.277579 56.195262,31.22387 L 56.195262,31.22387 z M 57.702768,25.319574 C 59.302005,25.319574 60.596625,24.455066 60.596625,23.389589 C 60.596625,22.325845 59.302005,21.46307 57.702768,21.46307 C 56.110452,21.46307 54.815832,22.325845 54.815832,23.389589 C 54.815832,24.453334 56.110452,25.319574 57.702768,25.319574"
+     d="M 53.701414,30.435526 L 53.701414,30.435526 C 50.823862,30.331266 48.567094,27.902676 48.658753,25.015338 C 48.704584,23.61963 49.301758,22.329571 50.315567,21.37593 C 51.329376,20.426458 52.661217,19.930177 54.055552,19.983001 C 56.935882,20.083093 59.195428,22.504731 59.100991,25.394849 C 59.055163,26.789167 58.469096,28.075054 57.451119,29.032865 C 56.430367,29.985119 55.101305,30.478622 53.701414,30.435526 L 53.701414,30.435526 z M 54.911041,25.697901 C 56.194274,25.697901 57.233081,25.004218 57.233081,24.149276 C 57.233081,23.295724 56.194274,22.603431 54.911041,22.603431 C 53.633362,22.603431 52.594555,23.295724 52.594555,24.149276 C 52.594555,25.002828 53.633362,25.697901 54.911041,25.697901"
      id="path19"
      style="opacity:1;fill:#4e9a06;fill-opacity:1;display:inline" /><svg:path
      style="opacity:1;fill:#4e9a06;fill-opacity:1;fill-rule:evenodd;display:inline"
-     d="M 32.316897,6.1815842 L 32.142135,6.2515586 L 32.107183,6.3915062 C 32.107183,6.3915062 32.009248,10.927213 32.002325,11.429632 C 31.292632,11.193751 29.069047,10.492254 26.025438,9.6452963 C 21.1607,15.002608 18.196065,22.098255 18.196065,29.902759 C 18.196065,37.5013 21.002892,44.469824 25.640961,49.775366 C 27.936715,48.099714 31.70183,48.514967 36.336441,49.04064 C 38.591645,49.29878 41.163007,49.613233 43.816288,49.670407 C 51.236126,49.71545 59.22942,48.328648 64.158673,46.171706 C 67.343298,44.780524 69.351042,43.86876 70.624894,42.707997 C 71.085283,42.328583 71.321112,41.723683 71.568614,41.063608 L 71.743376,40.608778 C 71.949335,40.075173 72.275935,38.951385 72.407474,38.334622 C 72.468053,38.05916 72.493002,37.74889 72.302617,37.599897 L 71.603566,37.739844 C 69.447016,39.040938 64.046484,41.48966 58.985694,41.588413 C 52.711633,41.71835 40.068751,35.27188 38.748167,34.591017 L 38.608358,34.451067 C 38.293354,33.695707 36.428602,29.207771 36.021867,28.258371 C 45.122294,34.256222 52.649122,37.573436 58.426455,38.089715 C 64.85975,38.661434 69.875104,35.14843 72.022996,33.646368 C 72.441842,33.365704 72.768734,33.136818 72.896811,33.086576 L 73.03662,32.876653 C 72.681807,30.617497 69.319164,19.66092 66.780115,17.02755 C 66.077416,16.310304 65.505508,15.593602 64.368388,14.92833 C 55.176229,9.5645666 33.341517,6.3305786 32.316897,6.1815842 z M 55.770059,15.453136 C 56.077049,15.433609 56.402454,15.442741 56.71378,15.453136 C 61.86284,15.640243 65.904619,19.96234 65.731537,25.109544 C 65.636344,27.599119 64.583076,29.917557 62.760571,31.617122 C 60.938063,33.32535 58.557579,34.219344 56.049681,34.136185 C 50.914466,33.942148 46.897258,29.59026 47.066873,24.444789 C 47.155144,21.950017 48.211868,19.636775 50.037841,17.937213 C 51.632536,16.44706 53.621131,15.589829 55.770059,15.453136 z "
+     d="M 27.649898,7.2231834 L 27.471166,7.2947473 L 27.43542,7.4378738 C 27.43542,7.4378738 27.335261,12.076609 27.32818,12.590441 C 26.602367,12.349202 24.328272,11.631771 21.215527,10.765575 C 16.240285,16.244578 13.208307,23.501405 13.208307,31.483191 C 13.208307,39.254335 16.078892,46.381151 20.822316,51.80721 C 23.170219,50.093495 27.02086,50.518181 31.760747,51.055795 C 34.067179,51.319798 36.69695,51.641394 39.410501,51.699867 C 46.998883,51.745933 55.173747,50.32763 60.21497,48.121692 C 63.471935,46.698909 65.525285,45.766434 66.828073,44.579304 C 67.29892,44.191271 67.540106,43.572631 67.79323,42.897562 L 67.971962,42.4324 C 68.182599,41.886674 68.516618,40.737359 68.651145,40.106586 C 68.7131,39.824867 68.738616,39.507549 68.543906,39.355172 L 67.828976,39.498298 C 65.623439,40.828946 60.100232,43.333292 54.924485,43.434288 C 48.507907,43.567177 35.577838,36.974273 34.227256,36.277944 L 34.084272,36.134815 C 33.762112,35.362297 31.855002,30.772416 31.439028,29.80145 C 40.746174,35.935544 48.443976,39.32811 54.352543,39.856116 C 60.931972,40.440822 66.061251,36.848019 68.257933,35.311837 C 68.686294,35.024798 69.020611,34.790712 69.151597,34.739329 L 69.294582,34.524638 C 68.931709,32.214164 65.492683,21.008705 62.895959,18.315517 C 62.177298,17.581979 61.592399,16.848997 60.429449,16.168613 C 51.028487,10.683011 28.697793,7.3755623 27.649898,7.2231834 z M 51.635806,16.70534 C 51.949769,16.68537 52.282566,16.694709 52.600964,16.70534 C 57.866986,16.896697 62.000576,21.316972 61.823562,26.581096 C 61.726207,29.127223 60.649013,31.498325 58.78511,33.236496 C 56.921203,34.983527 54.486645,35.897828 51.92178,35.81278 C 46.669917,35.614336 42.561456,31.163593 42.734924,25.901241 C 42.8252,23.3498 43.905928,20.984012 45.773379,19.245844 C 47.404298,17.721841 49.438064,16.845138 51.635806,16.70534 z"
      id="path21" /></svg:g><svg:g
    inkscape:groupmode="layer"
    id="layer1"

Modified: trunk/updater-gnome/images/22x22/status/opensuseupdater_green.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/22x22/status/opensuseupdater_green.png?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/updater-gnome/opensuse-updater-gnome.spec
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/opensuse-updater-gnome.spec?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/opensuse-updater-gnome.spec (original)
+++ trunk/updater-gnome/opensuse-updater-gnome.spec Mon Sep 17 18:46:29 2007
@@ -1,5 +1,5 @@
 #
-# spec file for package opensuse-updater-gnome (Version 0.4.2)
+# spec file for package opensuse-updater-gnome (Version 0.4.3)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -16,13 +16,13 @@
 License:        GPL v2 or later
 Group:          System/Packages
 Summary:        GNOME updater applet for OpenSUSE
-Version:        0.4.2
+Version:        0.4.3
 Release:        1
 URL:            http://en.opensuse.org/GNOME_Updater_Applet
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Prefix:         /usr
 Source0:        %{name}-%{version}.tar.bz2
-Requires:       zypper >= 0.8.18
+Requires:       zypper >= 0.8.20
 Requires:       libglade2 libgnome gnome-panel libgnomesu
 # No translations yet.
 # Requires:       %{name}-lang = %{version}
@@ -96,6 +96,9 @@
 #%files lang -f %{name}.lang
 
 %changelog
+* Mon Sep 17 2007 - jkress@xxxxxxx
+- v0.4.3
+- zypper dependency bumped to v0.8.20
 * Mon Sep 03 2007 - jkress@xxxxxxx
 - v0.4.2
 - zypper dependency bumped to v0.8.18

Modified: trunk/updater-gnome/src/updater-applet-callbacks.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet-callbacks.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater-applet-callbacks.c (original)
+++ trunk/updater-gnome/src/updater-applet-callbacks.c Mon Sep 17 18:46:29 2007
@@ -162,6 +162,7 @@
 
   updater_ui_set_for_active_operation(applet->updater, TRUE);
   updater_applet_set_icon(applet, ICON_BUSY);
+  gtk_status_icon_set_tooltip (GTK_STATUS_ICON (applet->applet_icon), _("Checking for updates..."));
 }
 
 /*-------------------------( verb_applet_quit )------------------------------*/

Modified: trunk/updater-gnome/src/updater-applet-support.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet-support.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater-applet-support.c (original)
+++ trunk/updater-gnome/src/updater-applet-support.c Mon Sep 17 18:46:29 2007
@@ -15,6 +15,11 @@
   gtk_status_icon_set_from_stock (GTK_STATUS_ICON (applet->applet_icon), icon_stock_id);
 }
 
+void updater_applet_set_tooltip(UpdaterApplet *applet, char *tooltip_message)
+{
+  gtk_status_icon_set_tooltip (GTK_STATUS_ICON (applet->applet_icon), tooltip_message);
+}
+
 void updater_applet_restart(UpdaterApplet *applet)
 {
   g_print ("updater_applet_restart: calling updater_destroy!\n");

Modified: trunk/updater-gnome/src/updater-applet-support.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet-support.h?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater-applet-support.h (original)
+++ trunk/updater-gnome/src/updater-applet-support.h Mon Sep 17 18:46:29 2007
@@ -36,6 +36,8 @@
 /** Sets applet icon to \a icon_stock_id. See ICON_* stock IDs definitions. */
 void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id);
 
+void updater_applet_set_tooltip(UpdaterApplet *applet, char *tooltip_message);
+
 void updater_applet_restart(UpdaterApplet *applet);
 
 #endif /*UPDATERAPPLET_H_*/

Modified: trunk/updater-gnome/src/updater-applet.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater-applet.c (original)
+++ trunk/updater-gnome/src/updater-applet.c Mon Sep 17 18:46:29 2007
@@ -176,6 +176,7 @@
 
   // create applet widgets (initial applet icon)
   applet->applet_icon = (GtkWidget *) gtk_status_icon_new_from_stock (ICON_GREEN);
+  updater_applet_set_tooltip(applet, _("System is up-to-date"));
 
   // create applet menus
   applet->popup_factory = gtk_item_factory_new (GTK_TYPE_MENU, "<main>", NULL);
@@ -248,7 +249,7 @@
   // sleep(5);
 
   gtk_init (&argc, &argv);
-  g_set_application_name (_("OpenSuSE Updater"));
+  g_set_application_name (_("openSuSE Updater"));
   
 /*
   if (!have_tray ())

Modified: trunk/updater-gnome/src/updater-backend.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backend.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater-backend.c (original)
+++ trunk/updater-gnome/src/updater-backend.c Mon Sep 17 18:46:29 2007
@@ -191,11 +191,20 @@
   }
   
   if (mandatory_count > 0)
+  {
     updater_applet_set_icon(updater->applet, ICON_RED);
+    updater_applet_set_tooltip(updater->applet, _("Mandatory updates available"));
+  }
   else if (optional_count > 0)
+  {
     updater_applet_set_icon(updater->applet, ICON_YELLOW);
+    updater_applet_set_tooltip(updater->applet, _("Additional updates available"));
+  }
   else
+  {
     updater_applet_set_icon(updater->applet, ICON_GREEN);
+    updater_applet_set_tooltip(updater->applet, _("Your system is up-to-date"));
+  }
   
   // update the ui elements with new data
   

Modified: trunk/updater-gnome/src/updater-callbacks.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-callbacks.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater-callbacks.c (original)
+++ trunk/updater-gnome/src/updater-callbacks.c Mon Sep 17 18:46:29 2007
@@ -6,6 +6,7 @@
 #include "updater-backend.h"
 #include "updater.h"
 #include <gtk/gtk.h>
+#include "updater-applet-support.h"
 
 void
 on_mainWindow_destroy (GtkWidget *widget, gpointer user_data)
@@ -203,6 +204,7 @@
       gtk_widget_destroy(updater->simple_window);
   
     updater_ui_set_for_active_operation(updater, TRUE);
+    updater_applet_set_tooltip(updater->applet, _("Installing updates..."));
   }
 }
 

Modified: trunk/updater-gnome/src/updater-support.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-support.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater-support.c (original)
+++ trunk/updater-gnome/src/updater-support.c Mon Sep 17 18:46:29 2007
@@ -280,66 +280,76 @@
    */
   if (all_count == 0)
   {
+    gchar *markup;
+    markup = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>",
+                                      _("Your system is up-to-date."));
     gtk_label_set_markup (GTK_LABEL (updater->simple_window_labelTitle), 
-                          "<span size=\"larger\" weight=\"bold\">Your system is up-to-date.</span>");
-    gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), "There are no updates that need to be installed.");
-    gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), "No optional updates available");
+                          markup);
+    gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), _("There are no updates that need to be installed."));
+    gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), _("No optional updates available"));
     gtk_widget_set_sensitive (updater->simple_window_checkbuttonRecommended, FALSE);
     gtk_widget_hide (updater->simple_window_checkbuttonRestart);
     gtk_widget_set_sensitive (updater->simple_window_buttonDetails, FALSE);
     gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
+    g_free (markup);
   }
   else
   {
-       gtk_label_set_markup (GTK_LABEL (updater->simple_window_labelTitle), 
-                          "<span size=\"larger\" weight=\"bold\">New software for your system is available</span>");
-       /* Restart are excluded */
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRestart)))
-       {
-         str = g_strdup_printf("%d mandatory updates are about to be installed", 
-                                             (mandatory_count - mandatory_restart_count));
-         gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str);
-         g_free(str);
-                 
-         str = g_strdup_printf("include %d additional updates", 
-                                            (optional_count - optional_restart_count));
-         gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str);
-         g_free(str);
-         
-         if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)))
-         {
-           if ((mandatory_count == mandatory_restart_count) && (optional_count == optional_restart_count))
-           {
+         gchar *markup;
+    markup = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>",
+                                      _("New software for your system is available"));
+         gtk_label_set_markup (GTK_LABEL (updater->simple_window_labelTitle), 
+                          markup);
+    g_free(markup);
+       /* Restart are excluded */
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRestart)))
+       {
+         str = g_strdup_printf(ngettext ("%d mandatory update is about to be installed",
+                                         "%d mandatory updates are about to be installed",
+                                         (mandatory_count - mandatory_restart_count)), 
+                                              (mandatory_count - mandatory_restart_count));
+         gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str);
+         g_free(str);
+                 
+         str = g_strdup_printf("include %d additional updates", 
+                                            (optional_count - optional_restart_count));
+         gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str);
+         g_free(str);
+         
+         if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)))
+         {
+           if ((mandatory_count == mandatory_restart_count) && (optional_count == optional_restart_count))
+           {
+            gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
+           }
+         }
+         else
+         {
+           if ((mandatory_count == mandatory_restart_count))
+           {
+            gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
+           }
+         }
+       }
+       else /* Restart updates are included */
+       {
+         str = g_strdup_printf("%d mandatory updates are about to be installed", 
+                                             mandatory_count);
+         gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str);
+         g_free(str);
+                 
+         str = g_strdup_printf("include %d additional updates", 
+                                             optional_count);
+         gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str);
+         g_free(str);
+                 
+         /* We have only additional updates */
+         if ((mandatory_count == 0) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)))
+         {
+           /* Only additional available and they are deselected */
           gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
-           }
-         }
-         else
-         {
-           if ((mandatory_count == mandatory_restart_count))
-           {
-          gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
-           }
-         }
-       }
-       else /* Restart updates are included */
-       {
-         str = g_strdup_printf("%d mandatory updates are about to be installed", 
-                                             mandatory_count);
-         gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str);
-         g_free(str);
-                 
-         str = g_strdup_printf("include %d additional updates", 
-                                             optional_count);
-         gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str);
-         g_free(str);
-                 
-         /* We have only additional updates */
-         if ((mandatory_count == 0) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)))
-         {
-           /* Only additional available and they are deselected */
-        gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
-         }
-       }   
+         }
+       }   
   }
 }
 

Modified: trunk/updater-gnome/src/updater.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater.c (original)
+++ trunk/updater-gnome/src/updater.c Mon Sep 17 18:46:29 2007
@@ -5,6 +5,7 @@
 #include "updater.h"
 #include "updater-support.h"
 #include "updater-callbacks.h"
+#include "updater-applet-support.h"
 
 // ----------------------------------------------------------------------------
 
@@ -425,6 +426,7 @@
   g_print ("DONE\n");
 
   updater_ui_set_for_active_operation(updater, TRUE);
+  updater_applet_set_tooltip(updater->applet, _("Checking for updates..."));
 }
 
 // ----------------------------------------------------------------------------

Modified: trunk/updater-gnome/src/updater.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.h?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/updater.h (original)
+++ trunk/updater-gnome/src/updater.h Mon Sep 17 18:46:29 2007
@@ -13,6 +13,7 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 #include "updater-backend.h"
 

Modified: trunk/updater-gnome/src/zypp/updater-zypper-gui.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/zypp/updater-zypper-gui.c?rev=7274&r1=7273&r2=7274&view=diff
==============================================================================
--- trunk/updater-gnome/src/zypp/updater-zypper-gui.c (original)
+++ trunk/updater-gnome/src/zypp/updater-zypper-gui.c Mon Sep 17 18:46:29 2007
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 /* --- Set up the variables ---------------------------------------------- */
 GString   *security_patch_line;
@@ -37,30 +38,34 @@
   recommended_patch_line = g_string_new("");
   package_line = g_string_new("");
   
+  /*
   printf("%d\n", *argc);
   printf("%s\n", argv[0][1]);
+  */
   
   if (!g_ascii_strcasecmp(argv[0][1], "ZOPTIONS_RESTART_TRUE"))
     restart_included = TRUE;
   
-  printf("%s\n", argv[0][2]);  
+  /* printf("%s\n", argv[0][2]); */  
   if (!g_ascii_strcasecmp(argv[0][2], "ZOPTIONS_RECOMMENDED_TRUE"))
     recommended_included = TRUE;
   
-  printf("%s\n", argv[0][3]);  
+  /* printf("%s\n", argv[0][3]);  */
   if (!g_ascii_strcasecmp(argv[0][3], "ZOPTIONS_PACKAGES_TRUE"))
     packages_included = TRUE;
   
-  printf("%s\n", argv[0][4]);  
+  /* printf("%s\n", argv[0][4]);  */
   spatch_count = (guint16) atoi(argv[0][4]);
-  printf("%s\n", argv[0][5]);
+  /* printf("%s\n", argv[0][5]);*/
   rpatch_count = (guint16) atoi(argv[0][5]);
-  printf("%s\n", argv[0][6]);
+  /* printf("%s\n", argv[0][6]);*/
   package_count = (guint16) atoi(argv[0][6]);
   
+  /*
   g_print("Security Count: %d\n", spatch_count);
   g_print("Recommended Count: %d\n", rpatch_count);
   g_print("Package Count: %d\n\n", package_count);
+  */
   
   /* --- Create security patch line -------------------------------------- */
   spatch_limit = 7 + spatch_count;
@@ -74,8 +79,10 @@
       g_string_append_printf(security_patch_line, " %s", argv[0][i]);
     }
     
+    /*
     g_print("Security Limit: %d\n", spatch_limit);
     g_print("Security Patches: %s\n\n", security_patch_line->str);
+    */
   }
   
   /* --- Create recommended patch list if possible ----------------------- */
@@ -87,8 +94,10 @@
       g_string_append_printf(recommended_patch_line, " %s", argv[0][i]);
     }
     
+    /*
     g_print("Recommended Limit: %d\n", rpatch_limit);
     g_print("Recommended Patches: %s\n\n", recommended_patch_line->str);
+    */
   }
   
   /* --- Create package list if possible --------------------------------- */
@@ -100,8 +109,10 @@
       g_string_append_printf(package_line, " %s", argv[0][i]);
     }
     
+    /*
     g_print("Package Limit: %d\n", package_limit);
     g_print("Packages: %s\n\n", package_line->str);
+    */
   }
   
 }
@@ -123,10 +134,11 @@
        */
        
        dialog = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title (GTK_WINDOW (dialog), "Update Progress");
+       gtk_window_set_title (GTK_WINDOW (dialog), _("Update Progress"));
        gtk_window_set_deletable (GTK_WINDOW (dialog), FALSE);
        gtk_window_set_icon_from_file (GTK_WINDOW (dialog), "/usr/share/opensuse-updater-gnome/images/updater_logo.png", NULL);
        gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
+       gtk_window_set_default_size (GTK_WINDOW (dialog), 200, -1);
        gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
        vbox = gtk_vbox_new (FALSE, 12);
@@ -154,11 +166,14 @@
        gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
 
        label = gtk_label_new (NULL);
-       gtk_label_set_markup (GTK_LABEL (label),
-                       "<span size=\"larger\" weight=\"bold\">Update in progress</span>\n"
-                       "\n"
-                       "You're not able to stop this process in order to ensure\n"
-                       "integrity of your system. Please be patient.");
+       gchar *label_markup;
+       label_markup = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s",
+                                               _("Update in progress"),
+                                               _("You're not able to stop this process in order to ensure integrity of your system. Please be patient."));
+       gtk_label_set_markup (GTK_LABEL (label), label_markup);
+       g_free (label_markup);
+       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+       gtk_widget_set_size_request (label, 300, -1);
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
@@ -177,9 +192,9 @@
        gtk_box_pack_start (GTK_BOX (hbox), imageSecurity, FALSE, FALSE, 0);
 
        if (spatch_count == 0)
-         label = gtk_label_new ("No mandatory updates to apply");
+         label = gtk_label_new (_("No mandatory updates to apply"));
        else
-         label = gtk_label_new ("Applying mandatory updates");
+         label = gtk_label_new (_("Applying mandatory updates"));
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
@@ -196,9 +211,9 @@
        gtk_box_pack_start (GTK_BOX (hbox), imageRecommended, FALSE, FALSE, 0);
 
        if (recommended_included || packages_included)
-         label = gtk_label_new ("Applying additional updates");
+         label = gtk_label_new (_("Applying additional updates"));
        else
-         label = gtk_label_new ("No additional updates to apply");
+         label = gtk_label_new (_("No additional updates to apply"));
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
@@ -233,18 +248,18 @@
     {
       if (security_patches_done)
       {  
-        if (!recommended_patches_done)
+        gtk_image_set_from_stock (GTK_IMAGE (imageRecommended), GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU);
+        if (!recommended_patches_done && recommended_included)
         {
-          gtk_image_set_from_stock (GTK_IMAGE (imageRecommended), GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU);
-          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Applying additional updates...");
+          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Applying additional updates..."));
         }
         else
-          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Applying additional package updates...");
+          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Applying additional package updates..."));
       }
       else
       {
         gtk_image_set_from_stock (GTK_IMAGE (imageSecurity), GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU);
-        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Applying mandatory updates...");
+        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Applying mandatory updates..."));
       }
       while (gtk_events_pending ())
         gtk_main_iteration();
@@ -258,7 +273,7 @@
         {  
           gtk_image_set_from_stock (GTK_IMAGE (imageRecommended), GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU);
           gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar), 1.0);
-          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Additonal updates done.");
+          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Additonal updates done."));
           while (gtk_events_pending ())
             gtk_main_iteration();
           g_usleep (1000000);
@@ -268,7 +283,7 @@
           {
             GtkWidget *successdialog, *successlabel, *vbox;
 
-            successdialog = gtk_dialog_new_with_buttons ("Updates installed",
+            successdialog = gtk_dialog_new_with_buttons (_("Updates installed"),
                                                   NULL,
                                                   GTK_DIALOG_MODAL, 
                                                   GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -310,7 +325,7 @@
           {
             GtkWidget *successdialog, *successlabel, *vbox;
 
-            successdialog = gtk_dialog_new_with_buttons ("Updates installed",
+            successdialog = gtk_dialog_new_with_buttons (_("Updates installed"),
                                                   NULL,
                                                   GTK_DIALOG_MODAL, 
                                                   GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -349,13 +364,13 @@
         else
         {
           recommended_patches_done = TRUE;
-          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Checking for additional package updates");
+          gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Checking for additional package updates"));
         }
       }
       else
       {
         gtk_image_set_from_stock (GTK_IMAGE (imageSecurity), GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU);
-        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Mandatory updates done.");
+        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Mandatory updates done."));
         security_patches_done = TRUE;
         
         if (!recommended_included && !packages_included)
@@ -365,7 +380,7 @@
           {
             GtkWidget *successdialog, *successlabel, *vbox;
 
-            successdialog = gtk_dialog_new_with_buttons ("Updates installed",
+            successdialog = gtk_dialog_new_with_buttons (_("Updates installed"),
                                                   NULL,
                                                   GTK_DIALOG_MODAL, 
                                                   GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -407,7 +422,7 @@
           {
             GtkWidget *successdialog, *successlabel, *vbox;
 
-            successdialog = gtk_dialog_new_with_buttons ("Updates installed",
+            successdialog = gtk_dialog_new_with_buttons (_("Updates installed"),
                                                   NULL,
                                                   GTK_DIALOG_MODAL, 
                                                   GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -502,7 +517,7 @@
   if (spatch_count > 0)
   {
     command_security = g_string_prepend(security_patch_line, "zypper -q --terse --non-interactive  in -l -t patch --name ");
-    g_print("%s\n", command_security->str);
+    /* g_print("%s\n", command_security->str); */
     
     /* DEBUGGING */
     /*
@@ -519,7 +534,7 @@
   if (rpatch_count > 0)
   {
     command_recommended = g_string_prepend(recommended_patch_line, "zypper -q --terse --non-interactive  in -l -t patch --name ");
-    g_print("%s\n", command_recommended->str);
+    /* g_print("%s\n", command_recommended->str); */
     
     /* DEBUGGING */
     /*
@@ -538,7 +553,7 @@
   if (package_count > 0)
   {
     command_packages = g_string_prepend(package_line, "zypper -q --terse --non-interactive  in -l -t package --name ");
-    g_print("%s\n", command_packages->str);
+    /* g_print("%s\n", command_packages->str); */
     
     /* DEBUGGING */
     /*
@@ -557,22 +572,22 @@
   /* --- Spawning zypper ----------------------------------------------- */
   
   fp = g_fopen("/tmp/spawn-zypper", "w+");
-  g_printf("Command complete: %s\n", command_complete->str);
+  /* g_printf("Command complete: %s\n", command_complete->str); */
   gint cc = g_fprintf(fp, "%s \n", command_complete->str);
   fclose(fp);
-  g_print("Character Count written to file: %d\n", cc);
+  /* g_print("Character Count written to file: %d\n", cc); */
   g_chmod("/tmp/spawn-zypper", 0700);
   
   g_shell_parse_argv ("sh /tmp/spawn-zypper", &argc, &argv, NULL);
   
-  /* Debug output */
+  /* Debug output
   g_print("Spawning zypper\n %d\n ", argc);
   for (i=0; i<argc; i++)
   {
     g_print("%s ", argv[i]);
   }
   g_print("\n");
-  
+  */
   
   ret = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &pid, NULL, &fout, NULL, NULL);
   
@@ -580,7 +595,37 @@
   g_string_free (command_complete, TRUE);
   
   if (!ret)
+  {
     g_warning ("zypper could not be started!\n");
+    GtkWidget *errordialog, *errorlabel, *vbox;
+
+            errordialog = gtk_dialog_new_with_buttons (_("Update error"),
+                                                  NULL,
+                                                  GTK_DIALOG_MODAL, 
+                                                  GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                                  NULL);
+            gtk_dialog_set_has_separator (GTK_DIALOG (errordialog), FALSE);
+            
+            vbox = gtk_vbox_new (FALSE, 6);
+               gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+               gtk_container_add (GTK_CONTAINER (GTK_DIALOG (errordialog)->vbox), vbox);
+
+            errorlabel = gtk_label_new (NULL);
+            gchar *markup;
+            markup = g_markup_printf_escaped ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s\n%s",
+                                              _("Error"),
+                                              _("Could not call zypper."),
+                                              _("Please ensure you have zypper instlled correctly."));
+            gtk_label_set_markup (GTK_LABEL (errorlabel), markup);
+            g_free (markup);
+            
+            gtk_container_add (GTK_CONTAINER (vbox),
+                                errorlabel);
+            
+            gtk_widget_show_all(errordialog);
+            if (gtk_dialog_run (GTK_DIALOG (errordialog)) == GTK_RESPONSE_OK)
+              gtk_main_quit();
+  }
   else
   {
     channel = g_io_channel_unix_new (fout);

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages