Commit 3d0654d3 authored by Leander Schulten's avatar Leander Schulten
Browse files

Move ControlPane Components in own virtual "ControlPane" dir and physically into the "qml" dir

parent 61adce06
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
ControlPanel * ControlPanel::lastCreated = nullptr; ControlPanel * ControlPanel::lastCreated = nullptr;
QQmlEngine * ControlPanel::engine = nullptr; QQmlEngine * ControlPanel::engine = nullptr;
ControlPanel::ControlPanel():programm(engine,QUrl("qrc:/ProgrammControl.qml")),switchGroup(engine,QUrl("qrc:/SwitchGroupControl.qml")),dimmerGroup(engine,QUrl("qrc:/DimmerGroupControl.qml")) ControlPanel::ControlPanel():programm(engine,QUrl("qrc:/ControlPane/ProgrammControl.qml")),switchGroup(engine,QUrl("qrc:/ControlPane/SwitchGroupControl.qml")),dimmerGroup(engine,QUrl("qrc:/ControlPane/DimmerGroupControl.qml"))
{ {
lastCreated = this; lastCreated = this;
if(engine==nullptr){ if(engine==nullptr){
......
...@@ -4,6 +4,8 @@ import QtQuick.Controls 2.0 ...@@ -4,6 +4,8 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
import custom.licht 1.0 import custom.licht 1.0
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import "ControlPane"
ApplicationWindow { ApplicationWindow {
visible: true visible: true
width: 900 width: 900
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
<file>ProgrammPrototypeView.qml</file> <file>ProgrammPrototypeView.qml</file>
<file>ModelView.qml</file> <file>ModelView.qml</file>
<file>TextUnderline.qml</file> <file>TextUnderline.qml</file>
<file>ControlView.qml</file>
<file>ControlItem.qml</file>
<file>icons/down.svg</file> <file>icons/down.svg</file>
<file>icons/pause.svg</file> <file>icons/pause.svg</file>
<file>icons/play.svg</file> <file>icons/play.svg</file>
...@@ -30,10 +28,6 @@ ...@@ -30,10 +28,6 @@
<file>icons/ic_stop_black_24px.svg</file> <file>icons/ic_stop_black_24px.svg</file>
<file>icons/ic_pause_black_24px.svg</file> <file>icons/ic_pause_black_24px.svg</file>
<file>icons/ic_play_arrow_black_24px.svg</file> <file>icons/ic_play_arrow_black_24px.svg</file>
<file>ControlItemBlock.qml</file>
<file>ProgrammControl.qml</file>
<file>SwitchGroupControl.qml</file>
<file>DimmerGroupControl.qml</file>
<file>LoginView.qml</file> <file>LoginView.qml</file>
<file>SettingsView.qml</file> <file>SettingsView.qml</file>
<file>ModuleView.qml</file> <file>ModuleView.qml</file>
...@@ -55,5 +49,11 @@ ...@@ -55,5 +49,11 @@
<file>icons/material-pause.svg</file> <file>icons/material-pause.svg</file>
<file>icons/material-play.svg</file> <file>icons/material-play.svg</file>
<file>icons/material-stop.svg</file> <file>icons/material-stop.svg</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>
</qresource> </qresource>
</RCC> </RCC>
...@@ -45,7 +45,7 @@ ControlItemTemplate{ ...@@ -45,7 +45,7 @@ ControlItemTemplate{
height: 18 height: 18
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
source: "icons/ic_settings_black_24px.svg" source: "/icons/ic_settings_black_24px.svg"
visible: popup!==null visible: popup!==null
Behavior on rotation{ Behavior on rotation{
......
...@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.0 ...@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.0
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import custom.licht 1.0 import custom.licht 1.0
import QtQml 2.11 import QtQml 2.11
import ".."
ControlItem{ ControlItem{
id:item id:item
......
...@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0 ...@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import custom.licht 1.0 import custom.licht 1.0
import ".."
ControlItem{ ControlItem{
id:item id:item
......
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