Author: locilka Date: Mon Feb 8 14:52:28 2010 New Revision: 60728 URL: http://svn.opensuse.org/viewcvs/yast?rev=60728&view=rev Log: - Better busy messages for adjusting services (BNC #446546). - 2.18.0 Modified: trunk/runlevel/VERSION trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/ui.ycp Modified: trunk/runlevel/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/VERSION?rev=60728&r1=60727&r2=60728&view=diff ============================================================================== --- trunk/runlevel/VERSION (original) +++ trunk/runlevel/VERSION Mon Feb 8 14:52:28 2010 @@ -1 +1 @@ -2.17.4 +2.18.0 Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.changes?rev=60728&r1=60727&r2=60728&view=diff ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Mon Feb 8 14:52:28 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Mon Feb 8 14:49:58 CET 2010 - locilka@suse.cz + +- Better busy messages for adjusting services (BNC #446546). +- 2.18.0 + +------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/runlevel/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/ui.ycp?rev=60728&r1=60727&r2=60728&view=diff ============================================================================== --- trunk/runlevel/src/ui.ycp (original) +++ trunk/runlevel/src/ui.ycp Mon Feb 8 14:52:28 2010 @@ -852,6 +852,32 @@ return ModifyServiceDep (service_name, [], enable, false, true); } + // BNC #446546: Better busy message + string ServiceBusyMessage (string service_name, string command) { + string ret = nil; + + switch (command) { + case "start" : + // busy message + ret = sformat (_("Starting service %1 ..."), service_name); + break; + case "stop" : + // busy message + ret = sformat (_("Stopping service %1 ..."), service_name); + break; + case "status" : + // busy message + ret = sformat (_("Checking status of service %1 ..."), service_name); + break; + default : + // busy message + ret = sformat (_("Running command %1 %2 ..."), service_name, command); + break; + } + + return ret; + } + /** * Starts/stops/checks status of a service * @param service_name service to start/stop @@ -860,7 +886,7 @@ */ define list startStopService (string service_name, string command) ``{ - UI::OpenDialog (`Label (service_name + " " + command)); + UI::OpenDialog (`Label (ServiceBusyMessage (service_name, command))); y2milestone("%1 -> %2", service_name, command); string log_filename = sformat ("'%1/runlevel_out_%2'", (string) SCR::Read(.target.tmpdir), String::Quote(service_name)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org