diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.cpp
index 1817ddb5123a..b89613e401e9 100644
--- a/src/app/qgslabeldialog.cpp
+++ b/src/app/qgslabeldialog.cpp
@@ -72,7 +72,6 @@ void QgsLabelDialog::init( )
cboLabelField->addItems( myFieldStringList );
cboLabelField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Text ), myFieldStringList ) );
-
cboFontField->clear();
cboFontField->addItems( myFieldStringList );
cboFontField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Family ), myFieldStringList ) );
@@ -98,9 +97,16 @@ void QgsLabelDialog::init( )
cboFontSizeTypeField->addItems( myFieldStringList );
cboFontSizeTypeField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::SizeType ), myFieldStringList ) );
+#if 0
cboFontTransparencyField->clear();
cboFontTransparencyField->addItems( myFieldStringList );
- //cboFontTransparencyField->setCurrentIndex(itemNoForField(mLabel->labelField(QgsLabel::FontTransparency),myFieldStringList));
+ cboFontTransparencyField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::FontTransparency ), myFieldStringList ) );
+#endif
+
+ cboFontColorField->clear();
+ cboFontColorField->addItems( myFieldStringList );
+ cboFontColorField->setCurrentIndex( itemNoForField( mLabel->labelField( QgsLabel::Color ), myFieldStringList ) );
+
cboBufferSizeField->clear();
cboBufferSizeField->addItems( myFieldStringList );
@@ -389,6 +395,7 @@ void QgsLabelDialog::apply()
mLabel->setLabelField( QgsLabel::Underline, fieldIndexFromName( cboUnderlineField->currentText() ) );
mLabel->setLabelField( QgsLabel::Size, fieldIndexFromName( cboFontSizeField->currentText() ) );
mLabel->setLabelField( QgsLabel::SizeType, fieldIndexFromName( cboFontSizeTypeField->currentText() ) );
+ mLabel->setLabelField( QgsLabel::Color, fieldIndexFromName( cboFontColorField->currentText() ) );
mLabel->setLabelField( QgsLabel::BufferSize, fieldIndexFromName( cboBufferSizeField->currentText() ) );
//mLabel->setLabelField( QgsLabel::BufferTransparency, cboBufferTransparencyField->currentText() );
mLabel->setLabelField( QgsLabel::XCoordinate, fieldIndexFromName( cboXCoordinateField->currentText() ) );
diff --git a/src/ui/qgslabeldialogbase.ui b/src/ui/qgslabeldialogbase.ui
index cca5d8edc517..9929d3bf93f1 100644
--- a/src/ui/qgslabeldialogbase.ui
+++ b/src/ui/qgslabeldialogbase.ui
@@ -117,6 +117,31 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Preview:
+
+
+
+ 11
+
+
-
+
+
+ QGIS Rocks!
+
+
+
+
+
+
-
@@ -126,15 +151,15 @@
- 0
+ 3
0
0
- 309
- 394
+ 304
+ 399
@@ -421,8 +446,8 @@
0
0
- 309
- 394
+ 304
+ 399
@@ -537,8 +562,8 @@
0
0
- 100
- 30
+ 304
+ 399
@@ -613,11 +638,11 @@
0
0
- 100
- 30
+ 304
+ 399
-
+
-
@@ -776,6 +801,9 @@
-
+
+ false
+
0
@@ -792,6 +820,35 @@
-
+
+ false
+
+
+
+ 0
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ &Color
+
+
+ cboFontColorField
+
+
+
+ -
+
0
@@ -807,8 +864,8 @@
0
0
- 100
- 30
+ 304
+ 399
@@ -851,8 +908,8 @@
0
0
- 100
- 30
+ 304
+ 399
@@ -987,32 +1044,10 @@
- -
-
-
-
- 0
- 0
-
-
-
- Preview:
-
-
-
- 11
-
-
-
-
-
- QGIS Rocks!
-
-
-
-
-
-
+ listWidget
+ groupBox5
+ stackedWidget