More user friendly display of 'all other values' category

qgis · Jan 8, 2019 · 210ec4c · 210ec4c
1 parent f66773a
commit 210ec4c
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -164,6 +164,10 @@ QVariant QgsCategorizedSymbolRendererModel::data( const QModelIndex &index, int
             else // tooltip
               return res.join( '\n' );
           }
+          else if ( !category.value().isValid() || category.value().isNull() || category.value().toString().isEmpty() )
+          {
+            return tr( "all other values" );
+          }
           else
           {
             return category.value().toString();
@@ -175,6 +179,17 @@ QVariant QgsCategorizedSymbolRendererModel::data( const QModelIndex &index, int
       break;
     }
 
+    case Qt::FontRole:
+    {
+      if ( index.column() == 1 && category.value().type() != QVariant::List && ( !category.value().isValid() || category.value().isNull() || category.value().toString().isEmpty() ) )
+      {
+        QFont italicFont;
+        italicFont.setItalic( true );
+        return italicFont;
+      }
+      return QVariant();
+    }
+
     case Qt::DecorationRole:
     {
       if ( index.column() == 0 && category.symbol() )
@@ -187,7 +202,8 @@ QVariant QgsCategorizedSymbolRendererModel::data( const QModelIndex &index, int
     case Qt::ForegroundRole:
     {
       QBrush brush( qApp->palette().color( QPalette::Text ), Qt::SolidPattern );
-      if ( index.column() == 1 && category.value().type() == QVariant::List )
+      if ( index.column() == 1 && ( category.value().type() == QVariant::List
+                                    || !category.value().isValid() || category.value().isNull() || category.value().toString().isEmpty() ) )
       {
         QColor fadedTextColor = brush.color();
         fadedTextColor.setAlpha( 128 );