pull/11/head
cutefishd 5 years ago
parent e5b79022f6
commit 9891c52077

@ -110,25 +110,25 @@ ItemPage {
} }
} }
HorizontalDivider {} //HorizontalDivider {}
GridLayout { //GridLayout {
columns: 2 //columns: 2
Label { //Label {
text: qsTr("Rounded window") //text: qsTr("Rounded window")
Layout.fillWidth: true //Layout.fillWidth: true
} //}
Switch { //Switch {
Layout.fillHeight: true //Layout.fillHeight: true
checked: appearance.dockRoundedWindow //checked: appearance.dockRoundedWindow
onCheckedChanged: { //onCheckedChanged: {
appearance.setDockRoundedWindow(checked) //appearance.setDockRoundedWindow(checked)
} //}
} //}
} //}
Item { Item {
Layout.fillHeight: true Layout.fillHeight: true

@ -144,10 +144,10 @@ Item {
} }
radius: Meui.Theme.mediumRadius radius: Meui.Theme.mediumRadius
color: isCurrent ? "transparent" : mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r, color: mouseArea.containsMouse ? Qt.rgba(Meui.Theme.textColor.r,
Meui.Theme.textColor.g, Meui.Theme.textColor.g,
Meui.Theme.textColor.b, Meui.Theme.textColor.b,
0.1) : "transparent" 0.1) : "transparent"
smooth: true smooth: true
} }

@ -1,8 +1,8 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.12
import QtQuick.Dialogs 1.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Qt.labs.platform 1.0 as LabsPlatform
import Cutefish.Settings 1.0 import Cutefish.Settings 1.0
import Cutefish.Accounts 1.0 import Cutefish.Accounts 1.0
@ -20,17 +20,22 @@ Item {
userId: model.userId userId: model.userId
} }
LabsPlatform.FileDialog { FileDialog {
id: currentUserFileDialog id: fileDialog
folder: LabsPlatform.StandardPaths.writableLocation(LabsPlatform.StandardPaths.PicturesLocation) folder: shortcuts.pictures
nameFilters: ["Pictures (*.png *.jpg *.gif)"] nameFilters: ["Image files (*.jpg *.png)", "All files (*)"]
onFileChanged: { onAccepted: {
currentUser.iconFileName = currentFile.toString().replace("file://", "") currentUser.iconFileName = fileDialog.fileUrl.toString().replace("file://", "")
_userImage.source = currentFile _userImage.source = fileDialog.fileUrl
_userImage.update() _userImage.update()
} }
} }
MouseArea {
anchors.fill: parent
onDoubleClicked: additionalSettings.toggle()
}
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
anchors.fill: parent anchors.fill: parent
@ -128,7 +133,7 @@ Item {
Button { Button {
text: qsTr("Choose") text: qsTr("Choose")
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
onClicked: currentUserFileDialog.open() onClicked: fileDialog.open()
} }
Label { Label {

Loading…
Cancel
Save