Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

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