Author: lslezak Date: Fri Apr 3 12:50:12 2009 New Revision: 56614 URL: http://svn.opensuse.org/viewcvs/yast?rev=56614&view=rev Log: - Display more details in lirc error popup, describe the details (bnc#449327) Modified: branches/tmp/SLE-11-SP1-Stash/tv/ (props changed) branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp Modified: branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes?rev=56614&r1=56613&r2=56614&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/package/yast2-tv.changes Fri Apr 3 12:50:12 2009 @@ -3,6 +3,8 @@ - Do not try installing unavailable packages (TV applications) (bnc #480179) +- Display more details in lirc error popup, describe the details + (bnc#449327) ------------------------------------------------------------------- Mon Dec 15 15:57:10 CET 2008 - lslezak@suse.cz Modified: branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp?rev=56614&r1=56613&r2=56614&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/src/irc_ui.ycp Fri Apr 3 12:50:12 2009 @@ -39,10 +39,10 @@ * start with temporary LIRC configuration to enable the test * @return empty string on success, error message otherwise */ - define string lirc_tmp_start () ``{ + define map lirc_tmp_start () ``{ if (!modified) - return ""; + return $[]; // store old configuration orig_module = (string) SCR::Read (.sysconfig.lirc.LIRC_MODULE); if (SCR::Read (.target.size, "/etc/lircd.conf") != -1) @@ -69,7 +69,7 @@ out = (map) SCR::Execute (.target.bash_output, "rclirc restart"); else out = (map) SCR::Execute (.target.bash_output, "rclirc start"); - return out["stderr"]:""; + return out; } /** @@ -99,11 +99,11 @@ `Label(_("Initializing...")) ); - string start = lirc_tmp_start (); - if (start != "") + map start = lirc_tmp_start (); + if (start["exit"]:-1 != 0) { // error popup text - ErrorWithDetails (_("Starting the 'lirc' service failed."), start); + ErrorWithDetails (_("Starting the 'lirc' service failed."), _("Output from /etc/init.d/lirc command:\n\n") + start["stdout"]:"" + "\n" + start["stderr"]:""); UI::CloseDialog(); lirc_tmp_stop (); return false; Modified: branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp?rev=56614&r1=56613&r2=56614&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/tv/src/misc.ycp Fri Apr 3 12:50:12 2009 @@ -95,7 +95,7 @@ `VSpacing (0.5), // label `Left(`Heading (Label::ErrorMsg())), - `Label (error), + `Left(`Label (error)), `ReplacePoint (`id(`rp), `Empty()), `VSpacing (0.5), `Left(`CheckBox (`id(`details), `opt (`notify), @@ -113,7 +113,7 @@ if (ret == `details) { if ((boolean)UI::QueryWidget (`id(`details), `Value)) - UI::ReplaceWidget (`id(`rp), `VBox (`Label (details))); + UI::ReplaceWidget (`id(`rp), `Frame(_("Details"), `Left(`Label (details)))); else UI::ReplaceWidget (`id(`rp), `Empty()); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org