Commit 7115dfdc authored by Leander Schulten's avatar Leander Schulten

QML: Structure QML files in folders. Every group with more than three files...

QML: Structure QML files in folders. Every group with more than three files got a own folder. Close #67
parent d9912a01
Pipeline #194471 passed with stage
in 4 minutes and 57 seconds
......@@ -8,9 +8,7 @@ QQmlEngine* GUI::ProgramBlockEditor::engine = nullptr;
namespace GUI{
ProgramBlockEditor::ProgramBlockEditor():programBlockEntry(engine,QUrl("qrc:/qml/ProgramBlockEntry.qml")),
programBlockConnection(engine,QUrl("qrc:/qml/ProgramBlockConnection.qml"))
{
ProgramBlockEditor::ProgramBlockEditor() : programBlockEntry(engine, QUrl(QStringLiteral("qrc:/qml/Modules/ProgramBlockEntry.qml"))), programBlockConnection(engine, QUrl(QStringLiteral("qrc:/qml/Modules/ProgramBlockConnection.qml"))) {
setAcceptedMouseButtons(Qt::AllButtons);
/*QQuickItem *c1 ;
if(programBlockEntry.isReady()){
......
......@@ -2,12 +2,12 @@
<qresource prefix="/">
<file>qtquickcontrols2.conf</file>
<file>qml/main.qml</file>
<file>qml/DeviceView.qml</file>
<file>qml/DMX/DeviceView.qml</file>
<file>qml/components/TextInputField.qml</file>
<file>qml/DevicePrototypeView.qml</file>
<file>qml/ProgrammView.qml</file>
<file>qml/ProgrammPrototypeView.qml</file>
<file>qml/ModelView.qml</file>
<file>qml/DMX/DevicePrototypeView.qml</file>
<file>qml/DMX/ProgrammView.qml</file>
<file>qml/DMX/ProgrammPrototypeView.qml</file>
<file>qml/DMX/ModelView.qml</file>
<file>qml/components/TextUnderline.qml</file>
<file>icons/down.svg</file>
<file>icons/pause.svg</file>
......@@ -27,9 +27,9 @@
<file>icons/ic_stop_black_24px.svg</file>
<file>icons/ic_pause_black_24px.svg</file>
<file>icons/ic_play_arrow_black_24px.svg</file>
<file>qml/LoginView.qml</file>
<file>qml/Login/LoginView.qml</file>
<file>qml/SettingsView.qml</file>
<file>qml/ModuleView.qml</file>
<file>qml/Modules/ModuleView.qml</file>
<file>icons/baseline-remove_circle_outline-24px.svg</file>
<file>icons/baseline-remove_circle-24px.svg</file>
<file>icons/baseline-add_circle_outline-24px.svg</file>
......@@ -38,11 +38,11 @@
<file>icons/remove.svg</file>
<file>icons/add.svg</file>
<file>icons/baseline-add-24px.svg</file>
<file>qml/ModuleProgramView.qml</file>
<file>qml/ProgramBlockEntry.qml</file>
<file>qml/ProgramBlockConnection.qml</file>
<file>qml/VerticalTabBar.qml</file>
<file>qml/VerticalTabButton.qml</file>
<file>qml/Modules/ModuleProgramView.qml</file>
<file>qml/Modules/ProgramBlockEntry.qml</file>
<file>qml/Modules/ProgramBlockConnection.qml</file>
<file>qml/components/VerticalTabBar.qml</file>
<file>qml/components/VerticalTabButton.qml</file>
<file>icons/resume.png</file>
<file>icons/replay.svg</file>
<file>icons/material-pause.svg</file>
......@@ -56,7 +56,7 @@
<file>qml/ControlPane/ControlView.qml</file>
<file>qml/ControlPane/ControlItem.qml</file>
<file>qml/components/TextFieldFileChooser.qml</file>
<file>qml/SpotifyLoginView.qml</file>
<file>qml/Login/SpotifyLoginView.qml</file>
<file>qml/components/AskWhenRemovePopup.qml</file>
<file>qml/FFTGraphView.qml</file>
<file>qml/BarMapView.qml</file>
......@@ -72,7 +72,7 @@
<file>icons/sort_order/sort-reverse-alphabetical-order_32px.png</file>
<file>icons/sort_order/sort-reverse-alphabetical-order_64px.png</file>
<file>icons/sort_order/sort-reverse-alphabetical-order_source</file>
<file>qml/UserSettingsPopup.qml</file>
<file>qml/Login/UserSettingsPopup.qml</file>
<file>qml/HelpSystem/Help.qml</file>
<file>qml/HelpSystem/HelpButton.qml</file>
<file>qml/HelpSystem/HelpEntry.qml</file>
......
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import "components"
import "../components"
ModelView{
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import custom.licht 1.0
import "components"
import "../components"
ModelView{
id: deviceModelView
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import custom.licht 1.0
import QtQuick.Controls.Material 2.3
import "components"
import "../components"
GridLayout{
anchors.leftMargin: 5
......@@ -91,7 +91,7 @@ GridLayout{
}
}
Button{
icon.source: sortedView.sortOrder === Qt.DescendingOrder ? "../icons/sort_order/sort-reverse-alphabetical-order.svg" : "../icons/sort_order/sort-by-alphabet.svg"
icon.source: sortedView.sortOrder === Qt.DescendingOrder ? "/icons/sort_order/sort-reverse-alphabetical-order.svg" : "/icons/sort_order/sort-by-alphabet.svg"
onClicked: sortedView.sortOrder = sortedView.sortOrder === Qt.DescendingOrder ? Qt.AscendingOrder : Qt.DescendingOrder;
}
} // RowLayout
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import custom.licht 1.0
import "components"
import "../components"
ModelView{
model: programmPrototypeModel
......
......@@ -2,7 +2,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import "components"
import "../components"
ModelView{
model:programmModel
......
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Window 2.12
import ".."
import "../components"
Window{
property VerticalTabButton button: null
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12
import custom.licht 1.0
import "components"
import "../components"
Item{
property alias currentItem : listView.currentItem
......
......@@ -2,7 +2,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import QtGraphicalEffects 1.0
import "components"
import "../components"
Popup {
property var user: null;
......
......@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.12
import custom.licht 1.0
import QtQuick.Dialogs 1.3
import QtQuick.Controls.Material 2.12
import "components"
import "../components"
Item{
id: root
......
......@@ -5,7 +5,7 @@ import custom.licht 1.0
import QtQuick.Controls.Material 2.12
import QtQml 2.12
import QtQuick.Window 2.12
import "components"
import "../components"
Item{
id: root
......@@ -124,7 +124,7 @@ Item{
}
}
Button{
icon.source: sortedView.sortOrder === Qt.DescendingOrder ? "../icons/sort_order/sort-reverse-alphabetical-order.svg" : "../icons/sort_order/sort-by-alphabet.svg"
icon.source: sortedView.sortOrder === Qt.DescendingOrder ? "/icons/sort_order/sort-reverse-alphabetical-order.svg" : "/icons/sort_order/sort-by-alphabet.svg"
onClicked: sortedView.sortOrder = sortedView.sortOrder === Qt.DescendingOrder ? Qt.AscendingOrder : Qt.DescendingOrder;
Layout.preferredWidth: 40
}
......
......@@ -8,6 +8,9 @@ import "ControlPane"
import "components"
import "HelpSystem"
import "LedVisualisation"
import "Modules"
import "DMX"
import "Login"
ApplicationWindow {
visible: true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment