February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63425 - /branches/tmp/jsuchome/snapper/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: jsuchome Date: Tue Feb 15 16:24:52 2011 New Revision: 63425 URL: http://svn.opensuse.org/viewcvs/yast?rev=63425&view=rev Log: one table for all different data shown for single (WIP) ask for restoring 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 Tue Feb 15 16:24:52 2011 @@ -79,8 +79,8 @@ list<map> snapshots = Snapper::snapshots; integer i = -1; - list single_snapshot_items = []; - list coupled_snapshot_items = []; + list snapshot_items = []; +// list coupled_snapshot_items = []; foreach (map s, snapshots, { i = i + 1; @@ -92,8 +92,8 @@ if (s["type"]:`none == `SINGLE) { - single_snapshot_items = add (single_snapshot_items, - `item (`id (i), date, num, s["description"]:"")); + snapshot_items = add (snapshot_items, + `item (`id (i), num, _("Single"), date, "", s["description"]:"")); } else if (s["type"]:`none == `POST) { @@ -106,8 +106,8 @@ } 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), pre, pre_date, num, date, desc)); + snapshot_items = add (snapshot_items, + `item (`id (i), sformat ("%1 - %2", pre, num), _("Pre & Post"), pre_date, date, desc)); } else { @@ -116,6 +116,7 @@ }); term contents = `VBox ( + /* // table label `Left (`Label (_("Single Snapshots"))), `Table (`id (`single_snapshots_table), `opt(`notify, `keepSorting), `header ( @@ -130,10 +131,12 @@ `VSpacing (0.5), // table label `Left (`Label (_("Coupled Snapshots"))), - `Table (`id (`coupled_snapshots_table), `opt(`notify, `keepSorting), `header ( + */ + `Table (`id (`snapshots_table), `opt(`notify, `keepSorting), `header ( // table header - _("Pre ID"), _("Start Date"), _("Post ID"), _("End Date"), _("Description")), - coupled_snapshot_items +// _("Pre ID"), _("Start Date"), _("Post ID"), _("End Date"), _("Description")), + _("ID"), _("Type"), _("Start Date"), _("End Date"), _("Description")), + snapshot_items ), `HBox ( `PushButton (`id (`show_c), `opt (`default), _("Show Changes")), @@ -146,9 +149,11 @@ Wizard::HideBackButton (); Wizard::HideAbortButton (); - UI::SetFocus (`id (`coupled_snapshots_table)); + UI::SetFocus (`id (`snapshots_table)); + /* if (coupled_snapshot_items == [] && single_snapshot_items != []) UI::SetFocus (`id (`single_snapshots_table)); + */ any ret = nil; while(true) { @@ -157,6 +162,7 @@ integer selected = 0; + /* if (ret == `single_snapshots_table || ret == `coupled_snapshots_table) { selected = (integer) UI::QueryWidget (`id (ret), `CurrentItem); ret = `show; @@ -165,8 +171,9 @@ selected = (integer) UI::QueryWidget (`id (`single_snapshots_table), `CurrentItem); ret = `show; } - if (ret == `show_c) { - selected = (integer) UI::QueryWidget (`id (`coupled_snapshots_table), `CurrentItem); + */ + if (ret == `show_c || ret == `snapshots_table) { + selected = (integer) UI::QueryWidget (`id (`snapshots_table), `CurrentItem); ret = `show; } @@ -221,6 +228,7 @@ string description = Snapper::snapshots[pre_index,"description"]:""; string pre_date = timestring ("%c", Snapper::snapshots[pre_index,"date"]:0, false); string date = timestring ("%c", snapshot["date"]:0, false); + symbol type = snapshot["type"]:`NONE; if (!haskey (snapshot, "files")) { @@ -303,7 +311,10 @@ void show_file_modification (string file, integer from, integer to) { term content = `VBox (); + // busy popup message + Popup::ShowFeedback ("", _("Calculating file modifications...")); map modification = Snapper::GetFileModification (file, from, to); + Popup::ClearFeedback (); if (haskey (modification, "diff")) { string diff = modification["diff"]:""; @@ -371,14 +382,35 @@ } } + string tree_label = sformat ("%1 - %2", previous_num, snapshot_num); + term date_widget = `VBox ( + `HBox ( + // label, date string will follow at the end of line + `Label (`id (`pre_date), _("Time of taking the first snapshot:")), + `Right (`Label (pre_date)) + ), + `HBox ( + // label, date string will follow at the end of line + `Label (`id (`post_date), _("Time of taking the second snapshot:")), + `Right (`Label (date)) + ) + ); + if (type == `SINGLE) + { + tree_label = tostring (snapshot_num); + date_widget = `HBox ( + // label, date string will follow at the end of line + `Label (`id (`date), _("Time of taking the snapshot:")), + `Right (`Label (date)) + ); + } + term contents = `HBox ( `HWeight (1, `HBox (`VSpacing (20), `VBox (`HSpacing(70), `HBox ( `HSpacing (), `ReplacePoint (`id (`reptree), - `Tree (`id(`tree), `opt (`notify, `multiSelection), - sformat ("%1 - %2", previous_num, snapshot_num), [] - ) + `Tree (`id(`tree), tree_label, []) ), `HSpacing () ), @@ -394,16 +426,7 @@ ))), `HWeight (2, `VBox ( `Left (`Label (`id (`desc), description)), - `HBox ( - // label, date string will follow at the end of line - `Label (`id (`pre_date), _("Time of taking the first snapshot:")), - `Right (`Label (pre_date)) - ), - `HBox ( - // label, date string will follow at the end of line - `Label (`id (`post_date), _("Time of taking the second snapshot:")), - `Right (`Label (date)) - ), + date_widget, `Frame ("", `HBox ( `HSpacing (0.5), `VBox ( `VSpacing (0.5), @@ -438,9 +461,7 @@ if (size (tree_items) > 0) { UI::ReplaceWidget (`id (`reptree), - `Tree (`id(`tree), `opt (`notify, `multiSelection), - sformat ("%1 - %2", previous_num, snapshot_num), tree_items - ) + `Tree (`id(`tree), `opt (`notify, `immediate, `multiSelection), tree_label, tree_items) ); // no item is selected UI::ChangeWidget (`tree, `CurrentItem, nil); @@ -495,16 +516,29 @@ continue; } else if (ret == `next) { - if (true) + list<string> files = (list<string>) UI::QueryWidget (`id (`tree), `SelectedItems); + y2internal ("files: %1", files); + files = filter (string file, files, { + return haskey (files_index, file); + }); + y2internal ("files: %1", files); + + if (files == []) { + // popup message Popup::Message (_("No file was selected for restoring")); continue; } - else if (Popup::YesNo (_("This will probably ruin your system. Are you sure?"))) + // FIXME restore from PRE or POST? + // popup headline + if (Popup::AnyQuestionRichText (_("Restoring files"), + // popup message + sformat (_("These files will be restored from snapshot %1:<br>%2<br>Are you sure?"), + snapshot_name, mergestring (files, "<br>")), + 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { y2milestone ("restoring files..."); - // do it - break; + // TODO copy the files } 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] r63424 - in /trunk/network: package/yast2-network.changes src/modules/DSL.ycp
by mvidner＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: mvidner Date: Tue Feb 15 15:20:09 2011 New Revision: 63424 URL: http://svn.opensuse.org/viewcvs/yast?rev=63424&view=rev Log: DSL: linux-atm-lib.rpm was renamed to libatm1.rpm (bnc#668586) Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/DSL.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Feb 15 15:20:09 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 15 15:19:47 CET 2011 - mvidner(a)suse.cz + +- DSL: linux-atm-lib.rpm was renamed to libatm1.rpm (bnc#668586) + +------------------------------------------------------------------- Mon Jan 17 14:10:10 UTC 2011 - mvidner(a)novell.com - fixed progress messages being out of sync when writing LAN config Modified: trunk/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DSL.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DSL.ycp (original) +++ trunk/network/src/modules/DSL.ycp Tue Feb 15 15:20:09 2011 @@ -568,7 +568,7 @@ global list<string> Packages() { if(size(NetworkInterfaces::List("dsl")) < 1) return []; - return ["smpppd", "ppp", "pptp", "linux-atm-lib"]; + return ["smpppd", "ppp", "pptp", "libatm1"]; } /** -- 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] r63423 - /tags/stable-2_20_6/ncurses/
by gs＠svn2.opensuse.org 15 Feb '11

15 Feb '11

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

15 Feb '11

Author: gs Date: Tue Feb 15 14:07:51 2011 New Revision: 63422 URL: http://svn.opensuse.org/viewcvs/yast?rev=63422&view=rev Log: modified bug-fix for bnc #652240 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=63422&r1=634… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue Feb 15 14:07:51 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 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 Tue Feb 15 14:07:51 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 15 13:53:30 CET 2011 - gs(a)suse.de + +- Correct color for shortcuts and visible cursor in text entry + (modified bug-fix for bnc #652240) +- V 2.20.6 + +------------------------------------------------------------------- Wed Feb 9 13:42:49 CET 2011 - gs(a)suse.de - Bugfixes in NCTree (currentItem works correctly) and -- 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] r63421 - in /trunk/ncurses/src: NCTextPad.cc ncursesw.cc
by gs＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: gs Date: Tue Feb 15 14:07:21 2011 New Revision: 63421 URL: http://svn.opensuse.org/viewcvs/yast?rev=63421&view=rev Log: check #ifdef NCURSES_EXT_COLORS instead of exact patch version (which will change) Modified: trunk/ncurses/src/NCTextPad.cc trunk/ncurses/src/ncursesw.cc Modified: trunk/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTextPad.cc?rev=634… ============================================================================== --- trunk/ncurses/src/NCTextPad.cc (original) +++ trunk/ncurses/src/NCTextPad.cc Tue Feb 15 14:07:21 2011 @@ -355,7 +355,7 @@ setcchar( &cchar, wch, attr, color, NULL ); // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from attr_get (bnc#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS cchar.ext_color = 0; #endif ins_wch( curs.L, curs.C++, &cchar ); @@ -496,7 +496,7 @@ setcchar( &cchar, wch, attr, color, NULL ); // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from attr_get (bcn#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS cchar.ext_color = 0; #endif ins_wch( cl, cc++, &cchar ); Modified: trunk/ncurses/src/ncursesw.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/ncursesw.cc?rev=6342… ============================================================================== --- trunk/ncurses/src/ncursesw.cc (original) +++ trunk/ncurses/src/ncursesw.cc Tue Feb 15 14:07:21 2011 @@ -139,7 +139,7 @@ // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from mvwin_wch (bnc#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS combined->ext_color = 0; #endif return ret; @@ -152,7 +152,7 @@ combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET ); // libncurses6 enables ext_color from struct cchar_t (see curses.h). // Set ext_color to 0 to respect the settings got from win_wch (bnc#652240). -#if NCURSES_EXT_COLORS==20100109 +#ifdef NCURSES_EXT_COLORS combined->ext_color = 0; #endif return ret; -- 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] r63420 - /tags/branch-Code-11-SP2-2_17_77/installation/
by locilka＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: locilka Date: Tue Feb 15 13:35:33 2011 New Revision: 63420 URL: http://svn.opensuse.org/viewcvs/yast?rev=63420&view=rev Log: Created tag branch-Code-11-SP2-2_17_77 for installation Added: tags/branch-Code-11-SP2-2_17_77/installation/ (props changed) - copied from r63419, branches/SuSE-Code-11-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

[yast-commit] r63419 - /tags/branch-Code-11-SP2-2_17_77/
by locilka＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: locilka Date: Tue Feb 15 13:35:31 2011 New Revision: 63419 URL: http://svn.opensuse.org/viewcvs/yast?rev=63419&view=rev Log: Created tag branch-Code-11-SP2-2_17_77 Added: tags/branch-Code-11-SP2-2_17_77/ -- 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] r63418 - in /branches/SuSE-Code-11-SP2-Branch/installation: VERSION package/yast2-installation.changes src/clients/inst_mode.ycp
by locilka＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: locilka Date: Tue Feb 15 13:34:09 2011 New Revision: 63418 URL: http://svn.opensuse.org/viewcvs/yast?rev=63418&view=rev Log: - Correctly disabling Update and Repair options if no previous system is found by the system analysis (BNC #664907). - 2.17.77 Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Tue Feb 15 13:34:09 2011 @@ -1 +1 @@ -2.17.76 +2.17.77 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Tue Feb 15 13:34:09 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 15 13:31:29 CET 2011 - locilka(a)suse.cz + +- Correctly disabling Update and Repair options if no previous + system is found by the system analysis (BNC #664907). +- 2.17.77 + +------------------------------------------------------------------- Thu Jan 20 14:18:41 CET 2011 - jsrain(a)suse.cz - fix initialization of AutoUpgrade for 2nd stage Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp Tue Feb 15 13:34:09 2011 @@ -89,16 +89,6 @@ Pkg::TargetFinish(); } -boolean other_options_disabled = false; - -if (! (InstData::have_linux && InstData::offer_update)) -{ - // to offer add-on products - // Mode::SetMode ("installation"); - // return `auto; - other_options_disabled = true; -} - // bugzilla #208222 // Release disk used as the installation source ReleaseHDDUsedAsInstallationSource(); @@ -255,10 +245,10 @@ string media = Linuxrc::InstallInf ("InstMode"); y2milestone ("Umount result: %1, inst mode: %2", umount_result, media); -other_options_disabled = false; +boolean other_options_enabled = (InstData::have_linux && InstData::offer_update); // only installation (and addon products) enabled -if (other_options_disabled) { +if (other_options_enabled != true) { UI::ChangeWidget (`id (`update), `Enabled, false); UI::ChangeWidget (`id (`repair), `Enabled, false); -- 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] r63417 - /trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp
by gs＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: gs Date: Tue Feb 15 12:22:56 2011 New Revision: 63417 URL: http://svn.opensuse.org/viewcvs/yast?rev=63417&view=rev Log: log current before loop Modified: trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp Modified: 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 (original) +++ trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp Tue Feb 15 12:22:56 2011 @@ -25,13 +25,14 @@ UI::ChangeWidget(`mod, `SelectedItems, ["keyboard", "xmas", "newyear" ] ); any id = nil; - + string current = (string) UI::QueryWidget( `id(`mod), `CurrentItem ); + y2milestone( "Current item: %1", current ); repeat { id = UI::UserInput(); list selected_items = (list) UI::QueryWidget( `id(`mod), `SelectedItems ); y2milestone( "Selected items: %1", selected_items ); - string current = (string) UI::QueryWidget( `id(`mod), `CurrentItem ); + current = (string) UI::QueryWidget( `id(`mod), `CurrentItem ); y2milestone( "Current item: %1", current ); } until (id == `ok); } -- 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] r63416 - /trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp
by gs＠svn2.opensuse.org 15 Feb '11

15 Feb '11

Author: gs Date: Tue Feb 15 12:20:25 2011 New Revision: 63416 URL: http://svn.opensuse.org/viewcvs/yast?rev=63416&view=rev Log: log current item Modified: trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp Modified: 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 (original) +++ trunk/ycp-ui-bindings/examples/Tree-Checkbox2.ycp Tue Feb 15 12:20:25 2011 @@ -14,8 +14,8 @@ ), `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" ) + `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" ) @@ -23,7 +23,7 @@ ) ); - UI::ChangeWidget(`mod, `SelectedItems, ["keyboard", `xmas, `newyear ] ); + UI::ChangeWidget(`mod, `SelectedItems, ["keyboard", "xmas", "newyear" ] ); any id = nil; repeat @@ -31,5 +31,7 @@ id = UI::UserInput(); list selected_items = (list) UI::QueryWidget( `id(`mod), `SelectedItems ); y2milestone( "Selected items: %1", selected_items ); + string current = (string) UI::QueryWidget( `id(`mod), `CurrentItem ); + y2milestone( "Current item: %1", current ); } until (id == `ok); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0