February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63395 - in /branches/tmp/jsuchome/snapper/src: Snapper.ycp dialogs.ycp
by jsuchome＠svn2.opensuse.org 10 Feb '11

10 Feb '11

Author: jsuchome Date: Thu Feb 10 22:03:14 2011 New Revision: 63395 URL: http://svn.opensuse.org/viewcvs/yast?rev=63395&view=rev Log: show one item for snapshot pair (the POST one) Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp branches/tmp/jsuchome/snapper/src/dialogs.ycp Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Snap… ============================================================================== --- branches/tmp/jsuchome/snapper/src/Snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/Snapper.ycp Thu Feb 10 22:03:14 2011 @@ -38,12 +38,16 @@ import "Progress"; +// global list of all snapshot global list<map> snapshots = []; global string snapshots_path = "/snapshots"; // FIXME global map selected_snapshot = $[]; +// mapping of snapshot number to index in snapshots list +global map<integer,integer> id2index = $[]; + // index to snapshots list global integer selected_snapshot_index = 0; @@ -106,13 +110,16 @@ list<map> snapshot_maps = (list<map>) SCR::Read (.snapper.snapshots); - + if (snapshot_maps == nil) snapshot_maps = []; + integer i = 0; foreach (map snapshot, snapshot_maps, { integer id = snapshot["num"]:0; if (id == 0) return; // ignore the 'current system' snapshot["name"] = tostring (id); y2internal ("snapshot data: %1", snapshot); snapshots = add (snapshots, snapshot); + id2index[id] = i; + i = i + 1; }); Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/dial… ============================================================================== --- branches/tmp/jsuchome/snapper/src/dialogs.ycp (original) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Thu Feb 10 22:03:14 2011 @@ -82,20 +82,36 @@ list single_snapshot_items = []; list coupled_snapshot_items = []; - foreach (map s, snapshots, ``{ + foreach (map s, snapshots, { i = i + 1; - string date = ""; - if (s["num"]:0 != 0) - date = timestring("%c", s["date"]:0, false); + + integer num = s["num"]:0; + string date = ""; + if (num != 0) + date = timestring ("%c", s["date"]:0, false); if (s["type"]:`none == `SINGLE) + { single_snapshot_items = add (single_snapshot_items, - `item (`id (i), date, s["name"]:"", s["description"]:"")); - else + `item (`id (i), date, num, s["description"]:"")); + } + else if (s["type"]:`none == `POST) { - string pre = s["pre_num"]:0 != 0 ? tostring (s["pre_num"]:0) : ""; + integer pre = s["pre_num"]:0; // pre canot be 0 + integer index = Snapper::id2index[pre]:-1; + if (pre == 0 || index == -1) + { + y2warning ("something wrong - pre:%1, index:%2", pre, index); + continue; + } + string desc = Snapper::snapshots[index,"description"]:""; + string pre_date = timestring ("%c", Snapper::snapshots[index,"date"]:0, false); coupled_snapshot_items = add (coupled_snapshot_items, - `item (`id (i), date, s["name"]:"", pre, s["description"]:"")); + `item (`id (i), pre, pre_date, num, date, desc)); + } + else + { + y2milestone ("skipping pre snapshot: %1", num); } }); @@ -116,12 +132,11 @@ `Left (`Label (_("Coupled Snapshots"))), `Table (`id (`coupled_snapshots_table), `opt(`notify, `keepSorting), `header ( // table header - _("Date"), _("Number"), _("Previous"), _("Description")), + _("Pre ID"), _("Start Date"), _("Post ID"), _("End Date"), _("Description")), coupled_snapshot_items ), `HBox ( `PushButton (`id (`show_c), `opt (`default), _("Show Changes")), -// `PushButton (`id (`edit), _("Edit Snapshot")), `HStretch () ) ); @@ -160,6 +175,7 @@ else continue; } else if (ret == `show) { + // `POST snapshot is selected from the couple Snapper::selected_snapshot = snapshots[selected]:$[]; Snapper::selected_snapshot_index = selected; break; @@ -187,7 +203,7 @@ map display_info = UI::GetDisplayInfo (); boolean textmode = display_info["TextMode"]:false; - string current = ""; + string current_file = ""; // map of already read files map<string,boolean> files = $[]; @@ -318,7 +334,7 @@ // create the term for selected file void set_entry_term () { - if (current != "" && files_index[current]:$[] != $[]) + if (current_file != "" && files_index[current_file]:$[] != $[]) { UI::ReplaceWidget (`id (`diff_chooser), `VBox ( @@ -333,7 +349,7 @@ )))), `VSpacing () )); - show_file_modification (current, previous_num, snapshot_num); + show_file_modification (current_file, previous_num, snapshot_num); } else { @@ -394,15 +410,14 @@ if (size (tree_items) > 0) { - UI::ReplaceWidget (`id (`reptree), textmode ? - `Tree (`id(`tree), `opt (`multiSelection), snapshot_name, tree_items) : - `Tree (`id(`tree), `opt(`notify, `multiSelection), snapshot_name, tree_items)); + UI::ReplaceWidget (`id (`reptree), + `Tree (`id(`tree), `opt (`notify, `multiSelection), snapshot_name, tree_items) + ); // no item is selected UI::ChangeWidget (`tree, `CurrentItem, nil); } - current = (string) UI::QueryWidget (`id(`tree), `CurrentItem); - if (current == nil) current = ""; + current_file = ""; set_entry_term (); @@ -413,11 +428,11 @@ while(true) { map event = UI::WaitForEvent (); +y2internal ("event: %1", event); // FIXME look at ncurses ret = (symbol) event["ID"]:nil; - current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); - if (current == nil) - current = ""; + current_file = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + if (current_file == nil) current_file = ""; // events in tree if (ret == `tree) @@ -429,21 +444,21 @@ } else if (ret == `diff_snapshot) { - show_file_modification (current, previous_num, snapshot_num); + show_file_modification (current_file, previous_num, snapshot_num); } else if (ret == `diff_current) { - show_file_modification (current, snapshot_num, 0); + show_file_modification (current_file, snapshot_num, 0); } else if (ret == `abort || ret == `cancel || ret == `back) { break; } else if (ret == `restore) { - if (Popup::YesNo (sformat ("Do you want to restore the file '%1' from snapshot '%2'? + if (Popup::YesNo (sformat ("Do you want to copy the file '%1' from snapshot '%2' to current system? -This will probably break your system. Are you sure?", current, snapshot_name))) +This will probably break your system. Are you sure?", current_file, snapshot_name))) { - y2milestone ("restoring file %1...", current); + y2milestone ("restoring file %1...", current_file); } continue; } -- 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] r63394 - /branches/tmp/jsuchome/snapper/src/wizards.ycp
by jsuchome＠svn2.opensuse.org 10 Feb '11

10 Feb '11

Author: jsuchome Date: Thu Feb 10 22:01:30 2011 New Revision: 63394 URL: http://svn.opensuse.org/viewcvs/yast?rev=63394&view=rev Log: strange, but in ncurses it works with this Modified: branches/tmp/jsuchome/snapper/src/wizards.ycp Modified: branches/tmp/jsuchome/snapper/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/wiza… ============================================================================== --- branches/tmp/jsuchome/snapper/src/wizards.ycp (original) +++ branches/tmp/jsuchome/snapper/src/wizards.ycp Thu Feb 10 22:01:30 2011 @@ -94,7 +94,7 @@ ] ]; - Wizard::OpenOKDialog (); + Wizard::CreateDialog (); any ret = Sequencer::Run(aliases, sequence); -- 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] r63393 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printer.ycp src/driveradd.ycp
by jsmeix＠svn2.opensuse.org 10 Feb '11

10 Feb '11

Author: jsmeix Date: Thu Feb 10 16:26:40 2011 New Revision: 63393 URL: http://svn.opensuse.org/viewcvs/yast?rev=63393&view=rev Log: - Be backward compatible in the "Driver Packages" dialog regarding OpenPrintingPPDs-ghostscript and cups-drivers: It tries first to install OpenPrintingPPDs-ghostscript but if this fails it tries to install cups-drivers and it removes both OpenPrintingPPDs-ghostscript and cups-drivers if installed. - 2.20.8 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/driveradd.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=63393&r1=633… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Feb 10 16:26:40 2011 @@ -1 +1 @@ -2.20.7 +2.20.8 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 Thu Feb 10 16:26:40 2011 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Feb 10 16:06:03 CET 2011 - jsmeix(a)suse.de + +- Be backward compatible in the "Driver Packages" dialog + regarding OpenPrintingPPDs-ghostscript and cups-drivers: + It tries first to install OpenPrintingPPDs-ghostscript + but if this fails it tries to install cups-drivers + and it removes both OpenPrintingPPDs-ghostscript and + cups-drivers if installed. +- 2.20.8 + +------------------------------------------------------------------- Fri Feb 4 14:51:44 CET 2011 - jsmeix(a)suse.de - Fixed the automatic configuration in printer_proposal.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6339… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Thu Feb 10 16:26:40 2011 @@ -388,10 +388,10 @@ `DownloadProgress( // Header of a DownloadProgress indicator: _("Retrieving printer driver information..."), create_database_progress_filename, - // On my openSUSE 11.1 the size is about 90000 bytes. - // The number 102400 results exactly "100.0 KB" in the + // On my openSUSE 11.4 the size is about 110000 bytes. + // The number 122880 results exactly "120.0 KB" in the // YaST Gtk user inteface for a DownloadProgress: - 102400 + 122880 ) ) ) Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=63… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Thu Feb 10 16:26:40 2011 @@ -271,14 +271,34 @@ // for whatever product (e.g. a Live CD or a stripped DVD/CD in whatever magazine). boolean package_changed = false; if( OpenPrintingPPDs_ghostscript_install != OpenPrintingPPDs_ghostscript_installed ) - { if( OpenPrintingPPDs_ghostscript_install ) + { // Since openSUSE 11.4 OpenPrintingPPDs-ghostscript is to a certain extent the successor of cups-drivers + // (more precisely: OpenPrintingPPDs-ghostscript contains most of what cups-drivers contained), + // see https://bugzilla.novell.com/show_bug.cgi?id=641704 + // To be backward compatible try also cups-drivers: + if( OpenPrintingPPDs_ghostscript_install ) { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "install" ) ) { package_changed = true; } + if( ! Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "installed" ) ) + { // Try to install the old cups-drivers only if the newer OpenPrintingPPDs-ghostscript was not installed: + if( Printerlib::TestAndInstallPackage( "cups-drivers", "install" ) ) + { package_changed = true; + } + } } else - { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "remove" ) ) - { package_changed = true; + { // Try to remove both OpenPrintingPPDs-ghostscript and cups-drivers if installed: + if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "remove" ) ) + { package_changed = true; + } + } + if( Printerlib::TestAndInstallPackage( "cups-drivers", "installed" ) ) + { // The user must confirm each package which should be removed + // so that the user can decide not to remove cups-drivers: + if( Printerlib::TestAndInstallPackage( "cups-drivers", "remove" ) ) + { package_changed = true; + } } } } @@ -409,7 +429,10 @@ } } if( splix_install != splix_installed ) - { if( splix_install ) + { // Since openSUSE 11.4 cups-drivers-splix is renamed splix, + // see https://bugzilla.novell.com/show_bug.cgi?id=659579 + // To be backward compatible try also cups-drivers-splix: + if( splix_install ) { if( Printerlib::TestAndInstallPackage( "splix", "install" ) ) { package_changed = 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] r63392 - in /trunk/scanner: VERSION package/yast2-scanner.changes src/Scanner.ycp
by jsmeix＠svn2.opensuse.org 10 Feb '11

10 Feb '11

Author: jsmeix Date: Thu Feb 10 14:47:27 2011 New Revision: 63392 URL: http://svn.opensuse.org/viewcvs/yast?rev=63392&view=rev Log: - V 2.20.1 - Changed the number for DownloadProgress to multiple of 1024 to get nicer looking "nnn.0 KB" texts in the Gtk UI. Using 921600 because /var/lib/YaST2/scanner_database.ycp is about 890000 bytes in openSUSE 11.4 (see openSUSE/Novell Bugzilla bnc#670675). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/Scanner.ycp Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=63392&r1=633… ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Thu Feb 10 14:47:27 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.ch… ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Thu Feb 10 14:47:27 2011 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Feb 10 14:38:49 CET 2011 - jsmeix(a)suse.de + +- V 2.20.1 +- Changed the number for DownloadProgress to multiple of 1024 + to get nicer looking "nnn.0 KB" texts in the Gtk UI. + Using 921600 because /var/lib/YaST2/scanner_database.ycp + is about 890000 bytes in openSUSE 11.4 + (see openSUSE/Novell Bugzilla bnc#670675). + +------------------------------------------------------------------- Thu Sep 23 15:27:40 CEST 2010 - jsmeix(a)suse.de - V 2.20.0 Modified: trunk/scanner/src/Scanner.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/Scanner.ycp?rev=6339… ============================================================================== --- trunk/scanner/src/Scanner.ycp (original) +++ trunk/scanner/src/Scanner.ycp Thu Feb 10 14:47:27 2011 @@ -795,8 +795,10 @@ `ReplacePoint( `id(`create_database_progress_replace_point), `DownloadProgress( feedback_message, database_filename, - // On my openSUSE 10.3 the size is about 538000 bytes: - 600000 + // On my openSUSE 11.4 the size is about 891000 bytes. + // The number 921600 results exactly "900.0 KB" in the + // YaST Gtk user inteface for a DownloadProgress: + 921600 ) ) ) -- 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] r63391 - /trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc
by tgoettlicher＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: tgoettlicher Date: Wed Feb 9 16:07:04 2011 New Revision: 63391 URL: http://svn.opensuse.org/viewcvs/yast?rev=63391&view=rev Log: fixed segfault when calling currentItem() 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 Wed Feb 9 16:07:04 2011 @@ -1268,16 +1268,10 @@ return YCPNull(); YItem * currentItem = tree->currentItem(); + YCPTreeItem * item = dynamic_cast<YCPTreeItem *> (currentItem); - if ( tree ) - { - YCPTreeItem * item = dynamic_cast<YCPTreeItem *> (currentItem); - - if ( item ) - return item->id(); - else - y2error( "Item is not a YCPItem: \"%s\"", currentItem->label().c_str() ); - } + if ( item ) + return item->id(); return YCPVoid(); -- 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] r63390 - /branches/tmp/jsuchome/snapper/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: jsuchome Date: Wed Feb 9 15:58:25 2011 New Revision: 63390 URL: http://svn.opensuse.org/viewcvs/yast?rev=63390&view=rev Log: create diffs for pre and single snapshots Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/dial… ============================================================================== --- branches/tmp/jsuchome/snapper/src/dialogs.ycp (original) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Wed Feb 9 15:58:25 2011 @@ -202,17 +202,23 @@ if (!haskey (snapshot, "files")) { + integer from = snapshot_num; + integer to = 0; // current system if (snapshot["type"]:`NONE == `POST) { - integer pre = snapshot["pre_num"]:0; - snapshot["files"] = Snapper::ReadModifiedFiles (pre, snapshot_num); - file_list = snapshot["files"]:[]; - // update the global snapshots list - Snapper::snapshots[Snapper::selected_snapshot_index] = snapshot; + from = snapshot["pre_num"]:0; + to = snapshot_num; } + else if (snapshot["type"]:`NONE == `PRE) + { + to = snapshot["post_num"]:0; + } + snapshot["files"] = Snapper::ReadModifiedFiles (from, to); + file_list = snapshot["files"]:[]; + // update the global snapshots list + Snapper::snapshots[Snapper::selected_snapshot_index] = snapshot; } - // FIXME what to use for previous_num in non-post snapshots? integer previous_num = snapshot["pre_num"]:snapshot_num; string snapshot_name = tostring (snapshot_num); map<string,map> tree_map = $[]; -- 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] r63389 - /tags/stable-2_20_3/ncurses-pkg/
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 14:24:01 2011 New Revision: 63389 URL: http://svn.opensuse.org/viewcvs/yast?rev=63389&view=rev Log: Created tag stable-2_20_3 for ncurses-pkg Added: tags/stable-2_20_3/ncurses-pkg/ - copied from r63388, trunk/ncurses-pkg/ -- 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] r63388 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes yast2-ncurses-pkg.spec.in
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 14:23:30 2011 New Revision: 63388 URL: http://svn.opensuse.org/viewcvs/yast?rev=63388&view=rev Log: Require latest libyui Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=63388&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Wed Feb 9 14:23:30 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed Feb 9 14:23:30 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 9 14:22:09 CET 2011 - gs(a)suse.de + +- Require latest libyui +- V 2.20.3 + +------------------------------------------------------------------- Wed Feb 2 14:44:00 CET 2011 - gs(a)suse.de - Internal: code cleanup (esp. NCPackageSelector, NCPkgTable), Modified: trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/yast2-ncurses-pkg.sp… ============================================================================== --- trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in (original) +++ trunk/ncurses-pkg/yast2-ncurses-pkg.spec.in Wed Feb 9 14:23:30 2011 @@ -12,7 +12,7 @@ Provides: yast2_ui_pkg Requires: glibc-locale BuildRequires: yast2-core-devel >= 2.16.33 -BuildRequires: yast2-libyui-devel >= 2.20.0 +BuildRequires: yast2-libyui-devel >= 2.20.1 BuildRequires: libzypp-devel >= 7.4.0 Requires: yast2-core >= 2.16.33 #ncurses6 library -- 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] r63387 - /tags/stable-2_20_5/ncurses/
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 14:20:27 2011 New Revision: 63387 URL: http://svn.opensuse.org/viewcvs/yast?rev=63387&view=rev Log: Created tag stable-2_20_5 for ncurses Added: tags/stable-2_20_5/ncurses/ - copied from r63386, trunk/ncurses/ -- 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] r63386 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 14:19:43 2011 New Revision: 63386 URL: http://svn.opensuse.org/viewcvs/yast?rev=63386&view=rev Log: 2.20.5 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=63386&r1=633… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Wed Feb 9 14:19:43 2011 @@ -1 +1 @@ -2.20.4 +2.20.5 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Feb 9 14:19:43 2011 @@ -2,7 +2,8 @@ Wed Feb 9 13:42:49 CET 2011 - gs(a)suse.de - Bugfixes in NCTree (currentItem works correctly) and - NCMultiSelection (check for valid pointer), require latest libyui + NCMultiSelection (check for valid pointer), require latest libyui +- V 2.20.5 ------------------------------------------------------------------- Wed Feb 2 14:42:34 CET 2011 - gs(a)suse.de -- 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] r63385 - in /trunk/ncurses: package/yast2-ncurses.changes yast2-ncurses.spec.in
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 13:53:14 2011 New Revision: 63385 URL: http://svn.opensuse.org/viewcvs/yast?rev=63385&view=rev Log: require latest libyui Modified: trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/yast2-ncurses.spec.in Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Feb 9 13:53:14 2011 @@ -2,7 +2,7 @@ Wed Feb 9 13:42:49 CET 2011 - gs(a)suse.de - Bugfixes in NCTree (currentItem works correctly) and - NCMultiSelection (check for valid pointer) + NCMultiSelection (check for valid pointer), require latest libyui ------------------------------------------------------------------- Wed Feb 2 14:42:34 CET 2011 - gs(a)suse.de Modified: trunk/ncurses/yast2-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/yast2-ncurses.spec.in?re… ============================================================================== --- trunk/ncurses/yast2-ncurses.spec.in (original) +++ trunk/ncurses/yast2-ncurses.spec.in Wed Feb 9 13:53:14 2011 @@ -10,8 +10,8 @@ Summary: YaST2 - Character Based User Interface Provides: yast2_ui Requires: glibc-locale -BuildRequires: yast2-libyui-devel >= 2.20.0 -Requires: yast2-libyui >= 2.20.0 +BuildRequires: yast2-libyui-devel >= 2.20.1 +Requires: yast2-libyui >= 2.20.1 Recommends: yast2-ncurses-pkg %description This package contains the character based (ncurses) user interface -- 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] r63384 - /trunk/ncurses/package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 13:45:29 2011 New Revision: 63384 URL: http://svn.opensuse.org/viewcvs/yast?rev=63384&view=rev Log: bugfixes NCTree, NCMultiSelection Modified: trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Feb 9 13:45:29 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 9 13:42:49 CET 2011 - gs(a)suse.de + +- Bugfixes in NCTree (currentItem works correctly) and + NCMultiSelection (check for valid pointer) + +------------------------------------------------------------------- Wed Feb 2 14:42:34 CET 2011 - gs(a)suse.de - Add support for multi selection in Tree widget (checkboxes), -- 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] r63383 - in /trunk/ncurses/src: NCTree.cc NCTree.h
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 13:41:19 2011 New Revision: 63383 URL: http://svn.opensuse.org/viewcvs/yast?rev=63383&view=rev Log: currentItem implemented correctly Modified: trunk/ncurses/src/NCTree.cc trunk/ncurses/src/NCTree.h Modified: trunk/ncurses/src/NCTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTree.cc?rev=63383&… ============================================================================== --- trunk/ncurses/src/NCTree.cc (original) +++ trunk/ncurses/src/NCTree.cc Wed Feb 9 13:41:19 2011 @@ -472,8 +472,11 @@ } } - - +// Returns current item (pure virtual in YTree) +YTreeItem * NCTree::currentItem() +{ + return getCurrentItem(); +} // Fills TreePad with lines (uses CreateTreeLines to create them) void NCTree::DrawPad() Modified: trunk/ncurses/src/NCTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTree.h?rev=63383&r… ============================================================================== --- trunk/ncurses/src/NCTree.h (original) +++ trunk/ncurses/src/NCTree.h Wed Feb 9 13:41:19 2011 @@ -73,6 +73,8 @@ virtual YTreeItem * getCurrentItem() const; + virtual YTreeItem * currentItem(); + virtual void selectItem( YItem *item, bool selected ); virtual void selectItem( int index ); -- 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] r63382 - /trunk/ncurses/src/NCMultiSelectionBox.cc
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 13:40:46 2011 New Revision: 63382 URL: http://svn.opensuse.org/viewcvs/yast?rev=63382&view=rev Log: add more pointer checks Modified: trunk/ncurses/src/NCMultiSelectionBox.cc Modified: trunk/ncurses/src/NCMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMultiSelectionBox.… ============================================================================== --- trunk/ncurses/src/NCMultiSelectionBox.cc (original) +++ trunk/ncurses/src/NCMultiSelectionBox.cc Wed Feb 9 13:40:46 2011 @@ -138,22 +138,27 @@ bool NCMultiSelectionBox::isItemSelected( YItem *item ) { - return item->selected(); + if ( item ) + return item->selected(); + else + return false; } void NCMultiSelectionBox::selectItem( YItem *yitem, bool selected ) { - YMultiSelectionBox::selectItem( yitem, selected ); - - //retrieve pointer to the line tag associated with this item - NCTableTag * tag = ( NCTableTag * )yitem->data(); - YUI_CHECK_PTR( tag ); + if ( yitem ) + { + YMultiSelectionBox::selectItem( yitem, selected ); - tag->SetSelected( selected ); + //retrieve pointer to the line tag associated with this item + NCTableTag * tag = ( NCTableTag * )yitem->data(); + YUI_CHECK_PTR( tag ); - DrawPad(); + tag->SetSelected( selected ); + DrawPad(); + } } @@ -164,6 +169,8 @@ for ( unsigned int i = 0; i < getNumLines(); i++ ) { NCTableTag *t = tagCell( i ); + YUI_CHECK_PTR( t ); + t->SetSelected( false ); } @@ -178,8 +185,8 @@ void NCMultiSelectionBox::toggleCurrentItem() { YItem *it = currentItem(); - selectItem( it, !( it->selected() ) ); - + if ( it ) + selectItem( it, !( it->selected() ) ); } -- 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] r63381 - in /trunk/ycp-ui-bindings/examples: MultiLineEdit4.ycp MultiSelectionBox4.ycp Tree-Checkbox2.ycp Tree-Checkbox3.ycp
by gs＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: gs Date: Wed Feb 9 13:26:39 2011 New Revision: 63381 URL: http://svn.opensuse.org/viewcvs/yast?rev=63381&view=rev Log: more examples added Added: trunk/ycp-ui-bindings/examples/MultiLineEdit4.ycp trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp trunk/ycp-ui-bindings/examples/Tree-Checkbox3.ycp Added: trunk/ycp-ui-bindings/examples/MultiLineEdit4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/MultiLi… ============================================================================== --- trunk/ycp-ui-bindings/examples/MultiLineEdit4.ycp (added) +++ trunk/ycp-ui-bindings/examples/MultiLineEdit4.ycp Wed Feb 9 13:26:39 2011 @@ -0,0 +1,62 @@ +// Build dialog with MuliLineEdit widget, +// a character counter for the MuliLineEdit's contents as they are typed +// and an OK button. +{ + UI::OpenDialog( + `VBox( + `MultiLineEdit(`id(`problem), + `opt(`notify), // make UI::UserInput() return on every keystroke + "Problem &description:" ), + `HBox( + `Label("Number of characters entered:"), + `Label(`id(`char_count), "0 ") + ), + `PushButton(`id(`ok), "&OK") + ) + ); + + UI::ChangeWidget(`id(`problem), `Value, + "My first input is already\nhere" ); + + any ret = nil; + + do + { + // Wait for user input. + // + // Since the MultiLineEdit is in "notify" mode, it, too, will cause + // UI::UserInput() to return upon any single character entered. + ret = UI::UserInput(); + + if ( ret == `problem ) // User typed some text + { + // Set the `char_count label to the number of characters entered + // into the MultiLineEdit widget. + + UI::ChangeWidget(`id(`char_count), `Value, + sformat( "%1", size( (string) UI::QueryWidget(`id(`problem), `Value) ) ) ); + } + } while ( ret != `ok ); + + // Get the input from the MultiLineEdit. + // + // Notice: The return value of UI::UserInput() does NOT return this value! + // Rather, it returns the ID of the widget (normally the PushButton) + // that caused UI::UserInput() to return. + string input = (string) UI::QueryWidget(`id(`problem), `Value); + + // Close the dialog. + // Remember to read values from the dialog's widgets BEFORE closing it! + UI::CloseDialog(); + + // Pop up a new dialog to echo the input. + UI::OpenDialog( + `VBox( + `Label("You entered:"), + `Label(input), + `PushButton("&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); +} Added: trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/MultiSe… ============================================================================== --- trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp (added) +++ trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp Wed Feb 9 13:26:39 2011 @@ -0,0 +1,40 @@ +{ + import "Label"; + + list items = [ + `item (`id ("a"), "a"), + `item (`id ("x"), "x"), + `item (`id ("y"), "y"), + `item (`id ("z"), "z") + ]; + + term contents = `HBox (`VSpacing (20), `VBox (`HSpacing(70), + `VSpacing (0.2), + `MultiSelectionBox (`id(`tree), `opt(`notify), "tree", items), + `HBox ( + `PushButton (`id (`ok), `opt (`default), Label::OKButton()), + `PushButton(`id (`cancel), `opt (`key_F9), Label::CancelButton()) + ), + `VSpacing (0.2) + )); + + UI::OpenDialog (`opt (`decorated), contents); + UI::ChangeWidget (`tree, `CurrentItem, nil); + while (true) + { + map event = UI::WaitForEvent (); + any ret = event["ID"]:nil; + if (ret == `tree) + { + string current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + y2internal ("current: %1", current); + } + + if (ret == `ok || ret == `cancel) + break; + } + string current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + y2internal ("current before leaving: %1", current ); + UI::CloseDialog (); +} + Added: trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Tree-Ch… ============================================================================== --- trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp (added) +++ trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp Wed Feb 9 13:26:39 2011 @@ -0,0 +1,35 @@ +// Tree with icons +{ + UI::OpenDialog( + `VBox( + `Heading( "YaST2 Mini Control Center" ), + `Tree(`id(`mod), `opt(`notify, `multiSelection, `immediate ), + "Modules", + [ + `item(`id( "country" ), `icon( "yast-yast-language.png" ), "Localization", false, + [ + `item(`id( "keyboard" ), `icon( "yast-keyboard.png" ), "Keyboard" ), + `item(`id( "timezone" ), `icon( "yast-timezone.png" ), "Time zone" ) + ] + ), + `item(`id( "mouse" ), `icon( "yast-mouse.png" ), "Mouse" ), + `item(`id( "lan" ), `icon( "yast-lan.png" ), "Network" ), + `item(`id( `xmas ), `icon( "yast-software.png" ), "Merry X-Mas" ), + `item(`id( `newyear ), `icon( "yast-software.png" ), "Happy New Year" ) + ] ), + `HBox(`PushButton(`id(`ok), `opt(`default), "&OK"), + `PushButton(`id(`deselect), "&Log selected" ) + ) + ) + ); + + UI::ChangeWidget(`mod, `SelectedItems, ["keyboard", `xmas, `newyear ] ); + any id = nil; + + repeat + { + id = UI::UserInput(); + list selected_items = (list) UI::QueryWidget( `id(`mod), `SelectedItems ); + y2milestone( "Selected items: %1", selected_items ); + } until (id == `ok); +} Added: trunk/ycp-ui-bindings/examples/Tree-Checkbox3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Tree-Ch… ============================================================================== --- trunk/ycp-ui-bindings/examples/Tree-Checkbox3.ycp (added) +++ trunk/ycp-ui-bindings/examples/Tree-Checkbox3.ycp Wed Feb 9 13:26:39 2011 @@ -0,0 +1,44 @@ +{ + import "Label"; + + list items = [ + `item (`id ("a"), "a", false, []), + `item (`id ("x"), "x", true, [ + `item (`id ("y"), "y", false, []), + `item (`id ("z"), "z", false, []), + ]), + ]; + + term contents = `HBox (`VSpacing (20), `VBox (`HSpacing(70), + `VSpacing (0.2), + //`Tree (`id(`tree), `opt(`notify, `immediate, `multiSelection), "tree", items), + `Tree (`id(`tree), `opt(`notify, `multiSelection), "tree", items), + //`Tree (`id(`tree), `opt(`notify), "tree", items), + `HBox ( + `PushButton (`id (`ok), `opt (`default), Label::OKButton()), + `PushButton(`id (`cancel), `opt (`key_F9), Label::CancelButton()) + ), + `VSpacing (0.2) + )); + + UI::OpenDialog (`opt (`decorated), contents); + UI::ChangeWidget (`tree, `CurrentItem, nil); + while (true) + { + map event = UI::WaitForEvent (); + any ret = event["ID"]:nil; + if (ret == `tree) + { + string current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + y2internal ("current: %1", current); + } + + if (ret == `ok || ret == `cancel) + break; + } + string current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + y2internal ("current before leaving: %1", current); + + 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] r63380 - /trunk/ntp-client/src/ntp-client_proposal.ycp
by varkoly＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: varkoly Date: Wed Feb 9 13:01:29 2011 New Revision: 63380 URL: http://svn.opensuse.org/viewcvs/yast?rev=63380&view=rev Log: Fix the parameter of WriteNtpSettings Modified: trunk/ntp-client/src/ntp-client_proposal.ycp Modified: 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 (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Wed Feb 9 13:01:29 2011 @@ -231,7 +231,7 @@ return ret; } -boolean WriteNtpSettings (list ntp_servers, string ntp_server, boolean run_service) { +boolean WriteNtpSettings (list<string> ntp_servers, string ntp_server, boolean run_service) { NtpClient::modified = true; if ( ntp_servers != [] ) @@ -275,7 +275,7 @@ */ symbol Write(map param) { symbol ret = nil; - list ntp_servers = param["servers"]:[]; + list<string> ntp_servers = param["servers"]:[]; string ntp_server = param["server"]:""; boolean run_service = param["run_service"]:true; if (ntp_server == "") -- 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] r63379 - /trunk/ntp-client/src/ntp-client_proposal.ycp
by varkoly＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: varkoly Date: Wed Feb 9 12:50:35 2011 New Revision: 63379 URL: http://svn.opensuse.org/viewcvs/yast?rev=63379&view=rev Log: Now we can write in proposal more then one ntp server Modified: trunk/ntp-client/src/ntp-client_proposal.ycp Modified: 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 (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Wed Feb 9 12:50:35 2011 @@ -231,10 +231,19 @@ return ret; } -boolean WriteNtpSettings (string ntp_server,boolean run_service) { +boolean WriteNtpSettings (list ntp_servers, string ntp_server, boolean run_service) { NtpClient::modified = true; - AddSingleServer(ntp_server); + if ( ntp_servers != [] ) + { + foreach (string server, ntp_servers, { + AddSingleServer(server); + }); + } + else + { + AddSingleServer(ntp_server); + } if( ! run_service ) { NtpClient::synchronize_time=true; @@ -266,6 +275,7 @@ */ symbol Write(map param) { symbol ret = nil; + list ntp_servers = param["servers"]:[]; string ntp_server = param["server"]:""; boolean run_service = param["run_service"]:true; if (ntp_server == "") @@ -276,7 +286,7 @@ if (param["write_only"]:false) { - WriteNtpSettings (ntp_server,run_service); + WriteNtpSettings (ntp_servers,ntp_server,run_service); return `success; } @@ -325,7 +335,7 @@ // User wants to more than running sntp (synchronize on boot) if (!ntpdate_only) { - WriteNtpSettings (ntp_server,run_service); + WriteNtpSettings (ntp_servers,ntp_server,run_service); } return `success; @@ -393,7 +403,7 @@ } else if (!argmap["ntpdate_only"]:false) { - WriteNtpSettings (server,argmap["run_service"]:false); //may be the server is realy not accessable + WriteNtpSettings ([],server,argmap["run_service"]:false); //may be the server is realy not accessable } } // success, exit -- 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] r63378 - /branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc
by jsuchome＠svn2.opensuse.org 09 Feb '11

09 Feb '11

Author: jsuchome Date: Wed Feb 9 12:16:31 2011 New Revision: 63378 URL: http://svn.opensuse.org/viewcvs/yast?rev=63378&view=rev Log: find post snapshot for pre snapshot Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agent-sn… ============================================================================== --- branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc Wed Feb 9 12:16:31 2011 @@ -135,10 +135,15 @@ s->add (YCPString ("date"), YCPInteger (it->getDate())); if (it->getType() == SINGLE || it->getType() == PRE) + { s->add (YCPString ("description"), YCPString (it->getDescription())); - - if (it->getType() == POST) + if (it->getType() == PRE) + s->add (YCPString ("post_num"), YCPInteger (snapshots.findPost (it)->getNum ())); + } + else if (it->getType() == POST) + { s->add (YCPString ("pre_num"), YCPInteger (it->getPreNum())); + } y2internal ("snapshot %s", s.toString().c_str()); retlist->add (s); @@ -155,7 +160,7 @@ unsigned int num2 = getIntValue (argmap, "to", 0); const Snapshots& snapshots = sh->getSnapshots(); - sh->setComparisonNums(snapshots.find(num1), snapshots.find(num2)); + sh->setComparison (snapshots.find(num1), snapshots.find(num2)); const Files& files = sh->getFiles(); for (Files::const_iterator it = files.begin(); it != files.end(); ++it) -- 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] r63377 - /trunk/yast2/scripts/yast2
by aschnell＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: aschnell Date: Tue Feb 8 23:46:47 2011 New Revision: 63377 URL: http://svn.opensuse.org/viewcvs/yast?rev=63377&view=rev Log: - adapted snapper calls Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=63377&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Feb 8 23:46:47 2011 @@ -215,7 +215,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - SNAPSHOT_NUMBER=`$SNAPPERBIN --print-number create pre "yast2 $1"` + SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --print-number --description="yast2 $1"` fi fi } @@ -224,7 +224,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - $SNAPPERBIN create post $SNAPSHOT_NUMBER + $SNAPPERBIN create --type=post --pre-number=$SNAPSHOT_NUMBER fi fi } -- 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] r63376 - /tags/stable-2_21_91/gtk/
by rpmcruz＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: rpmcruz Date: Tue Feb 8 19:29:52 2011 New Revision: 63376 URL: http://svn.opensuse.org/viewcvs/yast?rev=63376&view=rev Log: Created tag stable-2_21_91 for gtk Added: tags/stable-2_21_91/gtk/ - copied from r63375, trunk/gtk/ -- 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] r63375 - /tags/stable-2_21_91/
by rpmcruz＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: rpmcruz Date: Tue Feb 8 19:29:46 2011 New Revision: 63375 URL: http://svn.opensuse.org/viewcvs/yast?rev=63375&view=rev Log: Created tag stable-2_21_91 Added: tags/stable-2_21_91/ -- 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] r63374 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes src/YGTreeView.cc
by rpmcruz＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: rpmcruz Date: Tue Feb 8 19:29:39 2011 New Revision: 63374 URL: http://svn.opensuse.org/viewcvs/yast?rev=63374&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGTreeView.cc Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=63374&r1=63373&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Tue Feb 8 19:29:39 2011 @@ -1 +1 @@ -2.21.90 +2.21.91 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=63374&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Tue Feb 8 19:29:39 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "90") +SET(VERSION_PATCH "91") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Tue Feb 8 19:29:39 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 08 18:28:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.91 +- fixed compatibility with upcoming yast2-libyui 2.20.1. + +------------------------------------------------------------------- Tue Feb 01 22:43:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.90 Modified: trunk/gtk/src/YGTreeView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTreeView.cc?rev=63374&… ============================================================================== --- trunk/gtk/src/YGTreeView.cc (original) +++ trunk/gtk/src/YGTreeView.cc Tue Feb 8 19:29:39 2011 @@ -199,6 +199,14 @@ gtk_tree_model_foreach (getModel(), inner::foreach_unmark, this); } + YItem *getFocusItem() + { + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (getSelection(), NULL, &iter)) + return getYItem (&iter); + return NULL; + } + virtual bool _immediateMode() { return true; } virtual bool _shrinkable() { return false; } @@ -619,12 +627,7 @@ // YMultiSelectionBox virtual YItem *currentItem() - { - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (getSelection(), NULL, &iter)) - return getYItem (&iter); - return NULL; - } + { return getFocusItem(); } virtual void setCurrentItem (YItem *item) { focusItem (item, true); } @@ -748,6 +751,9 @@ syncCount(); } + virtual YTreeItem *currentItem() + { return (YTreeItem *) getFocusItem(); } + // YGSelectionStore void doAddItem (YItem *item) {} // rebuild will be called anyway -- 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] r63373 - /tags/stable-2_20_12/yast2/
by jsrain＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: jsrain Date: Tue Feb 8 16:45:42 2011 New Revision: 63373 URL: http://svn.opensuse.org/viewcvs/yast?rev=63373&view=rev Log: Created tag stable-2_20_12 for yast2 Added: tags/stable-2_20_12/yast2/ (props changed) - copied from r63372, trunk/yast2/ -- 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] r63372 - in /trunk/yast2: VERSION library/system/src/Initrd.ycp package/yast2.changes
by jsrain＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: jsrain Date: Tue Feb 8 16:45:33 2011 New Revision: 63372 URL: http://svn.opensuse.org/viewcvs/yast?rev=63372&view=rev Log: do not define splash screen resolution to mkinitrd if boot splash is not installed (bnc#670225) Modified: trunk/yast2/VERSION trunk/yast2/library/system/src/Initrd.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63372&r1=63371… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Feb 8 16:45:33 2011 @@ -1 +1 @@ -2.20.11 +2.20.12 Modified: trunk/yast2/library/system/src/Initrd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Initrd.… ============================================================================== --- trunk/yast2/library/system/src/Initrd.ycp (original) +++ trunk/yast2/library/system/src/Initrd.ycp Tue Feb 8 16:45:33 2011 @@ -405,8 +405,11 @@ SCR::Write (.sysconfig.kernel, nil); // recreate initrd string param = ""; - if (splash != "" && splash != nil) + if (splash != "" && splash != nil + && 0 < (integer)SCR::Read (.target.size, "/lib/mkinitrd/scripts/setup-splash.sh")) + { param = sformat ("-s %1", splash); + } if ( SCR::Execute (.target.bash, sformat ("/sbin/mkinitrd %1 %2 >> \ %3 2>&1", param, additional_parameters, Directory::logdir + "/y2logmkinitrd")) != 0 ) Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Feb 8 16:45:33 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 8 16:37:35 CET 2011 - jsrain(a)suse.cz + +- do not define splash screen resolution to mkinitrd if boot splash + is not installed (bnc#670225) +- 2.20.12 + +------------------------------------------------------------------- Wed Jan 19 13:49:18 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) -- 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] r63371 - in /trunk/installation: control/control.openSUSE.xml control/docs/control-section.xml control/docs/examples/supported_desktops.xml package/yast2-installation.changes
by locilka＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: locilka Date: Tue Feb 8 15:11:59 2011 New Revision: 63371 URL: http://svn.opensuse.org/viewcvs/yast?rev=63371&view=rev Log: - Adapted openSUSE control file to the current naming schema of desktops (BNC #667408) Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/control/docs/control-section.xml trunk/installation/control/docs/examples/supported_desktops.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Tue Feb 8 15:11:59 2011 @@ -273,8 +273,8 @@ <one_supported_desktop> <name>kde</name> -  - <desktop>startkde</desktop> +  + <desktop>kde4</desktop> <label_id>desktop_kde</label_id> <logon>kdm</logon> <cursor>DMZ</cursor> @@ -286,7 +286,8 @@ <one_supported_desktop> <name>xfce</name> - <desktop>startxfce4</desktop> +  + <desktop>xfce</desktop> <label_id>desktop_xfce</label_id> <logon>gdm</logon> <cursor>DMZ</cursor> @@ -299,7 +300,8 @@  <one_supported_desktop> <name>lxde</name> - <desktop>startlxde</desktop> +  + <desktop>lxde</desktop> <label_id>desktop_lxde</label_id> <logon>lxdm</logon> <cursor>DMZ</cursor> Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/contro… ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Tue Feb 8 15:11:59 2011 @@ -833,7 +833,7 @@ <listitem> <para>(string) <emphasis>desktop</emphasis></para> - <para>Desktop to start (gnome, startkde4, startkde3, startxfce4, ...).</para> + <para>Desktop to start (gnome, kde4, kde, xfce, ...).</para> </listitem> <listitem> Modified: trunk/installation/control/docs/examples/supported_desktops.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/exampl… ============================================================================== --- trunk/installation/control/docs/examples/supported_desktops.xml (original) +++ trunk/installation/control/docs/examples/supported_desktops.xml Tue Feb 8 15:11:59 2011 @@ -20,7 +20,7 @@ <one_supported_desktop> <name>kde</name> - <desktop>startkde4</desktop> + <desktop>kde4</desktop>  <label_id>desktop_kde</label_id> <logon>kdm4</logon> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Feb 8 15:11:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 8 15:10:25 CET 2011 - locilka(a)suse.cz + +- Adapted openSUSE control file to the current naming schema of + desktops (BNC #667408) + +------------------------------------------------------------------- Thu Jan 20 14:18:41 CET 2011 - jsrain(a)suse.cz - fix initialization of AutoUpgrade for 2nd stage -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0