Author: jsrain Date: Thu Aug 28 11:23:16 2008 New Revision: 50426 URL: http://svn.opensuse.org/viewcvs/yast?rev=50426&view=rev Log: updated the scope to only select profiles Modified: trunk/power-management/package/yast2-power-management.changes trunk/power-management/src/PowerManagement.ycp trunk/power-management/src/commandline.ycp trunk/power-management/src/helps.ycp trunk/power-management/src/widgets.ycp Modified: trunk/power-management/package/yast2-power-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/package/yast2-power-management.changes?rev=50426&r1=50425&r2=50426&view=diff ============================================================================== --- trunk/power-management/package/yast2-power-management.changes (original) +++ trunk/power-management/package/yast2-power-management.changes Thu Aug 28 11:23:16 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Aug 28 11:19:39 CEST 2008 - jsrain@suse.cz + +- updated the scope to only select profiles + +------------------------------------------------------------------- Fri Aug 22 13:22:26 CEST 2008 - jsrain@suse.cz - renamed schemes to profiles, some more clean-up Modified: trunk/power-management/src/PowerManagement.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/src/PowerManagement.ycp?rev=50426&r1=50425&r2=50426&view=diff ============================================================================== --- trunk/power-management/src/PowerManagement.ycp (original) +++ trunk/power-management/src/PowerManagement.ycp Thu Aug 28 11:23:16 2008 @@ -275,7 +275,7 @@ /* PowerManagement read dialog caption */ string caption = _("Saving Configuration"); - integer steps = 3; + integer steps = 2; integer sl = 0; sleep(sl); @@ -286,14 +286,14 @@ // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ /* Progress stage 1/3 */ - _("Write profiles"), +// _("Write profiles"), /* Progress stage 2/3 */ _("Write general settings"), /* Progress stage 3/3 */ _("Restart pm-profiler daemon") ], [ /* Progress step 1/3 */ - _("Writing profiles..."), +// _("Writing profiles..."), /* Progress step 2/3 */ _("Writing general settings..."), /* Progress step 3/3 */ @@ -307,7 +307,7 @@ // write schemes if(Abort()) return false; Progress::NextStage(); - +/* y2milestone ("Writing power saving schemes"); // copy new scheme files foreach (string dst, string src, new_schemes, ``{ @@ -348,7 +348,7 @@ if(! stage_success) { - /* Error message */ + // Error message Report::Error(_("Cannot write power saving profiles.")); } success = success && stage_success; @@ -358,7 +358,7 @@ // write global settings if(Abort()) return false; Progress::NextStage (); - +*/ y2milestone ("Writing global settings"); global_settings = mapmap (string k, string v, global_settings, { if (default_values[k]:"" == v) Modified: trunk/power-management/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/src/commandline.ycp?rev=50426&r1=50425&r2=50426&view=diff ============================================================================== --- trunk/power-management/src/commandline.ycp (original) +++ trunk/power-management/src/commandline.ycp Thu Aug 28 11:23:16 2008 @@ -24,8 +24,10 @@ * @return boolean true if settings have been changed */ define boolean PrintHandler (map options) { - boolean print_all = false; + boolean print_all = true; boolean printed = false; +/* + boolean print_all = false; if (! (haskey (options, "selected_profile") || haskey (options, "profile"))) { @@ -57,7 +59,7 @@ printed = true; } }); - } + }*/ if (print_all || haskey (options, "selected_profile")) { if (printed) @@ -213,11 +215,13 @@ // command line help text for an action "help" : _("Set general settings"), ], +/* "profile" : $[ "handler" : SchemeHandler, // command line help text for an action "help" : _("Set options of a profile"), ], +*/ ], "options" : $[ @@ -280,10 +284,11 @@ ], "mappings" : $[ - "print" : [ "selected_profile", "profile", ], +// "print" : [ "selected_profile", "profile", ], + "print" : [ ], "set" : [ "profile", ], - "profile" : ["add", "edit", "delete", "name", "description", - "clone", "option", "value", "rename"], +// "profile" : ["add", "edit", "delete", "name", "description", +// "clone", "option", "value", "rename"], ], ]; Modified: trunk/power-management/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/src/helps.ycp?rev=50426&r1=50425&r2=50426&view=diff ============================================================================== --- trunk/power-management/src/helps.ycp (original) +++ trunk/power-management/src/helps.ycp Thu Aug 28 11:23:16 2008 @@ -34,17 +34,20 @@ Abort the save procedure by pressing <b>Abort</b>.</p>"), - // Main dialog help 1/5 + // Main dialog help 1/2 "profile_selection" : _("<p><b><big>Energy Saving Profiles</big></b><br> Use <b>Selected Profile</b> to adjust the energy saving profile to use.</p>") + - // Main dialog help 2/5 + // Main dialog help 2/2 _("<p>Below the selected profile, its description is displayed.</p>") +/* + // Main dialog help 3/5 _("<p><b><big>Adjusting Energy Saving Profiles</big></b><br> To adjust energy saving profiles, delete existing ones, or create new ones, -use <b>Edit Profiles</b>.</p>"), +use <b>Edit Profiles</b>.</p>") +*/ +, Modified: trunk/power-management/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/src/widgets.ycp?rev=50426&r1=50425&r2=50426&view=diff ============================================================================== --- trunk/power-management/src/widgets.ycp (original) +++ trunk/power-management/src/widgets.ycp Thu Aug 28 11:23:16 2008 @@ -106,6 +106,7 @@ _("&AC Powered"), [])), `RichText (`id (`descr), `opt (`hstretch), "") )) +/* ), `HBox ( `HStretch (), @@ -113,6 +114,7 @@ // push button _("Ed&it Profiles")), `HStretch () +*/ ) )), "init" : SchemeSelectionInit, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org