April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46873 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast last_rev_zypp
by coolo＠svn.opensuse.org 19 Apr '08

19 Apr '08

Author: coolo Date: Sat Apr 19 07:50:13 2008 New Revision: 46873 URL: http://svn.opensuse.org/viewcvs/yast?rev=46873&view=rev Log: 100 revisions in less than 2 days Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Sat Apr 19 07:50:13 2008 @@ -1 +1 @@ -46777 +46873 Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Sat Apr 19 07:50:13 2008 @@ -1 +1 @@ -9671 +9726 -- 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] r46872 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: aschnell Date: Fri Apr 18 18:48:04 2008 New Revision: 46872 URL: http://svn.opensuse.org/viewcvs/yast?rev=46872&view=rev Log: - removed global variable Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Fri Apr 18 18:48:04 2008 @@ -40,10 +40,7 @@ include "partitioning/ep-log.ycp"; - map<any, map> data = $[]; - - - list<term> MakeNavigationTree(map open_items) + void MakeNavigationTree(map open_items, list<term>& tree, map<any, map>& data) { // TODO: somehow use AlwaysHideDisk and AlwaysHidePartition @@ -128,26 +125,26 @@ string short_hostname = Hostname::CurrentHostname(); - list<term> tree = [ `item(`id(`all), short_hostname, open(`all), [ - `item(`id(`hd), "Hard Disks", open(`hd), subtree[`hd]:[]), - `item(`id(`lvm), "Volume Management", open(`lvm), subtree[`lvm]:[]), - `item(`id(`md), "RAID", open(`md), subtree[`md]:[]), - `item(`id(`loop), "Crypt Files", open(`loop), subtree[`loop]:[]), - `item(`id(`dm), "Device Mapper", open(`dm), subtree[`dm]:[]), - `item(`id(`nfs), "NFS", open(`nfs), subtree[`nfs]:[]), - `item(`id(`unused), "Unused Devices", open(`unused)) - ]), - `item(`id(`settings), "Settings", open(`settings)), - `item(`id(`log), "Log", open(`log)) ]; - - return tree; + tree = [ `item(`id(`all), short_hostname, open(`all), [ + `item(`id(`hd), _("Hard Disks"), open(`hd), subtree[`hd]:[]), + `item(`id(`lvm), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), + `item(`id(`md), _("RAID"), open(`md), subtree[`md]:[]), + `item(`id(`loop), _("Crypt Files"), open(`loop), subtree[`loop]:[]), + `item(`id(`dm), _("Device Mapper"), open(`dm), subtree[`dm]:[]), + `item(`id(`nfs), _("NFS"), open(`nfs), subtree[`nfs]:[]), + `item(`id(`unused), _("Unused Devices"), open(`unused)) + ]), + `item(`id(`settings), _("Settings"), open(`settings)), + `item(`id(`log), _("Log"), open(`log)) ]; } void UpdateNavigationTree(any new_focus) { + list<term> tree = []; + map<any, map> data = $[]; map open_items = (map) UI::QueryWidget(`id(`tree), `OpenItems); - list<term> tree = MakeNavigationTree(open_items); + MakeNavigationTree(open_items, tree, data); TreePanel::Update(data, tree, new_focus); } @@ -179,26 +176,28 @@ } - term systemViewTreePanel = - `VBox( - `Tree(`id(`tree), `opt(`notify), "System View", MakeNavigationTree($[`all : "ID"])) - ); - - any test_new_ep() { SCR::Write(.target.ycp, Storage::SaveDumpPath("targetmap-ep-start"), Storage::GetTargetMap()); Storage::CreateTargetBackup("expert-partitioner"); + list<term> tree = []; + map<any, map> data = $[]; + MakeNavigationTree($[`all : "ID"], tree, data); + string back_label = Label::BackButton(); string next_label = Label::AcceptButton(); - term contents = `MarginBox(0.7, 0.5, + term contents = `MarginBox(0.5, 0.5, `HBox( - `HWeight(30, systemViewTreePanel ), - `HWeight(70, `ReplacePoint(`id(`tree_panel), - TreePanel::empty_panel)) + `HWeight(30, + `VBox( + `Tree(`id(`tree), `opt(`notify), _("System View"), tree) + ) + ), + `HWeight(70, + `ReplacePoint(`id(`tree_panel), TreePanel::empty_panel)) ) ); -- 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] r46871 - /trunk/ycp-ui-bindings/examples/MultiProgressMeter1.ycp
by sh-sh-sh＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: sh-sh-sh Date: Fri Apr 18 17:34:03 2008 New Revision: 46871 URL: http://svn.opensuse.org/viewcvs/yast?rev=46871&view=rev Log: less misleading example Modified: trunk/ycp-ui-bindings/examples/MultiProgressMeter1.ycp Modified: trunk/ycp-ui-bindings/examples/MultiProgressMeter1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/MultiPr… ============================================================================== --- trunk/ycp-ui-bindings/examples/MultiProgressMeter1.ycp (original) +++ trunk/ycp-ui-bindings/examples/MultiProgressMeter1.ycp Fri Apr 18 17:34:03 2008 @@ -17,25 +17,44 @@ UI::OpenDialog( `VBox( - `HMultiProgressMeter(`id(`prog), [ 1000, 200, 500, 20, 100 ] ), + `VMultiProgressMeter(`id(`prog), [ 1000, 200, 500, 20, 100 ] ), `PushButton(`opt(`default), "&Ok" ) ) ); - UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 800, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 500, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 200, 200, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 100, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 200, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 300, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 400, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 500, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 600, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 700, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 800, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 900, 0, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 0, 0, 0, 0 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 1000, 50, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 100, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 150, 0, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 0, 0, 0 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 100, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 20, 500, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 100, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 200, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 300, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 400, 0, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 0, 0 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 400, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 300, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 200, 20, 100 ] ); UI::UserInput(); - UI::ChangeWidget(`prog, `Values, [ 0, 0, 100, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 10, 0 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 0 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 20 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 40 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 80 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 100 ] ); UI::UserInput(); + + UI::UserInput(); UI::CloseDialog(); } -- 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] r46870 - in /branches/tmp/aschnell/part-redesign/storage/src/modules: TabPanel.ycp TreePanel.ycp
by aschnell＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: aschnell Date: Fri Apr 18 17:28:27 2008 New Revision: 46870 URL: http://svn.opensuse.org/viewcvs/yast?rev=46870&view=rev Log: - removed unfinished checks Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp Fri Apr 18 17:28:27 2008 @@ -5,8 +5,7 @@ * Authors: Arvin Schnell <aschnell(a)suse.de> * * The DumbTab widget must have id `tab. The ids of the items of the DumbTab - * widget must be made of symbols. The id must be the first argument of the - * items. + * widget must be made of symbols. */ { module "TabPanel"; @@ -56,18 +55,6 @@ } - void Check() - { - list<symbol> items1 = maplist(symbol s, map m, data, { return s; }); - - list<symbol> items2 = maplist(term t, (list<term>) UI::QueryWidget(`id(`tab), `Items), - { return t[0, 0]:`none; }); - - if (sort(items1) != sort(items2)) - y2warning("DumbTab items and callback data do not match"); - } - - void AddToHistory() { history = filter(symbol s, history, { return s != current_item; }); @@ -81,7 +68,6 @@ global void Init(map<symbol, map> d) { data = d; - Check(); list<symbol> items = maplist(symbol s, map m, data, { return s; }); current_item = find(symbol s, history, { return contains(items, s); }); Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Fri Apr 18 17:28:27 2008 @@ -5,8 +5,7 @@ * Authors: Arvin Schnell <aschnell(a)suse.de> * * The Tree widget must have id `tree. The ids of the items of the Tree - * widget must be made of symbols or strings. The id must be the first - * argument of the items. + * widget must be made of symbols or strings. */ { module "TreePanel"; @@ -54,14 +53,6 @@ } - void Check() - { - list<any> items1 = maplist(any a, map m, data, { return a; }); - - // TODO: likely not worth it, rather clumsy - } - - /** * Initialises internal data and calls the create function of the * selected panel. @@ -71,7 +62,6 @@ global void Init(map<any, map> d) { data = d; - Check(); current_item = UI::QueryWidget(`tree, `CurrentItem); CallCreate(); @@ -97,14 +87,12 @@ { CallDestroy(); data = d; - Check(); current_item = new_item; CallCreate(); } else { data = d; - Check(); } } -- 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] r46869 - /trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp
by sh-sh-sh＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: sh-sh-sh Date: Fri Apr 18 17:25:52 2008 New Revision: 46869 URL: http://svn.opensuse.org/viewcvs/yast?rev=46869&view=rev Log: whitespace Modified: trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp Modified: trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/MultiPr… ============================================================================== --- trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp (original) +++ trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp Fri Apr 18 17:25:52 2008 @@ -7,12 +7,12 @@ // // Global variables // - + list<integer> maxValueList = [ 950, 200, 500, 20, 100 ]; - list<integer> valueList = [ 100, 30, 400, 0, 0 ]; + list<integer> valueList = [ 100, 30, 400, 0, 0 ]; integer unit = 0; // exponent: powers of 2 - + /** * Return a VBox term with Slider widgets for each list value. **/ @@ -50,7 +50,7 @@ scaledValues = add( scaledValues, val << unit ); }); - // y2debug( "Values: %1 unit: %2 scaled: %3", values, unit, scaledValues ); + // y2debug( "Values: %1 unit: %2 scaled: %3", values, unit, scaledValues ); return scaledValues; } @@ -79,7 +79,7 @@ return values; } - + /** * Update progress meters with values from sliders. **/ @@ -89,7 +89,7 @@ UI::ChangeWidget(`vProgress, `Values, values ); UI::ChangeWidget(`hProgress, `Values, values ); } - + // @@ -97,16 +97,16 @@ // if ( ! UI::HasSpecialWidget(`HMultiProgressMeter ) || - ! UI::HasSpecialWidget(`Slider ) ) + ! UI::HasSpecialWidget(`Slider ) ) { - UI::OpenDialog( + UI::OpenDialog( `VBox( `Label("Error: This UI doesn't support the required widgets!"), `PushButton(`opt(`default), "&OK") ) ); - UI::UserInput(); - UI::CloseDialog(); + UI::UserInput(); + UI::CloseDialog(); return; } @@ -115,7 +115,7 @@ // // Create dialog // - + term radioBox = `Frame( "Unit", `RadioButtonGroup(`id(`unit), `opt(`notify), @@ -154,7 +154,7 @@ ) ) ); - + UI::ChangeWidget(`id(`unit), `Value, `unit( unit ) ); updateProgress(); @@ -196,10 +196,10 @@ break; } - + // // Clean up // - + UI::CloseDialog(); } -- 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] r46868 - /trunk/ycp-ui-bindings/src/YCPDialogParser.cc
by sh-sh-sh＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: sh-sh-sh Date: Fri Apr 18 17:24:48 2008 New Revision: 46868 URL: http://svn.opensuse.org/viewcvs/yast?rev=46868&view=rev Log: mention new example in docs Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogPar… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Fri Apr 18 17:24:48 2008 @@ -2727,7 +2727,7 @@ * @usage if ( HasSpecialWidget( `MultiProgressMeter ) {... * `MultiProgressMeter( "Percentage", 1, 100, 50 ) * - * @examples MultiProgressMeter1.ycp + * @examples MultiProgressMeter1.ycp MultiProgressMeter2.ycp * * @description * -- 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] r46867 - in /trunk/qt: package/yast2-qt.changes src/YQMultiProgressMeter.cc src/YQMultiProgressMeter.h
by sh-sh-sh＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: sh-sh-sh Date: Fri Apr 18 17:22:40 2008 New Revision: 46867 URL: http://svn.opensuse.org/viewcvs/yast?rev=46867&view=rev Log: Fixed bnc #374851: YQMultiProgressMeter integer overflow Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/YQMultiProgressMeter.cc trunk/qt/src/YQMultiProgressMeter.h Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Apr 18 17:22:40 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 18 17:21:53 CEST 2008 - sh(a)suse.de + +- Fixed bnc #374851: YQMultiProgressMeter integer overflow + +------------------------------------------------------------------- Thu Apr 17 10:47:49 CEST 2008 - coolo(a)suse.de - update the steps status (bnc#379539) Modified: trunk/qt/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiProgressMeter.cc?r… ============================================================================== --- trunk/qt/src/YQMultiProgressMeter.cc (original) +++ trunk/qt/src/YQMultiProgressMeter.cc Fri Apr 18 17:22:40 2008 @@ -36,7 +36,6 @@ : QWidget( (QWidget *) parent->widgetRep() ) , YMultiProgressMeter( parent, dim, maxValues ) { - _triangularShaped = false; init(); setWidgetRep( this ); } @@ -53,24 +52,8 @@ _margin = 2; _segmentMinLength = 12; _triSpacing = 1; - - if ( triangularShaped() ) - { - _spacing = 0; - setTriThickness( -1 ); - } - else - { - _spacing = 2; - setTriThickness( 4 ); - } -} - - -void YQMultiProgressMeter::setTriangularShaped( bool triangular ) -{ - _triangularShaped = triangular; - init(); + _spacing = 2; + setTriThickness( 4 ); } @@ -149,7 +132,7 @@ // Small segments that get at least minLength pixels consume more screen - // space than initially planned, so recompute what is left for the others + // space than initially planned, so recompute what is left for the others. int distributableLength = totalLength - smallSegmentsCount * minLength; @@ -163,10 +146,7 @@ // space disproportional to their real size (maxValue). scale = ( (float) distributableLength ) / ( restSum ); - - // Calculate indentation - - int indent = triangularShaped() ? (int) ( thickness * 0.37 ) : 0; + int indent = 0; // Set up painter @@ -189,7 +169,7 @@ else length = (int) ( maxValue( i ) * scale + 0.5 ); - drawSegment( i, painter, offset, length, thickness, indent ); + drawSegment( i, painter, offset, length, thickness ); if ( i > 0 ) drawMarkers( painter, offset, thickness ); @@ -199,28 +179,11 @@ } -void YQMultiProgressMeter::mouseDoubleClickEvent ( QMouseEvent * event ) -{ - if ( event && event->button() == Qt::RightButton ) - { - // Easter egg: Switch between rectangular and triangular shape - - yuiMilestone() << "Switching shape" << endl; - setTriangularShaped( ! triangularShaped() ); - setSize( vertical() ? preferredWidth() : width(), - horizontal() ? preferredHeight() : height() ); - findDialog()->recalcLayout(); - QWidget::update(); - } -} - - void YQMultiProgressMeter::drawSegment( int segment, QPainter & painter, int offset, int length, - int thickness, - int indent ) + int thickness ) { // // Fill segment @@ -241,13 +204,18 @@ return; } + // Use 0..1000 range to avoid overflow with huge numbers (Gigabytes). + const int scaledMax = 1000; + int scaledProgress = + (int) ( 0.5 + ( currentValue( segment ) / maxValue( segment ) ) * ( (float) scaledMax ) ); + if ( vertical() ) // fill thermometer-like from bottom to top { QStyleOptionProgressBarV2 opts; opts.initFrom(this); - opts.progress = (int) currentValue( segment); + opts.progress = scaledMax - scaledProgress; opts.minimum = 0; - opts.maximum = (int) maxValue( segment); + opts.maximum = scaledMax; opts.invertedAppearance = true; opts.rect = QRect( offset, border, length, thickness ); style()->drawControl(QStyle::CE_ProgressBarGroove, &opts, &painter, this); @@ -259,9 +227,9 @@ { QStyleOptionProgressBarV2 opts; opts.initFrom(this); - opts.progress = (int) ( maxValue( segment) - currentValue( segment) ); + opts.progress = scaledProgress; opts.minimum = 0; - opts.maximum = (int) maxValue( segment); + opts.maximum = scaledMax; opts.rect = QRect( offset, border, length, thickness ); style()->drawControl(QStyle::CE_ProgressBarGroove, &opts, &painter, this); @@ -288,10 +256,11 @@ int tri = triThickness(); QPointF points[3] = - { QPointF( offset - tri+1, margin() ), // top left (base) - QPointF( offset, margin() + tri-1 ), // lower center (point) - QPointF( offset + tri-1, margin() ) // top right (base) - }; + { + QPointF( offset - tri+1, margin() ), // top left (base) + QPointF( offset, margin() + tri-1 ), // lower center (point) + QPointF( offset + tri-1, margin() ) // top right (base) + }; painter.drawConvexPolygon( points, 3 ); @@ -300,10 +269,11 @@ int pointOffset = margin() + tri + thickness + 2 * triSpacing(); QPointF points2[3] = - { QPointF( offset, pointOffset ), // top center (point) - QPointF( offset + tri-1, pointOffset + tri-1 ), // top right (base) - QPointF( offset - tri+1, pointOffset + tri-1 ) // bottom left (base) - }; + { + QPointF( offset, pointOffset ), // top center (point) + QPointF( offset + tri-1, pointOffset + tri-1 ), // top right (base) + QPointF( offset - tri+1, pointOffset + tri-1 ) // bottom left (base) + }; painter.drawConvexPolygon( points2, 3 ); } @@ -311,7 +281,7 @@ int YQMultiProgressMeter::thickness() { - int thickness = triangularShaped() ? 35 : 23; + int thickness = 23; thickness += 2 * margin(); if ( triThickness() > 0 ) Modified: trunk/qt/src/YQMultiProgressMeter.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMultiProgressMeter.h?re… ============================================================================== --- trunk/qt/src/YQMultiProgressMeter.h (original) +++ trunk/qt/src/YQMultiProgressMeter.h Fri Apr 18 17:22:40 2008 @@ -125,17 +125,6 @@ void setTriSpacing( int value ) { _triSpacing = value; } /** - * Returns "true" if the segments of this widget are triangular shaped. - **/ - bool triangularShaped() const { return _triangularShaped; } - - /** - * Set triangular shape (true) or normal rectangular shape. - * This call does not trigger a screen update. - **/ - void setTriangularShaped( bool triangular = true ); - - /** * Set enabled/disabled state. * * Reimplemented from YWidget. @@ -184,13 +173,6 @@ virtual void paintEvent ( QPaintEvent * ); /** - * Mouse double click - - * - * reimplemented from QWidget. - **/ - virtual void mouseDoubleClickEvent ( QMouseEvent * e ); - - /** * Draw segment number 'segment' with pixel length 'length' from pixel * coordinate 'offset' on and fill it according to that segment's current * value. 'painter' is set up previously to take rotating into account @@ -200,8 +182,7 @@ QPainter & painter, int offset, int length, - int thickness, - int indent ); + int thickness ); /** * Draw markers between segments (or beside that spacing). @@ -211,7 +192,6 @@ private: - bool _triangularShaped; int _margin; int _spacing; int _segmentMinLength; -- 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] r46866 - /trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc
by sh-sh-sh＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: sh-sh-sh Date: Fri Apr 18 17:19:05 2008 New Revision: 46866 URL: http://svn.opensuse.org/viewcvs/yast?rev=46866&view=rev Log: less verbose Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyH… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc Fri Apr 18 17:19:05 2008 @@ -589,7 +589,7 @@ if ( newCurrentButton ) { - y2debug( "Setting new current radio button: %s", newCurrentButton->debugLabel().c_str() ); + // y2debug( "Setting new current radio button: %s", newCurrentButton->debugLabel().c_str() ); newCurrentButton->setValue( true ); } else @@ -902,7 +902,7 @@ if ( ! currentButton ) return YCPVoid(); - y2debug( "Current radio button: %s", currentButton->debugLabel().c_str() ); + // y2debug( "Current radio button: %s", currentButton->debugLabel().c_str() ); if ( currentButton->hasId() ) { -- 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] r46865 - /trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp
by sh-sh-sh＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: sh-sh-sh Date: Fri Apr 18 17:08:58 2008 New Revision: 46865 URL: http://svn.opensuse.org/viewcvs/yast?rev=46865&view=rev Log: huge numbers example Modified: trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp Modified: trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/MultiPr… ============================================================================== --- trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp (original) +++ trunk/ycp-ui-bindings/examples/MultiProgressMeter2.ycp Fri Apr 18 17:08:58 2008 @@ -1,6 +1,21 @@ -// MultiProgressMeter example with huge numbers +// +// Advanced MultiProgressMeter example: +// Change values interactively with sliders +// and allow tests with huge numbers +// { - // Return a VBox term with Slider widgets for each list value. + // + // Global variables + // + + list<integer> maxValueList = [ 950, 200, 500, 20, 100 ]; + list<integer> valueList = [ 100, 30, 400, 0, 0 ]; + integer unit = 0; // exponent: powers of 2 + + + /** + * Return a VBox term with Slider widgets for each list value. + **/ term slidersVBox( list<integer> maxValuesList, list<integer> currentValuesList ) { term vbox = `VBox(); @@ -23,7 +38,63 @@ } + /** + * Apply unit to a list of values. Return the scaled list. + **/ + list<integer> scaleList( integer unit, list<integer> values ) + { + list<integer> scaledValues = []; + + foreach ( integer val, values, + { + scaledValues = add( scaledValues, val << unit ); + }); + + // y2debug( "Values: %1 unit: %2 scaled: %3", values, unit, scaledValues ); + return scaledValues; + } + + + /** + * Get the current values from all sliders and return them as a list. + **/ + list<integer> getValues() + { + list<integer> values = []; + integer i = 0; + + while ( true ) + { + term sliderID = `slider(i); + // y2debug( "Looking for %1", sliderID ); + + if ( ! UI::WidgetExists(`id( sliderID) ) ) + break; + + values = add( values, (integer) UI::QueryWidget(`id(sliderID), `Value ) ); + i = i+1; + } + + // y2debug( "Values: %1", values ); + return values; + } + + + /** + * Update progress meters with values from sliders. + **/ + void updateProgress() + { + list<integer> values = scaleList( unit, getValues() ); + UI::ChangeWidget(`vProgress, `Values, values ); + UI::ChangeWidget(`hProgress, `Values, values ); + } + + + // + // Check if required special widgets are available + // if ( ! UI::HasSpecialWidget(`HMultiProgressMeter ) || ! UI::HasSpecialWidget(`Slider ) ) @@ -41,9 +112,23 @@ } - - list<integer> maxValueList = [ 1000, 200, 500, 20, 100 ]; - list<integer> valueList = [ 0, 0, 0, 0, 0 ]; + // + // Create dialog + // + + term radioBox = + `Frame( "Unit", + `RadioButtonGroup(`id(`unit), `opt(`notify), + `HBox( + `HSpacing(0.5), + `RadioButton(`id(`unit( 0)), `opt(`notify), "&Bytes"), `HSpacing(1.5), + `RadioButton(`id(`unit(10)), `opt(`notify), "&kB"), `HSpacing(1.5), + `RadioButton(`id(`unit(20)), `opt(`notify), "&MB"), `HSpacing(1.5), + `RadioButton(`id(`unit(30)), `opt(`notify), "&GB"), + `HSpacing(0.5) + ) + ) + ); UI::OpenDialog( `VBox( @@ -52,30 +137,69 @@ `Heading( "MultiProgressMeter Example" ), `VSpacing( 1 ), slidersVBox( maxValueList, valueList ), - `Frame( "Unit", - `RadioButtonGroup(`id(`unit), `opt(`notify), - `HBox( - `HSpacing(0.5), - `RadioButton(`id(`unit( 0)), "&Bytes", true), `HSpacing(1.5), - `RadioButton(`id(`unit(10)), "&kB"), `HSpacing(1.5), - `RadioButton(`id(`unit(20)), "&MB"), `HSpacing(1.5), - `RadioButton(`id(`unit(30)), "&GB"), - `HSpacing(0.5) - ) - ) - ), + radioBox, `VStretch() ), `HSpacing( 1 ), - `VMultiProgressMeter(`id(`vProgress), maxValueList ) + `ReplacePoint(`id(`rep_vProgress), + `VMultiProgressMeter(`id(`vProgress), scaleList( unit, maxValueList ) ) + ) ), `HBox( - `HMultiProgressMeter(`id(`hProgress), maxValueList ), + `ReplacePoint(`id(`rep_hProgress), + `HMultiProgressMeter(`id(`hProgress), scaleList( unit, maxValueList ) ) + ), `HSpacing( 0.5 ), `PushButton(`id(`cancel), "&Close" ) ) ) ); - UI::UserInput(); + + UI::ChangeWidget(`id(`unit), `Value, `unit( unit ) ); + updateProgress(); + + + // + // Event loop + // + + while ( true ) + { + map<string, any> event = UI::WaitForEvent(); + // y2debug( "Event: %1", event ); + any id = event["ID"]:nil; + symbol widgetClass = (symbol) event["WidgetClass"]:nil; + + if ( widgetClass == `RadioButton ) + { + any currentUnitID = UI::QueryWidget(`unit, `CurrentButton ); + + if ( is( currentUnitID, term ) ) + { + unit = ( (term) currentUnitID )[0]:0; + + y2milestone( "New unit: 2^%1", unit ); + UI::ReplaceWidget(`rep_vProgress, `VMultiProgressMeter(`id(`vProgress), scaleList( unit, maxValueList ) ) ); + UI::ReplaceWidget(`rep_hProgress, `HMultiProgressMeter(`id(`hProgress), scaleList( unit, maxValueList ) ) ); + updateProgress(); + } + } + if ( widgetClass == `Slider ) + { + updateProgress(); + list<integer> values = scaleList( unit, getValues() ); + UI::ChangeWidget(`vProgress, `Values, values ); + UI::ChangeWidget(`hProgress, `Values, values ); + } + + if ( id == `cancel ) + break; + } + + + // + // Clean up + // + UI::CloseDialog(); } -- 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] r46864 - /tags/branch-SLE-10-SP2-2_13_210/installation/
by locilka＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: locilka Date: Fri Apr 18 16:24:23 2008 New Revision: 46864 URL: http://svn.opensuse.org/viewcvs/yast?rev=46864&view=rev Log: Created tag branch-SLE-10-SP2-2_13_210 for installation Added: tags/branch-SLE-10-SP2-2_13_210/installation/ - copied from r46863, branches/SuSE-SLE-10-SP2-Branch/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0