Skip to content
Permalink
Browse files

Add direct link to PAL engine settings to diagram tab

  • Loading branch information
m-kuhn committed Aug 15, 2012
1 parent 97a5427 commit 2a48a61dcc0c8767b28380536c3390d7d93e249a
@@ -19,7 +19,9 @@
#include "diagram/qgspiediagram.h"
#include "diagram/qgstextdiagram.h"

#include "qgisapp.h"
#include "qgsdiagramproperties.h"
#include "qgslabelengineconfigdialog.h"
#include "qgsvectorlayerproperties.h"
#include "qgsdiagramrendererv2.h"
#include "qgsvectordataprovider.h"
@@ -441,6 +443,12 @@ void QgsDiagramProperties::on_mDiagramAttributesTreeWidget_itemDoubleClicked( QT
}
}

void QgsDiagramProperties::on_mEngineSettingsButton_clicked()
{
QgsLabelEngineConfigDialog dlg( QgisApp::instance()->palLabeling(), this );
dlg.exec();
}

void QgsDiagramProperties::apply()
{
if ( !mDisplayDiagramsGroupBox->isChecked() )
@@ -44,6 +44,7 @@ class QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPropertiesBas
void on_mRemoveCategoryPushButton_clicked();
void on_mDiagramFontButton_clicked();
void on_mDiagramAttributesTreeWidget_itemDoubleClicked( QTreeWidgetItem * item, int column );
void on_mEngineSettingsButton_clicked();

protected:
QFont mDiagramFont;
@@ -117,7 +117,7 @@
<item>
<widget class="QTabWidget" name="mDiagramPropertiesTabWidget">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -531,7 +531,7 @@
</item>
</layout>
</item>
<item row="2" column="0">
<item row="4" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -544,7 +544,7 @@
</property>
</spacer>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QGroupBox" name="mDataDefinedPositionGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -611,7 +611,7 @@
</layout>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -637,6 +637,13 @@
</property>
</spacer>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="mEngineSettingsButton">
<property name="text">
<string>Engine settings</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="mOptionsTab">
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>316</width>
<height>271</height>
<width>435</width>
<height>307</height>
</rect>
</property>
<property name="windowTitle">
@@ -175,14 +175,14 @@
<item>
<widget class="QCheckBox" name="chkShowAllLabels">
<property name="text">
<string>Show all labels (i.e. including colliding labels)</string>
<string>Show all labels and features (i.e. including colliding objects)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkShowCandidates">
<property name="text">
<string>Show label candidates (for debugging)</string>
<string>Show candidates (for debugging)</string>
</property>
</widget>
</item>

0 comments on commit 2a48a61

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