Add apply buttons to annotation dialogs

(cherry-picked from 0352745)
qgis · Jul 26, 2016 · 6fef0fa · 6fef0fa
1 parent 8a9afcc
commit 6fef0fa
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 11 deletions.
diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp
@@ -59,7 +59,7 @@ QgsAnnotationWidget::QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * par
     const QgsMarkerSymbolV2* symbol = mItem->markerSymbol();
     if ( symbol )
     {
-      mMarkerSymbol = symbol->clone();
+      mMarkerSymbol.reset( symbol->clone() );
       updateCenterIcon();
     }
 
@@ -69,7 +69,6 @@ QgsAnnotationWidget::QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * par
 
 QgsAnnotationWidget::~QgsAnnotationWidget()
 {
-  delete mMarkerSymbol;
 }
 
 void QgsAnnotationWidget::apply()
@@ -80,8 +79,7 @@ void QgsAnnotationWidget::apply()
     mItem->setFrameBorderWidth( mFrameWidthSpinBox->value() );
     mItem->setFrameColor( mFrameColorButton->color() );
     mItem->setFrameBackgroundColor( mBackgroundColorButton->color() );
-    mItem->setMarkerSymbol( mMarkerSymbol );
-    mMarkerSymbol = nullptr; //item takes ownership
+    mItem->setMarkerSymbol( mMarkerSymbol->clone() );
     mItem->update();
   }
 }
@@ -108,8 +106,7 @@ void QgsAnnotationWidget::on_mMapMarkerButton_clicked()
   }
   else
   {
-    delete mMarkerSymbol;
-    mMarkerSymbol = markerSymbol;
+    mMarkerSymbol.reset( markerSymbol );
     updateCenterIcon();
   }
 }
@@ -120,7 +117,7 @@ void QgsAnnotationWidget::updateCenterIcon()
   {
     return;
   }
-  QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mMarkerSymbol, mMapMarkerButton->iconSize() );
+  QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mMarkerSymbol.data(), mMapMarkerButton->iconSize() );
   mMapMarkerButton->setIcon( icon );
 }
 
diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h
@@ -44,7 +44,7 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW
 
   private:
     QgsAnnotationItem* mItem;
-    QgsMarkerSymbolV2* mMarkerSymbol;
+    QScopedPointer< QgsMarkerSymbolV2 > mMarkerSymbol;
 
     void blockAllSignals( bool block );
     void updateCenterIcon();

diff --git a/src/app/qgsformannotationdialog.cpp b/src/app/qgsformannotationdialog.cpp
@@ -89,3 +89,11 @@ void QgsFormAnnotationDialog::deleteItem()
   mItem = nullptr;
 }
 
+void QgsFormAnnotationDialog::on_mButtonBox_clicked( QAbstractButton* button )
+{
+  if ( mButtonBox->buttonRole( button ) == QDialogButtonBox::ApplyRole )
+  {
+    applySettingsToItem();
+  }
+}
+
diff --git a/src/app/qgsformannotationdialog.h b/src/app/qgsformannotationdialog.h
@@ -35,6 +35,7 @@ class APP_EXPORT QgsFormAnnotationDialog: public QDialog, private Ui::QgsFormAnn
     void applySettingsToItem();
     void on_mBrowseToolButton_clicked();
     void deleteItem();
+    void on_mButtonBox_clicked( QAbstractButton* button );
 };
 
 #endif // QGSFORMANNOTATIONDIALOG_H
diff --git a/src/app/qgshtmlannotationdialog.cpp b/src/app/qgshtmlannotationdialog.cpp
@@ -94,3 +94,11 @@ void QgsHtmlAnnotationDialog::deleteItem()
   mItem = nullptr;
 }
 
+void QgsHtmlAnnotationDialog::on_mButtonBox_clicked( QAbstractButton* button )
+{
+  if ( mButtonBox->buttonRole( button ) == QDialogButtonBox::ApplyRole )
+  {
+    applySettingsToItem();
+  }
+}
+
diff --git a/src/app/qgshtmlannotationdialog.h b/src/app/qgshtmlannotationdialog.h
@@ -35,6 +35,7 @@ class APP_EXPORT QgsHtmlAnnotationDialog: public QDialog, private Ui::QgsFormAnn
     void applySettingsToItem();
     void on_mBrowseToolButton_clicked();
     void deleteItem();
+    void on_mButtonBox_clicked( QAbstractButton* button );
 };
 
 #endif // QgsHTMLAnnotationDialog_H
diff --git a/src/app/qgssvgannotationdialog.cpp b/src/app/qgssvgannotationdialog.cpp
@@ -89,3 +89,11 @@ void QgsSvgAnnotationDialog::deleteItem()
   delete mItem;
   mItem = nullptr;
 }
+
+void QgsSvgAnnotationDialog::on_mButtonBox_clicked( QAbstractButton* button )
+{
+  if ( mButtonBox->buttonRole( button ) == QDialogButtonBox::ApplyRole )
+  {
+    applySettingsToItem();
+  }
+}
diff --git a/src/app/qgssvgannotationdialog.h b/src/app/qgssvgannotationdialog.h
@@ -34,6 +34,7 @@ class APP_EXPORT QgsSvgAnnotationDialog: public QDialog, private Ui::QgsFormAnno
     void on_mBrowseToolButton_clicked();
     void applySettingsToItem();
     void deleteItem();
+    void on_mButtonBox_clicked( QAbstractButton* button );
 
   private:
     QgsSvgAnnotationDialog(); //forbidden

diff --git a/src/app/qgstextannotationdialog.cpp b/src/app/qgstextannotationdialog.cpp
@@ -58,6 +58,15 @@ QgsTextAnnotationDialog::~QgsTextAnnotationDialog()
   delete mTextDocument;
 }
 
+void QgsTextAnnotationDialog::on_mButtonBox_clicked( QAbstractButton *button )
+{
+  if ( mButtonBox->buttonRole( button ) == QDialogButtonBox::ApplyRole )
+  {
+    applyTextToItem();
+    mEmbeddedWidget->apply();
+  }
+}
+
 void QgsTextAnnotationDialog::showEvent( QShowEvent* )
 {
   backgroundColorChanged( mItem ? mItem->frameBackgroundColor() : Qt::white );

diff --git a/src/app/qgstextannotationdialog.h b/src/app/qgstextannotationdialog.h
@@ -49,6 +49,7 @@ class APP_EXPORT QgsTextAnnotationDialog: public QDialog, private Ui::QgsTextAnn
     void setCurrentFontPropertiesToGui();
     void deleteItem();
     void backgroundColorChanged( const QColor& color );
+    void on_mButtonBox_clicked( QAbstractButton* button );
 };
 
 #endif // QGSTEXTANNOTATIONDIALOG_H
diff --git a/src/ui/qgsformannotationdialogbase.ui b/src/ui/qgsformannotationdialogbase.ui
@@ -40,7 +40,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>

diff --git a/src/ui/qgstextannotationdialogbase.ui b/src/ui/qgstextannotationdialogbase.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>517</width>
+    <width>519</width>
     <height>364</height>
    </rect>
   </property>
@@ -97,7 +97,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>