Further small fixes to labeling widget interface

This code has been funded by Tuscany Region (Italy) - SITA (CIG: 63526840AE) and commissioned to Gis3W s.a.s.
qgis · Sep 24, 2015 · 9970b45 · 9970b45
1 parent be2cbe8
commit 9970b45
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5186,7 +5186,6 @@ void QgisApp::labeling()
 
   QDialogButtonBox *buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply, Qt::Horizontal, &dlg );
   layout->addWidget( buttonBox );
-  layout->setContentsMargins( 0, 0, 0, 0 );
 
   dlg.setLayout( layout );
 
@@ -5195,7 +5194,7 @@ void QgisApp::labeling()
 
   connect( buttonBox->button( QDialogButtonBox::Ok ), SIGNAL( clicked() ), &dlg, SLOT( accept() ) );
   connect( buttonBox->button( QDialogButtonBox::Cancel ), SIGNAL( clicked() ), &dlg, SLOT( reject() ) );
-  connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), labelingGui, SLOT( apply() ) );
+  connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), labelingGui, SLOT( writeSettingsToLayer() ) );
 
   if ( dlg.exec() )
   {

diff --git a/src/app/qgslabelingwidget.h b/src/app/qgslabelingwidget.h
@@ -19,11 +19,10 @@ class QgsLabelingWidget : public QWidget, private Ui::QgsLabelingWidget
   public:
     QgsLabelingWidget( QgsVectorLayer* layer, QgsMapCanvas* canvas, QWidget* parent = 0 );
 
+  public slots:
     //! save config to layer
     void writeSettingsToLayer();
 
-  signals:
-
   protected slots:
     void labelModeChanged( int index );
     void showEngineConfigDialog();

diff --git a/src/ui/qgsrulebasedlabelingwidget.ui b/src/ui/qgsrulebasedlabelingwidget.ui
@@ -11,6 +11,9 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTreeView" name="viewRules">
      <property name="acceptDrops">