aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2015-12-15 19:53:18 +0100
committerAdrian Kummerlaender2015-12-15 19:53:18 +0100
commit55c66514c6e03bc731c7f5ae4d6f6a1e1d1ab601 (patch)
treea8725d321568ce978fd1638758d43299ee99656b
parent012d8f7503d9d49ff33da621aee5fabd252e57f5 (diff)
downloadMetaTerm-master.tar
MetaTerm-master.tar.gz
MetaTerm-master.tar.bz2
MetaTerm-master.tar.lz
MetaTerm-master.tar.xz
MetaTerm-master.tar.zst
MetaTerm-master.zip
Separate widgets into primary and augmenting itemsHEADmaster
-rw-r--r--src/ui.qrc6
-rw-r--r--src/widget/augment/Highlighter.qml (renamed from src/widget/Highlighter.qml)0
-rw-r--r--src/widget/augment/Overlay.qml (renamed from src/widget/Overlay.qml)5
-rw-r--r--src/widget/augment/StatusLine.qml (renamed from src/widget/StatusLine.qml)0
4 files changed, 5 insertions, 6 deletions
diff --git a/src/ui.qrc b/src/ui.qrc
index 31ec346..0cf1b20 100644
--- a/src/ui.qrc
+++ b/src/ui.qrc
@@ -8,9 +8,9 @@
<file alias="CommandInput.qml">command/CommandInput.qml</file>
<file alias="commands.js">command/commands.js</file>
<file alias="EmbeddedTerminal.qml">widget/EmbeddedTerminal.qml</file>
- <file alias="StatusLine.qml">widget/StatusLine.qml</file>
<file alias="HistoryViewer.qml">widget/HistoryViewer.qml</file>
- <file alias="Highlighter.qml">widget/Highlighter.qml</file>
- <file alias="Overlay.qml">widget/Overlay.qml</file>
+ <file alias="StatusLine.qml">widget/augment/StatusLine.qml</file>
+ <file alias="Highlighter.qml">widget/augment/Highlighter.qml</file>
+ <file alias="Overlay.qml">widget/augment/Overlay.qml</file>
</qresource>
</RCC>
diff --git a/src/widget/Highlighter.qml b/src/widget/augment/Highlighter.qml
index 53f308c..53f308c 100644
--- a/src/widget/Highlighter.qml
+++ b/src/widget/augment/Highlighter.qml
diff --git a/src/widget/Overlay.qml b/src/widget/augment/Overlay.qml
index 2a50219..ac1e230 100644
--- a/src/widget/Overlay.qml
+++ b/src/widget/augment/Overlay.qml
@@ -3,9 +3,8 @@ import QtQuick 2.0
Item {
id: item
- property bool enabled : false
-
- property alias text : content.text
+ property bool enabled : false
+ property alias text : content.text
function displayBriefly() {
if ( enabled ) {
diff --git a/src/widget/StatusLine.qml b/src/widget/augment/StatusLine.qml
index 56b0b31..56b0b31 100644
--- a/src/widget/StatusLine.qml
+++ b/src/widget/augment/StatusLine.qml