aboutsummaryrefslogtreecommitdiff
path: root/src/widget
diff options
context:
space:
mode:
Diffstat (limited to 'src/widget')
-rw-r--r--src/widget/EmbeddedTerminal.qml11
-rw-r--r--src/widget/HistoryViewer.qml33
2 files changed, 44 insertions, 0 deletions
diff --git a/src/widget/EmbeddedTerminal.qml b/src/widget/EmbeddedTerminal.qml
index fa30e23..497bf49 100644
--- a/src/widget/EmbeddedTerminal.qml
+++ b/src/widget/EmbeddedTerminal.qml
@@ -5,11 +5,15 @@ import QtQuick.Layouts 1.1
Item {
id: item
+ signal finished
+
property string program
property string workingDirectory
property int lines : settings.terminal.initialLines
+ property alias history : session.history
+
function select() { highlighter.select() }
function deselect() { highlighter.deselect() }
function displayOverlay() { overlay.displayBriefly() }
@@ -48,6 +52,8 @@ Item {
colorScheme: settings.terminal.colorScheme
session: QMLTermSession {
+ id: session
+
initialWorkingDirectory: item.workingDirectory
shellProgram: {
@@ -60,6 +66,11 @@ Item {
return elements;
}
+
+ onFinished: {
+ clearScreen();
+ item.finished();
+ }
}
Component.onCompleted: {
diff --git a/src/widget/HistoryViewer.qml b/src/widget/HistoryViewer.qml
new file mode 100644
index 0000000..ca042f4
--- /dev/null
+++ b/src/widget/HistoryViewer.qml
@@ -0,0 +1,33 @@
+import QtQuick 2.0
+import QMLTermWidget 1.0
+import QtQuick.Layouts 1.1
+
+Item {
+ id: item
+
+ property string history
+
+ height: viewer.height
+ width: parent.width - settings.terminal.frameWidth
+
+ Text {
+ id: viewer
+
+ anchors {
+ left: parent.left
+ leftMargin: settings.terminal.frameWidth
+ right: parent.right
+ }
+
+ color: settings.item.fontColor
+
+ font {
+ family: settings.terminal.fontFamily
+ pointSize: settings.terminal.fontSize
+ }
+
+ Layout.fillWidth: true
+
+ text: history.trim()
+ }
+}