October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66311 - in /trunk/storage: VERSION package/yast2-storage.changes
by fehr＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: fehr Date: Thu Oct 6 21:14:16 2011 New Revision: 66311 URL: http://svn.opensuse.org/viewcvs/yast?rev=66311&view=rev Log: version 2.21.8 Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=66311&r1=663… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Thu Oct 6 21:14:16 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Oct 6 21:14:16 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Oct 6 12:36:26 CEST 2011 - fehr(a)suse.de +- version 2.21.8 - remove jfs completely from fs list (bnc#720483) ------------------------------------------------------------------- -- 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] r66310 - /tags/branch-Code-11-SP2-2_17_115/storage/
by fehr＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: fehr Date: Thu Oct 6 21:13:41 2011 New Revision: 66310 URL: http://svn.opensuse.org/viewcvs/yast?rev=66310&view=rev Log: Created tag branch-Code-11-SP2-2_17_115 for storage Added: tags/branch-Code-11-SP2-2_17_115/storage/ (props changed) - copied from r66309, branches/SuSE-Code-11-SP2-Branch/storage/ -- 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] r66309 - /tags/branch-Code-11-SP2-2_17_115/
by fehr＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: fehr Date: Thu Oct 6 21:13:39 2011 New Revision: 66309 URL: http://svn.opensuse.org/viewcvs/yast?rev=66309&view=rev Log: Created tag branch-Code-11-SP2-2_17_115 Added: tags/branch-Code-11-SP2-2_17_115/ -- 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] r66308 - in /branches/SuSE-Code-11-SP2-Branch/storage: VERSION package/yast2-storage.changes
by fehr＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: fehr Date: Thu Oct 6 21:13:15 2011 New Revision: 66308 URL: http://svn.opensuse.org/viewcvs/yast?rev=66308&view=rev Log: version 2.17.115 Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Thu Oct 6 21:13:15 2011 @@ -1 +1 @@ -2.17.114 +2.17.115 Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Oct 6 21:13:15 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Oct 6 12:36:26 CEST 2011 - fehr(a)suse.de +- version 2.17.115 - remove jfs completely from fs list (bnc#720483) ------------------------------------------------------------------- -- 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] r66307 - in /branches/tmp/lslezak/sound/sound/src: Sound.ycp card_wizard.ycp ui.ycp volume.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 16:20:32 2011 New Revision: 66307 URL: http://svn.opensuse.org/viewcvs/yast?rev=66307&view=rev Log: removed "Configure joystick" option from the sound card setup, the joystick API has changed, the dialog is not displayed during installtion (automatic setup) anyway and USB joysticks are more common these days Modified: branches/tmp/lslezak/sound/sound/src/Sound.ycp branches/tmp/lslezak/sound/sound/src/card_wizard.ycp branches/tmp/lslezak/sound/sound/src/ui.ycp branches/tmp/lslezak/sound/sound/src/volume.ycp Modified: branches/tmp/lslezak/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/S… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/Sound.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/Sound.ycp Thu Oct 6 16:20:32 2011 @@ -138,9 +138,6 @@ */ global string curr_model = ""; - // if joystick dialog should be started after sound card config - global boolean conf_joystick = true; - /** * default value of volume for new card */ Modified: branches/tmp/lslezak/sound/sound/src/card_wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/c… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/card_wizard.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/card_wizard.ycp Thu Oct 6 16:20:32 2011 @@ -33,15 +33,8 @@ string modelname = Sound::save_entry["model"]:""; string modname = Sound::save_entry["module"]:""; - boolean has_joy = false; - if (Sound::db_modules[modname, "joystick"]:$[] != $[]) - { - has_joy = true; - } - - map res = DisplayName ( - modelname, Sound::save_entry["alias"]:"", card_id, flags, has_joy); + map res = DisplayName (modelname, Sound::save_entry["alias"]:"", card_id, flags); symbol ui = res["ui"]:`back; Modified: branches/tmp/lslezak/sound/sound/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/u… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/ui.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/ui.ycp Thu Oct 6 16:20:32 2011 @@ -47,11 +47,9 @@ * @param name card model * @param cname alias for modules conf * @param cpos position of the card - * @param has_joy If true checkbox for joystick configuration is added * @return term with widget */ - define term AutoconfDlg (string name, string cname, integer cpos, - boolean has_joy) ``{ + define term AutoconfDlg (string name, string cname, integer cpos) { string clab = ""; if (cpos < 3) { @@ -63,10 +61,6 @@ cpos + 1); } - term jcheckbox = (!has_joy) ? `Empty() : - // push button label - `Left (`CheckBox(`id(`joystick), _("&Configure joystick"))); - term con = `VBox ( `VSpacing (1), // this is the first part of message "The sound card 'cardname' @@ -87,11 +81,9 @@ `VSpacing (0.3), `RadioButton (`id (`options), `opt (`hstretch, `notify), // radio button label - type of setup - _("Advanced setup with possibility to change &options")), - `VSpacing (3), - jcheckbox + _("Advanced setup with possibility to change &options")) )) - ), + ), `VStretch () ); return con; @@ -104,14 +96,12 @@ * @param cname sound card alias for modules conf * @param cpos cards position * @param flags enable/disable radiobuttons accordingly - * @param has_joy sound card supports joystick * @return map symbol of next dialog */ - define map DisplayName (string name, string cname, integer cpos, - integer flags, boolean has_joy) ``{ + define map DisplayName (string name, string cname, integer cpos, integer flags) { string helptext = Sound::STRINGS["DisplayName"]:""; - term con = AutoconfDlg (name, cname, cpos, has_joy); + term con = AutoconfDlg (name, cname, cpos); // dialog header Wizard::SetContents (_("Sound Card Configuration"), con, helptext, true, true); @@ -165,15 +155,6 @@ { output = `next; } - if (has_joy == true) - { - Sound::conf_joystick = - (boolean)UI::QueryWidget(`id(`joystick), `Value); - } - else - { - Sound::conf_joystick = false; - } } return $["ui" : output]; } Modified: branches/tmp/lslezak/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/v… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/volume.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/volume.ycp Thu Oct 6 16:20:32 2011 @@ -174,23 +174,6 @@ } } } - else if (ui == `next && Sound::conf_joystick && !Mode::config()) - { - symbol ret = nil; //FIXME: joy_dialog(card_id, `next); - if (ret == `back) - { - con = VolumeCon(save_entry, vol); - // dialog header - Wizard::SetContents (_("Sound Card Volume"), con, - help_text, true, true); - continue; - } - else - { - ui = ret; - break; - } - } else if (ui == `abort || ui == `cancel) { if (ReallyAbort()) @@ -350,20 +333,7 @@ } if (!quick) { - while (true) - { - ui = VolumeDialog (save_entry, finish, card_id); - if (ui != `joystick) - { - break; - } - symbol s = nil; // FIXME: joy_dialog (card_id, `next); - if (s == `abort || s == `cancel) - { - ui = `abort; - break; - } - } + ui = VolumeDialog (save_entry, finish, card_id); } else { @@ -393,11 +363,6 @@ setVolume ("Speaker", card_id, devs["Speaker"]:Sound::default_volume); } - - if (Sound::conf_joystick == true && Sound::use_ui) - { - // FIXME: joy_dialog(card_id, `next); - } ui = `next; } if (!Mode::config() && !Mode::autoinst()) -- 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] r66306 - /tags/branch-Code-11-SP2-2_17_5/snapper/
by jsuchome＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: jsuchome Date: Thu Oct 6 16:10:40 2011 New Revision: 66306 URL: http://svn.opensuse.org/viewcvs/yast?rev=66306&view=rev Log: Created tag branch-Code-11-SP2-2_17_5 for snapper Added: tags/branch-Code-11-SP2-2_17_5/snapper/ - copied from r66305, branches/SuSE-Code-11-SP2-Branch/snapper/ -- 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] r66305 - in /branches/SuSE-Code-11-SP2-Branch/snapper: VERSION agent-snapper/src/SnapperAgent.cc agent-snapper/src/SnapperAgent.h package/yast2-snapper.changes src/Snapper.ycp src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: jsuchome Date: Thu Oct 6 16:10:29 2011 New Revision: 66305 URL: http://svn.opensuse.org/viewcvs/yast?rev=66305&view=rev Log: - support more snapper configurations (bnc#719482) - 2.17.5 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.h branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/VERSION Thu Oct 6 16:10:29 2011 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.cc Thu Oct 6 16:10:29 2011 @@ -18,13 +18,13 @@ /* * search the map for value of given key; both key and value have to be strings */ -string SnapperAgent::getValue (const YCPMap map, const string key) +string SnapperAgent::getValue (const YCPMap map, const string key, string deflt) { if (!map->value(YCPString(key)).isNull() && map->value(YCPString(key))->isString()) return map->value(YCPString(key))->asString()->value(); else - return ""; + return deflt; } /** @@ -132,14 +132,14 @@ */ YCPValue SnapperAgent::Read(const YCPPath &path, const YCPValue& arg, const YCPValue& opt) { - y2debug ("path in Read: '%s'.", path->toString().c_str()); + y2internal ("path in Read: '%s'.", path->toString().c_str()); YCPValue ret = YCPVoid(); YCPMap argmap; if (!arg.isNull() && arg->isMap()) argmap = arg->asMap(); - if (!snapper_initialized && PC(0) != "error") { + if (!snapper_initialized && PC(0) != "error" && PC(0) != "configs") { y2error ("snapper not initialized: use Execute (.snapper) first!"); snapper_error = "not_initialized"; return YCPVoid(); @@ -147,6 +147,24 @@ if (path->length() == 1) { + if (PC(0) == "configs") { + YCPList retlist; + + try { + list<ConfigInfo> configs = Snapper::getConfigs(); + for (list<ConfigInfo>::const_iterator it = configs.begin(); it != configs.end(); ++it) + { + retlist->add (YCPString (it->config_name)); + } + } + catch (const ListConfigsFailedException& e) + { + y2error ("sysconfig file not found."); + snapper_error = "sysconfig_not_found"; + return YCPVoid(); + } + return retlist; + } /** * Read (.snapper.error) -> returns last error message */ @@ -201,7 +219,7 @@ s->add (YCPString ("pre_num"), YCPInteger (it->getPreNum())); } - y2debug ("snapshot %s", s.toString().c_str()); + y2internal ("snapshot %s", s.toString().c_str()); retlist->add (s); } return retlist; @@ -242,7 +260,10 @@ for (Files::const_iterator it = files.begin(); it != files.end(); ++it) { - retmap->add (YCPString (it->getName()), YCPString (statusToString (it->getPreToPostStatus()))); + YCPMap file_map; + file_map->add (YCPString ("status"), YCPString (statusToString (it->getPreToPostStatus()))); + file_map->add (YCPString ("full_path"), YCPString (it->getAbsolutePath (LOC_SYSTEM))); + retmap->add (YCPString (it->getName()), file_map); } return retmap; } @@ -294,7 +315,7 @@ YCPBoolean SnapperAgent::Write(const YCPPath &path, const YCPValue& arg, const YCPValue& arg2) { - y2debug ("path in Write: '%s'.", path->toString().c_str()); + y2internal ("path in Write: '%s'.", path->toString().c_str()); YCPBoolean ret = YCPBoolean(true); return ret; @@ -306,7 +327,7 @@ YCPValue SnapperAgent::Execute(const YCPPath &path, const YCPValue& arg, const YCPValue& arg2) { - y2debug ("path in Execute: '%s'.", path->toString().c_str()); + y2internal ("path in Execute: '%s'.", path->toString().c_str()); YCPValue ret = YCPBoolean (true); YCPMap argmap; @@ -317,9 +338,17 @@ * Execute (.snapper) call: Initialize snapper object */ if (path->length() == 0) { + + snapper_initialized = false; + if (sh) + { + y2milestone ("deleting existing snapper object"); + deleteSnapper(sh); + } + string config_name = getValue (argmap, "config", "root"); try { - sh = createSnapper(); + sh = createSnapper (config_name); } catch (const ConfigNotFoundException& e) { @@ -363,7 +392,7 @@ if (selected.value(i)->isString()) { string name = selected->value(i)->asString()->value(); - y2debug ("file to rollback: %s", name.c_str()); + y2internal ("file to rollback: %s", name.c_str()); Files::iterator it = files.find(name); if (it == files.end()) { Modified: branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.h (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/agent-snapper/src/SnapperAgent.h Thu Oct 6 16:10:29 2011 @@ -35,9 +35,9 @@ /** * search the map for value of given key; both key and value have to be strings - * when key is not present, empty string is returned + * when key is not present, default value is returned */ - string getValue (const YCPMap map, const string key); + string getValue (const YCPMap map, const string key, string deflt); /** * Search the map for value of given key Modified: branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/package/yast2-snapper.changes Thu Oct 6 16:10:29 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 21 16:07:48 CEST 2011 - jsuchome(a)suse.cz + +- support more snapper configurations (bnc#719482) +- 2.17.5 + +------------------------------------------------------------------- Tue Aug 30 11:40:52 CEST 2011 - jsuchome(a)suse.cz - added icon (bnc#711193) Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/Snapper.ycp Thu Oct 6 16:10:29 2011 @@ -51,12 +51,17 @@ // index to snapshots list global integer selected_snapshot_index = 0; +// list of configurations +global list<string> configs = [ "root" ]; + +global string current_config = "root"; + /** * Return map of files modified between given snapshots * Return structure has just one level, and maps each modified file to it's modification map */ -global map<string,string> ReadModifiedFilesIndex (integer from, integer to) { - return (map<string,string>) SCR::Read (.snapper.diff_index, $[ "from" : from, "to" : to]); +global map<string,map> ReadModifiedFilesIndex (integer from, integer to) { + return (map<string,map>) SCR::Read (.snapper.diff_index, $[ "from" : from, "to" : to]); } /** @@ -91,7 +96,9 @@ string file1 = sformat ("%1%2", GetSnapshotPath (old), file); string file2 = sformat ("%1%2", GetSnapshotPath (new), file); if (new == 0) - file2 = file; + { + file2 = snapshots[selected_snapshot_index,"files_index",file,"full_path"]:file; + } y2milestone ("comparing '%1' and '%2'", file1, file2); @@ -157,7 +164,7 @@ */ global boolean ReadSnapshots () { - + snapshots = []; list<map> snapshot_maps = (list<map>) SCR::Read (.snapper.snapshots); if (snapshot_maps == nil) snapshot_maps = []; integer i = 0; @@ -170,8 +177,6 @@ id2index[id] = i; i = i + 1; }); - - return true; } @@ -180,13 +185,28 @@ return (map) SCR::Read (.snapper.error); } + +global list<string> ReadConfigs () { + + configs = (list<string>) SCR::Read (.snapper.configs); + if (configs == nil) + { + // error popup + Report::Error (_("File /etc/sysconfig/snapper is not available")); + configs = [ "root" ]; + } + return configs; +} + + + /** * Initialize snapper agent * Return true on success */ -global boolean InitializeSnapper () { +global boolean InitializeSnapper (string config) { - boolean init = (boolean) SCR::Execute (.snapper); + boolean init = (boolean) SCR::Execute (.snapper, $[ "config" : config ]); if (!init) { map err_map = LastSnapperErrorMap (); @@ -236,7 +256,9 @@ Progress::NextStage(); - if (!InitializeSnapper ()) + ReadConfigs (); + + if (!InitializeSnapper (current_config)) { return false; } @@ -282,8 +304,9 @@ UI::ChangeWidget (`id (`progress ), `Value, progress); string orig = GetSnapshotPath (snapshot_num) + file; + string full_path= snapshots[selected_snapshot_index,"files_index",file,"full_path"]:file; + string dir = substring (full_path, 0, findlastof (full_path, "/")); - string dir = substring (file, 0, findlastof (file, "/")); if (!FileUtils::Exists (orig)) { // log entry (%1 is file name) @@ -295,24 +318,24 @@ if (FileUtils::IsDirectory (orig) == true) { map stat = (map) SCR::Read (.target.stat, orig); - if (!FileUtils::Exists (file)) + if (!FileUtils::Exists (full_path)) { - SCR::Execute (.target.mkdir, file); + SCR::Execute (.target.mkdir, full_path); } - SCR::Execute (.target.bash, sformat ("/bin/chown %1:%2 '%3'", stat["uid"]:0, stat["gid"]:0, file)); - SCR::Execute (.target.bash, sformat ("/bin/chmod %1 '%2'", GetFileMode (orig), file)); + SCR::Execute (.target.bash, sformat ("/bin/chown %1:%2 '%3'", stat["uid"]:0, stat["gid"]:0, full_path)); + SCR::Execute (.target.bash, sformat ("/bin/chmod %1 '%2'", GetFileMode (orig), full_path)); } else { - SCR::Execute (.target.bash, sformat ("/bin/cp -a '%1' '%2'", orig, file)); + SCR::Execute (.target.bash, sformat ("/bin/cp -a '%1' '%2'", orig, full_path)); } - UI::ChangeWidget (`id (`log), `LastLine, file + "\n"); + UI::ChangeWidget (`id (`log), `LastLine, full_path + "\n"); } else { - y2milestone ("failed to copy file '%1' to '%2' (dir: %3)", orig, file, dir); + y2milestone ("failed to copy file '%1' to '%2' (dir: %3)", orig, full_path, dir); // log entry (%1 is file name) - UI::ChangeWidget (`id (`log), `LastLine, sformat (_("%1 skipped\n"), file)); + UI::ChangeWidget (`id (`log), `LastLine, sformat (_("%1 skipped\n"), full_path)); } sleep (100); progress = progress + 1; Modified: branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/snapp… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/snapper/src/dialogs.ycp Thu Oct 6 16:10:29 2011 @@ -67,12 +67,16 @@ /* summary dialog caption */ string caption = _("Snapshots"); - list<map> snapshots = Snapper::snapshots; - integer i = -1; + list<map> snapshots = Snapper::snapshots; + list<string> configs = Snapper::configs; list snapshot_items = []; - foreach (map s, snapshots, { + list get_snapshot_items () { + + integer i = -1; + snapshot_items = []; + foreach (map s, snapshots, { i = i + 1; integer num = s["num"]:0; @@ -103,13 +107,23 @@ { y2milestone ("skipping pre snapshot: %1", num); } - }); + }); + return snapshot_items; + } term contents = `VBox ( + `HBox ( + // combo box label + `Label (_("Current Configuration")), + `ComboBox (`id (`configs), `opt (`notify), "", maplist (string config, configs, { + return `item (`id (config), config, config == Snapper::current_config); + })), + `HStretch () + ), `Table (`id (`snapshots_table), `opt(`notify, `keepSorting), `header ( // table header _("ID"), _("Type"), _("Start Date"), _("End Date"), _("Description")), - snapshot_items + get_snapshot_items () ), `HBox ( `PushButton (`id (`show_c), `opt (`default), _("Show Changes")), @@ -127,6 +141,7 @@ { UI::ChangeWidget (`id (`show_c), `Enabled, false); } + UI::ChangeWidget (`id (`configs), `Enabled, size (configs) > 1); any ret = nil; while(true) { @@ -150,8 +165,25 @@ Snapper::selected_snapshot_index = selected; break; } - else if(ret == `next) { - // TODO check if something needs to be written (description) + else if (ret == `configs) { + string config = (string) UI::QueryWidget (`id (ret), `Value); + if (config != Snapper::current_config) + { + Snapper::current_config = config; + + // busy popup message + Popup::ShowFeedback ("", _("Reading list of snapshots...")); + + Snapper::InitializeSnapper (config); + Snapper::ReadSnapshots (); + snapshots = Snapper::snapshots; + Popup::ClearFeedback (); + + UI::ChangeWidget (`id (`snapshots_table), `Items, get_snapshot_items ()); + continue; + } + } + else if (ret == `next) { break; } else { @@ -225,7 +257,7 @@ tree_map = snapshot["tree_map"]:$[]; } // full paths of files marked as modified, mapping to changes string - map<string,string> files_index = $[]; + map<string,map> files_index = $[]; if (!haskey (snapshot, "files_index")) { snapshot["files_index"] = Snapper::ReadModifiedFilesIndex (from, to); @@ -242,10 +274,10 @@ map<string,boolean> selected_items = $[]; boolean file_was_created (string file) { - return (substring (files_index[file]:"", 0, 1) == "+"); + return (substring (files_index[file,"status"]:"", 0, 1) == "+"); } boolean file_was_removed (string file) { - return (substring (files_index[file]:"", 0, 1) == "-"); + return (substring (files_index[file,"status"]:"", 0, 1) == "-"); } // go through the map defining filesystem tree and create the widget items -- 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] r66304 - /branches/tmp/lslezak/sound/sound/src/ui.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 16:02:22 2011 New Revision: 66304 URL: http://svn.opensuse.org/viewcvs/yast?rev=66304&view=rev Log: cleanup - removed unused code Modified: branches/tmp/lslezak/sound/sound/src/ui.ycp Modified: branches/tmp/lslezak/sound/sound/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/u… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/ui.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/ui.ycp Thu Oct 6 16:02:22 2011 @@ -178,109 +178,4 @@ return $["ui" : output]; } - /** - * quick conf dialog widget - * @param name card model - * @param cname card alias for module.conf - * @param cpos card position - * @param has_joy If true checkbox for joystick configuration is added - * @return term widget - */ - define term QuickconfDlg (string name, string cname, integer cpos, - boolean has_joy) ``{ - string clab = ""; - if (cpos < 3) - { - clab = "\n" + sformat(Sound::STRINGS["soundCount", cpos]:"", cname); - } - else - { - clab = "\n" + sformat(Sound::STRINGS["soundCount", 3]:"", cname, cpos + 1); - } - - term jcheckbox = (!has_joy) ? `Empty() : - // push button label - `Left (`CheckBox(`id(`joystick), _("&Configure joystick"))); - - term con = `VBox ( - `VSpacing (1), - // this is the first part of message "The sound card 'cardname' - // will be configured as the first snd card" - `Label (`opt (`hstretch), _("The sound card\n")), - `HBox (`HSpacing (5), `Label (`opt (`hstretch), name)), - `Label (`opt (`hstretch), clab), - `VSpacing (1), - `HBox (`HSpacing (5), - `RadioButtonGroup (`id (`action),`VBox ( - `RadioButton (`id (`quick), `opt (`hstretch, `notify), - // radio button label - type of setup - _("&Quick automatic setup"), true), - `VSpacing (0.3), - `RadioButton (`id (`normal), `opt (`hstretch, `notify), - // radio button label - type of setup - _("Normal &setup")), - `VSpacing (0.3), - `RadioButton (`id (`intro), `opt (`hstretch, `notify), - // radio button label - type of setup - _("&More detailed installation of sound cards")), - `VSpacing(3), - jcheckbox - )) - ), - `VStretch () - ); - return con; - } - - - /** - * quick config dialog (is shown when only one card has been detected0 - * @param name card model - * @param cname alias for modules conf - * @param cpos position of the soud card - * @param has_joy set to true if configured card supports joystick - * @return map symbol for next dialog - */ - define map quickConfig(string name, string cname, integer cpos, - boolean has_joy) ``{ - - string helptext = Sound::STRINGS["quickConfig"]:""; - term con = QuickconfDlg (name, cname, cpos, has_joy); - // dialog header - Wizard::SetContents (_("Sound Card Configuration"), con, - helptext, true, true); - Wizard::RestoreNextButton(); - - symbol input = `quick; - - do { - if (input == `cancel || input == `abort) - { - if (ReallyAbort()) - { - return $["ui" : `abort]; - } - } - input = (symbol) UI::UserInput(); - - } while (input != `next && input != `back); - - symbol output = input; - if (input == `next) - { - if (has_joy == true) - { - Sound::conf_joystick = - (boolean) UI::QueryWidget(`id(`joystick), `Value); - } - else - { - Sound::conf_joystick = false; - } - output = (symbol) UI::QueryWidget(`id(`action), `CurrentButton); - } - return $["ui" : output]; - } - - }//EOF -- 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] r66303 - /branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 15:35:29 2011 New Revision: 66303 URL: http://svn.opensuse.org/viewcvs/yast?rev=66303&view=rev Log: joystick dialog - added help text Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Thu Oct 6 15:35:29 2011 @@ -681,7 +681,11 @@ // dialog title WizardHW::CreateHWDialog(_("Joysticks"), - "", + // help text + _("<big>Joysticks</big>") + + _("Here is an overview of the detected joysticks.") + + _("To configure a new joystick connected to a Gameport press Add button.") + + "" + usb_notice + "", // table header [_("Model"), _("Device name"), _("Attached to")], extra_buttons -- 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] r66302 - in /branches/tmp/lslezak/sound/sound/src: joy_dialog.ycp joystick.ycp
by lslezak＠svn2.opensuse.org 06 Oct '11

06 Oct '11

Author: lslezak Date: Thu Oct 6 15:24:19 2011 New Revision: 66302 URL: http://svn.opensuse.org/viewcvs/yast?rev=66302&view=rev Log: use Abort and Finish buttons in the main dialog Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp branches/tmp/lslezak/sound/sound/src/joystick.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Thu Oct 6 15:24:19 2011 @@ -693,6 +693,8 @@ WizardHW::SetContents(items); + Wizard::SetNextButton(`next, Label::FinishButton()); + symbol ret = `dummy; while (!contains([`abort, `back, `next],ret)) Modified: branches/tmp/lslezak/sound/sound/src/joystick.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joystick.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joystick.ycp Thu Oct 6 15:24:19 2011 @@ -118,8 +118,6 @@ Wizard::CreateDialog(); Wizard::SetDesktopTitleAndIcon("joystick"); - Wizard::SetAbortButton(`abort, Label::CancelButton()); - // read sound card configuration boolean progress_orig = Progress::set(false); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0