August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40664 - in /trunk: control-center/src/ theme/openSUSE/icons/22x22/apps/ theme/openSUSE/icons/32x32/apps/ theme/openSUSE/icons/48x48/apps/ theme/openSUSE/icons/scalable/apps/
by sreeves1＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: sreeves1 Date: Sat Sep 1 00:01:33 2007 New Revision: 40664 URL: http://svn.opensuse.org/viewcvs/yast?rev=40664&view=rev Log: Fix for #8097 - replace current yast icon Added: trunk/theme/openSUSE/icons/22x22/apps/yast.png (with props) trunk/theme/openSUSE/icons/32x32/apps/yast.png (with props) trunk/theme/openSUSE/icons/48x48/apps/yast.png (with props) trunk/theme/openSUSE/icons/scalable/apps/yast.svg Modified: trunk/control-center/src/yast.png Modified: trunk/control-center/src/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/yast.png?rev=… ============================================================================== Binary files - no diff available. Added: trunk/theme/openSUSE/icons/22x22/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/32x32/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/48x48/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/scalable/apps/yast.svg URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/scalable/ap… ============================================================================== --- trunk/theme/openSUSE/icons/scalable/apps/yast.svg (added) +++ trunk/theme/openSUSE/icons/scalable/apps/yast.svg Sat Sep 1 00:01:33 2007 @@ -0,0 +1,424 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<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://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + id="svg7854" + sodipodi:version="0.32" + inkscape:version="0.45+devel" + version="1.0" + sodipodi:docname="yast-shell.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs7856"> + <linearGradient + inkscape:collect="always" + id="linearGradient5529"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop5531" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop5533" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5519"> + <stop + style="stop-color:#fff345;stop-opacity:1;" + offset="0" + id="stop5521" /> + <stop + style="stop-color:#fff345;stop-opacity:0;" + offset="1" + id="stop5523" /> + </linearGradient> + <linearGradient + id="linearGradient5509"> + <stop + id="stop5511" + offset="0" + style="stop-color:#fff9a4;stop-opacity:1" /> + <stop + id="stop5513" + offset="1" + style="stop-color:#ff7100;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient5499"> + <stop + style="stop-color:#fff9a4;stop-opacity:1" + offset="0" + id="stop5501" /> + <stop + style="stop-color:#ffb720;stop-opacity:1;" + offset="1" + id="stop5503" /> + </linearGradient> + <linearGradient + id="linearGradient5485"> + <stop + id="stop5489" + offset="0" + style="stop-color:#ffe9bb;stop-opacity:1;" /> + <stop + id="stop5487" + offset="1" + style="stop-color:#ff8f08;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5475"> + <stop + style="stop-color:#fce94f;stop-opacity:1;" + offset="0" + id="stop5477" /> + <stop + style="stop-color:#fce94f;stop-opacity:0;" + offset="1" + id="stop5479" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5443"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5445" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5447" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5425"> + <stop + style="stop-color:#3465a4;stop-opacity:1;" + offset="0" + id="stop5427" /> + <stop + style="stop-color:#3465a4;stop-opacity:0;" + offset="1" + id="stop5429" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5415"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5417" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5419" /> + </linearGradient> + <linearGradient + id="linearGradient5403"> + <stop + id="stop5407" + offset="0" + style="stop-color:#e2ecf6;stop-opacity:1;" /> + <stop + style="stop-color:#cadbed;stop-opacity:1;" + offset="0.58286089" + id="stop5469" /> + <stop + id="stop5405" + offset="1" + style="stop-color:#729fcf;stop-opacity:1;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5415" + id="radialGradient5421" + cx="21.522562" + cy="27.096155" + fx="21.522562" + fy="27.096155" + r="8.352699" + gradientTransform="matrix(1.7745072,0,0,0.516391,-16.66938,13.103945)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5425" + id="linearGradient5431" + x1="24.35099" + y1="23.207069" + x2="26.870058" + y2="26.123884" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5403" + id="radialGradient5441" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3714339,0,0,1.4504842,-6.6468827,-2.7059689)" + cx="17.895197" + cy="6.5830007" + fx="17.895197" + fy="6.5830007" + r="15.182886" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5443" + id="radialGradient5449" + cx="19.1875" + cy="14.347643" + fx="19.1875" + fy="14.347643" + r="13.9375" + gradientTransform="matrix(1,0,0,0.9764574,0,0.443263)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5475" + id="linearGradient5481" + x1="26.277246" + y1="28.12495" + x2="36.78125" + y2="42.12495" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5485" + id="radialGradient5491" + cx="32.5" + cy="32.277779" + fx="32.5" + fy="32.277779" + r="5" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.5002572,0,0,1.5002572,-16.258358,-16.147191)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5499" + id="radialGradient5497" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.5002572,0,0,1.5002572,-16.258358,-16.147191)" + cx="33.727859" + cy="37.091766" + fx="33.727859" + fy="37.091766" + r="5" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5509" + id="radialGradient5507" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.5002572,0,0,1.5002572,-16.258358,-16.147191)" + cx="32.5" + cy="30.426243" + fx="32.5" + fy="30.426243" + r="5" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5519" + id="linearGradient5525" + x1="35.090176" + y1="36.200157" + x2="29.786875" + y2="31.073631" + gradientUnits="userSpaceOnUse" /> + <filter + inkscape:collect="always" + x="-0.13981191" + width="1.2796238" + y="-0.31204399" + height="1.624088" + id="filter5597"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.5859105" + id="feGaussianBlur5599" /> + </filter> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5529" + id="radialGradient5609" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.4480519,0,21.858859)" + cx="31.643028" + cy="39.603107" + fx="31.643028" + fy="39.603107" + r="13.611806" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5529" + id="radialGradient5611" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.4480519,0,21.858859)" + cx="31.643028" + cy="39.603107" + fx="31.643028" + fy="39.603107" + r="13.611806" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#e0e0e0" + borderopacity="1" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="40.508636" + inkscape:cy="26.050499" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="48px" + height="48px" + inkscape:showpageshadow="false" + inkscape:window-width="754" + inkscape:window-height="733" + inkscape:window-x="588" + inkscape:window-y="293"> + <inkscape:grid + type="xygrid" + id="grid5433" /> + </sodipodi:namedview> + <metadata + id="metadata7859"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g5605" + transform="matrix(1,0,0,0.7101449,1.2374369,13.600483)" + style="opacity:0.75862069"> + <path + transform="matrix(1.5844156,0,0,1,-26.44763,0)" + sodipodi:type="arc" + style="opacity:0.25862067999999999;color:#000000;fill:url(#radialGradient5609);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter5597);enable-background:accumulate" + id="path5601" + sodipodi:cx="31.643028" + sodipodi:cy="39.603107" + sodipodi:rx="13.611806" + sodipodi:ry="6.0987959" + d="M 45.254834,39.603107 A 13.611806,6.0987959 0 1 1 18.031222,39.603107 A 13.611806,6.0987959 0 1 1 45.254834,39.603107 z" /> + <path + d="M 45.254834,39.603107 A 13.611806,6.0987959 0 1 1 18.031222,39.603107 A 13.611806,6.0987959 0 1 1 45.254834,39.603107 z" + sodipodi:ry="6.0987959" + sodipodi:rx="13.611806" + sodipodi:cy="39.603107" + sodipodi:cx="31.643028" + id="path5527" + style="opacity:0.40804599000000003;color:#000000;fill:url(#radialGradient5611);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter5597);enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <path + style="opacity:1;color:#000000;fill:url(#radialGradient5441);fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 15.526989,4.4861407 C 14.214475,4.4861407 12.724366,4.6582799 11.670421,5.2158998 L 18.789853,12.777832 L 11.632604,20.145279 L 4.2911607,12.198961 C 3.4837118,13.837682 3.2123107,15.038566 3.2123107,16.987801 C 3.2123107,23.785218 8.7292866,29.301962 15.526989,29.301962 C 17.422204,29.301962 19.21168,28.857435 20.815986,28.091596 L 26.052355,33.406683 L 32.578082,26.670731 L 27.157519,20.987273 C 27.590619,19.730271 27.841668,18.391282 27.841668,16.987801 C 27.841668,10.190385 22.324692,4.4861407 15.526989,4.4861407 z" + id="path4818" + sodipodi:nodetypes="cccccssccccsc" /> + <path + sodipodi:type="inkscape:offset" + inkscape:radius="-1.0185251" + inkscape:original="M 15.53125 4.5 C 14.218736 4.5 12.710195 4.6611301 11.65625 5.21875 L 18.78125 12.78125 L 11.625 20.15625 L 4.28125 12.1875 C 3.4738012 13.826221 3.21875 15.050765 3.21875 17 C 3.2187499 23.797417 8.7335476 29.3125 15.53125 29.3125 C 17.426465 29.3125 19.208194 28.859589 20.8125 28.09375 L 26.0625 33.40625 L 32.5625 26.65625 L 27.15625 21 C 27.589351 19.742999 27.84375 18.403481 27.84375 17 C 27.843751 10.202584 22.328953 4.5 15.53125 4.5 z " + xlink:href="#path4818" + style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient5449);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path5439" + inkscape:href="#path4818" + d="M 15.53125,5.71875 C 14.927359,5.71875 14.388746,5.8848635 13.8125,5.96875 L 19.53125,12.09375 C 19.898093,12.495611 19.884333,13.114832 19.5,13.5 L 12.34375,20.875 C 12.147474,21.070778 11.879881,21.178102 11.602719,21.172204 C 11.325557,21.166307 11.062771,21.0477 10.875,20.84375 L 4.65625,14.09375 C 4.3946449,14.941336 4.25,15.801611 4.25,17 C 4.2499999,23.246525 9.2844446,28.28125 15.53125,28.28125 C 17.264196,28.28125 18.894384,27.894294 20.375,27.1875 C 20.761403,26.999987 21.223905,27.074987 21.53125,27.375 L 26.0625,31.9375 L 31.125,26.65625 L 26.40625,21.71875 C 26.13513,21.436092 26.050085,21.023019 26.1875,20.65625 C 26.58802,19.493811 26.8125,18.2804 26.8125,17 C 26.812501,10.753476 21.778056,5.71875 15.53125,5.71875 z" /> + <path + style="opacity:0.42528736;color:#000000;fill:url(#linearGradient5431);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 25,22 L 28,25 L 24,29 L 21,26 L 25,22 z" + id="path5423" + sodipodi:nodetypes="ccccc" /> + <path + style="opacity:1;color:#000000;fill:url(#radialGradient5421);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 7.6013979,24.665476 C 9.3876872,26.566177 14.041294,29.675182 20.948038,26.963573 L 23.599689,29.526835 L 24.306796,28.73134 L 21.566757,25.991301 C 15.650995,28.070644 11.413761,26.792931 7.6013979,24.665476 z" + id="path5413" + sodipodi:nodetypes="cccccc" /> + <path + style="color:#000000;fill:#fcaf3e;fill-opacity:1;fill-rule:evenodd;stroke:#f57900;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 30.367756,23.197506 C 29.910434,23.190018 29.460873,23.35277 29.104712,23.69744 L 22.973686,29.61771 C 22.261363,30.30705 22.231691,31.431398 22.921059,32.143692 C 25.608353,34.949847 31.025591,40.537318 31.025591,40.537318 C 32.454889,42.147332 34.148441,43.826357 36.525095,43.826357 C 39.982046,43.826357 42.787688,41.020833 42.787688,37.564027 C 42.787688,35.403524 41.585473,33.822002 40.024779,32.380502 L 31.6308,23.723753 C 31.286116,23.367606 30.825077,23.204995 30.367756,23.197506 z" + id="path4809" + sodipodi:nodetypes="cccccssccc" /> + <path + style="opacity:0.42528734000000001;color:#000000;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 21.0625,26.03125 L 24.96875,22 L 27.40625,24.4375 L 25.09375,22.4375 L 21.5625,26.09375 L 21.0625,26.03125 z" + id="path5471" /> + <path + sodipodi:type="inkscape:offset" + inkscape:radius="-1.1187773" + inkscape:original="M 30.375 23.1875 C 29.917678 23.180012 29.449911 23.34283 29.09375 23.6875 L 22.96875 29.625 C 22.256427 30.31434 22.216882 31.443956 22.90625 32.15625 C 25.593544 34.962405 31.03125 40.53125 31.03125 40.53125 C 32.460548 42.141263 34.154596 43.8125 36.53125 43.8125 C 39.988199 43.812498 42.78125 41.019306 42.78125 37.5625 C 42.781249 35.401998 41.591944 33.8165 40.03125 32.375 L 31.625 23.71875 C 31.280316 23.362603 30.832321 23.194989 30.375 23.1875 z " + xlink:href="#path4809" + style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5481);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path5473" + inkscape:href="#path4809" + d="M 30.34375,24.3125 C 30.164349,24.309563 30.005914,24.37331 29.875,24.5 L 23.75,30.4375 C 23.461718,30.71648 23.455331,31.102821 23.71875,31.375 C 26.396,34.170667 31.84375,39.75 31.84375,39.75 C 31.854371,39.76021 31.86479,39.770629 31.875,39.78125 C 33.26811,41.350499 34.679071,42.6875 36.53125,42.6875 C 39.385556,42.687498 41.65625,40.416668 41.65625,37.5625 C 41.656249,35.812571 40.749678,34.543781 39.28125,33.1875 C 39.260096,33.177737 39.239253,33.167315 39.21875,33.15625 L 30.8125,24.5 C 30.682727,24.365911 30.539777,24.31571 30.34375,24.3125 z" /> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient5525);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 30.317203,25.814525 L 25.013902,31.029437 L 33.852737,40.045049 L 38.802485,35.448855 L 30.317203,25.814525 z" + id="path5517" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#radialGradient5491);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.11111116;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path5483" + sodipodi:cx="32.5" + sodipodi:cy="34.5" + sodipodi:rx="5" + sodipodi:ry="5" + d="M 37.5,34.5 A 5,5 0 1 1 27.5,34.5 A 5,5 0 1 1 37.5,34.5 z" + transform="matrix(0.9,0,0,0.9,7.25,6.45)" /> + <path + transform="matrix(0.5,0,0,0.5,20.25,20.25)" + d="M 37.5,34.5 A 5,5 0 1 1 27.5,34.5 A 5,5 0 1 1 37.5,34.5 z" + sodipodi:ry="5" + sodipodi:rx="5" + sodipodi:cy="34.5" + sodipodi:cx="32.5" + id="path5495" + style="opacity:1;color:#000000;fill:url(#radialGradient5497);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.11111116;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#radialGradient5507);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.11111116;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path5505" + sodipodi:cx="32.5" + sodipodi:cy="34.5" + sodipodi:rx="5" + sodipodi:ry="5" + d="M 37.5,34.5 A 5,5 0 1 1 27.5,34.5 A 5,5 0 1 1 37.5,34.5 z" + transform="matrix(0.3,0,0,0.3,26.75,27.15)" /> + <path + style="opacity:1;color:#000000;fill:#ff8f08;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 25,31 L 30,26 L 36,32 L 30,27 L 25.8125,31.25 L 25,31 z" + id="path5515" /> + </g> +</svg> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40663 - /trunk/control-center-gnome/src/control-center.c
by sreeves1＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: sreeves1 Date: Fri Aug 31 23:54:30 2007 New Revision: 40663 URL: http://svn.opensuse.org/viewcvs/yast?rev=40663&view=rev Log: Fix for #8097 - change icon Modified: trunk/control-center-gnome/src/control-center.c Modified: trunk/control-center-gnome/src/control-center.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/src/control… ============================================================================== --- trunk/control-center-gnome/src/control-center.c (original) +++ trunk/control-center-gnome/src/control-center.c Fri Aug 31 23:54:30 2007 @@ -161,7 +161,7 @@ g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data); textdomain (YAST_CC_PACKAGE); create_main_window (app_data, widget_theming_name, _("YaST2 Control Center"), - "yast-shell", 975, 600, hidden); + "yast", 975, 600, hidden); textdomain (GNOME_MAIN_MENU_PACKAGE); if (bonobo_app) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40662 - /tags/stable-2_15_11/x11/
by jdsn＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: jdsn Date: Fri Aug 31 21:45:16 2007 New Revision: 40662 URL: http://svn.opensuse.org/viewcvs/yast?rev=40662&view=rev Log: Created tag stable-2_15_11 for x11 Added: tags/stable-2_15_11/x11/ - copied from r40661, trunk/x11/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40661 - /tags/stable-2_15_71/packager/
by locilka＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: locilka Date: Fri Aug 31 17:39:19 2007 New Revision: 40661 URL: http://svn.opensuse.org/viewcvs/yast?rev=40661&view=rev Log: Created tag stable-2_15_71 for packager Added: tags/stable-2_15_71/packager/ - copied from r40660, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40660 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_productsources.ycp
by locilka＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: locilka Date: Fri Aug 31 17:37:01 2007 New Revision: 40660 URL: http://svn.opensuse.org/viewcvs/yast?rev=40660&view=rev Log: - Added commandline support for inst_productsources (#304720). - 2.15.71 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_productsources.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40660&r1=40… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Fri Aug 31 17:37:01 2007 @@ -1 +1 @@ -2.15.70 +2.15.71 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri Aug 31 17:37:01 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 31 17:34:40 CEST 2007 - locilka(a)suse.cz + +- Added commandline support for inst_productsources (#304720). +- 2.15.71 + +------------------------------------------------------------------- Fri Aug 31 12:45:59 CEST 2007 - lslezak(a)suse.cz - check exit status and report errors when adding online Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Fri Aug 31 17:37:01 2007 @@ -67,6 +67,7 @@ import "Progress"; import "Stage"; import "Report"; + import "CommandLine"; import "FileUtils"; import "HTTP"; @@ -86,6 +87,14 @@ return `back; } + list args = WFM::Args(); + y2milestone("args: %1", args); + + if (Mode::normal() && size (args)>0) { + CommandLine::Run ($["id":"inst_productsources"]); + return `auto; + } + // (Applicable only in inst-sys) boolean preselect_recommended = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40659 - /trunk/country/package/yast2-country.changes
by kmachalkova＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kmachalkova Date: Fri Aug 31 17:34:45 2007 New Revision: 40659 URL: http://svn.opensuse.org/viewcvs/yast?rev=40659&view=rev Log: er, typo :) Modified: trunk/country/package/yast2-country.changes Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Aug 31 17:34:45 2007 @@ -2,7 +2,7 @@ Fri Aug 31 17:26:12 CEST 2007 - kmachalkova(a)suse.cz - Timezone dialog adjusted to use new ntp installation clients - (FaTE #302192, bugzilla #(#299238,#299557,#302389) + (FaTE #302192, bugzilla #299238,#299557,#302389) ------------------------------------------------------------------- Fri Aug 17 14:34:32 CEST 2007 - jsuchome(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40658 - /tags/stable-2_15_7/ntp-client/
by kmachalkova＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kmachalkova Date: Fri Aug 31 17:29:35 2007 New Revision: 40658 URL: http://svn.opensuse.org/viewcvs/yast?rev=40658&view=rev Log: Created tag stable-2_15_7 for ntp-client Added: tags/stable-2_15_7/ntp-client/ - copied from r40657, trunk/ntp-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40657 - in /trunk/ntp-client: VERSION package/yast2-ntp-client.changes
by kmachalkova＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kmachalkova Date: Fri Aug 31 17:28:37 2007 New Revision: 40657 URL: http://svn.opensuse.org/viewcvs/yast?rev=40657&view=rev Log: version 2.15.7 Modified: trunk/ntp-client/VERSION trunk/ntp-client/package/yast2-ntp-client.changes Modified: trunk/ntp-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=40657&r1=… ============================================================================== --- trunk/ntp-client/VERSION (original) +++ trunk/ntp-client/VERSION Fri Aug 31 17:28:37 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Fri Aug 31 17:28:37 2007 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Aug 31 17:04:37 CEST 2007 - kmachalkova(a)suse.cz + +- Move all installation-related functionality into separate inst. + clients (_proposal and _finish) (FaTE #302192) +- Do not check for xntp package during installation (#299557, #299238) +- Call 'ntpdate' to synchronize with NTP server during installation + (do not restart the service) (#299238) +- 'During boot' NTP service start is now default (#302389) +- 2.15.7 + +------------------------------------------------------------------- Mon Aug 6 16:04:39 CEST 2007 - kmachalkova(a)suse.cz - Do not allow to edit access control rules if NTP is configured -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40656 - in /trunk/country: package/yast2-country.changes timezone/src/dialogs.ycp
by kmachalkova＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kmachalkova Date: Fri Aug 31 17:28:13 2007 New Revision: 40656 URL: http://svn.opensuse.org/viewcvs/yast?rev=40656&view=rev Log: - Timezone dialog adjusted to use new ntp installation clients (FaTE #302192, bugzilla #(#299238,#299557,#302389) Modified: trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Aug 31 17:28:13 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 31 17:26:12 CEST 2007 - kmachalkova(a)suse.cz + +- Timezone dialog adjusted to use new ntp installation clients + (FaTE #302192, bugzilla #(#299238,#299557,#302389) + +------------------------------------------------------------------- Fri Aug 17 14:34:32 CEST 2007 - jsuchome(a)suse.cz - when non-listed locale is selected, add it to the list of Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Fri Aug 31 17:28:13 2007 @@ -121,67 +121,28 @@ ); dt_widgets = true; } - list ntp_items = []; - boolean ntp_used = Service::Enabled ("ntp") && Package::Installed ("yast2-ntp-client"); - // list of servers based on the language (got from ntp-client module) - list ntp_items_proposed = nil; - list ntp_items_proposal () { - if (ntp_items_proposed == nil) - { - list servers = (list) WFM::CallFunction ("ntp-client_auto", [ - "GetNtpServersByCountry", - $[ "country" : Language::GetLanguageCountry () ] - ]); - ntp_items_proposed = (servers == nil) ? [] : servers; - } - return ntp_items_proposed; - } - - /** - * get the list of ntp servers from current ntp-client instance - */ - list get_current_ntp_settings () { - - list ret = []; - map ex = (map)WFM::CallFunction ("ntp-client_auto", ["Export"]); - if (ex == nil) return ret; - foreach (map peer, ex["peers"]:[], { - if (peer["type"]:"" == "server") - ret = add (ret, peer["address"]:""); - }); - return ret; - } - - /** - * read current NTP settings (using yast2-ntp-client) - * and fill the list of servers - */ - boolean read_ntp_settings () { - - // busy popup - Popup::ShowFeedback ("", _("Reading NTP configuration...")); - any read = WFM::CallFunction ("ntp-client_auto", ["Read"]); - if (read == false) - { - ntp_used = false; - ntp_items = []; - } - else - { - ntp_items = get_current_ntp_settings (); - } - if (ntp_used && ntp_items == []) - ntp_items = ntp_items_proposal (); - Popup::ClearFeedback (); - return ntp_used; + void enable_disable_widgets ( boolean ntp_used) { + if (!dt_widgets) + { + foreach (symbol widget, [`hour, `minute, `second, `day, `month, `year],{ + UI::ChangeWidget (`id (widget), `Enabled, !ntp_used); + }); + } + else + { + UI::ChangeWidget (`id (`date), `Enabled, !ntp_used); + UI::ChangeWidget (`id (`time), `Enabled, !ntp_used); + } + UI::ChangeWidget (`id (`ntp_address), `Enabled, ntp_used); + UI::ChangeWidget (`id (`ntp_configure), `Enabled, ntp_used); } term cont = `HBox ( `RadioButtonGroup (`id (`rb), `HCenter (`VBox ( `Left (`VBox ( // radio button label (= how to setup time) - `Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"), !ntp_used)), + `Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"), true)), `VSpacing (0.5), `HBox ( `HSpacing (3), @@ -190,35 +151,17 @@ `VSpacing(), `Left (dateterm) ) - ) - )), - `VSpacing (1), - `Left (`VBox ( - `Left (`RadioButton (`id (`ntp), `opt (`notify), - // radio button label - _("Synchronize with NTP Server"), ntp_used) ), - `VSpacing (0.5), - `HBox ( - `HSpacing (3), - `MinWidth (38, - `ComboBox (`id (`ntp_address), `opt (`editable), - // combo box label - _("NTP Server Address"), ntp_items - ) - ), - `VBox ( - `Label (""), - // push button label - `PushButton (`id (`ntp_configure), _("Configure...")) - ) - ) + `VSpacing (1), + `ReplacePoint(`id(`rp), `Empty()) )) - ))) - ); + )))); Wizard::OpenAcceptDialog (); Wizard::SetContents (_("Change Date and Time"), cont, htext, true, true); + Wizard::SetDesktopIcon("timezone"); + WFM::CallFunction("ntp-client_proposal", ["CreateUI"]); + enable_disable_widgets(false); if (!dt_widgets) { @@ -229,38 +172,17 @@ }); } - if (ntp_used) - { - read_ntp_settings (); - UI::ChangeWidget (`id (`ntp_address), `Items, ntp_items); - } + boolean ntp_installed = false; + boolean ntp_used = false; - void enable_disable_widgets () { - if (!dt_widgets) - { - foreach (symbol widget, [`hour, `minute, `second, `day, `month, `year],{ - UI::ChangeWidget (`id (widget), `Enabled, !ntp_used); - }); - } - else - { - UI::ChangeWidget (`id (`date), `Enabled, !ntp_used); - UI::ChangeWidget (`id (`time), `Enabled, !ntp_used); - } - UI::ChangeWidget (`id (`ntp_address), `Enabled, ntp_used); - UI::ChangeWidget (`id (`ntp_configure), `Enabled, ntp_used); - } - - enable_disable_widgets (); - any ret = `cancel; - boolean ntp_installed = false; + any ret = nil; repeat { ret = UI::UserInput(); y2debug ("UserInput ret:%1", ret ); if (ret == `ntp || ret == `manual) - { - ntp_used = (ret == `ntp); + { + ntp_used = (ret == `ntp); if (ntp_used && !Stage::initial () && !ntp_installed) { ntp_installed = Package::Install ("yast2-ntp-client"); @@ -271,49 +193,17 @@ UI::ChangeWidget (`id (`ntp), `Value, false); } } - if (ntp_used && ntp_items == []) + if (ntp_used ) { - if (!read_ntp_settings ()) - { - UI::ChangeWidget (`id (`manual), `Value, true); - UI::ChangeWidget (`id (`ntp), `Value, false); - continue; - } - UI::ChangeWidget (`id (`ntp_address), `Items, ntp_items); + WFM::CallFunction("ntp-client_proposal", [ "MakeProposal", + $[ "country" : Language::GetLanguageCountry() ] ]); } - enable_disable_widgets (); + enable_disable_widgets (ntp_used); } if (ret == `ntp_configure) { - if (WFM::CallFunction ("ntp-client_auto", ["Change"]) != `next) + if (WFM::CallFunction ("ntp-client_proposal", ["AskUser"]) != `next) continue; - // read current settings again - ntp_items = get_current_ntp_settings (); - UI::ChangeWidget (`id (`ntp_address), `Items, ntp_items); - // adapt current time after the attempt to synchronize - val = Timezone::GetDateTimeMap(); - hour = val["hour"]:""; - minute = val["minute"]:""; - second = val["second"]:""; - day = val["day"]:""; - month = val["month"]:""; - year = val["year"]:""; - if (dt_widgets) - { - UI::ChangeWidget (`id (`date), `Value, - sformat ("%1-%2-%3", year, month, day)); - UI::ChangeWidget (`id (`time), `Value, - sformat ("%1:%2:%3", hour, minute, second)); - } - else - { - UI::ChangeWidget (`id (`hour), `Value, hour); - UI::ChangeWidget (`id (`minute), `Value, minute); - UI::ChangeWidget (`id (`second), `Value, second); - UI::ChangeWidget (`id (`day), `Value, day); - UI::ChangeWidget (`id (`month), `Value, month); - UI::ChangeWidget (`id (`year), `Value, year); - } } if (ret == `accept && !ntp_used) { @@ -366,24 +256,22 @@ } if (ret == `accept && ntp_used) { - // check the address validity, call ntp-client API etc. - map ex = (map)WFM::CallFunction ("ntp-client_auto", ["Export"]); - list peers = add (ex["peers"]:[], $[ - "address" : UI::QueryWidget (`id (`ntp_address), `Value), - "comment" : "", - "options" : "", - "type" : "server", - "initial_sync" : true, - ] - ); - map import_map = $[ - "peers" : peers, - "start_at_boot" : true, - ]; - WFM::CallFunction ("ntp-client_auto", ["Import", import_map]); - WFM::CallFunction ("ntp-client_auto", ["Write", $[ - "restart_services": true - ]]); + symbol rv = (symbol) WFM::CallFunction("ntp-client_proposal", ["Write"]); + + string server = (string) UI::QueryWidget(`id(`ntp_address), `Value); + + if (rv == `invalid_hostname) + { + Popup::Error( sformat("Invalid NTP server hostname %1", server) ); + ret = `retry; + continue; + } + else if ( rv == `ntpdate_failed) + { + if (Popup::YesNo( sformat("'ntpdate %1' failed. Revisit NTP server configuration?", server) )) + ret = `retry; + continue; + } } } until( ret==`accept || ret==`cancel ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40655 - in /trunk/ntp-client/src: Makefile.am NtpClient.ycp dialogs.ycp ntp-client_auto.ycp ntp-client_finish.ycp ntp-client_proposal.ycp widgets.ycp
by kmachalkova＠svn.opensuse.org 31 Aug '07

31 Aug '07

Author: kmachalkova Date: Fri Aug 31 17:04:20 2007 New Revision: 40655 URL: http://svn.opensuse.org/viewcvs/yast?rev=40655&view=rev Log: New ntp installation client to handle ntp settings in 1st stage added + related changes in r/w functions (FaTE #302192, bugzilla #(#299238,#299557,#302389, #302433) Added: trunk/ntp-client/src/ntp-client_finish.ycp trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/src/Makefile.am trunk/ntp-client/src/NtpClient.ycp trunk/ntp-client/src/dialogs.ycp trunk/ntp-client/src/ntp-client_auto.ycp trunk/ntp-client/src/widgets.ycp Modified: trunk/ntp-client/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/Makefile.am?rev=4… ============================================================================== --- trunk/ntp-client/src/Makefile.am (original) +++ trunk/ntp-client/src/Makefile.am Fri Aug 31 17:04:20 2007 @@ -8,7 +8,9 @@ client_DATA = \ ntp-client.ycp \ - ntp-client_auto.ycp + ntp-client_auto.ycp \ + ntp-client_proposal.ycp \ + ntp-client_finish.ycp ynclude_DATA = \ helps.ycp \ Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev… ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Fri Aug 31 17:04:20 2007 @@ -58,7 +58,7 @@ /** * Should the daemon be started when system boots? */ -global boolean run_service = false; +global boolean run_service = true; /** * Service name of the NTP daemon @@ -124,6 +124,8 @@ global boolean simple_dialog = false; +global boolean already_proposed = false; + /** * Abort function * @return blah blah lahjk @@ -156,7 +158,7 @@ //workaround bug #241054: servers in United Kingdom are in domain .uk // domain .gb does not exist - add UK to the list of known countries - if (haskey(known_countries, "GB")){ + if (haskey(known_countries, "GB")){ known_countries["UK"] = known_countries["GB"]:""; known_countries = remove(known_countries,"GB"); } @@ -238,9 +240,10 @@ /** * Get list of public NTP servers for a country * @param country two-letter country code + * @param terse_output display additional data (location etc.) * @return list of servers (usable as combo-box items) */ -global list GetNtpServersByCountry ( string country ) { +global list GetNtpServersByCountry ( string country, boolean terse_output ) { map<string,string> country_names = $[]; map<string,map<string,string> > servers = GetNtpServers (); if (country != "") @@ -255,7 +258,7 @@ } list items = maplist (string s, map<string,string> o, servers, { - string label = o["location"]:""; + string label = o["location"]:""; string l_country = o["country"]:""; if (country != "") l_country = ""; @@ -267,7 +270,11 @@ label = s; else label = sformat ("%1 (%2%3)", s, label, l_country); - return `item (`id (s), label); + + if (terse_output) + return `item (`id(s), s); + else + return `item (`id (s), label); }); return items; @@ -275,79 +282,22 @@ } /** - * Read all ntp-client settings + * Read and parse /etc.ntp.conf * @return true on success */ -global define boolean Read() ``{ - - /* NtpClient read dialog caption */ - string caption = _("Initializing NTP Client Configuration"); - - integer steps = 2; - integer sl = 500; - // We do not set help text here, because it was set outside - Progress::New( caption, " ", steps, [ - // progress stage - _("Read network configuration"), - // progress stage - _("Read NTP settings"), - ], [ - // progress step - _("Reading network configuration..."), - // progress step - _("Reading NTP settings..."), - // progress step - _("Finished") - ], - "" - ); - - // read network configuration - if(Abort()) return false; - Progress::NextStage(); +global define boolean ProcessNtpConf() ``{ - boolean progress_orig = Progress::set (false); - NetworkDevices::Read (); - Progress::set (progress_orig); - config_dhcp = tolower ((string)SCR::Read (.sysconfig.network.dhcp.DHCLIENT_MODIFY_NTP_CONF)) == "yes"; - original_config_dhcp = config_dhcp; + map conf = nil; + if (FileUtils::Exists("/etc/ntp.conf")) + conf = (map)SCR::Read (.etc.ntp_conf.all); - GetNtpServers (); - GetCountryNames (); - // read current settings - if(Abort()) return false; - Progress::NextStage(); - - boolean failed = false; - - if (! Mode::testsuite () && ! Mode::installation () - && ! PackageSystem::CheckAndInstallPackagesInteractive (["xntp"]) - ) + if (conf == nil ) { + y2error("Failed to read /etc/ntp.conf, either it doesn't exist or contains no data"); return false; } - run_service = Service::Enabled (service_name); - - //Poke to /var/lib/YaST if there is Active Directory controller address dumped in .ycp file - string ad_ntp_file = Directory::vardir + "/ad_ntp_data.ycp"; - if(FileUtils::Exists(ad_ntp_file)) { - y2milestone("Reading %1", ad_ntp_file); - map <string, string> ad_ntp_data = (map <string, string>) SCR::Read(.target.ycp, ad_ntp_file); - ad_controller = ad_ntp_data["ads"]:""; - if(ad_controller != "") { - y2milestone("Got %1 for ntp sync, deleting %2, since it is no longer needed", ad_controller, ad_ntp_file); - SCR::Execute(.target.remove, ad_ntp_file); - } - } - - - map conf = (map)SCR::Read (.etc.ntp_conf.all); - if (conf == nil) - { - failed = true; - conf = $[]; - } + already_proposed = true; list<map<string, any> > value = conf["value"]:[]; integer index = -1; ntp_records = maplist (map<string, any> m, value, ``{ @@ -424,16 +374,6 @@ return m; }); - run_chroot = SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED) == "yes"; - - string initial_sync = (string)SCR::Read (.sysconfig.ntp.NTPD_INITIAL_NTPDATE); - if (initial_sync == nil) - { - initial_sync = ""; - failed = true; - y2error ("Failed reading .sysconfig.ntp.NTPD_INITIAL_NTPDATE"); - } - // mark local clock to be local clock and not real servers ntp_records = maplist (map<string,any> p, ntp_records, ``{ if (p["type"]:"" == "server" @@ -444,6 +384,89 @@ return p; }); + return true; + +} + +/** + * Read all ntp-client settings + * @return true on success + */ +global define boolean Read() ``{ + + /* NtpClient read dialog caption */ + string caption = _("Initializing NTP Client Configuration"); + + integer steps = 2; + integer sl = 500; + // We do not set help text here, because it was set outside + Progress::New( caption, " ", steps, [ + // progress stage + _("Read network configuration"), + // progress stage + _("Read NTP settings"), + ], [ + // progress step + _("Reading network configuration..."), + // progress step + _("Reading NTP settings..."), + // progress step + _("Finished") + ], + "" + ); + + // read network configuration + if(Abort()) return false; + Progress::NextStage(); + + boolean progress_orig = Progress::set (false); + NetworkDevices::Read (); + Progress::set (progress_orig); + config_dhcp = tolower ((string)SCR::Read (.sysconfig.network.dhcp.DHCLIENT_MODIFY_NTP_CONF)) == "yes"; + original_config_dhcp = config_dhcp; + + GetNtpServers (); + GetCountryNames (); + // read current settings + if(Abort()) return false; + Progress::NextStage(); + + boolean failed = false; + + if (! Mode::testsuite () && ! Mode::installation () + && ! PackageSystem::CheckAndInstallPackagesInteractive (["xntp"]) + ) + { + return false; + } + + run_service = Service::Enabled (service_name); + + //Poke to /var/lib/YaST if there is Active Directory controller address dumped in .ycp file + string ad_ntp_file = Directory::vardir + "/ad_ntp_data.ycp"; + if(FileUtils::Exists(ad_ntp_file)) { + y2milestone("Reading %1", ad_ntp_file); + map <string, string> ad_ntp_data = (map <string, string>) SCR::Read(.target.ycp, ad_ntp_file); + ad_controller = ad_ntp_data["ads"]:""; + if(ad_controller != "") { + y2milestone("Got %1 for ntp sync, deleting %2, since it is no longer needed", ad_controller, ad_ntp_file); + SCR::Execute(.target.remove, ad_ntp_file); + } + } + + ProcessNtpConf(); + + run_chroot = SCR::Read (.sysconfig.ntp.NTPD_RUN_CHROOTED) == "yes"; + + string initial_sync = (string)SCR::Read (.sysconfig.ntp.NTPD_INITIAL_NTPDATE); + if (initial_sync == nil) + { + initial_sync = ""; + failed = true; + y2error ("Failed reading .sysconfig.ntp.NTPD_INITIAL_NTPDATE"); + } + // mark those servers and peers that are used for initial syncing if (initial_sync == "AUTO") { Modified: trunk/ntp-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/dialogs.ycp?rev=4… ============================================================================== --- trunk/ntp-client/src/dialogs.ycp (original) +++ trunk/ntp-client/src/dialogs.ycp Fri Aug 31 17:04:20 2007 @@ -16,6 +16,7 @@ import "Label"; import "NtpClient"; import "Popup"; +import "Stage"; import "SuSEFirewall"; import "Wizard"; import "Report"; @@ -51,14 +52,22 @@ */ define symbol ReadDialog() ``{ Wizard::RestoreHelp(HELPS["read"]:""); - - // checking for root permissions (#158483) - if (!Confirm::MustBeRoot()) - return `abort; - - NtpClient::AbortFunction = PollAbort; - boolean ret = NtpClient::Read(); - return ret ? `next : `abort; + + if(Stage::initial()) + { + NtpClient::ProcessNtpConf(); + return `next; + } + else + { + // checking for root permissions (#158483) + if (!Confirm::MustBeRoot()) + return `abort; + + NtpClient::AbortFunction = PollAbort; + boolean ret = NtpClient::Read(); + return ret ? `next : `abort; + } } /** @@ -66,6 +75,9 @@ * @return `abort if aborted and `next otherwise */ define symbol WriteDialog() ``{ + if (Stage::initial()) + return `next; + Wizard::RestoreHelp(HELPS["write"]:""); NtpClient::AbortFunction = PollAbort; boolean ret = NtpClient::Write(); Modified: trunk/ntp-client/src/ntp-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_auto.y… ============================================================================== --- trunk/ntp-client/src/ntp-client_auto.ycp (original) +++ trunk/ntp-client/src/ntp-client_auto.ycp Fri Aug 31 17:04:20 2007 @@ -87,18 +87,11 @@ else if (func == "Write") { import "Progress"; boolean progress_orig = Progress::set (false); - //restart_service - also do 'rcntpd restart' and trigger time change - //otherwise - only write ntp.conf and stuff (default for autoyast) - if (param["restart_services"]:false == false) - NtpClient::write_only = true; + NtpClient::write_only = true; ret = NtpClient::Write(); Progress::set (progress_orig); } -else if (func == "GetNtpServersByCountry") { - string cc = param["country"]:NtpClient::GetCurrentLanguageCode(); - ret = NtpClient::GetNtpServersByCountry( cc ); -} /* Unknown function */ else { y2error("Unknown function: %1", func); Added: trunk/ntp-client/src/ntp-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_finish… ============================================================================== --- trunk/ntp-client/src/ntp-client_finish.ycp (added) +++ trunk/ntp-client/src/ntp-client_finish.ycp Fri Aug 31 17:04:20 2007 @@ -0,0 +1,58 @@ +/** + * File: clients/ntp-client_finish.ycp + * Summary: Installation client for writing ntp configuration + * at the end of 1st stage + * Author: Bubli <kmachalkova(a)suse.cz> + * + */ +{ +textdomain "ntp-client"; + +import "NtpClient"; + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map)WFM::Args(1); +} + +y2milestone ("starting ntp-client_finish"); +y2debug("func=%1", func); +y2debug("param=%1", param); + +if (func == "Info") +{ + return (any)$[ + "steps" : 1, + // progress step title + "title" : _("Writing NTP Configuration..."), + "when" : [ `installation, `autoinst ], + ]; +} +else if (func == "Write") +{ + map ex = NtpClient::Export(); + + NtpClient::Read(); + + NtpClient::Import( ex ); + + NtpClient::Write(); + +} +else +{ + y2error ("unknown function: %1", func); + ret = nil; +} + +y2debug("ret=%1", ret); +y2milestone("ntp-client_finish finished"); +return ret; + +} Added: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_propos… ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (added) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Fri Aug 31 17:04:20 2007 @@ -0,0 +1,168 @@ +/** + * File: clients/ntp-client_proposal.ycp + * Summary: Installation client for ntp configuration + * Author: Bubli <kmachalkova(a)suse.cz> + * + */ + +{ +textdomain "ntp-client"; + +import "Hostname"; +import "NetworkService"; +import "NtpClient"; +import "Service"; +import "String"; +import "Stage"; +import "Package"; +import "Pkg"; + +y2milestone("----------------------------------------"); +y2milestone("Ntp client proposal started"); +y2milestone("Arguments: %1", WFM::Args()); + +any ret = nil; +string func = ""; +map param = $[]; + +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map)WFM::Args(1); +} + +void ProposeSomething() +{ + list ntp_items = []; + if( NtpClient::already_proposed || NtpClient::ProcessNtpConf() ) + { + ntp_items = maplist(string server, NtpClient::GetUsedNtpServers(),{ + return `item(`id(server), server); + }); + } + if( ntp_items == []) + { + string cc = param["country"]:NtpClient::GetCurrentLanguageCode(); + y2milestone("Nothing found in /etc/ntp.conf, proposing current language-based NTP server list"); + ntp_items = NtpClient::GetNtpServersByCountry( cc, true ); + NtpClient::already_proposed = true; + } + UI::ChangeWidget(`id(`ntp_address), `Items, ntp_items); + +} + +void AddSingleServer( string server ) +{ + NtpClient::selected_record["address"] = server; + NtpClient::selected_record["type"] = "server"; + NtpClient::storeSyncRecord(); +} + +if (func == "CreateUI") +{ + term cont = + `Left (`VBox ( `id(`ntp_content), + `Left (`RadioButton (`id (`ntp), `opt (`notify), + // radio button label + _("Synchronize with NTP Server"), false) + ), + `VSpacing (0.5), + `HBox ( + `HSpacing (3), + `MinWidth (38, + `ComboBox (`id (`ntp_address), `opt (`editable), + // combo box label + _("NTP Server Address") + ) + ), + `VBox ( + `Label (""), + // push button label + `PushButton (`id (`ntp_configure), _("Configure...")) + ) + ) + )); + + if (UI::WidgetExists(`id(`rp))) + { + UI::ReplaceWidget(`id(`rp), cont); + + if (!NetworkService::isNetworkRunning()) + { + y2warning("Network is not running, NTP synchronization will not be available"); + UI::ChangeWidget(`id(`ntp_content), `Enabled, false); + } + + //does not really work ideally, need something better pkg binding :( + if (!Package::Available("xntp")) + { + y2warning("xntp package is not installable, NTP synchronization will not be available"); + UI::ChangeWidget(`id(`ntp_content), `Enabled, false); + } + } + + ret = true; +} + +else if (func == "MakeProposal") +{ + ProposeSomething(); + ret = true; +} + +else if (func == "Write") +{ + string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value); + if (!Hostname::CheckFQ(ntp_server)) + { + UI::SetFocus(`id(`ntp_address)); + ret = `invalid_hostname; + } + else + { + y2milestone("Running ntpdate to sync with %1", ntp_server); + + integer status = 0; + string service_name = "ntp"; + + //Stop NTP service on running system (during 1st stage, we don't care) + if( !Stage::initial() && status == 0) + { + Service::Stop(service_name); + } + + //Schedule package for installation + Pkg::PkgInstall("xntp"); + + integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server))); + y2milestone ("'ntpdate %1' returned %2", ntp_server, r); + + if( !Stage::initial() && status == 0) + { + Service::Start(service_name); + } + + if (r == 0) + { + ret = `success; + AddSingleServer(ntp_server); + } + else + ret = `ntpdate_failed; + } +} + +else if (func == "AskUser") +{ + string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value); + AddSingleServer(ntp_server); + ret = (symbol) WFM::CallFunction("ntp-client"); + ProposeSomething(); +} + +y2milestone("Ntp client proposal finished"); +y2milestone("----------------------------------------"); +return ret; +} + + Modified: trunk/ntp-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/widgets.ycp?rev=4… ============================================================================== --- trunk/ntp-client/src/widgets.ycp (original) +++ trunk/ntp-client/src/widgets.ycp Fri Aug 31 17:04:20 2007 @@ -887,7 +887,7 @@ { last_country = country; - list items = NtpClient::GetNtpServersByCountry ( country); + list items = NtpClient::GetNtpServersByCountry ( country, false); UI::ReplaceWidget (`servers_rp, `VBox( // Combobox has at least 40 characters -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0