mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 21:05:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

define constants specific for font sizes in conflict dialog

Browse source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-16 09:04:11 +02:00 committed by Matthieu Gallien
parent 31e4dede62
commit 635b1ec729
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/ConflictDelegate.qml
View file

@ -43,7 +43,7 @@ Item {
text: root.existingFileName text: root.existingFileName
font.weight: Font.Bold font.weight: Font.Bold
font.pixelSize: 15 font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
} }
RowLayout { RowLayout {

6
src/gui/ConflictItemFileInfo.qml
View file

@ -72,7 +72,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 15 font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
} }
EnforcedPlainTextLabel { EnforcedPlainTextLabel {
@ -80,7 +80,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 15 font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
} }
EnforcedPlainTextLabel { EnforcedPlainTextLabel {
@ -88,7 +88,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 15 font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
} }
Item { Item {

8
src/gui/ResolveConflictsDialog.qml
View file

@ -53,14 +53,14 @@ QtWindow.Window {
EnforcedPlainTextLabel { EnforcedPlainTextLabel {
text: qsTr("%1 files in conflict").arg(delegateModel.count) text: qsTr("%1 files in conflict").arg(delegateModel.count)
font.bold: true font.bold: true
font.pixelSize: 20 font.pixelSize: Style.bigFontPixelSizeResolveConflictsDialog
Layout.fillWidth: true Layout.fillWidth: true
} }
EnforcedPlainTextLabel { EnforcedPlainTextLabel {
text: qsTr("Choose if you want to keep the local version, server version, or both. If you choose both, the local file will have a number added to its name.") text: qsTr("Choose if you want to keep the local version, server version, or both. If you choose both, the local file will have a number added to its name.")
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
font.pixelSize: 15 font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -15 Layout.topMargin: -15
} }
@ -79,7 +79,7 @@ QtWindow.Window {
leftPadding: 0 leftPadding: 0
implicitWidth: 100 implicitWidth: 100
font.pixelSize: 15 font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
checked: realModel.allExistingsSelected checked: realModel.allExistingsSelected
onToggled: function() { onToggled: function() {
@ -97,7 +97,7 @@ QtWindow.Window {
leftPadding: 0 leftPadding: 0
implicitWidth: 100 implicitWidth: 100
font.pixelSize: 15 font.pixelSize: Style.fontPixelSizeResolveConflictsDialog
checked: realModel.allConflictingSelected checked: realModel.allConflictingSelected
onToggled: function() { onToggled: function() {

3
theme/Style/Style.qml
View file

@ -131,6 +131,9 @@ QtObject {
readonly property var fontMetrics: FontMetrics {} readonly property var fontMetrics: FontMetrics {}
readonly property int bigFontPixelSizeResolveConflictsDialog: 20
readonly property int fontPixelSizeResolveConflictsDialog: 15
readonly property int activityContentSpace: 4 readonly property int activityContentSpace: 4
readonly property double smallIconScaleFactor: 0.6 readonly property double smallIconScaleFactor: 0.6