December 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63002 - /tags/branch-Code-11-SP1-2_17_150/
by mzugec＠svn2.opensuse.org 17 Dec '10

17 Dec '10

Author: mzugec Date: Fri Dec 17 10:16:51 2010 New Revision: 63002 URL: http://svn.opensuse.org/viewcvs/yast?rev=63002&view=rev Log: Created tag branch-Code-11-SP1-2_17_150 Added: tags/branch-Code-11-SP1-2_17_150/ -- 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] r63001 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/clients/lan_proposal.ycp src/modules/Lan.ycp
by mzugec＠svn2.opensuse.org 17 Dec '10

17 Dec '10

Author: mzugec Date: Fri Dec 17 10:15:23 2010 New Revision: 63001 URL: http://svn.opensuse.org/viewcvs/yast?rev=63001&view=rev Log: L3: don't propose bridge for vbox (bnc#648044) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan_proposal.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Fri Dec 17 10:15:23 2010 @@ -1 +1 @@ -2.17.149 +2.17.150 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Fri Dec 17 10:15:23 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 17 10:05:06 CET 2010 - mzugec(a)suse.de + +- L3: don't propose bridge for vbox (bnc#648044) +- 2.17.150 + +------------------------------------------------------------------- Mon Dec 6 15:46:53 CET 2010 - mzugec(a)suse.cz - L3: AY Layer2 support - fixed portname option (bnc#573607) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan_proposal.ycp Fri Dec 17 10:15:23 2010 @@ -63,7 +63,7 @@ Lan::Read (force_reset? `nocache: `cache); if (Lan::virt_net_proposal==nil){ if((PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")|| - PackageSystem::Installed("qemu") || PackageSystem::Installed("virtualbox-ose")) + PackageSystem::Installed("qemu")) Lan::virt_net_proposal = true; else Lan::virt_net_proposal = false; } Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Fri Dec 17 10:15:23 2010 @@ -744,8 +744,9 @@ // enable ipv6 support link_v6 = Hyperlink (href_v6, _("Enable IPv6")); } + // no exception needed for virtualbox* (bnc#648044) http://www.virtualbox.org/manual/ch06.html if ( (PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")|| - PackageSystem::Installed("qemu")||PackageSystem::Installed("virtualbox-ose") + PackageSystem::Installed("qemu") ){ if (virt_net_proposal){ href_virt_net = "virtual-revert"; @@ -878,7 +879,7 @@ // test if we have any virtualization installed if (virt_net_proposal) { - y2milestone("Virtualization [xen|kvm|qemu|virtualbox-ose] detected - will propose virtualization network"); + y2milestone("Virtualization [xen|kvm|qemu] detected - will propose virtualization network"); // in case of virtualization use special proposal // collect all interfaces that will be skipped from bridged proposal list<string> skipped = []; -- 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] r63000 - in /branches/tmp/jsuchome/snapper/src: Snapper.ycp dialogs.ycp
by jsuchome＠svn2.opensuse.org 16 Dec '10

16 Dec '10

Author: jsuchome Date: Thu Dec 16 17:42:49 2010 New Revision: 63000 URL: http://svn.opensuse.org/viewcvs/yast?rev=63000&view=rev Log: better UI, alignment etc. 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 Dec 16 17:42:49 2010 @@ -88,7 +88,27 @@ map out = (map) SCR::Execute (.target.bash_output, sformat ("/usr/bin/diff -u %1 %2", file1, file2)); - ret["diff"] = out["stdout"]:""; + if (out["stderr"]:"" != "") + { + y2warning ("out: %1", out); + ret["diff"] = out["stderr"]:""; + } + else if (out["stdout"]:nil == "") + { + ret["status"] = "no_change"; + } + else + { + ret["diff"] = out["stdout"]:""; + } + } + else if (FileUtils::Exists (file1)) + { + ret["status"] = "removed"; + } + else if (FileUtils::Exists (file2)) + { + ret["status"] = "created"; } return ret; } 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 Dec 16 17:42:49 2010 @@ -84,13 +84,13 @@ }); term contents = `VBox ( - `Table (`id (`snapshots_table), `opt(`notify), `header ( + `Table (`id (`snapshots_table), `opt(`notify, `keepSorting), `header ( // table header _("Date"), _("Name"), _("Description")), snapshot_items ), `HBox ( - `PushButton (`id (`show), _("Show Changes")), + `PushButton (`id (`show), `opt (`default), _("Show Changes")), `PushButton (`id (`edit), _("Edit Snapshot")), `HStretch () ) @@ -101,6 +101,8 @@ Wizard::HideBackButton (); Wizard::HideAbortButton (); + UI::SetFocus (`id (`snapshots_table)); + any ret = nil; while(true) { @@ -209,26 +211,50 @@ return ret; } - // create the term for selected file - define void set_entry_term () { - - list items = []; + // helper function: show the specific modification between snapshots + void show_file_modification (string file, string pre, string post) { - term cont = `Heading ("some general info about the snapshot"); - string diff = ""; - if (current != "" && files_index[current]:$[] != $[]) + term content = `VBox (); + map modification = Snapper::GetFileModification (file, pre, post); + if (haskey (modification, "diff")) { - string changes = files_index[current,"changes"]:""; - cont = `VBox (`VSpacing ()); - if (substring (changes, 0, 1) == "+") + string diff = modification["diff"]:""; + diff = mergestring (splitstring (diff, "\n"), " "); + content = `RichText (`id (`diff), diff); + } + else + { + if (modification["status"]:"" == "created") { - cont = add (cont, `Label ("New file was created")); + content = `Left (`Heading ("New file was created")); } - else if (substring (changes, 0, 1) == "c") + else if (modification["status"]:"" == "removed") { - cont = `VBox ( - `VSpacing (), - `Label ("File was modified"), + content = `Left (`Heading ("File was removed")); + } + else if (modification["status"]:"" == "no_change") + { + content = `Left (`Heading ("File was not changed")); + } + else + { + y2warning ("not known: %1", modification); + } + } + UI::ReplaceWidget (`id (`diff_content), `VBox ( + content, + `Bottom (`Right (`PushButton (`id (`restore), _("Restore")))) + )); + } + + + // create the term for selected file + void set_entry_term () { + + if (current != "" && files_index[current]:$[] != $[]) + { + + UI::ReplaceWidget (`id (`diff_chooser), `VBox ( `VSpacing (), `RadioButtonGroup (`id(`rd), `Left (`HVSquash (`VBox ( `Left (`RadioButton (`id(`diff_snapshot), `opt (`notify), @@ -238,37 +264,22 @@ // radio button label _("Compare file from the snapshot with the current system"), false)) )))), - `VSpacing (), - `RichText (`id (`diff), "") - ); - map modification = Snapper::GetFileModification ( - current, snapshot_name + "/pre", snapshot_name + "/post"); - diff = modification["diff"]:""; - diff = mergestring (splitstring (diff, "\n"), " "); - } - else if (substring (changes, 0, 1) == "-") - { - cont = add (cont, `Label ("File was removed")); - } - else - { - cont = add (cont, `Heading (changes)); - } + `VSpacing () + )); + show_file_modification (current, snapshot_name + "/pre", snapshot_name + "/post"); } - UI::ReplaceWidget (`entryContents, cont); - if (UI::WidgetExists (`id (`diff))) + else { - UI::ChangeWidget (`id (`diff), `Value, diff); + UI::ReplaceWidget (`id (`diff_chooser), `VBox (`VStretch ())); + UI::ReplaceWidget (`id (`diff_content), `HBox (`HStretch ())); } } term contents = `HBox ( `HWeight (1, `HBox (`VSpacing (20), `VBox (`HSpacing(70), - `VSpacing (0.2), `HBox ( `HSpacing (), `ReplacePoint (`id (`reptree), `Tree (`id(`tree), snapshot_name, [])), - `ReplacePoint (`id (`repbuttons), `Empty ()), `HSpacing () ), `HBox ( @@ -279,16 +290,26 @@ `PushButton (`id (`open), `opt (`key_F6),_("&Open")): `Empty (), `HSpacing (1.5) - ), - `VSpacing (0.6) + ) ))), - `HWeight (2, `ReplacePoint (`id (`entryContents), `Top (`HBox ()))) + `HWeight (2, `VBox ( + `Label (`id (`label), Snapper::selected_snapshot["description"]:""), + `Frame ("", `HBox ( + `HSpacing (0.5), `VBox ( + `VSpacing (0.5), + `ReplacePoint (`id (`diff_chooser), `VBox (`VStretch ())), + `ReplacePoint (`id (`diff_content), `HBox (`HStretch ())), + `VSpacing (0.5) + ), + `HSpacing (0.5) + )) + )) ); // show the dialog contents with empty tree, compute items later Wizard::SetContentsButtons (caption, contents, HELPS["show"]:"", // button label - Label::CancelButton(), _("Restore")); + Label::CancelButton(), _("Restore Selected")); // generate the map with directory tree structure foreach (map file, file_list, { @@ -341,23 +362,24 @@ } else if (ret == `diff_snapshot) { - map modification = Snapper::GetFileModification ( - current, snapshot_name + "/pre", snapshot_name + "/post"); - string diff = modification["diff"]:""; - diff = mergestring (splitstring (diff, "\n"), " "); - UI::ChangeWidget (`id (`diff), `Value, diff); + show_file_modification (current, snapshot_name + "/pre", snapshot_name + "/post"); } else if (ret == `diff_current) { - map modification = Snapper::GetFileModification ( - current, snapshot_name + "/pre", ""); - string diff = modification["diff"]:""; - diff = mergestring (splitstring (diff, "\n"), " "); - UI::ChangeWidget (`id (`diff), `Value, diff); + show_file_modification (current, snapshot_name + "/post", ""); } 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'? + +This will probably break your system. Are you sure?", current, snapshot_name))) + { + y2milestone ("restoring file %1...", current); + } + continue; + } else if (ret == `next) { if (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] r62999 - in /branches/tmp/jsuchome/snapper/src: Snapper.ycp dialogs.ycp
by jsuchome＠svn2.opensuse.org 16 Dec '10

16 Dec '10

Author: jsuchome Date: Thu Dec 16 13:14:52 2010 New Revision: 62999 URL: http://svn.opensuse.org/viewcvs/yast?rev=62999&view=rev Log: show diff to current system 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 Dec 16 13:14:52 2010 @@ -72,21 +72,22 @@ /** * Describe what was done with given file in given snapshot FIXME compare arbitrary snapshots + * - when new is "", meaning is 'current system' */ -global map GetFileModification (string file, string snapshot) { +global map GetFileModification (string file, string old, string new) { map ret = $[]; - string dir1 = sformat ("%1/%2/pre", snapshots_path, snapshot); - string dir2 = sformat ("%1/%2/post", snapshots_path, snapshot); + string file1 = sformat ("%1/%2%3", snapshots_path, old, file); + string file2 = sformat ("%1/%2%3", snapshots_path, new, file); + if (new == "") + file2 = file; - if (FileUtils::IsDirectory (dir1) == true && - FileUtils::IsDirectory (dir2) == true) + if (FileUtils::Exists (file1) && FileUtils::Exists (file2)) { map out = (map) SCR::Execute (.target.bash_output, - sformat ("/usr/bin/diff -u %1%2 %3%2", dir1, file, dir2)); - y2internal ("out: %1", out); + sformat ("/usr/bin/diff -u %1 %2", file1, file2)); ret["diff"] = out["stdout"]:""; } return ret; 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 Dec 16 13:14:52 2010 @@ -214,25 +214,37 @@ list items = []; - term cont = `Heading ("some initial general info about the snapshot"); - + term cont = `Heading ("some general info about the snapshot"); + string diff = ""; if (current != "" && files_index[current]:$[] != $[]) { string changes = files_index[current,"changes"]:""; - cont = `VBox (`HSpacing ()); + cont = `VBox (`VSpacing ()); if (substring (changes, 0, 1) == "+") { cont = add (cont, `Label ("New file was created")); } else if (substring (changes, 0, 1) == "c") { - cont = add (cont, `Label ("File was modified")); - map modification = - Snapper::GetFileModification (current, snapshot_name); - string diff = modification["diff"]:""; + cont = `VBox ( + `VSpacing (), + `Label ("File was modified"), + `VSpacing (), + `RadioButtonGroup (`id(`rd), `Left (`HVSquash (`VBox ( + `Left (`RadioButton (`id(`diff_snapshot), `opt (`notify), + // radio button label + _("Show what was done when the snapshot was created"), true)), + `Left(`RadioButton (`id (`diff_current), `opt (`notify), + // radio button label + _("Compare file from the snapshot with the current system"), false)) + )))), + `VSpacing (), + `RichText (`id (`diff), "") + ); + map modification = Snapper::GetFileModification ( + current, snapshot_name + "/pre", snapshot_name + "/post"); + diff = modification["diff"]:""; diff = mergestring (splitstring (diff, "\n"), " "); - cont = add (cont, `HSpacing ()); - cont = add (cont, `RichText (diff)); } else if (substring (changes, 0, 1) == "-") { @@ -244,6 +256,10 @@ } } UI::ReplaceWidget (`entryContents, cont); + if (UI::WidgetExists (`id (`diff))) + { + UI::ChangeWidget (`id (`diff), `Value, diff); + } } term contents = `HBox ( @@ -323,6 +339,22 @@ if (textmode) UI::SetFocus (`id(`tree)); } + else if (ret == `diff_snapshot) + { + map modification = Snapper::GetFileModification ( + current, snapshot_name + "/pre", snapshot_name + "/post"); + string diff = modification["diff"]:""; + diff = mergestring (splitstring (diff, "\n"), " "); + UI::ChangeWidget (`id (`diff), `Value, diff); + } + else if (ret == `diff_current) + { + map modification = Snapper::GetFileModification ( + current, snapshot_name + "/pre", ""); + string diff = modification["diff"]:""; + diff = mergestring (splitstring (diff, "\n"), " "); + UI::ChangeWidget (`id (`diff), `Value, diff); + } else if (ret == `abort || ret == `cancel || ret == `back) { break; } -- 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] r62998 - in /branches/tmp/jsuchome/snapper/src: Snapper.ycp dialogs.ycp wizards.ycp
by jsuchome＠svn2.opensuse.org 15 Dec '10

15 Dec '10

Author: jsuchome Date: Wed Dec 15 17:59:01 2010 New Revision: 62998 URL: http://svn.opensuse.org/viewcvs/yast?rev=62998&view=rev Log: fill the tree with real files show some basic info how files were modified Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp branches/tmp/jsuchome/snapper/src/dialogs.ycp branches/tmp/jsuchome/snapper/src/wizards.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 Wed Dec 15 17:59:01 2010 @@ -46,21 +46,51 @@ /** * Return list of files modified in current snapshot + * File is a map with name (path) and some parameters */ -global list<string> ReadModifiedFiles (string snapshot) { +global list<map> ReadModifiedFiles (string snapshot) { - list<string> ret = []; + list<map> ret = []; string dir = snapshots_path + "/" + snapshot; if (FileUtils::Exists (dir + "/files.txt")) { string files = (string) SCR::Read (.target.string, dir + "/files.txt"); if (files == nil) files = ""; - ret = splitstring (files, "\n"); + foreach (string file, splitstring (files, "\n"), { + if (file == "") return; + list<string> parts = splitstring (file, " \t"); + ret = add (ret, $[ + "name" : parts[1]:"", + "changes" : parts[0]:"" + ]); + }); } return ret; } +/** + * Describe what was done with given file in given snapshot + FIXME compare arbitrary snapshots + */ +global map GetFileModification (string file, string snapshot) { + + map ret = $[]; + + string dir1 = sformat ("%1/%2/pre", snapshots_path, snapshot); + string dir2 = sformat ("%1/%2/post", snapshots_path, snapshot); + + if (FileUtils::IsDirectory (dir1) == true && + FileUtils::IsDirectory (dir2) == true) + { + + map out = (map) SCR::Execute (.target.bash_output, + sformat ("/usr/bin/diff -u %1%2 %3%2", dir1, file, dir2)); + y2internal ("out: %1", out); + ret["diff"] = out["stdout"]:""; + } + return ret; +} /** * Read the list of snapshots @@ -68,7 +98,6 @@ global boolean ReadSnapshots () { map out = (map) SCR::Execute (.target.bash_output, "btrfs subvolume list /"); - y2internal ("out: %1", out); map snapshots_map = $[]; snapshots = []; 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 Dec 15 17:59:01 2010 @@ -40,7 +40,7 @@ include "snapper/helps.ycp"; boolean ReallyAbort() { - return true;//FIXME Popup::ReallyAbort(true); + return Popup::ReallyAbort(true); } /** @@ -92,12 +92,14 @@ `HBox ( `PushButton (`id (`show), _("Show Changes")), `PushButton (`id (`edit), _("Edit Snapshot")), - `Right (`PushButton (`id (`rollback), _("Rollback"))) + `HStretch () ) ); Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", - Label::BackButton(), Label::FinishButton()); + Label::BackButton(), Label::CloseButton()); + Wizard::HideBackButton (); + Wizard::HideAbortButton (); any ret = nil; while(true) { @@ -117,6 +119,7 @@ break; } else if(ret == `next) { + // TODO check if something needs to be written (description) break; } else { @@ -136,10 +139,6 @@ // dialog caption string caption = _("Selected Snapshot Overview"); - term contents = `HBox ( - `HWeight (1, `ReplacePoint (`id (`treeContents), `Top (`HBox ()))), - `HWeight (1, `ReplacePoint (`id (`entryContents), `Top (`HBox ()))) - ); map display_info = UI::GetDisplayInfo (); boolean textmode = display_info["TextMode"]:false; string current = ""; @@ -150,53 +149,109 @@ list<string> subtree = []; list<term> tree_items = []; map open_items = $[]; - string root = "/"; - // information about selected file - map file_data = $[]; - - list<string> file_list = Snapper::selected_snapshot["files"]:[]; - foreach (string file, file_list, { - // FIXME - }); - // FIXME how to get list of top directories? - /* - tree_items = maplist (string dir, [ "/etc", "/opt", "/var", "/tmp"], { - return `item (`id(dir), dir, false, []); - }); - */ + list<map> file_list = Snapper::selected_snapshot["files"]:[]; + string snapshot_name = Snapper::selected_snapshot["name"]:""; + map<string,map> tree_map = $[]; + + // helper function: update the global map with directory tree structure + map<string,map> update_tree_map (map<string,map> current_map, list<string> path_list) + { + string first = path_list[0]:""; + + if (current_map[first]:nil == nil) + { + current_map[first] = $[]; + } + if (size (path_list) > 1) + { + current_map[first] = + update_tree_map ((map<string,map>)current_map[first]:$[], + (list<string>) remove (path_list, 0) + ); + } + return current_map; + } + + // save full paths of files marked as modified + map files_index = $[]; - // helper for set_tree_term function: create new items for subtrees - define list<term> update_items (list<term> its) { + // go through the map defining filesystem tree and create the widget items + list<term> generate_tree_items (string current_path, map<string,map> current_branch) { - return maplist (term it, its, { - string file = it[0,0]:""; - if (file == current) + list<term> ret = []; + foreach (string node, map branch, current_branch, { + string new_path = current_path + "/" + node; + if (files_index[new_path]:$[] != $[]) { - return `item (`id(file), file, true, - maplist (string k, subtree, ``( - `item (`id(k), k, false, [])) - ) + string changes = files_index[new_path,"changes"]:""; + string icon_f = "16x16/apps/gdu-smart-unknown.png"; + if (substring (changes, 0, 1) == "+") + { + icon_f = "16x16/apps/gdu-smart-healthy.png"; + } + else if (substring (changes, 0, 1) == "-") + { + icon_f = "16x16/apps/gdu-smart-failing.png"; + } + ret = add (ret, + `item (`id(new_path), `icon (icon_f), node, false, + generate_tree_items (new_path, (map<string,map>) branch)) + ); + } + else + { + ret = add (ret, `item (`id(new_path), node, false, + generate_tree_items (new_path, (map<string,map>) branch)) ); } - integer last = size (it) - 1; - if (size (it[last]:[]) == 0) - return it; - // `OpenItems doesn't work in ncurses... - boolean open = haskey (open_items, file) && !textmode; - return `item ( - `id(file), file, open, update_items (it[last]:[])); }); + return ret; } - // create the term with filesystem tree - define void set_tree_term () { + // create the term for selected file + define void set_entry_term () { + + list items = []; + + term cont = `Heading ("some initial general info about the snapshot"); - term cont = `HBox (`VSpacing (20), `VBox (`HSpacing(70), + if (current != "" && files_index[current]:$[] != $[]) + { + string changes = files_index[current,"changes"]:""; + cont = `VBox (`HSpacing ()); + if (substring (changes, 0, 1) == "+") + { + cont = add (cont, `Label ("New file was created")); + } + else if (substring (changes, 0, 1) == "c") + { + cont = add (cont, `Label ("File was modified")); + map modification = + Snapper::GetFileModification (current, snapshot_name); + string diff = modification["diff"]:""; + diff = mergestring (splitstring (diff, "\n"), " "); + cont = add (cont, `HSpacing ()); + cont = add (cont, `RichText (diff)); + } + else if (substring (changes, 0, 1) == "-") + { + cont = add (cont, `Label ("File was removed")); + } + else + { + cont = add (cont, `Heading (changes)); + } + } + UI::ReplaceWidget (`entryContents, cont); + } + + term contents = `HBox ( + `HWeight (1, `HBox (`VSpacing (20), `VBox (`HSpacing(70), `VSpacing (0.2), `HBox ( `HSpacing (), - `ReplacePoint (`id (`reptree), `Tree (`id(`tree), root, [])), + `ReplacePoint (`id (`reptree), `Tree (`id(`tree), snapshot_name, [])), `ReplacePoint (`id (`repbuttons), `Empty ()), `HSpacing () ), @@ -210,48 +265,45 @@ `HSpacing (1.5) ), `VSpacing (0.6) - )); - - UI::ReplaceWidget (`treeContents, cont); - - if (size (tree_items) > 0) - { - UI::ReplaceWidget (`id (`reptree), textmode ? - `Tree (`id(`tree), root, tree_items) : - `Tree (`id(`tree), `opt(`notify), root, tree_items)); - // no item is selected - UI::ChangeWidget (`tree, `CurrentItem, nil); - } - - if (textmode) - UI::SetFocus (`id(`tree)); - - if (current != "") - UI::ChangeWidget (`id(`tree), `CurrentItem, current); - } - - // create the term for selected file - define void set_entry_term () { - - list items = []; + ))), + `HWeight (2, `ReplacePoint (`id (`entryContents), `Top (`HBox ()))) + ); - term cont = `Label ("info about " + current); + // show the dialog contents with empty tree, compute items later + Wizard::SetContentsButtons (caption, contents, HELPS["show"]:"", + // button label + Label::CancelButton(), _("Restore")); + + // generate the map with directory tree structure + foreach (map file, file_list, { + string full_path = file["name"]:""; + list<string> path_l = splitstring (full_path, "/"); + if (path_l[0]:"" == "") + path_l = remove (path_l, 0); + tree_map = update_tree_map (tree_map, path_l); + files_index[full_path] = $[ + "changes" : file["changes"]:"" + ]; + }); - UI::ReplaceWidget (`entryContents, cont); + tree_items = generate_tree_items ("", tree_map); + if (size (tree_items) > 0) + { + UI::ReplaceWidget (`id (`reptree), textmode ? + `Tree (`id(`tree), snapshot_name, tree_items) : + `Tree (`id(`tree), `opt(`notify), snapshot_name, tree_items)); + // no item is selected + UI::ChangeWidget (`tree, `CurrentItem, nil); } - Wizard::SetContentsButtons(caption, contents, HELPS["show"]:"", - Label::BackButton(), Label::NextButton()); - - set_tree_term (); - current = (string) UI::QueryWidget (`id(`tree), `CurrentItem); if (current == nil) current = ""; set_entry_term (); + if (textmode) - UI::SetFocus (`id(`tree)); + UI::SetFocus (`id(`tree)); any ret = nil; while(true) { @@ -266,75 +318,27 @@ // events in tree if (ret == `tree) { - if (! files[current]:false) - { - UI::BusyCursor (); - // FIXME read files under current - subtree = [ - current + "/some file", - current + "/some other file" - ]; - - files [current] = true; - if (size (subtree) > 0) - { - open_items = (map) UI::QueryWidget (`tree, `OpenItems); - tree_items = update_items (tree_items); - UI::ReplaceWidget (`id (`reptree), textmode ? - `Tree (`id(`tree), root, tree_items) : - `Tree (`id(`tree), `opt(`notify), root, tree_items)); - UI::ChangeWidget (`id(`tree), `CurrentItem, current); - open_items = $[]; - } - current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); - if (current == nil) current = ""; - } - file_data = $[]; // FIXME read data for current item set_entry_term (); UI::NormalCursor (); if (textmode) UI::SetFocus (`id(`tree)); } - else if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; + else if (ret == `abort || ret == `cancel || ret == `back) { + break; } - else if(ret == `next || ret == `back) { - break; - } - else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; -} -/** - * @return dialog result - */ -any ConfigureDialog () { - - // dialog caption - string caption = _("Creating Snapshot"); - - term contents = `Label (_("Here, enter data for new snapshot")); - - Wizard::SetContentsButtons(caption, contents, HELPS["add"]:"", - Label::BackButton(), Label::NextButton()); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - - /* abort? */ - if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; - } - else if(ret == `next || ret == `back) { - break; + else if (ret == `next) { + if (true) + { + Popup::Message (_("No file was selected for restoring")); + continue; + } + else if (Popup::YesNo (_("This will probably ruin your system. Are you sure?"))) + { + y2milestone ("restoring files..."); + // do it + break; + } + continue; } else { y2error("unexpected retcode: %1", ret); 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 Wed Dec 15 17:59:01 2010 @@ -36,26 +36,6 @@ include "snapper/dialogs.ycp"; -/** - * Add a configuration of snapper - * @return sequence result - */ -any AddSequence() { - - map aliases = $[ - "config" : ``(ConfigureDialog()), - ]; - - map sequence = $[ - "ws_start" : "config", - "config" : $[ - `abort : `abort, - `next : `next, - ], - ]; - - return Sequencer::Run(aliases, sequence); -} /** * Main workflow of the snapper configuration @@ -66,7 +46,6 @@ map aliases = $[ "summary" : ``( SummaryDialog() ), "show" : ``( ShowDialog() ), - "add" : [ ``( AddSequence() ), true ], ]; map sequence = $[ @@ -74,13 +53,8 @@ "summary" : $[ `abort : `abort, `next : `next, - `add : "add", `show : "show", ], - "add" : $[ - `abort : `abort, - `next : "summary", - ], "show" : $[ `abort : `abort, `next : "summary", @@ -120,7 +94,7 @@ ] ]; - Wizard::CreateDialog(); + Wizard::OpenOKDialog (); 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] r62997 - in /trunk/gtk: ChangeLog README
by rpmcruz＠svn2.opensuse.org 15 Dec '10

15 Dec '10

Author: rpmcruz Date: Wed Dec 15 16:24:28 2010 New Revision: 62997 URL: http://svn.opensuse.org/viewcvs/yast?rev=62997&view=rev Log: * Got rid of the ChangeLog file. Please use instead: svn log | less * Added more instructions to the README file. Removed: trunk/gtk/ChangeLog Modified: trunk/gtk/README Modified: trunk/gtk/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/README?rev=62997&r1=62996&r2… ============================================================================== --- trunk/gtk/README (original) +++ trunk/gtk/README Wed Dec 15 16:24:28 2010 @@ -45,3 +45,15 @@ For documentation of YaST in general: http://developer.novell.com/wiki/index.php/Special:Downloads/yast/doc +ChangeLog + + Changes associated with version releases are recorded at + package/yast2-gtk.changes + + Individual svn changes can be read by issueing: svn log | less + + Other usage examples: + Last 50 changes: svn log -l 50 + Show also files changed: svn log -v + Changes for a given file: svn log src/YGUI.cc + -- 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] r62996 - /tags/stable-2_21_84/gtk/
by rpmcruz＠svn2.opensuse.org 15 Dec '10

15 Dec '10

Author: rpmcruz Date: Wed Dec 15 14:15:07 2010 New Revision: 62996 URL: http://svn.opensuse.org/viewcvs/yast?rev=62996&view=rev Log: Created tag stable-2_21_84 for gtk Added: tags/stable-2_21_84/gtk/ - copied from r62995, 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] r62995 - /tags/stable-2_21_84/
by rpmcruz＠svn2.opensuse.org 15 Dec '10

15 Dec '10

Author: rpmcruz Date: Wed Dec 15 14:15:00 2010 New Revision: 62995 URL: http://svn.opensuse.org/viewcvs/yast?rev=62995&view=rev Log: Created tag stable-2_21_84 Added: tags/stable-2_21_84/ -- 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] r62994 - in /trunk/gtk: ChangeLog VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 15 Dec '10

15 Dec '10

Author: rpmcruz Date: Wed Dec 15 14:14:57 2010 New Revision: 62994 URL: http://svn.opensuse.org/viewcvs/yast?rev=62994&view=rev Log: Milestone version. Modified: trunk/gtk/ChangeLog trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62994&r1=62993… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Dec 15 14:14:57 2010 @@ -1,3 +1,8 @@ +2010-12-15 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGUI.cc: got rid of code to exit package kit + daemon. + 2010-12-09 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGComboBox.cc: bug fix 655977: don't layout Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62994&r1=62993&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Wed Dec 15 14:14:57 2010 @@ -1 +1 @@ -2.21.83 +2.21.84 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62994&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Wed Dec 15 14:14:57 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "83") +SET(VERSION_PATCH "84") 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 Wed Dec 15 14:14:57 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 15 13:13:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.84 +- code to close packagekit deamon when running will be moved +to the sw_single ycp level (bnc#659522) + +------------------------------------------------------------------- Thu Dec 09 23:33:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.83 -- 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] r62993 - in /trunk/gtk/src: YGUI.cc YGUtils.cc YGUtils.h pkg/CMakeLists.txt pkg/YGPackageSelector.h
by rpmcruz＠svn2.opensuse.org 15 Dec '10

15 Dec '10

Author: rpmcruz Date: Wed Dec 15 13:59:26 2010 New Revision: 62993 URL: http://svn.opensuse.org/viewcvs/yast?rev=62993&view=rev Log: * got rid of PackageKit close daemon code: reported as bug 659522: this really is best done from the sw_single ycp code. * disabled the vestigial dialog for osc build. Modified: trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/pkg/CMakeLists.txt trunk/gtk/src/pkg/YGPackageSelector.h Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62993&r1=629… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Wed Dec 15 13:59:26 2010 @@ -153,26 +153,6 @@ gtk_window_set_default_icon (pixbuf); g_object_unref (G_OBJECT (pixbuf)); } - - if (m_swsingle) { - struct inner { - static bool is_pkkit_running() { - return YGUtils::exec ("dbus-send --system --dest=org.freedesktop.DBus " - "--type=method_call --print-reply --reply-timeout=200 " - "/ org.freedesktop.DBus.NameHasOwner " - "string:org.freedesktop.PackageKit").find ( - "boolean false") != std::string::npos; - } - - static void close_pkkit() { - YGUtils::exec ("/bin/dbus-send --system --dest=org.freedesktop.PackageKit " - "--type=method_call /org/freedesktop/PackageKit org.freedesktop.PackageKit.SuggestDaemonQuit"); - } - }; - - if (inner::is_pkkit_running()) - inner::close_pkkit(); - } } static gboolean ycp_wakeup_fn (GIOChannel *source, GIOCondition condition, Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=62993&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Wed Dec 15 13:59:26 2010 @@ -860,14 +860,3 @@ return ret; } -std::string YGUtils::exec (const char *cmd) -{ - FILE *pipe = popen (cmd, "r"); - if (!pipe) - return ""; - char buffer [1024]; - fgets (buffer, 1024, pipe); - pclose (pipe); - return buffer; -} - Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=62993&r1=6… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Wed Dec 15 13:59:26 2010 @@ -68,9 +68,6 @@ /* Shrink widget inner-border (thickness) */ void shrinkWidget (GtkWidget *widget); - - /* Runs and returns stdout of given command. */ - std::string exec (const char *cmd); }; extern "C" { Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=6… ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Wed Dec 15 13:59:26 2010 @@ -19,7 +19,7 @@ ygtkpkgundolist.cc yzypptags.cc yzyppwrapper.cc - ygtkpkgvestigialdialog.cc + #ygtkpkgvestigialdialog.cc ygtkcellrendererbutton.c ygtkcellrenderersidebutton.c Modified: trunk/gtk/src/pkg/YGPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.h?… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.h (original) +++ trunk/gtk/src/pkg/YGPackageSelector.h Wed Dec 15 13:59:26 2010 @@ -13,7 +13,7 @@ #include "YGWidget.h" #include "yzyppwrapper.h" -#define HAS_VESTIGIAL_DIALOG +//#define HAS_VESTIGIAL_DIALOG struct YGtkPkgUndoList; struct YGtkPkgSearchEntry; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0