Skip to content
Permalink
Browse files

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.
  • Loading branch information
wonder-sk committed Sep 24, 2015
1 parent be2cbe8 commit 9970b45a87aeeb73f26af0dc26e437bc1fecdc77
Showing with 5 additions and 4 deletions.
  1. +1 −2 src/app/qgisapp.cpp
  2. +1 −2 src/app/qgslabelingwidget.h
  3. +3 −0 src/ui/qgsrulebasedlabelingwidget.ui
@@ -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() )
{
@@ -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();
@@ -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">

0 comments on commit 9970b45

Please sign in to comment.
You can’t perform that action at this time.