cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

adopt new opaque combobox; fix toolbar color on contactlist only pane; fix settings pane color to pane color
the build was successful Details

This commit is contained in:
Dan Ballard 2020-06-03 16:20:40 -07:00
parent 9c8134e0c3
commit 37dab30d5e
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qml/main.qml
View File

@ -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,7 +255,12 @@ ApplicationWindow {
} else { } else {
toolbar.leftMenuVisible = false toolbar.leftMenuVisible = false
toolbar.backVisible = true toolbar.backVisible = true
toolbar.color = Theme.backgroundPaneColor
if (currentIndex == profilePane && theStack.currentIndex == theStack.emptyPane) {
toolbar.color = Theme.backgroundMainColor
} else {
toolbar.color = Theme.backgroundPaneColor
}
} }
} }
} }
@ -270,12 +268,12 @@ ApplicationWindow {
Component.onCompleted: updateToolbar() Component.onCompleted: updateToolbar()
Connections { Connections {
target: Theme target: Theme
onThemeChanged: { onThemeChanged: {
parentStack.updateToolbar() parentStack.updateToolbar()
}
} }
}
} }
Statusbar { Statusbar {

16
qml/panes/SettingsPane.qml
View File

@ -16,14 +16,14 @@ Opaque.SettingsList { // settingsPane
anchors.fill: parent anchors.fill: parent
settings: Column { settings: Column {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: 700 width: 700
Opaque.Setting { Opaque.Setting {
//: 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

8
qml/widgets/Statusbar.qml
View File

@ -184,11 +184,11 @@ Rectangle {
} }
Connections { Connections {
target: Theme target: Theme
onThemeChanged: { onThemeChanged: {
changeStatus() changeStatus()
}
} }
}
} }