diff --git a/src/qml/DockPage.qml b/src/qml/DockPage.qml index 6bb6c63..492bf84 100644 --- a/src/qml/DockPage.qml +++ b/src/qml/DockPage.qml @@ -110,25 +110,25 @@ ItemPage { } } - HorizontalDivider {} + //HorizontalDivider {} - GridLayout { - columns: 2 + //GridLayout { + //columns: 2 - Label { - text: qsTr("Rounded window") - Layout.fillWidth: true - } + //Label { + //text: qsTr("Rounded window") + //Layout.fillWidth: true + //} - Switch { - Layout.fillHeight: true - checked: appearance.dockRoundedWindow + //Switch { + //Layout.fillHeight: true + //checked: appearance.dockRoundedWindow - onCheckedChanged: { - appearance.setDockRoundedWindow(checked) - } - } - } + //onCheckedChanged: { + //appearance.setDockRoundedWindow(checked) + //} + //} + //} Item { Layout.fillHeight: true diff --git a/src/qml/SideBar.qml b/src/qml/SideBar.qml index 596500e..3a444f7 100644 --- a/src/qml/SideBar.qml +++ b/src/qml/SideBar.qml @@ -144,10 +144,10 @@ Item { } radius: Meui.Theme.mediumRadius - color: isCurrent ? "transparent" : mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r, - Meui.Theme.textColor.g, - Meui.Theme.textColor.b, - 0.1) : "transparent" + color: mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r, + Meui.Theme.textColor.g, + Meui.Theme.textColor.b, + 0.1) : "transparent" smooth: true } diff --git a/src/qml/UserPage/UserDelegateItem.qml b/src/qml/UserPage/UserDelegateItem.qml index 446a911..88fdd18 100644 --- a/src/qml/UserPage/UserDelegateItem.qml +++ b/src/qml/UserPage/UserDelegateItem.qml @@ -1,8 +1,8 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 +import QtQuick.Dialogs 1.2 import QtGraphicalEffects 1.0 -import Qt.labs.platform 1.0 as LabsPlatform import Cutefish.Settings 1.0 import Cutefish.Accounts 1.0 @@ -20,17 +20,22 @@ Item { userId: model.userId } - LabsPlatform.FileDialog { - id: currentUserFileDialog - folder: LabsPlatform.StandardPaths.writableLocation(LabsPlatform.StandardPaths.PicturesLocation) - nameFilters: ["Pictures (*.png *.jpg *.gif)"] - onFileChanged: { - currentUser.iconFileName = currentFile.toString().replace("file://", "") - _userImage.source = currentFile + FileDialog { + id: fileDialog + folder: shortcuts.pictures + nameFilters: ["Image files (*.jpg *.png)", "All files (*)"] + onAccepted: { + currentUser.iconFileName = fileDialog.fileUrl.toString().replace("file://", "") + _userImage.source = fileDialog.fileUrl _userImage.update() } } + MouseArea { + anchors.fill: parent + onDoubleClicked: additionalSettings.toggle() + } + ColumnLayout { id: mainLayout anchors.fill: parent @@ -128,7 +133,7 @@ Item { Button { text: qsTr("Choose") Layout.alignment: Qt.AlignVCenter | Qt.AlignRight - onClicked: currentUserFileDialog.open() + onClicked: fileDialog.open() } Label {