August 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62377 - in /trunk/printer: data/Makefile.am data/testprint.2pages.ps package/yast2-printer.changes src/overview.ycp
by jsmeix＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: jsmeix Date: Tue Aug 10 16:16:58 2010 New Revision: 62377 URL: http://svn.opensuse.org/viewcvs/yast?rev=62377&view=rev Log: - Added testprint.2pages.ps and enhanced test page printing in overview.ycp to let the user choose to print one (default) or two pages test print e.g. to test duplex printing (see Novell/Suse Bugzilla bnc#629160). Added: trunk/printer/data/testprint.2pages.ps Modified: trunk/printer/data/Makefile.am trunk/printer/package/yast2-printer.changes trunk/printer/src/overview.ycp Modified: trunk/printer/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/data/Makefile.am?rev=623… ============================================================================== --- trunk/printer/data/Makefile.am (original) +++ trunk/printer/data/Makefile.am Tue Aug 10 16:16:58 2010 @@ -1,5 +1,6 @@ # Makefile.am for printer/data -ydata_DATA = testprint.ps +ydata_DATA = testprint.ps \ + testprint.2pages.ps EXTRA_DIST = $(ydata_DATA) Added: trunk/printer/data/testprint.2pages.ps URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/data/testprint.2pages.ps… ============================================================================== --- trunk/printer/data/testprint.2pages.ps (added) +++ trunk/printer/data/testprint.2pages.ps Tue Aug 10 16:16:58 2010 @@ -0,0 +1,1065 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 +%%Pages: 2 +%%LanguageLevel: 1 +%%DocumentData: Clean7Bit +%%DocumentSuppliedResources: procset testprint/1.3 +%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman +%%Creator: Michael Sweet, Apple Inc. +%%CreationDate: D:20090113092400+0800 +%%Title: Test Page +%%EndComments +%%BeginProlog +%%BeginResource procset testprint 1.3 0 +% +% PostScript test page for the Common UNIX Printing System ("CUPS"). +% +% Copyright 2007-2010 Apple Inc. +% Copyright 1993-2007 Easy Software Products +% +% These coded instructions, statements, and computer programs are the +% property of Apple Inc. and are protected by Federal copyright law. +% Distribution and use rights are outlined in the file "LICENSE.txt" +% which is included with the CUPS source distribution. +% +/SEXTANT { % Draw a color wheel sextant... + % (name) white radius r g b SEXTANT - + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup 0.75 le { % Get "white" value + % Start from black + dup 0.75 div % val2 = val / 0.75 + + 0 index 5 index mul % R = R * val2 + 1 index 5 index mul % G = G * val2 + 2 index 5 index mul % B = B * val2 + + 4 -1 roll pop % Discard val2 + } { + % Fade to white + dup neg 1 add 4 mul % val2 = (1 - val) * 4 + + 0 index 5 index mul % R = R * val2 + 1 index neg 1 add add % + (1 - val2) + 1 index 5 index mul % G = G * val2 + 2 index neg 1 add add % + (1 - val2) + 2 index 5 index mul % B = B * val2 + 3 index neg 1 add add % + (1 - val2) + + 4 -1 roll pop % Discard val2 + } ifelse + setrgbcolor % Set the color... + + % Draw the polygon... + newpath % Start a new path... + dup 5 index mul % r1 = radius * val + 0 0 3 -1 roll 0 60 arc % Draw the inner arc + + dup 0.010101 add 5 index mul% r2 = (radius + 0.010101) * val + 0 0 3 -1 roll 60 0 arcn % Draw the outer arc + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + % Draw a line around the polygons... + pop pop pop dup % Pop R, G, B, start + 0 setgray % Black + newpath + 0 0 moveto % Center + 0 0 3 -1 roll 0 60 arc % Arc around octant + closepath % Back to center + stroke % Stroke it... + + % Draw the label... + dup % Save radius + dup 30 cos mul % X = radius * cos(30) + exch 30 sin mul % Y = radius * sin(30) + moveto % Position label + + gsave + 30 rotate % Rotate label + dup 0.05 mul % Offset to the right + exch -0.05 mul % and down... + rmoveto % Offset label + show % Show label + grestore +} bind def +/CENTER { % Draw centered text + % (name) CENTER - + dup stringwidth pop % Get the width of the string + 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance + show % Show the string +} bind def +/RIGHT { % Draw right-justified text + % (name) RIGHT - + dup stringwidth pop % Get the width of the string + neg 0 rmoveto % Shift left the entire distance + show % Show the string +} bind def +/NUMBER { % Draw a number + % power n NUMBER - + 1 index 1 eq { % power == 1? + round cvi exch pop % Convert "n" to integer + } { + 1 index mul round exch div % Truncate extra decimal places + } ifelse + 100 string cvs show % Convert to a string and show it... +} bind def +/CUPSLOGO { % Draw the CUPS logo + % height CUPSLOGO + % Start with a big C... + /Helvetica findfont 1 index scalefont setfont + 0 setgray + 0 0 moveto + (C) show + + % Then "UNIX Printing System" much smaller... + /Helvetica-Bold findfont 1 index 9 div scalefont setfont + 0.25 mul + dup dup 2.0 mul moveto + (UNIX) show + dup dup 1.6 mul moveto + (Printing) show + dup 1.2 mul moveto + (System) show +} bind def +%%EndResource +%%EndProlog + +% The first page: +%%Page: 1 1 +gsave + + % Determine the imageable area and device resolution... + initclip newpath clippath pathbbox % Get bounding rectangle + 72 div /pageTop exch def % Get top margin in inches + 72 div /pageRight exch def % Get right margin in inches + 72 div /pageBottom exch def % Get bottom margin in inches + 72 div /pageLeft exch def % Get left margin in inches + + 4 setlinewidth % Draw wide lines + 0 setgray closepath stroke % Draw a clipping rectangle + + /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft + /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom + + 72 72 dtransform % Get device resolution per inch + /yResolution exch abs def % yResolution = abs(yres) + /xResolution exch abs def % xResolution = abs(xres) + + % Figure out the sizes of things... + /wheelSize % size of wheels + pageWidth pageHeight lt + { pageWidth 9 mul } + { pageHeight 7 mul } + ifelse def + + % Create fonts... + /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold + pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) + + /mediumFont /Helvetica findfont % mediumFont = Helvetica + pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) + + /smallFont /Times-Roman findfont % smallFont = Times-Roman + pageHeight scalefont def % size = pageHeight (nominally 11) + + % Draw rulers along the edges... + /CENTIMETER 72 2.54 div def + /MILLIMETER 72 25.4 div def + + /Times-Roman findfont % Font for ruler numbers + 11 scalefont setfont % 11 points + + gsave % Left side inches + pageLeft 72 mul 0 translate % Offset left edge + + 1 setlinewidth % Draw normal lines + 72 72 pageTop 72 mul { % Height inches + dup dup + 0 exch moveto 24 0 rlineto stroke % Draw tic mark + 24 exch pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs RIGHT + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageTop 72 mul { % 1/4 inches + 0 exch moveto 15 0 rlineto stroke % Draw tic mark + } for + + 9 9 pageTop 72 mul { % 1/8 inches + 0 exch moveto 6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Bottom inches + 0 pageBottom 72 mul translate % Offset bottom edge + + 1 setlinewidth % Draw normal lines + 72 72 pageRight 72 mul { % Width inches + dup dup + 0 moveto 0 24 rlineto stroke % Draw tic mark + 3 add 27 pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageRight 72 mul { % 1/4 inches + 0 moveto 0 15 rlineto stroke % Draw tic mark + } for + + 9 9 pageRight 72 mul { % 1/8 inches + 0 moveto 0 6 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Right side centimeters + pageRight 72 mul 0 translate % Offset right edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageTop 72 mul { % Height centimeters + 0 exch moveto -24 0 rlineto stroke% Draw tic mark + } for + 1 1 pageTop 2.54 mul { % Height labels + dup + -24 exch CENTIMETER mul + pageHeight sub moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageTop 72 mul { % 1/2 centimeters + 0 exch moveto -15 0 rlineto stroke% Draw tic mark + } for + 0 MILLIMETER pageTop 72 mul { % Millimeters + 0 exch moveto -6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Top centimeters + 0 pageTop 72 mul translate % Offset top edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageRight 72 mul { % Width centimeters + 0 moveto 0 -24 rlineto stroke % Draw tic mark + } for + 1 1 pageRight 2.54 mul { % Width labels + dup + CENTIMETER mul 3 add -24 moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageRight 72 mul { % 1/2 centimeters + 0 moveto 0 -15 rlineto stroke % Draw tic mark + } for + 0 MILLIMETER pageRight 72 mul { % Millimeters + 0 moveto 0 -6 rlineto stroke % Draw tic mark + } for + grestore + + % Offset page to account for lower-left margin... + pageLeft 72 mul + pageBottom 72 mul + translate + + % Set text font and color... + mediumFont setfont % Font + 0 setgray % Color + 1 setlinewidth % Draw normal lines + + % Draw the color wheel... + gsave + % Position the wheel on the left side... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Draw the colors... + dup (C) 3 -1 roll 0 1 1 SEXTANT 60 rotate + dup (M) 3 -1 roll 1 0 1 SEXTANT 60 rotate + dup (Y) 3 -1 roll 1 1 0 SEXTANT 60 rotate + dup (R) 3 -1 roll 1 0 0 SEXTANT 60 rotate + dup (G) 3 -1 roll 0 1 0 SEXTANT 60 rotate + dup (B) 3 -1 roll 0 0 1 SEXTANT 60 rotate + + pop + grestore + + % Label the color wheel... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Color Wheel) CENTER % Show the text centered + + % Draw the gray ramp... + gsave + % Position the gray ramp in the center... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + wheelSize sub % - wheelSize + translate + + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup setgray % Set the grayscale... + + % Draw the polygon... + newpath % Start a new path... + + wheelSize -0.2 mul % X = -wheelSize / 5 + 1 index 2 mul wheelSize mul % Y = val * 2 * wheelSize + moveto % Move there... + + wheelSize 0.4 mul 0 rlineto % Right side... + + wheelSize 0.2 mul % X = wheelSize / 5 + 1 index 0.010101 add 2 mul wheelSize mul + % Y = (val + 0.010101) * 2 * wheelSize + lineto % Move there... + + wheelSize -0.4 mul 0 rlineto % Left side... + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + 0 setgray % Black + + newpath % Start a new path + wheelSize -0.2 mul 0 moveto % Bottom left + wheelSize 0.4 mul 0 rlineto % Bottom right + 0 wheelSize 2 mul rlineto % Upper right + wheelSize -0.4 mul 0 rlineto % Upper left + closepath % Close the path + stroke % Stroke it... + + 0 wheelSize -0.2 mul moveto % Center bottom for label + (K) CENTER % Center K at bottom + + 0 wheelSize 2.05 mul moveto % Center top for label + (W) CENTER % Center W at top + grestore + + % Label the gray ramp... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Gray Ramp) CENTER % Show the text centered + + + % Draw radial lines... + gsave + 0 setlinewidth % 1 pixel lines + + % Position the lines on the left side... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Loop at 1 degree increments + 0 1 359 { + pop % Discard angle - not used + 0 0 moveto % Start line at the center + dup 0 lineto % Draw to the radius + 1 rotate % Rotate 1 degree + } for + + pop % Discard radius - not needed anymore + stroke % Draw lines... + + grestore + + % Label the lines... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (1 Degree Radial Lines) CENTER % Show the text centered + + % Imageable area... + pageHeight 15 mul % Height of imageable area + + pageWidth 4.5 mul % x = pageWidth * 1/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the imageable area... + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Imageable Area) show % Show the text + + smallFont setfont % Font + pageWidth 14 mul % x = pageWidth * 3/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight -2 mul add % y -= 2 * smallFont height + + % Page Size inches + 2 copy moveto % Move to x & y + (Page Size: ) RIGHT % Label + 100 pageWidth NUMBER % pageWidth + (x) show % "x" + 100 pageHeight NUMBER % pageHeight + (in) show % "in" + + % Page Size millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageWidth 25.4 mul NUMBER % pageWidth + (x) show % "x" + 10 pageHeight 25.4 mul NUMBER % pageHeight + (mm) show % "mm" + + % Lower-left inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Lower-Left: ) RIGHT % Label + 100 pageLeft NUMBER % pageLeft + (x) show % "x" + 100 pageBottom NUMBER % pageBottom + (in) show % "in" + + % Lower-left millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageLeft 25.4 mul NUMBER % pageLeft + (x) show % "x" + 10 pageBottom 25.4 mul NUMBER % pageBottom + (mm) show % "mm" + + % Upper-right inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Upper-Right: ) RIGHT % Label + 100 pageRight NUMBER % pageRight + (x) show % "x" + 100 pageTop NUMBER % pageTop + (in) show % "in" + + % Upper-right millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageRight 25.4 mul NUMBER % pageRight + (x) show % "x" + 10 pageTop 25.4 mul NUMBER % pageTop + (mm) show % "mm" + + % Resolution dots-per-inch + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Resolution: ) RIGHT % Label + 1 xResolution NUMBER % xResolution + (x) show % "x" + 1 yResolution NUMBER % yResolution + (dpi) show % "dpi" + + % Resolution dots-per-meter + pageHeight sub % Move down... + + moveto % Move to x & y + 1 xResolution 39.27 mul NUMBER % xResolution + (x) show % "x" + 1 yResolution 39.27 mul NUMBER % yResolution + (dpm) show % "dpm" + + % Interpreter Information... + pageHeight 15 mul % Height of interpreter information + + pageWidth 40.5 mul % x = pageWidth * 9/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the interpreter info... + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Interpreter Information) show % Show the text + + smallFont setfont % Font + pageWidth 49 mul % x = pageWidth * 11/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight 2 mul sub % y -= 2 * smallFont height + + % Language level + 2 copy moveto % Move to x & y + (PostScript: ) RIGHT % Label + (Level ) show % "Level " + 1 languagelevel NUMBER % Language level + + % Version + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Version: ) RIGHT % Label + version show % Version + ( $) show % " (" + 1 revision NUMBER % Revision + ($) show % ")" + + % Product + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Product: ) RIGHT % Label + product show % Product name + + % Serial Number + pageHeight 2 mul sub % Move down... + moveto % Move to x & y + (Serial #: ) RIGHT % Label + 1 serialnumber NUMBER % S/N + + % Draw the label at the top... + pageWidth 36 mul % Center of page + pageHeight 66 mul % Top of page (11/12ths) + moveto % Position text + bigFont setfont % Font + (CUPS Printer Test Page 1/2) CENTER % Show text centered + + % Draw the copyright notice at the bottom... + pageWidth 17 mul % Center of page + pageHeight 9.5 mul % Bottom of page + moveto % Position text + (Printed with CUPS) show + + pageWidth 17 mul % Left side of page + pageHeight 7.5 mul % Move down... + 2 copy moveto % Position text + smallFont setfont % Font + (Copyright 2007-2010 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are) show + pageHeight 2 add sub % Move down... + 2 copy moveto % Position text + (the trademark property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show + pageHeight 2 mul 4 add sub % Move down... + moveto % Position text + (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show + + % Then the CUPS logo.... + gsave + pageWidth 4 mul + pageHeight 4 mul + translate + pageWidth 15 mul CUPSLOGO + grestore + +% Show the page... +grestore +showpage + +% The second page: +%%Page: 2 2 +gsave + + % Determine the imageable area and device resolution... + initclip newpath clippath pathbbox % Get bounding rectangle + 72 div /pageTop exch def % Get top margin in inches + 72 div /pageRight exch def % Get right margin in inches + 72 div /pageBottom exch def % Get bottom margin in inches + 72 div /pageLeft exch def % Get left margin in inches + + 4 setlinewidth % Draw wide lines + 0 setgray closepath stroke % Draw a clipping rectangle + + /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft + /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom + + 72 72 dtransform % Get device resolution per inch + /yResolution exch abs def % yResolution = abs(yres) + /xResolution exch abs def % xResolution = abs(xres) + + % Figure out the sizes of things... + /wheelSize % size of wheels + pageWidth pageHeight lt + { pageWidth 9 mul } + { pageHeight 7 mul } + ifelse def + + % Create fonts... + /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold + pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) + + /mediumFont /Helvetica findfont % mediumFont = Helvetica + pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) + + /smallFont /Times-Roman findfont % smallFont = Times-Roman + pageHeight scalefont def % size = pageHeight (nominally 11) + + % Draw rulers along the edges... + /CENTIMETER 72 2.54 div def + /MILLIMETER 72 25.4 div def + + /Times-Roman findfont % Font for ruler numbers + 11 scalefont setfont % 11 points + + gsave % Left side inches + pageLeft 72 mul 0 translate % Offset left edge + + 1 setlinewidth % Draw normal lines + 72 72 pageTop 72 mul { % Height inches + dup dup + 0 exch moveto 24 0 rlineto stroke % Draw tic mark + 24 exch pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs RIGHT + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageTop 72 mul { % 1/4 inches + 0 exch moveto 15 0 rlineto stroke % Draw tic mark + } for + + 9 9 pageTop 72 mul { % 1/8 inches + 0 exch moveto 6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Bottom inches + 0 pageBottom 72 mul translate % Offset bottom edge + + 1 setlinewidth % Draw normal lines + 72 72 pageRight 72 mul { % Width inches + dup dup + 0 moveto 0 24 rlineto stroke % Draw tic mark + 3 add 27 pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageRight 72 mul { % 1/4 inches + 0 moveto 0 15 rlineto stroke % Draw tic mark + } for + + 9 9 pageRight 72 mul { % 1/8 inches + 0 moveto 0 6 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Right side centimeters + pageRight 72 mul 0 translate % Offset right edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageTop 72 mul { % Height centimeters + 0 exch moveto -24 0 rlineto stroke% Draw tic mark + } for + 1 1 pageTop 2.54 mul { % Height labels + dup + -24 exch CENTIMETER mul + pageHeight sub moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageTop 72 mul { % 1/2 centimeters + 0 exch moveto -15 0 rlineto stroke% Draw tic mark + } for + 0 MILLIMETER pageTop 72 mul { % Millimeters + 0 exch moveto -6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Top centimeters + 0 pageTop 72 mul translate % Offset top edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageRight 72 mul { % Width centimeters + 0 moveto 0 -24 rlineto stroke % Draw tic mark + } for + 1 1 pageRight 2.54 mul { % Width labels + dup + CENTIMETER mul 3 add -24 moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageRight 72 mul { % 1/2 centimeters + 0 moveto 0 -15 rlineto stroke % Draw tic mark + } for + 0 MILLIMETER pageRight 72 mul { % Millimeters + 0 moveto 0 -6 rlineto stroke % Draw tic mark + } for + grestore + + % Offset page to account for lower-left margin... + pageLeft 72 mul + pageBottom 72 mul + translate + + % Set text font and color... + mediumFont setfont % Font + 0 setgray % Color + 1 setlinewidth % Draw normal lines + + % Draw the color wheel... + gsave + % Position the wheel on the left side... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Draw the colors... + dup (C) 3 -1 roll 0 1 1 SEXTANT 60 rotate + dup (M) 3 -1 roll 1 0 1 SEXTANT 60 rotate + dup (Y) 3 -1 roll 1 1 0 SEXTANT 60 rotate + dup (R) 3 -1 roll 1 0 0 SEXTANT 60 rotate + dup (G) 3 -1 roll 0 1 0 SEXTANT 60 rotate + dup (B) 3 -1 roll 0 0 1 SEXTANT 60 rotate + + pop + grestore + + % Label the color wheel... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Color Wheel) CENTER % Show the text centered + + % Draw the gray ramp... + gsave + % Position the gray ramp in the center... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + wheelSize sub % - wheelSize + translate + + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup setgray % Set the grayscale... + + % Draw the polygon... + newpath % Start a new path... + + wheelSize -0.2 mul % X = -wheelSize / 5 + 1 index 2 mul wheelSize mul % Y = val * 2 * wheelSize + moveto % Move there... + + wheelSize 0.4 mul 0 rlineto % Right side... + + wheelSize 0.2 mul % X = wheelSize / 5 + 1 index 0.010101 add 2 mul wheelSize mul + % Y = (val + 0.010101) * 2 * wheelSize + lineto % Move there... + + wheelSize -0.4 mul 0 rlineto % Left side... + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + 0 setgray % Black + + newpath % Start a new path + wheelSize -0.2 mul 0 moveto % Bottom left + wheelSize 0.4 mul 0 rlineto % Bottom right + 0 wheelSize 2 mul rlineto % Upper right + wheelSize -0.4 mul 0 rlineto % Upper left + closepath % Close the path + stroke % Stroke it... + + 0 wheelSize -0.2 mul moveto % Center bottom for label + (K) CENTER % Center K at bottom + + 0 wheelSize 2.05 mul moveto % Center top for label + (W) CENTER % Center W at top + grestore + + % Label the gray ramp... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Gray Ramp) CENTER % Show the text centered + + + % Draw radial lines... + gsave + 0 setlinewidth % 1 pixel lines + + % Position the lines on the left side... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Loop at 1 degree increments + 0 1 359 { + pop % Discard angle - not used + 0 0 moveto % Start line at the center + dup 0 lineto % Draw to the radius + 1 rotate % Rotate 1 degree + } for + + pop % Discard radius - not needed anymore + stroke % Draw lines... + + grestore + + % Label the lines... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (1 Degree Radial Lines) CENTER % Show the text centered + + % Imageable area... + pageHeight 15 mul % Height of imageable area + + pageWidth 4.5 mul % x = pageWidth * 1/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the imageable area... + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Imageable Area) show % Show the text + + smallFont setfont % Font + pageWidth 14 mul % x = pageWidth * 3/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight -2 mul add % y -= 2 * smallFont height + + % Page Size inches + 2 copy moveto % Move to x & y + (Page Size: ) RIGHT % Label + 100 pageWidth NUMBER % pageWidth + (x) show % "x" + 100 pageHeight NUMBER % pageHeight + (in) show % "in" + + % Page Size millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageWidth 25.4 mul NUMBER % pageWidth + (x) show % "x" + 10 pageHeight 25.4 mul NUMBER % pageHeight + (mm) show % "mm" + + % Lower-left inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Lower-Left: ) RIGHT % Label + 100 pageLeft NUMBER % pageLeft + (x) show % "x" + 100 pageBottom NUMBER % pageBottom + (in) show % "in" + + % Lower-left millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageLeft 25.4 mul NUMBER % pageLeft + (x) show % "x" + 10 pageBottom 25.4 mul NUMBER % pageBottom + (mm) show % "mm" + + % Upper-right inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Upper-Right: ) RIGHT % Label + 100 pageRight NUMBER % pageRight + (x) show % "x" + 100 pageTop NUMBER % pageTop + (in) show % "in" + + % Upper-right millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageRight 25.4 mul NUMBER % pageRight + (x) show % "x" + 10 pageTop 25.4 mul NUMBER % pageTop + (mm) show % "mm" + + % Resolution dots-per-inch + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Resolution: ) RIGHT % Label + 1 xResolution NUMBER % xResolution + (x) show % "x" + 1 yResolution NUMBER % yResolution + (dpi) show % "dpi" + + % Resolution dots-per-meter + pageHeight sub % Move down... + + moveto % Move to x & y + 1 xResolution 39.27 mul NUMBER % xResolution + (x) show % "x" + 1 yResolution 39.27 mul NUMBER % yResolution + (dpm) show % "dpm" + + % Interpreter Information... + pageHeight 15 mul % Height of interpreter information + + pageWidth 40.5 mul % x = pageWidth * 9/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the interpreter info... + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Interpreter Information) show % Show the text + + smallFont setfont % Font + pageWidth 49 mul % x = pageWidth * 11/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight 2 mul sub % y -= 2 * smallFont height + + % Language level + 2 copy moveto % Move to x & y + (PostScript: ) RIGHT % Label + (Level ) show % "Level " + 1 languagelevel NUMBER % Language level + + % Version + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Version: ) RIGHT % Label + version show % Version + ( $) show % " (" + 1 revision NUMBER % Revision + ($) show % ")" + + % Product + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Product: ) RIGHT % Label + product show % Product name + + % Serial Number + pageHeight 2 mul sub % Move down... + moveto % Move to x & y + (Serial #: ) RIGHT % Label + 1 serialnumber NUMBER % S/N + + % Draw the label at the top... + pageWidth 36 mul % Center of page + pageHeight 66 mul % Top of page (11/12ths) + moveto % Position text + bigFont setfont % Font + (CUPS Printer Test Page 2/2) CENTER % Show text centered + + % Draw the copyright notice at the bottom... + pageWidth 17 mul % Center of page + pageHeight 9.5 mul % Bottom of page + moveto % Position text + (Printed with CUPS) show + + pageWidth 17 mul % Left side of page + pageHeight 7.5 mul % Move down... + 2 copy moveto % Position text + smallFont setfont % Font + (Copyright 2007-2010 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are) show + pageHeight 2 add sub % Move down... + 2 copy moveto % Position text + (the trademark property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show + pageHeight 2 mul 4 add sub % Move down... + moveto % Position text + (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show + + % Then the CUPS logo.... + gsave + pageWidth 4 mul + pageHeight 4 mul + translate + pageWidth 15 mul CUPSLOGO + grestore + +% Show the page... +grestore +showpage +% +% End of "$Id: testprint.ps 8236 2009-01-13 17:27:16Z mike $". +% +%%EOF Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Aug 10 16:16:58 2010 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Aug 10 15:56:38 CEST 2010 - jsmeix(a)suse.de + +- Added testprint.2pages.ps and enhanced test page printing + in overview.ycp to let the user choose to print one (default) + or two pages test print e.g. to test duplex printing + (see Novell/Suse Bugzilla bnc#629160). +- Enhanced texts in popups regarding firewall so that they + can no longer be misunderstood to open ports + (see Novell/Suse Bugzilla bnc#627799). +- Enhanced the help text regarding possible drawback (delays + if CUPS server does not respond) for a "client only" config. +- 2.20.0 + +------------------------------------------------------------------- Thu Jul 1 17:33:47 CEST 2010 - jsmeix(a)suse.de - Enhanced the test_* tools to do the most meaningful test first Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=623… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Tue Aug 10 16:16:58 2010 @@ -666,8 +666,6 @@ } } string testprint_job_title = "YaST2testprint_" + queue_name; - // Do not enforce to talk to the cupsd on localhost when submiting the testpage - // because testpage printing must also work for a "client-only" config. // Since CUPS 1.4 there is no longer a readymade PostScript testpage in CUPS, see // https://bugzilla.novell.com/show_bug.cgi?id=520617 // Therefore a slightly modified CUPS 1.3.10 testprint.ps was added @@ -683,13 +681,32 @@ // + (Printed with CUPS) show // make it obvious that it is not a YaST testpage but a CUPS testpage // and it is now independent of the CUPS version. + string testprint_file_name = "/usr/share/YaST2/data/testprint.ps"; + if( ! Popup::AnyQuestion( // Popup::AnyQuestion header: + _("Test printout"), + // Popup::AnyQuestion message: + _("Print one or two pages e.g. to test duplex printing"), + // Popup::AnyQuestion so called 'yes' (default) button label: + _("Single test page"), + // Popup::AnyQuestion so called 'no' button label: + _("Two test pages"), + // The so called 'yes' button is the default choice: + `focus_yes + ) + ) + { // Basically testprint.2pages.ps consists of two testprint.ps concatenated: + testprint_file_name = "/usr/share/YaST2/data/testprint.2pages.ps"; + } + // Do not enforce to talk to the cupsd on localhost when submiting the testpage + // because testpage printing must also work for a "client-only" config. if( ! Printerlib::ExecuteBashCommand( "/usr/bin/lp -d '" + queue_name + "' -t '" + testprint_job_title + "' -o page-label=\"" + queue_name - + ":YaST2testprint@$(hostname)\" /usr/share/YaST2/data/testprint.ps" + + ":YaST2testprint@$(hostname)\" " + + testprint_file_name ) ) { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails -- 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] r62376 - in /trunk/autoinstallation: package/autoyast2.changes src/include/xml.ycp
by ug＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: ug Date: Tue Aug 10 15:13:26 2010 New Revision: 62376 URL: http://svn.opensuse.org/viewcvs/yast?rev=62376&view=rev Log: media_url removed from CDATA Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/xml.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Aug 10 15:13:26 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Aug 10 15:12:56 CEST 2010 - ug(a)suse.de + +- media_url removed from CDATA + +------------------------------------------------------------------- Thu Aug 5 10:53:55 CEST 2010 - ug(a)suse.de - a new filesystem can be specified for partitioning_advanced Modified: trunk/autoinstallation/src/include/xml.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/xml… ============================================================================== --- trunk/autoinstallation/src/include/xml.ycp (original) +++ trunk/autoinstallation/src/include/xml.ycp Tue Aug 10 15:13:26 2010 @@ -99,7 +99,7 @@ "net-udev":"rule" ]; - doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "media_url", "location", "script_source"]; + doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "location", "script_source"]; // doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd"; doc["rootElement"] = "profile"; doc["nameSpace"] = "http://www.suse.com/1.0/yast2ns"; -- 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] r62375 - in /trunk/core: VERSION libycp/src/parser.yy package/yast2-core.changes
by mvidner＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: mvidner Date: Tue Aug 10 13:29:07 2010 New Revision: 62375 URL: http://svn.opensuse.org/viewcvs/yast?rev=62375&view=rev Log: Enable input buffering for YCP include files (bnc#629882). Modified: trunk/core/VERSION trunk/core/libycp/src/parser.yy trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=62375&r1=62374&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Tue Aug 10 13:29:07 2010 @@ -1 +1 @@ -2.19.2 +2.19.3 Modified: trunk/core/libycp/src/parser.yy URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/parser.yy?rev=62… ============================================================================== --- trunk/core/libycp/src/parser.yy (original) +++ trunk/core/libycp/src/parser.yy Tue Aug 10 13:29:07 2010 @@ -1502,6 +1502,7 @@ // we duplicate the value, so scanner gets its own instance p_parser->setScanner (new Scanner (fd, Scanner::doStrdup($2.v.sval))); + p_parser->setBuffered(); // was missing, bnc#629882 // pass the outer scanner's tables p_parser->scanner()->initTables (scanner->scanner->globalTable(), scanner->scanner->localTable()); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Tue Aug 10 13:29:07 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 10 13:28:57 CEST 2010 - mvidner(a)suse.cz + +- Enable input buffering for YCP include files (bnc#629882). +- 2.19.3 + +------------------------------------------------------------------- Thu Mar 11 15:36:27 CET 2010 - mvidner(a)suse.cz - Fixed the regexpsub algorithm not to loop endlessly -- 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] r62374 - /trunk/storage/storage/src/modules/FileSystems.ycp
by fehr＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: fehr Date: Mon Aug 9 17:29:43 2010 New Revision: 62374 URL: http://svn.opensuse.org/viewcvs/yast?rev=62374&view=rev Log: fix typos Modified: trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 9 17:29:43 2010 @@ -603,8 +603,8 @@ `default : false, // help text, richtext format `help_text : _("No Journal: -Supressed use of journaling on filesystem. Only activate this when you really -know what you ar doing.\n") +Suppressed use of journaling on filesystem. Only activate this when you really +know what you are doing.\n") ] ]; -- 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] r62373 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp
by fehr＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: fehr Date: Mon Aug 9 13:51:30 2010 New Revision: 62373 URL: http://svn.opensuse.org/viewcvs/yast?rev=62373&view=rev Log: add option to supress journal to mkfs options for ext3 and ext4 (bnc#629363) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 9 13:51:30 2010 @@ -2,6 +2,8 @@ Mon Aug 9 13:38:45 CEST 2010 - fehr(a)suse.de - make mkfs option "dir_index" work as expected again +- add option to supress journal to mkfs options for ext3 and ext4 + (bnc#629363) ------------------------------------------------------------------- Fri Aug 06 15:48:27 CEST 2010 - aschnell(a)suse.de Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 9 13:51:30 2010 @@ -593,6 +593,18 @@ // help text, richtext format `help_text : _("Directory Index: Enables use of hashed b-trees to speed up lookups in large directories.\n") + ], + $[ + // label text + `widget : `CheckBox(`id("no_journal"), `opt(`hstretch), _("&No Journal")), + `query_key : "no_journal", + `option_str : "-O ^has_journal", + `type : `boolean, + `default : false, + // help text, richtext format + `help_text : _("No Journal: +Supressed use of journaling on filesystem. Only activate this when you really +know what you ar doing.\n") ] ]; -- 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] r62372 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: fehr Date: Mon Aug 9 13:49:48 2010 New Revision: 62372 URL: http://svn.opensuse.org/viewcvs/yast?rev=62372&view=rev Log: make mkfs option "dir_index" work as expected again Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 9 13:49:48 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 9 13:38:45 CEST 2010 - fehr(a)suse.de + +- make mkfs option "dir_index" work as expected again + +------------------------------------------------------------------- Fri Aug 06 15:48:27 CEST 2010 - aschnell(a)suse.de - hide button "Create New Partition Table" for DASDs Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Aug 9 13:49:48 2010 @@ -370,6 +370,11 @@ $[ "option_str" : entry[`option_str]:"", "option_cmd" : entry[`option_cmd]:`mkfs, "option_value" : query ]; + if( is( query, boolean ) && query==false && + haskey( entry, `option_false ) ) + { + fs_option["option_str"] = entry[`option_false]:""; + } y2milestone( "FileSystemOptions fs_option %1", fs_option ); if( entry[`option_blank]:false ) Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 9 13:49:48 2010 @@ -588,8 +588,8 @@ `widget : `CheckBox(`id("opt_dir_index"), `opt(`hstretch), _("&Directory Index Feature")), `query_key : "opt_dir_index", `option_str : "-O dir_index", + `option_false : "-O ^dir_index", `type : `boolean, - `default : false, // help text, richtext format `help_text : _("Directory Index: Enables use of hashed b-trees to speed up lookups in large directories.\n") Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 9 13:49:48 2010 @@ -1071,7 +1071,7 @@ } else if( is(option_value, boolean) && option_value != nil ) { - if( (boolean) option_value ) + if( size(option_str)>0 ) { if( size(ret)>0 ) ret = ret + " "; @@ -1113,17 +1113,30 @@ ``{ map m = $[]; string os = o[`option_str]:""; - if( !found && size(os)>0 && search( opts, os )==0 ) + string nos = o[`option_false]:""; + boolean se_ok = false; + boolean found_os = false; + if( size(os)>0 && search( opts, os )==0 ) + { + found_os = true; + se_ok = true; + } + else if( size(nos)>0 && search( opts, nos )==0) + { + found_os = false; + se_ok = true; + } + if( !found && se_ok ) { found = true; - m["option_str"] = os; + m["option_str"] = found_os?os:nos; m["option_cmd"] = o[`option_cmd]:`mkfs; if( o[`type]:`text==`boolean ) { - m["option_value"] = true; + m["option_value"] = found_os; ret[o[`query_key]:""] = m; } - opts = substring( opts, size(os) ); + opts = substring( opts, found_os?size(os):size(nos) ); pos = findfirstnotof( opts, " \t" ); if( pos>0 ) opts = substring( opts, pos ); -- 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] r62371 - /tags/stable-2_20_0/add-on-creator/
by jsuchome＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: jsuchome Date: Mon Aug 9 10:32:34 2010 New Revision: 62371 URL: http://svn.opensuse.org/viewcvs/yast?rev=62371&view=rev Log: Created tag stable-2_20_0 for add-on-creator Added: tags/stable-2_20_0/add-on-creator/ - copied from r62370, trunk/add-on-creator/ -- 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] r62370 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: jsuchome Date: Mon Aug 9 10:32:28 2010 New Revision: 62370 URL: http://svn.opensuse.org/viewcvs/yast?rev=62370&view=rev Log: - correct file name of exported keys (bnc#622569) - 2.20.0 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=62370… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon Aug 9 10:32:28 2010 @@ -1 +1 @@ -2.19.2 +2.20.0 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Aug 9 10:32:28 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 9 10:31:21 CEST 2010 - jsuchome(a)suse.cz + +- correct file name of exported keys (bnc#622569) +- 2.20.0 + +------------------------------------------------------------------- Tue Jul 27 13:48:15 CEST 2010 - jsuchome(a)suse.cz - cleanup the preparation directory for building iso image Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Aug 9 10:32:28 2010 @@ -2678,16 +2678,21 @@ map out = (map)SCR::Execute (.target.bash_output, command, $["LANG" : "C"]); string local_key = deletechars (out["stdout"]:"0","\n"); - out = (map)SCR::Execute (.target.bash_output, sformat ("gpg --list-secret-keys --with-colons %1| grep %2 | gawk -F: '{print $5}'| sed 's/........$//g'", key, local_key)); - string big_key = deletechars (out["stdout"]:"0","\n"); + // see /usr/share/doc/packages/gpg2/DETAILS for gpg --list-secret-keys --with-colons + // file name of exported key: keyid-creation date of the selfsignature (ie. e85fc3fc-4c1b74be) + + out = (map)SCR::Execute (.target.bash_output, sformat ("gpg --list-secret-keys --with-colons %1| grep %2 | gawk -F: '{print $6}'", key, local_key)); + + integer creation_date = tointeger (deletechars (out["stdout"]:"0","\n")); + string creation_date_s = substring (tohexstring (creation_date), 2); // use hex string without leading 0x // save the passphrase string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); // export the key: - command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", - local_key, base_path, big_key); + command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%1-%3.asc'", + tolower (local_key), base_path, creation_date_s); SCR::Execute (.target.bash, command, $["LANG" : "C"]); // make a sha1 sum of that key (content file is modified last time) -- 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] r62369 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: aschnell Date: Fri Aug 6 15:49:37 2010 New Revision: 62369 URL: http://svn.opensuse.org/viewcvs/yast?rev=62369&view=rev Log: - hide button "Create New Partition Table" for DASDs Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 6 15:49:37 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 06 15:48:27 CEST 2010 - aschnell(a)suse.de + +- hide button "Create New Partition Table" for DASDs + +------------------------------------------------------------------- Tue Aug 03 12:45:44 CEST 2010 - aschnell(a)suse.de - increased proposed size for /boot to 150 MB (bnc #627288) Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Fri Aug 6 15:49:37 2010 @@ -295,16 +295,22 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); - list<term> expert_cmds = [ - `item(`id(`create_partition_table), - // menu entry text - _("Create New Partition Table")), - `item(`id(`clone_disk), - // menu entry text - _("Clone This Disk")) - ]; + list<term> expert_cmds = []; - if (Arch::s390() && search(device, "/dev/dasd") == 0) + if (!String::StartsWith(device, "/dev/dasd")) + { + expert_cmds = add(expert_cmds, + `item(`id(`create_partition_table), + // menu entry text + _("Create New Partition Table"))); + } + + expert_cmds = add(expert_cmds, + `item(`id(`clone_disk), + // menu entry text + _("Clone This Disk"))); + + if (String::StartsWith(device, "/dev/dasd")) { expert_cmds = add(expert_cmds, `item(`id(`dasdfmt), -- 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] r62368 - /tags/branch-Code-11-SP1-2_17_141/network/
by mzugec＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: mzugec Date: Fri Aug 6 14:22:00 2010 New Revision: 62368 URL: http://svn.opensuse.org/viewcvs/yast?rev=62368&view=rev Log: Created tag branch-Code-11-SP1-2_17_141 for network Added: tags/branch-Code-11-SP1-2_17_141/network/ (props changed) - copied from r62367, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0