Commit ec12091d authored by Leander Schulten's avatar Leander Schulten
Browse files

Move qml files to own dir

parent 83ffad11
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
ApplicationWindow {
visible: true
width: 640
height: 480
title: qsTr("Hello World")
SwipeView {
id: swipeView
anchors.fill: parent
currentIndex: tabBar.currentIndex
Page{
Rectangle{
height: 100
width: 100
anchors.centerIn: parent
color: "red"
}
}
Page {
Label {
text: qsTr("Second page")
anchors.centerIn: parent
}
Button{
contentItem: Text {
id: testwe
text: qsTr("text");
rotation: 90
}
}
}
}
footer:TabBar {
id: tabBar
currentIndex: swipeView.currentIndex
TabButton {
text: qsTr("First")
}
TabButton {
text: qsTr("Second")
}
}
}
......@@ -9,7 +9,7 @@
ControlPanel * ControlPanel::lastCreated = nullptr;
QQmlEngine * ControlPanel::engine = nullptr;
ControlPanel::ControlPanel():programm(engine,QUrl("qrc:/ControlPane/ProgrammControl.qml")),switchGroup(engine,QUrl("qrc:/ControlPane/SwitchGroupControl.qml")),dimmerGroup(engine,QUrl("qrc:/ControlPane/DimmerGroupControl.qml")),programBlock(engine,QUrl("qrc:/ControlPane/ProgramBlockControl.qml"))
ControlPanel::ControlPanel():programm(engine,QUrl("qrc:/qml/ControlPane/ProgrammControl.qml")),switchGroup(engine,QUrl("qrc:/qml/ControlPane/SwitchGroupControl.qml")),dimmerGroup(engine,QUrl("qrc:/qml/ControlPane/DimmerGroupControl.qml")),programBlock(engine,QUrl("qrc:/qml/ControlPane/ProgramBlockControl.qml"))
{
lastCreated = this;
if(engine==nullptr){
......
......@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
engine.rootContext()->setContextProperty("spotify",&spotify);
QQmlEngine::setObjectOwnership(&Driver::dmxValueModel,QQmlEngine::CppOwnership);
engine.rootContext()->setContextProperty("dmxOutputValues",&Driver::dmxValueModel);
engine.load(QUrl(QLatin1String("qrc:/main.qml")));
engine.load(QUrl(QLatin1String("qrc:/qml/main.qml")));
// laden erst nach dem laden des qml ausführen
......
......@@ -6,8 +6,8 @@
QQmlEngine* ProgramBlockEditor::engine = nullptr;
ProgramBlockEditor::ProgramBlockEditor():programBlockEntry(engine,QUrl("qrc:/ProgramBlockEntry.qml")),
programBlockConnection(engine,QUrl("qrc:/ProgramBlockConnection.qml"))
ProgramBlockEditor::ProgramBlockEditor():programBlockEntry(engine,QUrl("qrc:/qml/ProgramBlockEntry.qml")),
programBlockConnection(engine,QUrl("qrc:/qml/ProgramBlockConnection.qml"))
{
setAcceptedMouseButtons(Qt::AllButtons);
/*QQuickItem *c1 ;
......
<RCC>
<qresource prefix="/">
<file>Test.qml</file>
<file>qtquickcontrols2.conf</file>
<file>main.qml</file>
<file>DeviceView.qml</file>
<file>TextInputField.qml</file>
<file>DevicePrototypeView.qml</file>
<file>ProgrammView.qml</file>
<file>ProgrammPrototypeView.qml</file>
<file>ModelView.qml</file>
<file>TextUnderline.qml</file>
<file>qml/main.qml</file>
<file>qml/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/components/TextUnderline.qml</file>
<file>icons/down.svg</file>
<file>icons/pause.svg</file>
<file>icons/play.svg</file>
......@@ -28,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>LoginView.qml</file>
<file>SettingsView.qml</file>
<file>ModuleView.qml</file>
<file>qml/LoginView.qml</file>
<file>qml/SettingsView.qml</file>
<file>qml/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>
......@@ -39,27 +38,33 @@
<file>icons/remove.svg</file>
<file>icons/add.svg</file>
<file>icons/baseline-add-24px.svg</file>
<file>ModuleProgramView.qml</file>
<file>ProgramBlockEntry.qml</file>
<file>ProgramBlockConnection.qml</file>
<file>VerticalTabBar.qml</file>
<file>VerticalTabButton.qml</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>icons/resume.png</file>
<file>icons/replay.svg</file>
<file>icons/material-pause.svg</file>
<file>icons/material-play.svg</file>
<file>icons/material-stop.svg</file>
<file alias="ControlPane/ProgramBlockControl.qml">qml/ProgramBlockControl.qml</file>
<file alias="ControlPane/ControlItemBlock.qml">qml/ControlItemBlock.qml</file>
<file alias="ControlPane/ProgrammControl.qml">qml/ProgrammControl.qml</file>
<file alias="ControlPane/SwitchGroupControl.qml">qml/SwitchGroupControl.qml</file>
<file alias="ControlPane/DimmerGroupControl.qml">qml/DimmerGroupControl.qml</file>
<file alias="ControlPane/ControlView.qml">qml/ControlView.qml</file>
<file alias="ControlPane/ControlItem.qml">qml/ControlItem.qml</file>
<file alias="component/TextFieldFileChooser.qml">qml/TextFieldFileChooser.qml</file>
<file>SpotifyLoginView.qml</file>
<file alias="component/AskWhenRemovePopup.qml">qml/AskWhenRemovePopup.qml</file>
<file alias="FFTGraphView.qml">qml/FFTGraphView.qml</file>
<file alias="BarMapView.qml">qml/BarMapView.qml</file>
<file>qml/ControlPane/ProgramBlockControl.qml</file>
<file>qml/ControlPane/ControlItemBlock.qml</file>
<file>qml/ControlPane/ProgrammControl.qml</file>
<file>qml/ControlPane/SwitchGroupControl.qml</file>
<file>qml/ControlPane/DimmerGroupControl.qml</file>
<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/InformationScreen/InformationWindow.qml</file>
<file>qml/InfoScreenPropertiesView.qml</file>
<file>qml/InformationScreen/SpotifyTrack.qml</file>
<file>qml/InformationScreen/AngebotsModel.qml</file>
<file>qml/InformationScreen/AngebotsManagmentComponent.qml</file>
<file>qml/InformationScreen/Lauftext.qml</file>
<file>qml/components/AskWhenRemovePopup.qml</file>
<file>qml/FFTGraphView.qml</file>
<file>qml/BarMapView.qml</file>
</qresource>
</RCC>
......@@ -3,6 +3,7 @@ import QtQuick.Layouts 1.12
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.12
import custom.licht 1.0
import "components"
ColumnLayout{
id: root
......
......@@ -5,6 +5,7 @@ import QtGraphicalEffects 1.0
import custom.licht 1.0
import QtQml 2.11
import ".."
import "../components"
ControlItem{
id:item
......
......@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.0
import QtGraphicalEffects 1.0
import custom.licht 1.0
import ".."
import "../components"
ControlItem{
id:item
......
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import "components"
ModelView{
......
......@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.2
import custom.licht 1.0
import "components"
ModelView{
id: deviceModelView
......
......@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.2
import custom.licht 1.0
import "components"
Item{
property alias currentItem : listView.currentItem
......
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import "components"
GridLayout{
anchors.leftMargin: 5
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import custom.licht 1.0
import QtQuick.Dialogs 1.2
import "component"
import "components"
Item{
id: root
......
......@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.0
import custom.licht 1.0
import QtQuick.Controls.Material 2.2
import QtQuick.Dialogs 1.2
import "component"
import "components"
Item{
id: root
......@@ -204,7 +204,7 @@ Item{
anchors.verticalCenter: parent.verticalCenter
height: 24
width: 24
source: "icons/remove.svg"
source: "/icons/remove.svg"
}
}
Button{
......@@ -225,7 +225,7 @@ Item{
anchors.verticalCenter: parent.verticalCenter
height: 24
width: 24
source: "icons/add.svg"
source: "/icons/add.svg"
}
}
}
......@@ -245,7 +245,7 @@ Item{
anchors.verticalCenter: parent.verticalCenter
height: 24
width: 24
source: "icons/add.svg"
source: "/icons/add.svg"
}
}
}
......
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