diff --git a/images/images.qrc b/images/images.qrc
index d9fd1387d5ff..0a6142fdf6c8 100644
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -346,6 +346,12 @@
themes/default/mIconExpressionPreview.svg
themes/default/mIconExpressionSelect.svg
themes/default/mIconFavourites.png
+ themes/default/mIconFieldDate.svg
+ themes/default/mIconFieldDateTime.svg
+ themes/default/mIconFieldFloat.svg
+ themes/default/mIconFieldInteger.svg
+ themes/default/mIconFieldText.svg
+ themes/default/mIconFieldTime.svg
themes/default/mIconFirst.png
themes/default/mIconGeometryLayer.png
themes/default/mIconInfo.png
@@ -518,10 +524,6 @@
themes/default/mActionCircularStringCurvePoint.svg
themes/default/mActionCircularStringRadius.png
themes/default/mActionCircularStringRadius.svg
- themes/default/mIconFloatField.svg
- themes/default/mIconIntegerField.svg
- themes/default/mIconDateField.svg
- themes/default/mIconDateTimeField.svg
flags/zh.png
diff --git a/images/themes/default/mIconDateField.svg b/images/themes/default/mIconDateField.svg
deleted file mode 100644
index 6be287822c5e..000000000000
--- a/images/themes/default/mIconDateField.svg
+++ /dev/null
@@ -1,797 +0,0 @@
-
-
-
-
diff --git a/images/themes/default/mIconDateTimeField.svg b/images/themes/default/mIconDateTimeField.svg
deleted file mode 100644
index 077d7d6ce67a..000000000000
--- a/images/themes/default/mIconDateTimeField.svg
+++ /dev/null
@@ -1,818 +0,0 @@
-
-
-
-
diff --git a/images/themes/default/mIconFieldDate.svg b/images/themes/default/mIconFieldDate.svg
new file mode 100644
index 000000000000..213938281ce5
--- /dev/null
+++ b/images/themes/default/mIconFieldDate.svg
@@ -0,0 +1,60 @@
+
+
+
+
diff --git a/images/themes/default/mIconFieldDateTime.svg b/images/themes/default/mIconFieldDateTime.svg
new file mode 100644
index 000000000000..c3c2f477fa0f
--- /dev/null
+++ b/images/themes/default/mIconFieldDateTime.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/images/themes/default/mIconFloatField.svg b/images/themes/default/mIconFieldFloat.svg
similarity index 100%
rename from images/themes/default/mIconFloatField.svg
rename to images/themes/default/mIconFieldFloat.svg
diff --git a/images/themes/default/mIconIntegerField.svg b/images/themes/default/mIconFieldInteger.svg
similarity index 100%
rename from images/themes/default/mIconIntegerField.svg
rename to images/themes/default/mIconFieldInteger.svg
diff --git a/images/themes/default/mIconFieldText.svg b/images/themes/default/mIconFieldText.svg
new file mode 100644
index 000000000000..f0d4a9bd8b34
--- /dev/null
+++ b/images/themes/default/mIconFieldText.svg
@@ -0,0 +1,30 @@
+
+
+
+
diff --git a/images/themes/default/mIconFieldTime.svg b/images/themes/default/mIconFieldTime.svg
new file mode 100644
index 000000000000..c8cb2fcb6400
--- /dev/null
+++ b/images/themes/default/mIconFieldTime.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
index 69429a6a3ef7..f78efb3f7bcf 100644
--- a/src/gui/qgsfieldmodel.cpp
+++ b/src/gui/qgsfieldmodel.cpp
@@ -365,32 +365,35 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
{
QgsField field = mFields[index.row()];
int fieldType = ( int )field.type();
- QIcon icon;
switch ( fieldType )
{
case QVariant::Int:
case QVariant::UInt:
- case QVariant::LognLong:
+ case QVariant::LongLong:
case QVariant::ULongLong:
{
- return icon = QgsApplication::getThemeIcon( "/mIconIntegerField.svg" );
+ return QgsApplication::getThemeIcon( "/mIconFieldInteger.svg" );
}
case QVariant::Double:
{
- return icon = QgsApplication::getThemeIcon( "/mIconFloatField.svg" );
+ return QgsApplication::getThemeIcon( "/mIconFieldFloat.svg" );
}
case QVariant::String:
{
- return icon = QgsApplication::getThemeIcon( "propertyicons/labeltext.svg" );
+ return QgsApplication::getThemeIcon( "/mIconFieldText.svg" );
}
case QVariant::Date:
{
- return icon = QgsApplication::getThemeIcon( "/mIconDateField.svg" );
+ return QgsApplication::getThemeIcon( "/mIconFieldDate.svg" );
}
case QVariant::DateTime:
{
- return icon = QgsApplication::getThemeIcon( "/mIconDateTimeField.svg" );
+ return QgsApplication::getThemeIcon( "/mIconFieldDateTime.svg" );
+ }
+ case QVariant::Time:
+ {
+ return QgsApplication::getThemeIcon( "/mIconFieldTime.svg" );
}
default:
return QIcon();