[yast-commit] r46378 - in /trunk/yast2/library/log: examples/logviewcore1.ycp examples/logviewcore3.ycp src/LogViewCore.ycp

Author: aschnell Date: Thu Apr 10 21:08:30 2008 New Revision: 46378 URL: http://svn.opensuse.org/viewcvs/yast?rev=46378&view=rev Log: - added/fixed example Added: trunk/yast2/library/log/examples/logviewcore3.ycp Modified: trunk/yast2/library/log/examples/logviewcore1.ycp trunk/yast2/library/log/src/LogViewCore.ycp Modified: trunk/yast2/library/log/examples/logviewcore1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/examples/logviewcore1.ycp?rev=46378&r1=46377&r2=46378&view=diff ============================================================================== --- trunk/yast2/library/log/examples/logviewcore1.ycp (original) +++ trunk/yast2/library/log/examples/logviewcore1.ycp Thu Apr 10 21:08:30 2008 @@ -9,7 +9,7 @@ `PushButton(`id(`close), "Close") )); - LogViewCore::Start($[ "widget" : `log, "file" : file]); + LogViewCore::Start(`id(`log), $[ "file" : file ]); while (true) { @@ -17,8 +17,8 @@ if (widget == `timeout) { - LogViewCore::Update(); - } + LogViewCore::Update(`id(`log)); + } else if (widget == `close) { break; Added: trunk/yast2/library/log/examples/logviewcore3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/examples/logviewcore3.ycp?rev=46378&view=auto ============================================================================== --- trunk/yast2/library/log/examples/logviewcore3.ycp (added) +++ trunk/yast2/library/log/examples/logviewcore3.ycp Thu Apr 10 21:08:30 2008 @@ -0,0 +1,29 @@ +{ + import "LogViewCore"; + + string command = "/usr/bin/tail -n 25 -f '/var/log/messages'"; + + UI::OpenDialog(`VBox( + `Left(`Heading("Log")), + `LogView(`id(`log), sformat("Output of %1:", command), 10, 100), + `PushButton(`id(`close), "Close") + )); + + LogViewCore::Start(`id(`log), $[ "command" : command ]); + + while (true) + { + any widget = UI::TimeoutUserInput(250); + + if (widget == `timeout) + { + LogViewCore::Update(`id(`log)); + } + else if (widget == `close) + { + break; + } + } + + LogViewCore::Stop(); +} Modified: trunk/yast2/library/log/src/LogViewCore.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/LogViewCore.ycp?rev=46378&r1=46377&r2=46378&view=diff ============================================================================== --- trunk/yast2/library/log/src/LogViewCore.ycp (original) +++ trunk/yast2/library/log/src/LogViewCore.ycp Thu Apr 10 21:08:30 2008 @@ -28,7 +28,7 @@ /** - * data describing log: file, max_lines etc. + * data describing log: file, command and max_lines */ map data = $[]; @@ -107,13 +107,24 @@ { data = d; - integer max_lines = data["max_lines"]:max_lines_default; - string file = data["file"]:""; + string command = data["command"]:""; + + if (command != "") + { + id = (integer) SCR::Execute (.process.start_shell, command); + is_running = true; + y2debug("started command %1", command); + } + else + { + integer max_lines = data["max_lines"]:max_lines_default; + string file = data["file"]:""; - list<string> args = [ "--retry", "-n", tostring(max_lines), "-f", file ]; - id = (integer) SCR::Execute (.process.start, "/usr/bin/tail", $[ "args" : args ]); - is_running = true; - y2debug("started tail with args %1", args); + list<string> args = [ "--retry", "-n", tostring(max_lines), "-f", file ]; + id = (integer) SCR::Execute (.process.start, "/usr/bin/tail", $[ "args" : args ]); + is_running = true; + y2debug("started tail with args %1", args); + } sleep(100); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org