Skip to content

Add check so unlink button won't show on a new feature #4685

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

Open
xkello wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add check so unlink button won't show on a new feature #4685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions app/attributes/attributecontroller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ class AttributeController : public QObject
*/
Q_PROPERTY( FeatureLayerPair featureLayerPair READ featureLayerPair WRITE setFeatureLayerPair NOTIFY featureLayerPairChanged )

//! Returns TRUE if the feature has not been saved yet (has a new/null feature id)
Q_PROPERTY( bool isNewFeature READ isNewFeature NOTIFY featureLayerPairChanged )

// this is never nullptr (a form with no tabs will be parsed as having a single tab)
Q_PROPERTY( AttributeTabProxyModel *attributeTabProxyModel READ attributeTabProxyModel NOTIFY attributeTabProxyModelChanged )

Expand Down
3 changes: 3 additions & 0 deletions app/qml/dialogs/MMRemovePhotoDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ MMDrawerDialog {
signal unlinkImage()

property string imagePath
property string featureState: ""

imageSource: __style.negativeMMSymbolImage
title: qsTr( "Delete photo?" )
Expand All @@ -35,6 +36,8 @@ MMDrawerDialog {
secondaryButton {
text: qsTr( "Unlink photo" )

visible: root.featureState !== "add"

fontColor: __style.grapeColor
fontColorHover: __style.negativeColor
}
Expand Down
1 change: 1 addition & 0 deletions app/qml/form/editors/MMFormPhotoEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ MMFormPhotoViewer {
id: imageDeleteDialog

property string imagePath
featureState: root._fieldController.isNewFeature ? "add" : ""

onDeleteImage: {
// schedule the image for deletion
Expand Down
Loading