Skip to content

Commit 3f90ce6

Browse files
author
jef
committed
add missing combobox to set data defined label color
git-svn-id: http://svn.osgeo.org/qgis/trunk@10746 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3fa33b5 commit 3f90ce6

File tree

2 files changed

+83
-41
lines changed

2 files changed

+83
-41
lines changed

‎src/app/qgslabeldialog.cpp‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ void QgsLabelDialog::init( )
7272
cboLabelField->addItems( myFieldStringList );
7373
cboLabelField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Text ), myFieldStringList ) );
7474

75-
7675
cboFontField->clear();
7776
cboFontField->addItems( myFieldStringList );
7877
cboFontField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Family ), myFieldStringList ) );
@@ -98,9 +97,16 @@ void QgsLabelDialog::init( )
9897
cboFontSizeTypeField->addItems( myFieldStringList );
9998
cboFontSizeTypeField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::SizeType ), myFieldStringList ) );
10099

100+
#if 0
101101
cboFontTransparencyField->clear();
102102
cboFontTransparencyField->addItems( myFieldStringList );
103-
//cboFontTransparencyField->setCurrentIndex(itemNoForField(mLabel->labelField(QgsLabel::FontTransparency),myFieldStringList));
103+
cboFontTransparencyField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::FontTransparency ), myFieldStringList ) );
104+
#endif
105+
106+
cboFontColorField->clear();
107+
cboFontColorField->addItems( myFieldStringList );
108+
cboFontColorField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Color ), myFieldStringList ) );
109+
104110

105111
cboBufferSizeField->clear();
106112
cboBufferSizeField->addItems( myFieldStringList );
@@ -389,6 +395,7 @@ void QgsLabelDialog::apply()
389395
mLabel->setLabelField( QgsLabel::Underline, fieldIndexFromName( cboUnderlineField->currentText() ) );
390396
mLabel->setLabelField( QgsLabel::Size, fieldIndexFromName( cboFontSizeField->currentText() ) );
391397
mLabel->setLabelField( QgsLabel::SizeType, fieldIndexFromName( cboFontSizeTypeField->currentText() ) );
398+
mLabel->setLabelField( QgsLabel::Color, fieldIndexFromName( cboFontColorField->currentText() ) );
392399
mLabel->setLabelField( QgsLabel::BufferSize, fieldIndexFromName( cboBufferSizeField->currentText() ) );
393400
//mLabel->setLabelField( QgsLabel::BufferTransparency, cboBufferTransparencyField->currentText() );
394401
mLabel->setLabelField( QgsLabel::XCoordinate, fieldIndexFromName( cboXCoordinateField->currentText() ) );

‎src/ui/qgslabeldialogbase.ui‎

Lines changed: 74 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,31 @@
117117
</item>
118118
</widget>
119119
</item>
120+
<item row="2" column="0" colspan="2" >
121+
<widget class="QGroupBox" name="groupBox5" >
122+
<property name="sizePolicy" >
123+
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
124+
<horstretch>0</horstretch>
125+
<verstretch>0</verstretch>
126+
</sizepolicy>
127+
</property>
128+
<property name="title" >
129+
<string>Preview:</string>
130+
</property>
131+
<layout class="QGridLayout" >
132+
<property name="margin" >
133+
<number>11</number>
134+
</property>
135+
<item row="0" column="0" >
136+
<widget class="QLabel" name="lblSample" >
137+
<property name="text" >
138+
<string>QGIS Rocks!</string>
139+
</property>
140+
</widget>
141+
</item>
142+
</layout>
143+
</widget>
144+
</item>
120145
<item row="1" column="1" >
121146
<widget class="QStackedWidget" name="stackedWidget" >
122147
<property name="sizePolicy" >
@@ -126,15 +151,15 @@
126151
</sizepolicy>
127152
</property>
128153
<property name="currentIndex" >
129-
<number>0</number>
154+
<number>3</number>
130155
</property>
131156
<widget class="QWidget" name="page" >
132157
<property name="geometry" >
133158
<rect>
134159
<x>0</x>
135160
<y>0</y>
136-
<width>309</width>
137-
<height>394</height>
161+
<width>304</width>
162+
<height>399</height>
138163
</rect>
139164
</property>
140165
<layout class="QGridLayout" >
@@ -421,8 +446,8 @@
421446
<rect>
422447
<x>0</x>
423448
<y>0</y>
424-
<width>309</width>
425-
<height>394</height>
449+
<width>304</width>
450+
<height>399</height>
426451
</rect>
427452
</property>
428453
<layout class="QGridLayout" >
@@ -537,8 +562,8 @@
537562
<rect>
538563
<x>0</x>
539564
<y>0</y>
540-
<width>100</width>
541-
<height>30</height>
565+
<width>304</width>
566+
<height>399</height>
542567
</rect>
543568
</property>
544569
<layout class="QGridLayout" >
@@ -613,11 +638,11 @@
613638
<rect>
614639
<x>0</x>
615640
<y>0</y>
616-
<width>100</width>
617-
<height>30</height>
641+
<width>304</width>
642+
<height>399</height>
618643
</rect>
619644
</property>
620-
<layout class="QGridLayout" >
645+
<layout class="QGridLayout" name="gridLayout" >
621646
<item row="0" column="0" >
622647
<widget class="QLabel" name="lblFont" >
623648
<property name="sizePolicy" >
@@ -776,6 +801,9 @@
776801
</item>
777802
<item row="6" column="0" >
778803
<widget class="QLabel" name="textLabel4_3_2_3" >
804+
<property name="enabled" >
805+
<bool>false</bool>
806+
</property>
779807
<property name="sizePolicy" >
780808
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
781809
<horstretch>0</horstretch>
@@ -792,6 +820,35 @@
792820
</item>
793821
<item row="6" column="1" >
794822
<widget class="QComboBox" name="cboFontTransparencyField" >
823+
<property name="enabled" >
824+
<bool>false</bool>
825+
</property>
826+
<property name="minimumSize" >
827+
<size>
828+
<width>0</width>
829+
<height>20</height>
830+
</size>
831+
</property>
832+
</widget>
833+
</item>
834+
<item row="7" column="0" >
835+
<widget class="QLabel" name="textLabel4_3_2_5" >
836+
<property name="sizePolicy" >
837+
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
838+
<horstretch>0</horstretch>
839+
<verstretch>0</verstretch>
840+
</sizepolicy>
841+
</property>
842+
<property name="text" >
843+
<string>&amp;Color</string>
844+
</property>
845+
<property name="buddy" >
846+
<cstring>cboFontColorField</cstring>
847+
</property>
848+
</widget>
849+
</item>
850+
<item row="7" column="1" >
851+
<widget class="QComboBox" name="cboFontColorField" >
795852
<property name="minimumSize" >
796853
<size>
797854
<width>0</width>
@@ -807,8 +864,8 @@
807864
<rect>
808865
<x>0</x>
809866
<y>0</y>
810-
<width>100</width>
811-
<height>30</height>
867+
<width>304</width>
868+
<height>399</height>
812869
</rect>
813870
</property>
814871
<layout class="QGridLayout" >
@@ -851,8 +908,8 @@
851908
<rect>
852909
<x>0</x>
853910
<y>0</y>
854-
<width>100</width>
855-
<height>30</height>
911+
<width>304</width>
912+
<height>399</height>
856913
</rect>
857914
</property>
858915
<layout class="QGridLayout" >
@@ -987,32 +1044,10 @@
9871044
</widget>
9881045
</widget>
9891046
</item>
990-
<item row="2" column="0" colspan="2" >
991-
<widget class="QGroupBox" name="groupBox5" >
992-
<property name="sizePolicy" >
993-
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
994-
<horstretch>0</horstretch>
995-
<verstretch>0</verstretch>
996-
</sizepolicy>
997-
</property>
998-
<property name="title" >
999-
<string>Preview:</string>
1000-
</property>
1001-
<layout class="QGridLayout" >
1002-
<property name="margin" >
1003-
<number>11</number>
1004-
</property>
1005-
<item row="0" column="0" >
1006-
<widget class="QLabel" name="lblSample" >
1007-
<property name="text" >
1008-
<string>QGIS Rocks!</string>
1009-
</property>
1010-
</widget>
1011-
</item>
1012-
</layout>
1013-
</widget>
1014-
</item>
10151047
</layout>
1048+
<zorder>listWidget</zorder>
1049+
<zorder>groupBox5</zorder>
1050+
<zorder>stackedWidget</zorder>
10161051
</widget>
10171052
<layoutdefault spacing="6" margin="11" />
10181053
<tabstops>

0 commit comments

Comments
 (0)