Skip to content

Commit

Permalink
Address PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@elpaso
elpaso committed Aug 18, 2021
1 parent c27d472 commit cc81788
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 61 deletions.
10 changes: 4 additions & 6 deletions python/core/auto_generated/qgsaction.sip.in
View file
Expand Up @@ -34,18 +34,17 @@ Utility class that encapsulates an action based on vector attributes.
Default constructor
%End

QgsAction( ActionType type, const QString &description, const QString &command, bool capture = false );
QgsAction( ActionType type, const QString &description, const QString &command, bool capture = false);
%Docstring
Create a new QgsAction

:param type: The type of this action
:param description: A human readable description string
:param command: The action text. Its interpretation depends on the type
:param capture: If this is set to ``True``, the output will be captured when an action is run
:param enabledOnlyWhenEditable: if ``True`` then action is only enable in editmode. Not available in Python bindings.
%End

QgsAction( ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString() );
QgsAction( ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString());
%Docstring
Create a new QgsAction

Expand All @@ -57,10 +56,9 @@ Create a new QgsAction
:param shortTitle: A short string used to label user interface elements like buttons
:param actionScopes: A set of scopes in which this action will be available
:param notificationMessage: A particular message which reception will trigger the action
:param enabledOnlyWhenEditable: if ``True`` then action is only enable in editmode. Not available in Python bindings.
%End

QgsAction( const QUuid &id, ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString() );
QgsAction( const QUuid &id, ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString());
%Docstring
Create a new QgsAction

Expand All @@ -73,9 +71,9 @@ Create a new QgsAction
:param shortTitle: A short string used to label user interface elements like buttons
:param actionScopes: A set of scopes in which this action will be available
:param notificationMessage: A particular message which reception will trigger the action
:param enabledOnlyWhenEditable: if ``True`` then action is only enable in editmode. Not available in Python bindings.
%End


QString name() const;
%Docstring
The name of the action. This may be a longer description.
Expand Down
48 changes: 4 additions & 44 deletions src/core/qgsaction.h
View file
Expand Up @@ -58,25 +58,14 @@ class CORE_EXPORT QgsAction
* \param capture If this is set to TRUE, the output will be captured when an action is run
* \param enabledOnlyWhenEditable if TRUE then action is only enable in editmode. Not available in Python bindings.
*/
#ifndef SIP_RUN
QgsAction( ActionType type, const QString &description, const QString &command, bool capture = false, bool enabledOnlyWhenEditable = false )
QgsAction( ActionType type, const QString &description, const QString &command, bool capture = false, bool enabledOnlyWhenEditable SIP_PYARGREMOVE = false )
: mType( type )
, mDescription( description )
, mCommand( command )
, mCaptureOutput( capture )
, mId( QUuid::createUuid() )
, mIsEnabledOnlyWhenEditable( enabledOnlyWhenEditable )
{}
#else
QgsAction( ActionType type, const QString &description, const QString &command, bool capture = false )
: mType( type )
, mDescription( description )
, mCommand( command )
, mCaptureOutput( capture )
, mId( QUuid::createUuid() )
, mIsEnabledOnlyWhenEditable( enabledOnlyWhenEditable )
{}
#endif

/**
* Create a new QgsAction
Expand All @@ -91,21 +80,7 @@ class CORE_EXPORT QgsAction
* \param notificationMessage A particular message which reception will trigger the action
* \param enabledOnlyWhenEditable if TRUE then action is only enable in editmode. Not available in Python bindings.
*/
#ifndef SIP_RUN
QgsAction( ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString(), bool enabledOnlyWhenEditable = false )
: mType( type )
, mDescription( description )
, mShortTitle( shortTitle )
, mIcon( icon )
, mCommand( action )
, mCaptureOutput( capture )
, mActionScopes( actionScopes )
, mNotificationMessage( notificationMessage )
, mId( QUuid::createUuid() )
, mIsEnabledOnlyWhenEditable( enabledOnlyWhenEditable )
{}
#else
QgsAction( ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString() )
QgsAction( ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString(), bool enabledOnlyWhenEditable SIP_PYARGREMOVE = false )
: mType( type )
, mDescription( description )
, mShortTitle( shortTitle )
Expand All @@ -117,7 +92,6 @@ class CORE_EXPORT QgsAction
, mId( QUuid::createUuid() )
, mIsEnabledOnlyWhenEditable( enabledOnlyWhenEditable )
{}
#endif

/**
* Create a new QgsAction
Expand All @@ -133,8 +107,7 @@ class CORE_EXPORT QgsAction
* \param notificationMessage A particular message which reception will trigger the action
* \param enabledOnlyWhenEditable if TRUE then action is only enable in editmode. Not available in Python bindings.
*/
#ifndef SIP_RUN
QgsAction( const QUuid &id, ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString(), bool enabledOnlyWhenEditable = false )
QgsAction( const QUuid &id, ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString(), bool enabledOnlyWhenEditable SIP_PYARGREMOVE = false )
: mType( type )
, mDescription( description )
, mShortTitle( shortTitle )
Expand All @@ -146,20 +119,7 @@ class CORE_EXPORT QgsAction
, mId( id )
, mIsEnabledOnlyWhenEditable( enabledOnlyWhenEditable )
{}
#else
QgsAction( const QUuid &id, ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString() )
: mType( type )
, mDescription( description )
, mShortTitle( shortTitle )
, mIcon( icon )
, mCommand( action )
, mCaptureOutput( capture )
, mActionScopes( actionScopes )
, mNotificationMessage( notificationMessage )
, mId( id )
, mIsEnabledOnlyWhenEditable( enabledOnlyWhenEditable )
{}
#endif


//! The name of the action. This may be a longer description.
QString name() const { return mDescription; }
Expand Down
6 changes: 3 additions & 3 deletions src/gui/editorwidgets/qgsactionwidgetwrapper.cpp
View file
Expand Up @@ -48,7 +48,7 @@ void QgsActionWidgetWrapper::setEnabled( bool enabled )
{
if ( valid() && layer() )
{
mActionButton->setEnabled( ! mAction.isEnabledOnlyWhenEditable() || enabled );
mActionButton->setEnabled( !mAction.isEnabledOnlyWhenEditable() || enabled );
}
}

Expand Down Expand Up @@ -79,7 +79,7 @@ void QgsActionWidgetWrapper::initWidget( QWidget *editor )
// Configure push button
if ( ! icon.isNull() )
{
mActionButton->setIcon( mAction.icon() );
mActionButton->setIcon( icon );
mActionButton->setToolTip( description );
}
else
Expand All @@ -91,7 +91,7 @@ void QgsActionWidgetWrapper::initWidget( QWidget *editor )
}
}

if ( mAction.isEnabledOnlyWhenEditable() && ! layer()->isEditable() )
if ( mAction.isEnabledOnlyWhenEditable() && !layer()->isEditable() )
{
mActionButton->setEnabled( false );
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
View file
Expand Up @@ -444,7 +444,7 @@ void QgsValueRelationWidgetWrapper::showIndeterminateState()
{
for ( int i = 0; i < nofColumns; ++i )
{
whileBlocking( mTableWidget ) ->item( j, i )->setCheckState( Qt::PartiallyChecked );
whileBlocking( mTableWidget )->item( j, i )->setCheckState( Qt::PartiallyChecked );
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/gui/vector/qgsattributeactiondialog.cpp
View file
Expand Up @@ -111,8 +111,8 @@ void QgsAttributeActionDialog::insertRow( int row, const QgsAction &action )

// Type
item = new QTableWidgetItem( textForType( action.type() ) );
item->setData( Qt::UserRole, action.type() );
item->setData( Qt::UserRole + 1, action.id() );
item->setData( Role::ActionType, action.type() );
item->setData( Role::ActionId, action.id() );
item->setFlags( item->flags() & ~Qt::ItemIsEditable );
mAttributeActionTable->setItem( row, Type, item );

Expand Down Expand Up @@ -225,9 +225,9 @@ void QgsAttributeActionDialog::swapRows( int row1, int row2 )

QgsAction QgsAttributeActionDialog::rowToAction( int row ) const
{
const QUuid id { mAttributeActionTable->item( row, Type )->data( Qt::UserRole + 1 ).toUuid() };
const QUuid id { mAttributeActionTable->item( row, Type )->data( Role::ActionId ).toUuid() };
QgsAction action( id,
static_cast<QgsAction::ActionType>( mAttributeActionTable->item( row, Type )->data( Qt::UserRole ).toInt() ),
static_cast<QgsAction::ActionType>( mAttributeActionTable->item( row, Type )->data( Role::ActionType ).toInt() ),
mAttributeActionTable->item( row, Description )->text(),
mAttributeActionTable->item( row, ActionText )->data( Qt::UserRole ).toString(),
mAttributeActionTable->verticalHeaderItem( row )->data( Qt::UserRole ).toString(),
Expand Down Expand Up @@ -334,7 +334,7 @@ void QgsAttributeActionDialog::itemDoubleClicked( QTableWidgetItem *item )
const int row = item->row();

QgsAttributeActionPropertiesDialog actionProperties(
static_cast<QgsAction::ActionType>( mAttributeActionTable->item( row, Type )->data( Qt::UserRole ).toInt() ),
static_cast<QgsAction::ActionType>( mAttributeActionTable->item( row, Type )->data( Role::ActionType ).toInt() ),
mAttributeActionTable->item( row, Description )->text(),
mAttributeActionTable->item( row, ShortTitle )->text(),
mAttributeActionTable->verticalHeaderItem( row )->data( Qt::UserRole ).toString(),
Expand All @@ -350,7 +350,7 @@ void QgsAttributeActionDialog::itemDoubleClicked( QTableWidgetItem *item )

if ( actionProperties.exec() )
{
mAttributeActionTable->item( row, Type )->setData( Qt::UserRole, actionProperties.type() );
mAttributeActionTable->item( row, Type )->setData( Role::ActionType, actionProperties.type() );
mAttributeActionTable->item( row, Type )->setText( textForType( actionProperties.type() ) );
mAttributeActionTable->item( row, Description )->setText( actionProperties.description() );
mAttributeActionTable->item( row, ShortTitle )->setText( actionProperties.shortTitle() );
Expand Down
7 changes: 7 additions & 0 deletions src/gui/vector/qgsattributeactiondialog.h
View file
Expand Up @@ -51,6 +51,13 @@ class GUI_EXPORT QgsAttributeActionDialog: public QWidget, private Ui::QgsAttrib
EnabledOnlyWhenEditable
};

//! UserRole for Type data
enum Role
{
ActionType = Qt::UserRole,
ActionId = Qt::UserRole + 1
};

public:
QgsAttributeActionDialog( const QgsActionManager &actions,
QWidget *parent = nullptr );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/vector/qgsattributesformproperties.cpp
View file
Expand Up @@ -588,7 +588,7 @@ void QgsAttributesFormProperties::loadAttributeSpecificEditor( QgsAttributesDnDT
}
case DnDTreeItemData::Action:
{
receiver->clearSelection();
receiver->selectFirstMatchingItem( itemData );
break;
}
case DnDTreeItemData::QmlWidget:
Expand Down

0 comments on commit cc81788

Please sign in to comment.