Query result UX tweaks

src/core/qgsqueryresultmodel.cpp

@@ -16,6 +16,10 @@
 #include "qgsqueryresultmodel.h"
 #include "moc_qgsqueryresultmodel.cpp"
 #include "qgsexpression.h"
+#include "qgsapplication.h"
+#include "qgsfileutils.h"
+
+#include <QFont>
 
 const int QgsQueryResultModel::FETCH_MORE_ROWS_COUNT = 400;
 
@@ -122,21 +126,76 @@ QVariant QgsQueryResultModel::data( const QModelIndex &index, int role ) const
       const QList<QVariant> result = mRows.at( index.row() );
       if ( index.column() < result.count( ) )
       {
-        return result.at( index.column() );
+        const QVariant value = result.at( index.column() );
+
+        if ( QgsVariantUtils::isNull( value ) )
+        {
+          return QgsApplication::nullRepresentation();
+        }
+        else if ( value.type() == QVariant::ByteArray )
+        {
+          return tr( "Binary (%1)" ).arg( QgsFileUtils::representFileSize( value.value< QByteArray >().size() ) );
+        }
+        else
+        {
+          return value;
+        }
       }
       break;
     }
 
+    case Qt::FontRole:
+    {
+      const QList<QVariant> result = mRows.at( index.row() );
+      if ( index.column() < result.count( ) )
+      {
+        const QVariant value = result.at( index.column() );
+
+        if ( QgsVariantUtils::isNull( value ) )
+        {
+          QFont f;
+          f.setItalic( true );
+          return f;
+        }
+      }
+      return QVariant();
+    }
+
+    case Qt::ForegroundRole:
+    {
+      const QList<QVariant> result = mRows.at( index.row() );
+      if ( index.column() < result.count( ) )
+      {
+        const QVariant value = result.at( index.column() );
+
+        if ( QgsVariantUtils::isNull( value ) )
+        {
+          return QColor( 128, 128, 128 );
+        }
+      }
+      return QVariant();
+    }
+
     case Qt::ToolTipRole:
     {
       const QList<QVariant> result = mRows.at( index.row() );
       if ( index.column() < result.count( ) )
       {
         const QVariant value = result.at( index.column() );
-        return QgsExpression::formatPreviewString( value, true, 255 );
+        if ( QgsVariantUtils::isNull( value ) )
+        {
+          return QVariant();
+        }
+        else
+        {
+          return QgsExpression::formatPreviewString( value, true, 255 );
+        }
       }
       break;
     }
+
+    default:
+      break;
   }
   return QVariant();
 }