aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2015-08-15 16:06:00 +0200
committerAdrian Kummerlaender2015-08-15 16:06:00 +0200
commitd8431223d34476a17835a05d9508e92447f22479 (patch)
tree91b42009fc464be238f9afab569f62cfdf355179
parent566e635cd798ef558f4d57fc319f0ee857869378 (diff)
Restructure QML and JS sources
`list` holds the components of the central list UI element. `command` holds the UI and implementation parts of the command mode. `widget` holds more or less general purpose elements that may also be of use in other circumstances.
-rw-r--r--MetaTerm.pro4
-rw-r--r--main.cc (renamed from main.cpp)0
-rw-r--r--qml/ui.qrc12
-rw-r--r--src/StateHandler.qml (renamed from qml/StateHandler.qml)0
-rw-r--r--src/command/CommandInput.qml (renamed from qml/CommandInput.qml)0
-rw-r--r--src/command/commands.js (renamed from qml/commands.js)0
-rw-r--r--src/list/TerminalItem.qml (renamed from qml/TerminalItem.qml)0
-rw-r--r--src/list/TerminalList.qml (renamed from qml/TerminalList.qml)0
-rw-r--r--src/main.qml (renamed from qml/main.qml)0
-rw-r--r--src/ui.qrc12
-rw-r--r--src/widget/EmbeddedTerminal.qml (renamed from qml/EmbeddedTerminal.qml)0
-rw-r--r--src/widget/Highlighter.qml (renamed from qml/Highlighter.qml)0
12 files changed, 14 insertions, 14 deletions
diff --git a/MetaTerm.pro b/MetaTerm.pro
index 532ba39..5c579ec 100644
--- a/MetaTerm.pro
+++ b/MetaTerm.pro
@@ -2,6 +2,6 @@ TEMPLATE = app
QT += qml quick widgets
-SOURCES += main.cpp
+SOURCES += main.cc
-RESOURCES += qml/ui.qrc
+RESOURCES += src/ui.qrc
diff --git a/main.cpp b/main.cc
index 617b43a..617b43a 100644
--- a/main.cpp
+++ b/main.cc
diff --git a/qml/ui.qrc b/qml/ui.qrc
deleted file mode 100644
index c8bd040..0000000
--- a/qml/ui.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>main.qml</file>
- <file>StateHandler.qml</file>
- <file>TerminalItem.qml</file>
- <file>EmbeddedTerminal.qml</file>
- <file>CommandInput.qml</file>
- <file>TerminalList.qml</file>
- <file>Highlighter.qml</file>
- <file>commands.js</file>
- </qresource>
-</RCC>
diff --git a/qml/StateHandler.qml b/src/StateHandler.qml
index d9f5f5a..d9f5f5a 100644
--- a/qml/StateHandler.qml
+++ b/src/StateHandler.qml
diff --git a/qml/CommandInput.qml b/src/command/CommandInput.qml
index 99f5d0e..99f5d0e 100644
--- a/qml/CommandInput.qml
+++ b/src/command/CommandInput.qml
diff --git a/qml/commands.js b/src/command/commands.js
index f76af01..f76af01 100644
--- a/qml/commands.js
+++ b/src/command/commands.js
diff --git a/qml/TerminalItem.qml b/src/list/TerminalItem.qml
index 57197bd..57197bd 100644
--- a/qml/TerminalItem.qml
+++ b/src/list/TerminalItem.qml
diff --git a/qml/TerminalList.qml b/src/list/TerminalList.qml
index 6c6465b..6c6465b 100644
--- a/qml/TerminalList.qml
+++ b/src/list/TerminalList.qml
diff --git a/qml/main.qml b/src/main.qml
index f7673dc..f7673dc 100644
--- a/qml/main.qml
+++ b/src/main.qml
diff --git a/src/ui.qrc b/src/ui.qrc
new file mode 100644
index 0000000..48554f7
--- /dev/null
+++ b/src/ui.qrc
@@ -0,0 +1,12 @@
+<RCC>
+ <qresource prefix="/">
+ <file>main.qml</file>
+ <file>StateHandler.qml</file>
+ <file alias="TerminalItem.qml">list/TerminalItem.qml</file>
+ <file alias="TerminalList.qml">list/TerminalList.qml</file>
+ <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="Highlighter.qml">widget/Highlighter.qml</file>
+ </qresource>
+</RCC>
diff --git a/qml/EmbeddedTerminal.qml b/src/widget/EmbeddedTerminal.qml
index 6d0dc6e..6d0dc6e 100644
--- a/qml/EmbeddedTerminal.qml
+++ b/src/widget/EmbeddedTerminal.qml
diff --git a/qml/Highlighter.qml b/src/widget/Highlighter.qml
index e42aeb1..e42aeb1 100644
--- a/qml/Highlighter.qml
+++ b/src/widget/Highlighter.qml