Tune up settings to fix inconsistencies and improve layout

There were some inconsistencies in capitalization and colons, so those were fixed in this MR.
I also rearranged some settings in the appearance section to improve the grouping.
This commit is contained in:
Devin Lin
2022-11-24 15:11:32 -05:00
committed by Carl Schwan
parent 60243c723a
commit 10796b2359
3 changed files with 31 additions and 31 deletions

View File

@@ -199,19 +199,26 @@ Kirigami.ScrollablePage {
} }
} }
} }
MobileForm.FormDelegateSeparator { below: colorSchemeDelegate.item ; visible: colorSchemeDelegate.visible }
Loader {
id: colorSchemeDelegate
visible: item !== null && Qt.platform.os !== "android"
source: "qrc:/ColorScheme.qml"
Layout.fillWidth: true
}
} }
} }
MobileForm.FormCard { MobileForm.FormCard {
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.fillWidth: true Layout.fillWidth: true
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 0 spacing: 0
MobileForm.FormCardHeader {
title: i18n("Timeline")
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
id: showFancyEffectsDelegate id: showFancyEffectsDelegate
text: i18n("Show Fancy Effects") text: i18n("Show fancy effects in chat")
checked: Config.showFancyEffects checked: Config.showFancyEffects
enabled: !Config.isShowFancyEffectsImmutable enabled: !Config.isShowFancyEffectsImmutable
onToggled: { onToggled: {
@@ -220,20 +227,7 @@ Kirigami.ScrollablePage {
} }
} }
MobileForm.FormDelegateSeparator { above: showFancyEffectsDelegate ; below: colorSchemeDelegate } MobileForm.FormDelegateSeparator { above: showFancyEffectsDelegate ; below: hasWindowSystemDelegate }
Loader {
id: colorSchemeDelegate
visible: item !== null && Qt.platform.os !== "android"
source: "qrc:/ColorScheme.qml"
Layout.fillWidth: true
}
MobileForm.FormDelegateSeparator {
above: colorSchemeDelegate
below: hasWindowSystemDelegate
visible: colorSchemeDelegate.visible
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
id: hasWindowSystemDelegate id: hasWindowSystemDelegate
@@ -254,6 +248,7 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true Layout.fillWidth: true
visible: Controller.hasWindowSystem && Config.blur visible: Controller.hasWindowSystem && Config.blur
enabled: !Config.isTransparancyImmutable enabled: !Config.isTransparancyImmutable
background: Item {}
contentItem: ColumnLayout { contentItem: ColumnLayout {
QQC2.Label { QQC2.Label {
text: i18n("Transparency") text: i18n("Transparency")
@@ -306,16 +301,21 @@ Kirigami.ScrollablePage {
Config.save() Config.save()
} }
} }
}
MobileForm.FormDelegateSeparator { above: showLinkPreviewDelegate; below: showAvatarDelegate } }
MobileForm.FormSectionText { MobileForm.FormCard {
id: showAvatarDelegate Layout.topMargin: Kirigami.Units.largeSpacing
text: i18n("Show Avatar") Layout.fillWidth: true
contentItem: ColumnLayout {
spacing: 0
MobileForm.FormCardHeader {
title: i18n("Show Avatar")
} }
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("In Chat") text: i18n("In chat")
checked: Config.showAvatarInTimeline checked: Config.showAvatarInTimeline
onToggled: { onToggled: {
Config.showAvatarInTimeline = checked Config.showAvatarInTimeline = checked
@@ -325,7 +325,7 @@ Kirigami.ScrollablePage {
} }
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("In Sidebar") text: i18n("In sidebar")
checked: Config.showAvatarInRoomDrawer checked: Config.showAvatarInRoomDrawer
enabled: !Config.isShowAvatarInRoomDrawerImmutable enabled: !Config.isShowAvatarInRoomDrawerImmutable
onToggled: { onToggled: {

View File

@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
MobileForm.FormComboBoxDelegate { MobileForm.FormComboBoxDelegate {
Layout.fillWidth: true Layout.fillWidth: true
text: i18n("Themes") text: i18n("Color theme")
textRole: "display" textRole: "display"
valueRole: "display" valueRole: "display"
model: ColorSchemer.model model: ColorSchemer.model

View File

@@ -150,7 +150,7 @@ Kirigami.ScrollablePage {
contentItem: ColumnLayout { contentItem: ColumnLayout {
spacing: 0 spacing: 0
MobileForm.FormCardHeader { MobileForm.FormCardHeader {
title: i18nc("Chat Editor", "Editor:") title: i18nc("Chat Editor", "Editor")
} }
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
id: quickEditCheckbox id: quickEditCheckbox
@@ -165,7 +165,7 @@ Kirigami.ScrollablePage {
MobileForm.FormDelegateSeparator { above: quickEditCheckbox; below: typingNotificationsDelegate } MobileForm.FormDelegateSeparator { above: quickEditCheckbox; below: typingNotificationsDelegate }
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
id: typingNotificationsDelegate id: typingNotificationsDelegate
text: i18n("Send Typing Notifications") text: i18n("Send typing notifications")
checked: Config.typingNotifications checked: Config.typingNotifications
enabled: !Config.isTypingNotificationsImmutable enabled: !Config.isTypingNotificationsImmutable
onToggled: { onToggled: {
@@ -185,7 +185,7 @@ Kirigami.ScrollablePage {
title: i18n("Developer Settings") title: i18n("Developer Settings")
} }
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Enable Developer Tools") text: i18n("Enable developer tools")
checked: Config.developerTools checked: Config.developerTools
enabled: !Config.isDeveloperToolsImmutable enabled: !Config.isDeveloperToolsImmutable
onToggled: { onToggled: {