Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid coordinate cursor label stealing hovering state, fix map canvas menu height #4492

Merged
merged 2 commits into from
Jul 30, 2023
Merged

Avoid coordinate cursor label stealing hovering state, fix map canvas menu height #4492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f012694
Avoid coordinate cursor label stealing hovering state
nirvn Jul 30, 2023
302a7c2
Fix map canvas (and other) menu height when separator hidden
nirvn Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/qml/NavigationBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ Rectangle {
MenuSeparator { width: parent.width }

MenuItem {
text: Qt.platform.os === "ios" ? qsTr( "Print Atlas Feature(s) to Image" ) : qsTr( 'Print Atlas Feature(s) to PDF' )
text: qsTr( 'Print Atlas Feature(s) to PDF' )
icon.source: Theme.getThemeIcon( "ic_print_white_24dp" )
enabled: toolBar.model && toolBar.model.selectedCount > 0 && LayerUtils.isAtlasCoverageLayer( toolBar.model.selectedLayer )

Expand All @@ -533,19 +533,19 @@ Rectangle {
}

MenuSeparator {
visible: mergeSelectedFeaturesBtn.visible || moveSelectedFeaturesBtn.visible || duplicateSelectedFeaturesBtn.visible || deleteSelectedFeaturesBtn.visible
enabled: mergeSelectedFeaturesBtn.visible || moveSelectedFeaturesBtn.visible || duplicateSelectedFeaturesBtn.visible || deleteSelectedFeaturesBtn.visible
visible: enabled
width: parent.width
height: enabled ? undefined : 0
}

MenuItem {
id: mergeSelectedFeaturesBtn
text: qsTr( 'Merge Selected Features' )
icon.source: Theme.getThemeIcon( "ic_merge_features_white_24dp" )
enabled: toolBar.model && toolBar.model.canMergeSelection && toolBar.model.selectedCount > 1 && projectInfo.editRights
visible: enabled

font: Theme.defaultFont
height: visible ? 48 : 0
leftPadding: 10

onTriggered: multiMergeClicked();
Expand All @@ -556,10 +556,8 @@ Rectangle {
text: qsTr( 'Move Selected Feature(s)' )
icon.source: Theme.getThemeVectorIcon( "ic_move_white_24dp" )
enabled: toolBar.model && toolBar.model.canMoveSelection && projectInfo.editRights
visible: enabled

font: Theme.defaultFont
height: visible ? 48 : 0
leftPadding: 10

onTriggered: multiMoveClicked();
Expand All @@ -570,10 +568,8 @@ Rectangle {
text: qsTr( 'Duplicate Selected Feature(s)' )
icon.source: Theme.getThemeVectorIcon( "ic_duplicate_black_24dp" )
enabled: toolBar.model && toolBar.model.canDuplicateSelection && projectInfo.insertRights
visible: enabled

font: Theme.defaultFont
height: visible ? 48 : 0
leftPadding: 10

onTriggered: multiDuplicateClicked();
Expand All @@ -585,9 +581,9 @@ Rectangle {
icon.source: Theme.getThemeIcon( "ic_delete_forever_white_24dp" )
enabled: toolBar.model && toolBar.model.canDeleteSelection && projectInfo.editRights
visible: enabled
height: enabled ? undefined : 0

font: Theme.defaultFont
height: visible ? 48 : 0
leftPadding: 10

onTriggered: multiDeleteClicked();
Expand Down
50 changes: 33 additions & 17 deletions src/qml/QFieldLocalDataPickerScreen.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,12 +369,13 @@ Page {

MenuItem {
id: sendDatasetTo
visible: platformUtilities.capabilities & PlatformUtilities.CustomSend
enabled: platformUtilities.capabilities & PlatformUtilities.CustomSend
&& itemMenu.itemMetaType == LocalFilesModel.Dataset
visible: enabled

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

text: qsTr( "Send to..." )
Expand All @@ -383,12 +384,13 @@ Page {

MenuItem {
id: exportDatasetTo
visible: platformUtilities.capabilities & PlatformUtilities.CustomExport
enabled: platformUtilities.capabilities & PlatformUtilities.CustomExport
&& itemMenu.itemMetaType == LocalFilesModel.Dataset
visible: enabled

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

text: qsTr( "Export to folder..." )
Expand All @@ -397,13 +399,14 @@ Page {

MenuItem {
id: removeDataset
visible: itemMenu.itemMetaType == LocalFilesModel.Dataset
enabled: itemMenu.itemMetaType == LocalFilesModel.Dataset
&& !qfieldLocalDataPickerScreen.projectFolderView
&& table.model.isDeletedAllowedInCurrentPath
visible: enabled

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

text: qsTr( "Remove dataset" )
Expand All @@ -412,12 +415,13 @@ Page {

MenuItem {
id: exportFolderTo
visible: platformUtilities.capabilities & PlatformUtilities.CustomExport &&
enabled: platformUtilities.capabilities & PlatformUtilities.CustomExport &&
itemMenu.itemMetaType == LocalFilesModel.Folder
visible: enabled

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

text: qsTr( "Export to folder..." )
Expand All @@ -426,12 +430,13 @@ Page {

MenuItem {
id: sendCompressedFolderTo
visible: platformUtilities.capabilities & PlatformUtilities.CustomSend
enabled: platformUtilities.capabilities & PlatformUtilities.CustomSend
&& itemMenu.itemMetaType == LocalFilesModel.Folder
visible: enabled

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

text: qsTr( "Send compressed folder to..." )
Expand All @@ -440,13 +445,14 @@ Page {

MenuItem {
id: removeProjectFolder
visible: itemMenu.itemMetaType == LocalFilesModel.Folder
enabled: itemMenu.itemMetaType == LocalFilesModel.Folder
&& !qfieldLocalDataPickerScreen.projectFolderView
&& table.model.isDeletedAllowedInCurrentPath
visible: enabled

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

text: qsTr( "Remove project folder" )
Expand Down Expand Up @@ -477,9 +483,10 @@ Page {
id: importProjectFromFolder

enabled: platformUtilities.capabilities & PlatformUtilities.CustomImport
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? 48 : 0
height: enabled ? undefined : 0
leftPadding: 10

text: qsTr( "Import project from folder" )
Expand All @@ -490,9 +497,10 @@ Page {
id: importProjectFromZIP

enabled: platformUtilities.capabilities & PlatformUtilities.CustomImport
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? 48 : 0
height: enabled ? undefined : 0
leftPadding: 10

text: qsTr( "Import project from ZIP" )
Expand All @@ -503,17 +511,23 @@ Page {
id: importDataset

enabled: platformUtilities.capabilities & PlatformUtilities.CustomImport
visible: enabled
font: Theme.defaultFont
width: parent.width
height: enabled ? 48 : 0
height: enabled ? undefined : 0

leftPadding: 10

text: qsTr( "Import dataset(s)" )
onTriggered: { platformUtilities.importDatasets(); }
}

MenuSeparator { visible: platformUtilities.capabilities & PlatformUtilities.CustomImport; width: parent.width }
MenuSeparator {
enabled: platformUtilities.capabilities & PlatformUtilities.CustomImport
visible: enabled
width: parent.width
height: enabled ? undefined : 0
}

MenuItem {
id: importUrl
Expand All @@ -529,7 +543,9 @@ Page {
}
}

MenuSeparator { width: parent.width }
MenuSeparator {
width: parent.width
}

MenuItem {
id: storageHelp
Expand Down
20 changes: 11 additions & 9 deletions src/qml/qgismobileapp.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,18 +907,19 @@ ApplicationWindow {
return newY;
}

textFormat: Text.PlainText
text: {
if ((qfieldSettings.numericalDigitizingInformation && stateMachine.state === "digitize" ) || stateMachine.state === 'measure') {
var point = GeometryUtils.reprojectPoint(coordinateLocator.currentCoordinate, coordinateLocator.mapSettings.destinationCrs, projectInfo.coordinateDisplayCrs)
var coordinates;
if (coordinatesIsXY) {
coordinates = '<p>%1: %2<br>%3: %4</p>'
coordinates = '%1: %2\n%3: %4\n'
.arg(coordinatesIsGeographic ? qsTr( 'Lon' ) : 'X')
.arg(point.x.toLocaleString( Qt.locale(), 'f', coordinatesIsGeographic ? 5 : 2 ))
.arg(coordinatesIsGeographic ? qsTr( 'Lat' ) : 'Y')
.arg(point.y.toLocaleString( Qt.locale(), 'f', coordinatesIsGeographic ? 5 : 2 ));
} else {
coordinates = '<p>%1: %2<br>%3: %4</p>'
coordinates = '%1: %2\n%3: %4\n'
.arg(coordinatesIsGeographic ? qsTr( 'Lat' ) : 'Y')
.arg(point.y.toLocaleString( Qt.locale(), 'f', coordinatesIsGeographic ? 5 : 2 ))
.arg(coordinatesIsGeographic ? qsTr( 'Lon' ) : 'X')
Expand All @@ -931,31 +932,31 @@ ApplicationWindow {
: '')

.arg(digitizingGeometryMeasure.lengthValid && digitizingGeometryMeasure.segmentLength != 0.0
? '<p>%1: %2</p>'
? '%1: %2\n'
.arg( digitizingGeometryMeasure.segmentLength != digitizingGeometryMeasure.length ? qsTr( 'Segment') : qsTr( 'Length' ) )
.arg(UnitTypes.formatDistance( digitizingGeometryMeasure.convertLengthMeansurement( digitizingGeometryMeasure.segmentLength, projectInfo.distanceUnits ) , 3, projectInfo.distanceUnits ) )
: '')

.arg(digitizingGeometryMeasure.lengthValid && digitizingGeometryMeasure.segmentLength != 0.0
? '<p>%1: %2</p>'
? '%1: %2\n'
.arg( qsTr( 'Azimuth') )
.arg( UnitTypes.formatAngle( digitizingGeometryMeasure.azimuth < 0 ? digitizingGeometryMeasure.azimuth + 360 : digitizingGeometryMeasure.azimuth, 2, Qgis.AngleUnit.Degrees ) )
: '')

.arg(currentRubberband.model && currentRubberband.model.geometryType === Qgis.GeometryType.Polygon
? digitizingGeometryMeasure.perimeterValid
? '<p>%1: %2</p>'
? '%1: %2\n'
.arg( qsTr( 'Perimeter') )
.arg(UnitTypes.formatDistance( digitizingGeometryMeasure.convertLengthMeansurement( digitizingGeometryMeasure.perimeter, projectInfo.distanceUnits ), 3, projectInfo.distanceUnits ) )
: ''
: digitizingGeometryMeasure.lengthValid && digitizingGeometryMeasure.segmentLength != digitizingGeometryMeasure.length
? '<p>%1: %2</p>'
? '%1: %2\n'
.arg( qsTr( 'Length') )
.arg(UnitTypes.formatDistance( digitizingGeometryMeasure.convertLengthMeansurement( digitizingGeometryMeasure.length, projectInfo.distanceUnits ),3, projectInfo.distanceUnits ) )
: '')

.arg(digitizingGeometryMeasure.areaValid
? '<p>%1: %2</p>'
? '%1: %2\n'
.arg( qsTr( 'Area') )
.arg(UnitTypes.formatArea( digitizingGeometryMeasure.convertAreaMeansurement( digitizingGeometryMeasure.area, projectInfo.areaUnits), 3, projectInfo.areaUnits ) )
: '')
Expand Down Expand Up @@ -2434,8 +2435,10 @@ ApplicationWindow {
}

MenuSeparator {
enabled: canvasMenuFeatureListInstantiator.count > 0
width: parent.width
visible: canvasMenuFeatureListInstantiator.count > 0
visible: enabled
height: enabled ? undefined : 0
}

Instantiator {
Expand All @@ -2456,7 +2459,6 @@ ApplicationWindow {

title: layerName + ': ' + featureName
font: Theme.defaultFont
leftPadding: 10

width: {
var result = 0;
Expand Down
Loading