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 d3b27c4d authored by Leander Schulten's avatar Leander Schulten
Browse files

Fix last commit

parent c2ac6784
......@@ -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
......
......@@ -55,5 +55,6 @@
<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>
</qresource>
</RCC>
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Dialogs 1.2
import "../"
RowLayout{
id: root
property string path
property bool folder: false
property var fileChooser: null
height: 20
Item{
Layout.fillWidth: true
Layout.preferredWidth: textField.implicitWidth
Layout.preferredHeight: textField.implicitHeight
Layout.topMargin: 4
id: wrapper
clip: true
TextInputField{
id:textField
text: root.path
anchors.fill: parent
anchors.bottomMargin: 2
onAccepted: {
root.path = text
}
}
}
Button{
Layout.minimumWidth: implicitWidth
Layout.leftMargin: 5
Layout.preferredHeight: implicitHeight - 15
text: "File Chooser"
onClicked: {
if(root.fileChooser === null){
throw "fileChooser ist not set!";
}
path = root.path
fileDialog = root.fileChooser;
fileDialog.selectFolder = parent.folder;
fileDialog.selectMultiple = !parent.folder;
fileDialog.folder = "file:///"+path.substring(0,path.lastIndexOf("/"));
fileDialog.addSelection("file:///"+path);
fileDialog.open();
fileDialog.callback = function(file){
root.pathChanged(file);
};
}
}
}
......@@ -53,14 +53,12 @@ public:
void setUpdatePauseInMs(unsigned int pause){settings.setValue("updatePauseInMs",pause);emit updatePauseInMsChanged();}
unsigned int getUpdatePauseInMs()const{return settings.value("updatePauseInMs").toUInt();}
void setModuleDirPath( const QString _moduleDirPath){
#ifdef Q_OS_MAC
if(!QDir("/" + _moduleDirPath).exists())return;
settings.setValue("moduleDirPath","/" + _moduleDirPath);
#else
if(!QDir(_moduleDirPath).exists())return;
settings.setValue("moduleDirPath",_moduleDirPath);
#endif
void setModuleDirPath( const QString &_moduleDirPath){
if(_moduleDirPath == getModuleDirPath())
return;
if(!QDir(_moduleDirPath).exists())
return;
settings.setValue("moduleDirPath",_moduleDirPath);
emit moduleDirPathChanged();
}
......
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