Skip to content

Commit

Permalink
Merge pull request #46977 from m-kuhn/init_gui
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Jan 24, 2022
2 parents b847dca + 50848fd commit 159a3e9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/gui/qgsgui.cpp
Expand Up @@ -332,7 +332,7 @@ bool QgsGui::pythonMacroAllowed( void ( *lambda )(), QgsMessageBar *messageBar )
{
QMessageBox msgBox( QMessageBox::Information, tr( "Python Macros" ),
tr( "Python macros are currently disabled. Do you allow this macro to run?" ) );
QAbstractButton *stopSessionButton = msgBox.addButton( tr( "Don't Ask Anymore" ), QMessageBox::DestructiveRole );
QAbstractButton *stopSessionButton = msgBox.addButton( tr( "Disable for this Session" ), QMessageBox::DestructiveRole );
msgBox.addButton( tr( "No" ), QMessageBox::NoRole );
QAbstractButton *yesButton = msgBox.addButton( tr( "Yes" ), QMessageBox::YesRole );
msgBox.exec();
Expand Down
2 changes: 2 additions & 0 deletions src/gui/vector/qgsattributesforminitcode.cpp
Expand Up @@ -16,12 +16,14 @@
#include "qgsattributesforminitcode.h"
#include "ui_qgsattributesforminitcode.h"
#include "qgssettings.h"
#include "qgsgui.h"

#include <QFileDialog>

QgsAttributesFormInitCode::QgsAttributesFormInitCode()
{
setupUi( this );
QgsGui::enableAutoGeometryRestore( this );

// Init function stuff
mInitCodeSourceComboBox->addItem( QString() );
Expand Down

0 comments on commit 159a3e9

Please sign in to comment.