Skip to content

Commit

Permalink
More HDPI adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@emericg
emericg committed Apr 4, 2024
1 parent f8fce30 commit 5f3d60d
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 60 deletions.
1 change: 0 additions & 1 deletion qml/PanelDeviceInfos.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ Flickable {
TextFieldThemed { // user comment
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
height: 36

colorBackground: Theme.colorBox
placeholderText: qsTr("Comment")
Expand Down
31 changes: 15 additions & 16 deletions qml/ScreenSettings.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ Loader {

Row {
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

z: 1
Expand Down Expand Up @@ -400,7 +400,7 @@ Loader {

ComboBoxThemed {
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

enabled: false
Expand Down Expand Up @@ -431,7 +431,7 @@ Loader {
SelectorMenu {
height: 32
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

model: ListModel {
Expand Down Expand Up @@ -473,7 +473,7 @@ Loader {
id: selector_prefscreen
height: 32
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

ListModel {
Expand Down Expand Up @@ -651,7 +651,7 @@ Loader {

SpinBoxThemedDesktop {
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

editable: false
Expand Down Expand Up @@ -686,7 +686,7 @@ Loader {

SpinBoxThemedDesktop {
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

editable: false
Expand Down Expand Up @@ -746,7 +746,7 @@ Loader {
anchors.right: parent.right
anchors.rightMargin: 64
anchors.verticalCenter: parent.verticalCenter
spacing: 24
spacing: Theme.componentMarginXL

Text {
anchors.verticalCenter: parent.verticalCenter
Expand Down Expand Up @@ -776,7 +776,7 @@ Loader {

ButtonWireframe {
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

fullColor: true
Expand All @@ -802,7 +802,7 @@ Loader {
anchors.right: parent.right
anchors.rightMargin: 64
anchors.verticalCenter: parent.verticalCenter
spacing: 24
spacing: Theme.componentMarginXL

Text {
anchors.verticalCenter: parent.verticalCenter
Expand Down Expand Up @@ -832,7 +832,7 @@ Loader {

ButtonWireframe {
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

fullColor: true
Expand Down Expand Up @@ -953,12 +953,11 @@ Loader {
TextFieldFileDialog {
id: ubertoothPath
anchors.left: parent.left
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

height: 36
selectByMouse: true

text: settingsManager.ubertooth_path
Expand Down Expand Up @@ -1021,7 +1020,7 @@ Loader {

SpinBoxThemedDesktop {
anchors.left: parent.left
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter
z: 2

Expand All @@ -1048,7 +1047,7 @@ Loader {

SpinBoxThemedDesktop {
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter
z: 2

Expand Down Expand Up @@ -1183,7 +1182,7 @@ Loader {
width: 20
height: 20

source: "qrc:/assets/icons_material/duotone-launch-24px"
source: "qrc:/assets/icons_material/duotone-launch-24px.svg"
color: parent.containsMouse ? Theme.colorPrimary : Theme.colorText
Behavior on color { ColorAnimation { duration: 133 } }
}
Expand Down
20 changes: 10 additions & 10 deletions qml/popups/PopupClearDeviceSeenCache.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Popup {

contentItem: Column {
id: columnContent
spacing: 24
spacing: Theme.componentMarginXL

////////

Expand All @@ -60,9 +60,9 @@ Popup {

Column {
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 24
anchors.rightMargin: Theme.componentMarginXL
anchors.verticalCenter: parent.verticalCenter
spacing: 4

Expand Down Expand Up @@ -94,10 +94,10 @@ Popup {

Column { // contentArea
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 24
spacing: 24
anchors.rightMargin: Theme.componentMarginXL
spacing: Theme.componentMarginXL

Rectangle {
width: parent.width
Expand All @@ -106,8 +106,8 @@ Popup {

Text {
anchors.fill: parent
anchors.leftMargin: 16
anchors.rightMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.rightMargin: Theme.componentMargin

text: qsTr("There are %n device(s) in the cache.", "", deviceManager.deviceSeenCached)
textFormat: Text.StyledText
Expand Down Expand Up @@ -148,8 +148,8 @@ Popup {

Row {
anchors.right: parent.right
anchors.rightMargin: 24
spacing: 16
anchors.rightMargin: Theme.componentMarginXL
spacing: Theme.componentMargin

ButtonWireframe {
primaryColor: Theme.colorSubText
Expand Down
20 changes: 10 additions & 10 deletions qml/popups/PopupClearDeviceStructureCache.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Popup {

contentItem: Column {
id: columnContent
spacing: 24
spacing: Theme.componentMarginXL

////////

Expand All @@ -63,9 +63,9 @@ Popup {

Column {
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 24
anchors.rightMargin: Theme.componentMarginXL
anchors.verticalCenter: parent.verticalCenter
spacing: 4

Expand Down Expand Up @@ -97,10 +97,10 @@ Popup {

Column { // contentArea
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 24
spacing: 24
anchors.rightMargin: Theme.componentMarginXL
spacing: Theme.componentMarginXL

Rectangle {
width: parent.width
Expand All @@ -109,8 +109,8 @@ Popup {

Text {
anchors.fill: parent
anchors.leftMargin: 16
anchors.rightMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.rightMargin: Theme.componentMargin

text: qsTr("There are %n device(s) in the cache.", "", deviceManager.deviceStructureCached)
textFormat: Text.StyledText
Expand Down Expand Up @@ -151,8 +151,8 @@ Popup {

Row {
anchors.right: parent.right
anchors.rightMargin: 24
spacing: 16
anchors.rightMargin: Theme.componentMarginXL
spacing: Theme.componentMargin

ButtonWireframe {
primaryColor: Theme.colorSubText
Expand Down
23 changes: 11 additions & 12 deletions qml/popups/PopupExportDeviceData.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Popup {

contentItem: Column {
id: columnContent
spacing: 24
spacing: Theme.componentMarginXL

////////

Expand All @@ -83,9 +83,9 @@ Popup {

Column {
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 24
anchors.rightMargin: Theme.componentMarginXL
anchors.verticalCenter: parent.verticalCenter
spacing: 4

Expand Down Expand Up @@ -129,10 +129,10 @@ Popup {

Column { // contentArea
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 24
spacing: 24
anchors.rightMargin: Theme.componentMarginXL
spacing: Theme.componentMarginXL

Column {
anchors.left: parent.left
Expand All @@ -150,7 +150,7 @@ Popup {

IconSvg {
anchors.left: parent.left
anchors.leftMargin: 16
anchors.leftMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter
width: 24
height: 24
Expand All @@ -162,7 +162,7 @@ Popup {
anchors.left: parent.left
anchors.leftMargin: 52
anchors.right: parent.right
anchors.rightMargin: 16
anchors.rightMargin: Theme.componentMargin
anchors.verticalCenter: parent.verticalCenter

text: qsTr("Services info loaded from cache")
Expand Down Expand Up @@ -258,7 +258,6 @@ Popup {
id: tfExportPath
anchors.left: parent.left
anchors.right: parent.right
height: 40

dialogTitle: qsTr("Please select the export file")
dialogFilter: ["Text file (*.txt)"]
Expand All @@ -275,9 +274,9 @@ Popup {

Item {
anchors.left: parent.left
anchors.leftMargin: 24
anchors.leftMargin: Theme.componentMarginXL
anchors.right: parent.right
anchors.rightMargin: 24
anchors.rightMargin: Theme.componentMarginXL
height: Theme.componentHeight

ButtonWireframe {
Expand All @@ -290,7 +289,7 @@ Popup {

Row {
anchors.right: parent.right
spacing: 16
spacing: Theme.componentMargin

ButtonWireframe {
primaryColor: Theme.colorSubText
Expand Down
Loading

0 comments on commit 5f3d60d

Please sign in to comment.