From 0dd49584e26c294e3fb25347969f61bca84afb5f Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sat, 29 Aug 2015 22:12:49 +0200 Subject: Automatically destroy terminal when killed and display history Child processes of _MetaTerm_ may be terminated using other ways that the integrated kill command. Automatic terminal widget destruction in such a event prevents the user from viewing the output of non-interactive applications. This requires _MetaTerm_ to display the application's output after it was terminated. This requirement is implemented via the new `HistoryViewer` widget that is instantiated after the terminal widget instance has been destroyed. --- src/list/TerminalItem.qml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/list') diff --git a/src/list/TerminalItem.qml b/src/list/TerminalItem.qml index febd116..cfffd86 100644 --- a/src/list/TerminalItem.qml +++ b/src/list/TerminalItem.qml @@ -6,6 +6,7 @@ Item { id: item property EmbeddedTerminal terminal : null + property HistoryViewer history : null property int index : 0 signal executed (int index) @@ -96,12 +97,22 @@ Item { function createTerminal(program) { var terminalComponent = Qt.createComponent("qrc:/EmbeddedTerminal.qml"); var instantiateTerminal = function() { + if ( item.history !== null ) { + item.history.destroy(); + item.history = null; + } + item.terminal = terminalComponent.createObject(elementList, { "settings" : settings, "program" : program, "workingDirectory" : "$HOME", "focus" : true }); + item.terminal.onFinished.connect(function() { + var history = item.terminal.history; + item.reset(); + createHistoryViewer(history); + }); } if ( terminalComponent.status === Component.Ready ) { @@ -111,6 +122,21 @@ Item { } } + function createHistoryViewer(history) { + var historyComponent = Qt.createComponent("qrc:/HistoryViewer.qml"); + var instantiateHistory = function() { + item.history = historyComponent.createObject(elementList, { + "history" : history + }); + } + + if ( historyComponent.status === Component.Ready ) { + instantiateHistory(); + } else { + historyComponent.statusChanged.connect(instantiateHistory); + } + } + RowLayout { anchors { left: parent.left -- cgit v1.2.3