Fix for #8003, font not written to table when using change label properties tool

The following have been updated/added to match layer's new labeling gui:
- Comboboxes for font family and style
- Buttons for underline, strikeout, bold and italic

src/app/qgslabelpropertydialog.cpp

@@ -17,14 +17,17 @@
 
 #include "qgslabelpropertydialog.h"
 #include <qgsdatadefined.h>
+#include <qgsfontutils.h>
+#include <qgslogger.h>
 #include "qgsmaplayerregistry.h"
 #include "qgsmaprenderer.h"
 #include "qgsvectorlayer.h"
-#include <QColorDialog>
-#include <QFontDialog>
 
-QgsLabelPropertyDialog::QgsLabelPropertyDialog( const QString& layerId, int featureId, const QString& labelText, QgsMapRenderer* renderer, QWidget * parent, Qt::WindowFlags f ):
-    QDialog( parent, f ), mMapRenderer( renderer ), mCurLabelField( -1 )
+#include <QColorDialog>
+#include <QFontDatabase>
+
+QgsLabelPropertyDialog::QgsLabelPropertyDialog( const QString& layerId, int featureId, const QFont& labelFont, const QString& labelText, QgsMapRenderer* renderer, QWidget * parent, Qt::WindowFlags f ):
+    QDialog( parent, f ), mMapRenderer( renderer ), mLabelFont( labelFont ), mCurLabelField( -1 )
 {
   setupUi( this );
   fillHaliComboBox();
@@ -99,10 +102,11 @@ void QgsLabelPropertyDialog::init( const QString& layerId, int featureId, const
   }
 
   //get attributes of the feature and fill data defined values
-  mLabelFont = layerSettings.textFont;
 
-  //set all the gui elements to the default values
-  mFontSizeSpinBox->setValue( layerSettings.textFont.pointSizeF() );
+  // font is set directly from QgsLabelPosition
+  updateFont( mLabelFont, false );
+
+  //set all the gui elements to the default layer-level values
   mBufferColorButton->setColor( layerSettings.textColor );
   mLabelDistanceSpinBox->setValue( layerSettings.dist );
   mBufferSizeSpinBox->setValue( layerSettings.bufferSize );
@@ -115,14 +119,16 @@ void QgsLabelPropertyDialog::init( const QString& layerId, int featureId, const
 
   disableGuiElements();
 
-  bool fontEditing = false;
-
   mDataDefinedProperties = layerSettings.dataDefinedProperties;
   QMap< QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined* >::const_iterator propIt = mDataDefinedProperties.constBegin();
 
   for ( ; propIt != mDataDefinedProperties.constEnd(); ++propIt )
   {
     QgsDataDefined* dd = propIt.value();
+    if ( !dd )
+    {
+      continue;
+    }
     QString ddField = dd->field();
     if ( !dd->isActive() || dd->useExpression() || ddField.isEmpty() )
     {
@@ -135,6 +141,8 @@ void QgsLabelPropertyDialog::init( const QString& layerId, int featureId, const
       continue;
     }
 
+    QgsDebugMsg( QString( "ddField: %1" ).arg( ddField ) );
+
     bool ok = false;
     switch ( propIt.key() )
     {
@@ -169,18 +177,6 @@ void QgsLabelPropertyDialog::init( const QString& layerId, int featureId, const
         }
         break;
       }
-      case QgsPalLayerSettings::Size:
-      {
-        mFontSizeSpinBox->setEnabled( true );
-        double fontSize = mCurLabelFeat.attribute( ddIndx ).toDouble( &ok );
-        if ( ok )
-        {
-          mLabelFont.setPointSizeF( fontSize );
-          mFontSizeSpinBox->setValue( fontSize );
-          fontEditing = true;
-        }
-        break;
-      }
       case QgsPalLayerSettings::BufferSize:
       {
         mBufferSizeSpinBox->setEnabled( true );
@@ -249,31 +245,31 @@ void QgsLabelPropertyDialog::init( const QString& layerId, int featureId, const
       }
 
       //font related properties
-      case QgsPalLayerSettings::Bold:
-        mLabelFont.setBold( mCurLabelFeat.attribute( ddIndx ).toBool() );
-        fontEditing = true;
+      case QgsPalLayerSettings::Family:
+        mFontFamilyCmbBx->setEnabled( true );
         break;
-      case QgsPalLayerSettings::Italic:
-        mLabelFont.setItalic( mCurLabelFeat.attribute( ddIndx ).toBool() );
-        fontEditing = true;
+      case QgsPalLayerSettings::FontStyle:
+        mFontStyleCmbBx->setEnabled( true );
         break;
       case QgsPalLayerSettings::Underline:
-        mLabelFont.setUnderline( mCurLabelFeat.attribute( ddIndx ).toBool() );
-        fontEditing = true;
+        mFontUnderlineBtn->setEnabled( true );
         break;
       case QgsPalLayerSettings::Strikeout:
-        mLabelFont.setStrikeOut( mCurLabelFeat.attribute( ddIndx ).toBool() );
-        fontEditing = true;
+        mFontStrikethroughBtn->setEnabled( true );
         break;
-      case QgsPalLayerSettings::Family:
-        mLabelFont.setFamily( mCurLabelFeat.attribute( ddIndx ).toString() );
-        fontEditing = true;
+      case QgsPalLayerSettings::Bold:
+        mFontBoldBtn->setEnabled( true );
+        break;
+      case QgsPalLayerSettings::Italic:
+        mFontItalicBtn->setEnabled( true );
+        break;
+      case QgsPalLayerSettings::Size:
+        mFontSizeSpinBox->setEnabled( true );
         break;
       default:
         break;
     }
   }
-  mFontPushButton->setEnabled( fontEditing );
   blockElementSignals( false );
 }
 
@@ -283,9 +279,14 @@ void QgsLabelPropertyDialog::disableGuiElements()
   mAlwaysShowChkbx->setEnabled( false );
   mMinScaleSpinBox->setEnabled( false );
   mMaxScaleSpinBox->setEnabled( false );
+  mFontFamilyCmbBx->setEnabled( false );
+  mFontStyleCmbBx->setEnabled( false );
+  mFontUnderlineBtn->setEnabled( false );
+  mFontStrikethroughBtn->setEnabled( false );
+  mFontBoldBtn->setEnabled( false );
+  mFontItalicBtn->setEnabled( false );
   mFontSizeSpinBox->setEnabled( false );
   mBufferSizeSpinBox->setEnabled( false );
-  mFontPushButton->setEnabled( false );
   mFontColorButton->setEnabled( false );
   mBufferColorButton->setEnabled( false );
   mLabelDistanceSpinBox->setEnabled( false );
@@ -302,9 +303,14 @@ void QgsLabelPropertyDialog::blockElementSignals( bool block )
   mAlwaysShowChkbx->blockSignals( block );
   mMinScaleSpinBox->blockSignals( block );
   mMaxScaleSpinBox->blockSignals( block );
+  mFontFamilyCmbBx->blockSignals( block );
+  mFontStyleCmbBx->blockSignals( block );
+  mFontUnderlineBtn->blockSignals( block );
+  mFontStrikethroughBtn->blockSignals( block );
+  mFontBoldBtn->blockSignals( block );
+  mFontItalicBtn->blockSignals( block );
   mFontSizeSpinBox->blockSignals( block );
   mBufferSizeSpinBox->blockSignals( block );
-  mFontPushButton->blockSignals( block );
   mFontColorButton->blockSignals( block );
   mBufferColorButton->blockSignals( block );
   mLabelDistanceSpinBox->blockSignals( block );
@@ -315,6 +321,45 @@ void QgsLabelPropertyDialog::blockElementSignals( bool block )
   mRotationSpinBox->blockSignals( block );
 }
 
+void QgsLabelPropertyDialog::updateFont( const QFont& font, bool block )
+{
+  // update background reference font
+  if ( font != mLabelFont )
+  {
+    mLabelFont = font;
+  }
+
+  if ( block )
+    blockElementSignals( true );
+  mFontFamilyCmbBx->setCurrentFont( mLabelFont );
+  populateFontStyleComboBox();
+  mFontUnderlineBtn->setChecked( mLabelFont.underline() );
+  mFontStrikethroughBtn->setChecked( mLabelFont.strikeOut() );
+  mFontBoldBtn->setChecked( mLabelFont.bold() );
+  mFontItalicBtn->setChecked( mLabelFont.italic() );
+  mFontSizeSpinBox->setValue( mLabelFont.pointSizeF() );
+  if ( block )
+    blockElementSignals( false );
+}
+
+void QgsLabelPropertyDialog::populateFontStyleComboBox()
+{
+  mFontStyleCmbBx->clear();
+  foreach ( const QString &style, mFontDB.styles( mLabelFont.family() ) )
+  {
+    mFontStyleCmbBx->addItem( style );
+  }
+
+  int curIndx = 0;
+  int stylIndx = mFontStyleCmbBx->findText( mFontDB.styleString( mLabelFont ) );
+  if ( stylIndx > -1 )
+  {
+    curIndx = stylIndx;
+  }
+
+  mFontStyleCmbBx->setCurrentIndex( curIndx );
+}
+
 void QgsLabelPropertyDialog::fillHaliComboBox()
 {
   mHaliComboBox->addItem( "Left" );
@@ -365,6 +410,48 @@ void QgsLabelPropertyDialog::on_mYCoordSpinBox_valueChanged( double d )
   insertChangedValue( QgsPalLayerSettings::PositionY, d );
 }
 
+void QgsLabelPropertyDialog::on_mFontFamilyCmbBx_currentFontChanged( const QFont& f )
+{
+  mLabelFont.setFamily( f.family() );
+  updateFont( mLabelFont );
+  insertChangedValue( QgsPalLayerSettings::Family, f.family() );
+}
+
+void QgsLabelPropertyDialog::on_mFontStyleCmbBx_currentIndexChanged( const QString & text )
+{
+  QgsFontUtils::updateFontViaStyle( mLabelFont, text );
+  updateFont( mLabelFont );
+  insertChangedValue( QgsPalLayerSettings::FontStyle, text );
+}
+
+void QgsLabelPropertyDialog::on_mFontUnderlineBtn_toggled( bool ckd )
+{
+  mLabelFont.setUnderline( ckd );
+  updateFont( mLabelFont );
+  insertChangedValue( QgsPalLayerSettings::Underline, ckd );
+}
+
+void QgsLabelPropertyDialog::on_mFontStrikethroughBtn_toggled( bool ckd )
+{
+  mLabelFont.setStrikeOut( ckd );
+  updateFont( mLabelFont );
+  insertChangedValue( QgsPalLayerSettings::Strikeout, ckd );
+}
+
+void QgsLabelPropertyDialog::on_mFontBoldBtn_toggled( bool ckd )
+{
+  mLabelFont.setBold( ckd );
+  updateFont( mLabelFont );
+  insertChangedValue( QgsPalLayerSettings::Bold, ckd );
+}
+
+void QgsLabelPropertyDialog::on_mFontItalicBtn_toggled( bool ckd )
+{
+  mLabelFont.setItalic( ckd );
+  updateFont( mLabelFont );
+  insertChangedValue( QgsPalLayerSettings::Italic, ckd );
+}
+
 void QgsLabelPropertyDialog::on_mFontSizeSpinBox_valueChanged( double d )
 {
   insertChangedValue( QgsPalLayerSettings::Size, d );
@@ -380,25 +467,6 @@ void QgsLabelPropertyDialog::on_mRotationSpinBox_valueChanged( double d )
   insertChangedValue( QgsPalLayerSettings::Rotation, d );
 }
 
-void QgsLabelPropertyDialog::on_mFontPushButton_clicked()
-{
-  bool ok;
-#if defined(Q_WS_MAC) && QT_VERSION >= 0x040500 && defined(QT_MAC_USE_COCOA)
-  // Native Mac dialog works only for Qt Carbon
-  mLabelFont = QFontDialog::getFont( &ok, mLabelFont, 0, tr( "Label font" ), QFontDialog::DontUseNativeDialog );
-#else
-  mLabelFont = QFontDialog::getFont( &ok, mLabelFont, 0, tr( "Label font" ) );
-#endif
-  if ( ok )
-  {
-    insertChangedValue( QgsPalLayerSettings::Size, mLabelFont.pointSizeF() );
-    insertChangedValue( QgsPalLayerSettings::Bold, mLabelFont.bold() );
-    insertChangedValue( QgsPalLayerSettings::Italic, mLabelFont.italic() );
-    insertChangedValue( QgsPalLayerSettings::Underline, mLabelFont.underline() );
-    insertChangedValue( QgsPalLayerSettings::Strikeout, mLabelFont.strikeOut() );
-  }
-}
-
 void QgsLabelPropertyDialog::on_mFontColorButton_colorChanged( const QColor &color )
 {
   insertChangedValue( QgsPalLayerSettings::Color, color.name() );

src/app/qgslabelpropertydialog.h

@@ -30,7 +30,7 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog
 {
     Q_OBJECT
   public:
-    QgsLabelPropertyDialog( const QString& layerId, int featureId, const QString& labelText, QgsMapRenderer* renderer, QWidget * parent = 0, Qt::WindowFlags f = 0 );
+    QgsLabelPropertyDialog( const QString& layerId, int featureId, const QFont& labelFont, const QString& labelText, QgsMapRenderer* renderer, QWidget * parent = 0, Qt::WindowFlags f = 0 );
     ~QgsLabelPropertyDialog();
 
     /**Returns properties changed by the user*/
@@ -44,10 +44,21 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog
     void on_mLabelDistanceSpinBox_valueChanged( double d );
     void on_mXCoordSpinBox_valueChanged( double d );
     void on_mYCoordSpinBox_valueChanged( double d );
+    /** @note added in 1.9 */
+    void on_mFontFamilyCmbBx_currentFontChanged( const QFont& f );
+    /** @note added in 1.9 */
+    void on_mFontStyleCmbBx_currentIndexChanged( const QString & text );
+    /** @note added in 1.9 */
+    void on_mFontUnderlineBtn_toggled( bool ckd );
+    /** @note added in 1.9 */
+    void on_mFontStrikethroughBtn_toggled( bool ckd );
+    /** @note added in 1.9 */
+    void on_mFontBoldBtn_toggled( bool ckd );
+    /** @note added in 1.9 */
+    void on_mFontItalicBtn_toggled( bool ckd );
     void on_mFontSizeSpinBox_valueChanged( double d );
     void on_mBufferSizeSpinBox_valueChanged( double d );
     void on_mRotationSpinBox_valueChanged( double d );
-    void on_mFontPushButton_clicked();
     void on_mFontColorButton_colorChanged( const QColor &color );
     void on_mBufferColorButton_colorChanged( const QColor &color );
     void on_mHaliComboBox_currentIndexChanged( const QString& text );
@@ -61,6 +72,14 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog
     /**Block / unblock all input element signals*/
     void blockElementSignals( bool block );
 
+    /** Updates font when family or style is updated
+     * @note added in 1.9 */
+    void updateFont( const QFont& font, bool block = true );
+
+    /** Updates combobox with named styles of font
+     * @note added in 1.9 */
+    void populateFontStyleComboBox();
+
     void fillHaliComboBox();
     void fillValiComboBox();
 
@@ -73,6 +92,9 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog
     QMap< QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined* > mDataDefinedProperties;
     QFont mLabelFont;
 
+    /** @note added in 1.9 */
+    QFontDatabase mFontDB;
+
     /**Label field for the current layer (or -1 if none)*/
     int mCurLabelField;
 

src/app/qgsmaptoolchangelabelproperties.cpp

@@ -61,7 +61,7 @@ void QgsMapToolChangeLabelProperties::canvasReleaseEvent( QMouseEvent *e )
       labeltext = mCurrentLabelPos.labelText;
     }
 
-    QgsLabelPropertyDialog d( mCurrentLabelPos.layerID, mCurrentLabelPos.featureId, labeltext, mCanvas->mapRenderer() );
+    QgsLabelPropertyDialog d( mCurrentLabelPos.layerID, mCurrentLabelPos.featureId, mCurrentLabelPos.labelFont, labeltext, mCanvas->mapRenderer() );
     if ( d.exec() == QDialog::Accepted )
     {
       const QgsAttributeMap& changes = d.changedProperties();

src/ui/qgslabelpropertydialogbase.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>415</width>
-    <height>611</height>
+    <height>695</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -34,14 +34,34 @@
       <string>Font</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="2">
-       <widget class="QPushButton" name="mFontPushButton">
-        <property name="text">
-         <string>Font</string>
+      <item row="1" column="1" colspan="2">
+       <widget class="QComboBox" name="mFontStyleCmbBx">
+        <property name="toolTip">
+         <string>Available typeface styles</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
+      <item row="3" column="2">
+       <widget class="QgsColorButton" name="mFontColorButton">
+        <property name="maximumSize">
+         <size>
+          <width>100</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="3">
+       <widget class="QFontComboBox" name="mFontFamilyCmbBx">
+        <property name="editable">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLabel" name="mFontSizeLabel">
@@ -68,19 +88,173 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="1">
-       <widget class="QgsColorButton" name="mFontColorButton">
-        <property name="maximumSize">
-         <size>
-          <width>100</width>
-          <height>16777215</height>
-         </size>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
         <property name="text">
-         <string/>
+         <string>Style</string>
         </property>
        </widget>
       </item>
+      <item row="2" column="1" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QToolButton" name="mFontUnderlineBtn">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>13</pointsize>
+            <underline>true</underline>
+           </font>
+          </property>
+          <property name="toolTip">
+           <string>Underlined text</string>
+          </property>
+          <property name="text">
+           <string>U</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="mFontStrikethroughBtn">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>13</pointsize>
+            <strikeout>true</strikeout>
+           </font>
+          </property>
+          <property name="toolTip">
+           <string>Strikeout text</string>
+          </property>
+          <property name="text">
+           <string>S</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>0</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QToolButton" name="mFontBoldBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>13</pointsize>
+           </font>
+          </property>
+          <property name="toolTip">
+           <string>Bold text
+(data defined only, overrides Style)</string>
+          </property>
+          <property name="text">
+           <string>B</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="mFontItalicBtn">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>13</pointsize>
+            <italic>true</italic>
+           </font>
+          </property>
+          <property name="toolTip">
+           <string>Italic text
+(data defined only, overrides Style)</string>
+          </property>
+          <property name="text">
+           <string>I</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>