sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-28 00:04:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable geometry restore for annotation config dialogs

Browse Source
This commit is contained in:
Nyall Dawson 2017-12-08 11:05:11 +10:00
parent 5473ebab32
commit 14f754ac6a
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/qgsformannotationdialog.cpp
View File

@ -19,6 +19,7 @@
#include "qgsvectorlayer.h" #include "qgsvectorlayer.h"
#include "qgsproject.h" #include "qgsproject.h"
#include "qgsannotationmanager.h" #include "qgsannotationmanager.h"
#include "qgsgui.h"
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QGraphicsScene> #include <QGraphicsScene>
@ -46,6 +47,8 @@ QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsMapCanvasAnnotationItem *it
QPushButton *deleteButton = new QPushButton( tr( "Delete" ) ); QPushButton *deleteButton = new QPushButton( tr( "Delete" ) );
QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsFormAnnotationDialog::deleteItem ); QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsFormAnnotationDialog::deleteItem );
mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole ); mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole );
QgsGui::instance()->enableAutoGeometryRestore( this );
} }
void QgsFormAnnotationDialog::applySettingsToItem() void QgsFormAnnotationDialog::applySettingsToItem()

3
src/app/qgshtmlannotationdialog.cpp
View File

@ -19,6 +19,7 @@
#include "qgsvectorlayer.h" #include "qgsvectorlayer.h"
#include "qgsproject.h" #include "qgsproject.h"
#include "qgsannotationmanager.h" #include "qgsannotationmanager.h"
#include "qgsgui.h"
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QGraphicsScene> #include <QGraphicsScene>
@ -47,6 +48,8 @@ QgsHtmlAnnotationDialog::QgsHtmlAnnotationDialog( QgsMapCanvasAnnotationItem *it
QPushButton *deleteButton = new QPushButton( tr( "Delete" ) ); QPushButton *deleteButton = new QPushButton( tr( "Delete" ) );
QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsHtmlAnnotationDialog::deleteItem ); QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsHtmlAnnotationDialog::deleteItem );
mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole ); mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole );
QgsGui::instance()->enableAutoGeometryRestore( this );
} }
void QgsHtmlAnnotationDialog::applySettingsToItem() void QgsHtmlAnnotationDialog::applySettingsToItem()

3
src/app/qgssvgannotationdialog.cpp
View File

@ -21,6 +21,7 @@
#include "qgsmapcanvasannotationitem.h" #include "qgsmapcanvasannotationitem.h"
#include "qgsproject.h" #include "qgsproject.h"
#include "qgsannotationmanager.h" #include "qgsannotationmanager.h"
#include "qgsgui.h"
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QGraphicsScene> #include <QGraphicsScene>
@ -49,6 +50,8 @@ QgsSvgAnnotationDialog::QgsSvgAnnotationDialog( QgsMapCanvasAnnotationItem *item
QPushButton *deleteButton = new QPushButton( tr( "Delete" ) ); QPushButton *deleteButton = new QPushButton( tr( "Delete" ) );
QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsSvgAnnotationDialog::deleteItem ); QObject::connect( deleteButton, &QPushButton::clicked, this, &QgsSvgAnnotationDialog::deleteItem );
mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole ); mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole );
QgsGui::instance()->enableAutoGeometryRestore( this );
} }
void QgsSvgAnnotationDialog::mBrowseToolButton_clicked() void QgsSvgAnnotationDialog::mBrowseToolButton_clicked()

3
src/app/qgstextannotationdialog.cpp
View File

@ -21,6 +21,7 @@
#include "qgsmapcanvasannotationitem.h" #include "qgsmapcanvasannotationitem.h"
#include "qgsannotationmanager.h" #include "qgsannotationmanager.h"
#include "qgsproject.h" #include "qgsproject.h"
#include "qgsgui.h"
#include <QColorDialog> #include <QColorDialog>
#include <QGraphicsScene> #include <QGraphicsScene>
@ -44,6 +45,8 @@ QgsTextAnnotationDialog::QgsTextAnnotationDialog( QgsMapCanvasAnnotationItem *it
mTextEdit->setDocument( mTextDocument.get() ); mTextEdit->setDocument( mTextDocument.get() );
} }
QgsGui::instance()->enableAutoGeometryRestore( this );
mFontColorButton->setColorDialogTitle( tr( "Select Font Color" ) ); mFontColorButton->setColorDialogTitle( tr( "Select Font Color" ) );
mFontColorButton->setAllowOpacity( true ); mFontColorButton->setAllowOpacity( true );
mFontColorButton->setContext( QStringLiteral( "symbology" ) ); mFontColorButton->setContext( QStringLiteral( "symbology" ) );