Merge pull request 'Add comboboxs to settings, minor tweaks' (#303) from dan/ui:combobox into master
the build was successful
Details
the build was successful
Details
This commit is contained in:
commit
1337f97345
16
qml/main.qml
16
qml/main.qml
|
@ -16,8 +16,6 @@ import "panes"
|
||||||
import "widgets"
|
import "widgets"
|
||||||
import "utils.js" as Utils
|
import "utils.js" as Utils
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ApplicationWindow {
|
ApplicationWindow {
|
||||||
id: windowItem
|
id: windowItem
|
||||||
width: 1200
|
width: 1200
|
||||||
|
@ -133,7 +131,6 @@ ApplicationWindow {
|
||||||
Rectangle { // Profile login/management pane
|
Rectangle { // Profile login/management pane
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
//anchors.fill: parent
|
|
||||||
visible: false
|
visible: false
|
||||||
color: Theme.backgroundMainColor
|
color: Theme.backgroundMainColor
|
||||||
|
|
||||||
|
@ -146,8 +143,7 @@ ApplicationWindow {
|
||||||
Rectangle { // Settings pane
|
Rectangle { // Settings pane
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
//anchors.fill: parent
|
color: Theme.backgroundPaneColor
|
||||||
color: Theme.backgroundMainColor
|
|
||||||
|
|
||||||
SettingsPane {
|
SettingsPane {
|
||||||
id: settingsPane
|
id: settingsPane
|
||||||
|
@ -159,7 +155,6 @@ ApplicationWindow {
|
||||||
Rectangle { // Profile Add / Edit pane
|
Rectangle { // Profile Add / Edit pane
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
//anchors.fill: parent
|
|
||||||
color: Theme.backgroundMainColor
|
color: Theme.backgroundMainColor
|
||||||
|
|
||||||
|
|
||||||
|
@ -173,7 +168,6 @@ ApplicationWindow {
|
||||||
RowLayout { // CONTAINS EVERYTHING EXCEPT THE TOOLBAR
|
RowLayout { // CONTAINS EVERYTHING EXCEPT THE TOOLBAR
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
//anchors.fill: parent
|
|
||||||
spacing: 0
|
spacing: 0
|
||||||
|
|
||||||
Rectangle { // THE LEFT PANE WITH TOOLS AND CONTACTS
|
Rectangle { // THE LEFT PANE WITH TOOLS AND CONTACTS
|
||||||
|
@ -222,6 +216,7 @@ ApplicationWindow {
|
||||||
AddGroupPane { anchors.fill: parent }
|
AddGroupPane { anchors.fill: parent }
|
||||||
|
|
||||||
onCurrentIndexChanged: {
|
onCurrentIndexChanged: {
|
||||||
|
parentStack.updateToolbar()
|
||||||
if (currentIndex == emptyPane) {
|
if (currentIndex == emptyPane) {
|
||||||
toolbar.hideTitle()
|
toolbar.hideTitle()
|
||||||
toolbar.rightMenuVisible = false
|
toolbar.rightMenuVisible = false
|
||||||
|
@ -246,8 +241,6 @@ ApplicationWindow {
|
||||||
onCurrentIndexChanged : { updateToolbar(); statusbar.resetHeight() }
|
onCurrentIndexChanged : { updateToolbar(); statusbar.resetHeight() }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function updateToolbar() {
|
function updateToolbar() {
|
||||||
toolbar.hideTitle()
|
toolbar.hideTitle()
|
||||||
toolbar.rightMenuVisible = false
|
toolbar.rightMenuVisible = false
|
||||||
|
@ -262,10 +255,15 @@ ApplicationWindow {
|
||||||
} else {
|
} else {
|
||||||
toolbar.leftMenuVisible = false
|
toolbar.leftMenuVisible = false
|
||||||
toolbar.backVisible = true
|
toolbar.backVisible = true
|
||||||
|
|
||||||
|
if (currentIndex == profilePane && theStack.currentIndex == theStack.emptyPane) {
|
||||||
|
toolbar.color = Theme.backgroundMainColor
|
||||||
|
} else {
|
||||||
toolbar.color = Theme.backgroundPaneColor
|
toolbar.color = Theme.backgroundPaneColor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Component.onCompleted: updateToolbar()
|
Component.onCompleted: updateToolbar()
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ Opaque.SettingsList { // settingsPane
|
||||||
//: Language
|
//: Language
|
||||||
label: qsTr("setting-language")
|
label: qsTr("setting-language")
|
||||||
|
|
||||||
field: ComboBox {
|
field: Opaque.ComboBox {
|
||||||
id: cbLanguage
|
id: cbLanguage
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
@ -64,13 +64,14 @@ Opaque.SettingsList { // settingsPane
|
||||||
size: 8
|
size: 8
|
||||||
}
|
}
|
||||||
|
|
||||||
Slider {
|
Opaque.Slider {
|
||||||
id: zoomSlider
|
id: zoomSlider
|
||||||
minimumValue: 0.5
|
from: 0.5
|
||||||
// TODO: find out why > 2.0 halts desktop app on load - task: fix all the qml anchor/layout warnings on load
|
// TODO: find out why > 2.0 halts desktop app on load - task: fix all the qml anchor/layout warnings on load
|
||||||
maximumValue: gcd.os == "android" ? 4.0 : 1.9
|
to: gcd.os == "android" ? 4.0 : 1.9
|
||||||
value: gcd.themeScale
|
value: gcd.themeScale
|
||||||
updateValueWhileDragging: false
|
live: false
|
||||||
|
stepSize: 0.1
|
||||||
onValueChanged: {
|
onValueChanged: {
|
||||||
gcd.themeScale = zoomSlider.value
|
gcd.themeScale = zoomSlider.value
|
||||||
}
|
}
|
||||||
|
@ -87,11 +88,12 @@ Opaque.SettingsList { // settingsPane
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Opaque.Setting {
|
Opaque.Setting {
|
||||||
//: Theme
|
//: Theme
|
||||||
label: qsTr("setting-theme")
|
label: qsTr("setting-theme")
|
||||||
|
|
||||||
field: ComboBox {
|
field: Opaque.ComboBox {
|
||||||
id: cbTheme
|
id: cbTheme
|
||||||
property bool inited: false
|
property bool inited: false
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
Reference in New Issue