Skip to content

Commit

Permalink
Insure menu item height is consistent across the board
Browse files Browse the repository at this point in the history
  • Loading branch information
@nirvn
nirvn committed Feb 4, 2025
1 parent 995dd62 commit c7f1476
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 17 deletions.
6 changes: 5 additions & 1 deletion src/qml/NavigationBar.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ Rectangle {
MenuItem {
id: mergeSelectedFeaturesBtn
text: qsTr('Merge Selected Features')
height: 48
icon.source: Theme.getThemeVectorIcon("ic_merge_features_white_24dp")
enabled: toolBar.model && toolBar.model.canMergeSelection && toolBar.model.selectedCount > 1 && projectInfo.editRights

Expand All @@ -557,6 +558,7 @@ Rectangle {
MenuItem {
id: moveSelectedFeaturesBtn
text: qsTr('Move Selected Feature(s)')
height: 48
icon.source: Theme.getThemeVectorIcon("ic_move_white_24dp")
enabled: toolBar.model && toolBar.model.canMoveSelection && projectInfo.editRights

Expand All @@ -569,6 +571,7 @@ Rectangle {
MenuItem {
id: duplicateSelectedFeaturesBtn
text: qsTr('Duplicate Selected Feature(s)')
height: 48
icon.source: Theme.getThemeVectorIcon("ic_duplicate_black_24dp")
enabled: toolBar.model && toolBar.model.canDuplicateSelection && projectInfo.insertRights

Expand All @@ -584,7 +587,7 @@ Rectangle {
icon.source: Theme.getThemeVectorIcon("ic_delete_forever_white_24dp")
enabled: toolBar.model && toolBar.model.canDeleteSelection && projectInfo.editRights
visible: enabled
height: enabled ? undefined : 0
height: enabled ? 48 : 0

font: Theme.defaultFont
leftPadding: Theme.menuItemLeftPadding
Expand All @@ -599,6 +602,7 @@ Rectangle {
MenuItem {
id: processingSelectedFeaturesBtn
text: qsTr('Process Selected Feature(s)')
height: 48
icon.source: Theme.getThemeVectorIcon("ic_processing_black_24dp")
enabled: toolBar.model && toolBar.model.canProcessSelection && projectInfo.editRights

Expand Down
35 changes: 19 additions & 16 deletions src/qml/QFieldLocalDataPickerScreen.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Send to...")
Expand All @@ -434,7 +434,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Push to QFieldCloud")
Expand All @@ -452,7 +452,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Export to folder...")
Expand All @@ -469,7 +469,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: !itemMenu.itemIsFavorite ? qsTr("Add to favorites") : qsTr("Remove from favorites")
Expand All @@ -496,7 +496,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Export to folder...")
Expand All @@ -512,7 +512,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Send compressed folder to...")
Expand All @@ -528,7 +528,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Upload folder to WebDAV server")
Expand All @@ -546,7 +546,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Download folder from WebDAV server")
Expand All @@ -571,7 +571,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Remove dataset")
Expand All @@ -588,7 +588,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Remove folder")
Expand Down Expand Up @@ -625,7 +625,7 @@ Page {
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Import project from folder")
Expand All @@ -641,7 +641,7 @@ Page {
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Import project from ZIP")
Expand All @@ -657,7 +657,7 @@ Page {
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Import dataset(s)")
Expand All @@ -678,6 +678,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: 48
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Import URL")
Expand All @@ -692,6 +693,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: 48
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Import WebDAV folder")
Expand All @@ -710,6 +712,7 @@ Page {

font: Theme.defaultFont
width: parent.width
height: 48
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Storage management help")
Expand Down Expand Up @@ -745,7 +748,7 @@ Page {
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Update project from ZIP")
Expand All @@ -761,7 +764,7 @@ Page {
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Upload project to WebDAV")
Expand All @@ -779,7 +782,7 @@ Page {
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? undefined : 0
height: enabled ? 48 : 0
leftPadding: Theme.menuItemLeftPadding

text: qsTr("Download project from WebDAV")
Expand Down
7 changes: 7 additions & 0 deletions src/qml/qgismobileapp.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2675,6 +2675,7 @@ ApplicationWindow {

font: Theme.defaultFont
leftPadding: Theme.menuItemLeftPadding
height: 48

onTriggered: {
if (SensorStatus == Qgis.DeviceConnectionStatus.Connected) {
Expand Down Expand Up @@ -2742,6 +2743,7 @@ ApplicationWindow {

font: Theme.defaultFont
leftPadding: Theme.menuItemLeftPadding
height: 48

onTriggered: {
highlighted = false;
Expand Down Expand Up @@ -2954,10 +2956,12 @@ ApplicationWindow {

MenuItem {
text: qsTr('Layer:') + ' ' + layerName
height: 48
enabled: false
}
MenuItem {
text: qsTr('Feature:') + ' ' + featureName
height: 48
enabled: false
}
MenuSeparator {
Expand All @@ -2969,6 +2973,7 @@ ApplicationWindow {
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_baseline-list_white_24dp")
leftPadding: Theme.menuItemLeftPadding
height: 48

onTriggered: {
featureForm.model.setFeatures(menu.featureLayer, '$id = ' + menu.fid);
Expand All @@ -2982,6 +2987,7 @@ ApplicationWindow {
font: Theme.defaultFont
icon.source: Theme.getThemeVectorIcon("ic_copy_black_24dp")
leftPadding: Theme.menuItemLeftPadding
height: 48

onTriggered: {
clipboardManager.copyFeatureToClipboard(menu.featureLayer, menu.fid, true);
Expand All @@ -2994,6 +3000,7 @@ ApplicationWindow {
enabled: projectInfo.insertRights
icon.source: Theme.getThemeVectorIcon("ic_duplicate_black_24dp")
leftPadding: Theme.menuItemLeftPadding
height: 48

onTriggered: {
featureForm.model.setFeatures(menu.featureLayer, '$id = ' + menu.fid);
Expand Down

1 comment on commit c7f1476

@qfield-fairy
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 Ta-daaa, freshly created APKs are available: arm64-android

Other architectures

Please sign in to comment.