diff options
author | Adrian Kummerlaender | 2015-07-06 20:26:14 +0200 |
---|---|---|
committer | Adrian Kummerlaender | 2015-07-06 20:26:14 +0200 |
commit | cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74 (patch) | |
tree | ace3a2328e3e755a85cfea400d4705a5b42e34a4 /qml/EmbeddedTerminal.qml | |
parent | ef1a71f77d318ef75e04467bab17a650c0b4d868 (diff) | |
download | MetaTerm-cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74.tar MetaTerm-cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74.tar.gz MetaTerm-cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74.tar.bz2 MetaTerm-cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74.tar.lz MetaTerm-cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74.tar.xz MetaTerm-cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74.tar.zst MetaTerm-cdec039fe30ec2bcb75a9a1596b32fa6eeed6b74.zip |
Added `terminal` property to TerminalItem
Makes it easier to access the `QMLTermWidget` instance from both outside and inside `TerminalItem`
Diffstat (limited to 'qml/EmbeddedTerminal.qml')
-rw-r--r-- | qml/EmbeddedTerminal.qml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/qml/EmbeddedTerminal.qml b/qml/EmbeddedTerminal.qml index 6d94230..146df7f 100644 --- a/qml/EmbeddedTerminal.qml +++ b/qml/EmbeddedTerminal.qml @@ -1,16 +1,15 @@ import QtQuick 2.0 import QMLTermWidget 1.0 -import QtQuick.Controls 1.2 Item { - id: embeddedTerminal + id: item property string program property string workingDirectory - property int columns - property int lines + property int columns + property int lines - width: container.width + width: container.width height: container.height function select() { highlighter.select() } @@ -52,18 +51,18 @@ Item { font.family: "Monospace" font.pointSize: 8 - width: fontMetrics.width * embeddedTerminal.columns - height: fontMetrics.height * embeddedTerminal.lines + width: fontMetrics.width * item.columns + height: fontMetrics.height * item.lines session: QMLTermSession { - initialWorkingDirectory: embeddedTerminal.workingDirectory + initialWorkingDirectory: item.workingDirectory shellProgram: { - return (embeddedTerminal.program).split(" ")[0]; + return (item.program).split(" ")[0]; } shellProgramArgs: { - var elements = (embeddedTerminal.program).split(" "); + var elements = (item.program).split(" "); elements.shift(); return elements; @@ -80,7 +79,7 @@ Item { } Component.onCompleted: { - terminal.forceActiveFocus(); + forceActiveFocus(); session.startShellProgram(); } } |