diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
index d38d74071ab026fe354e55d350a371a25d0f7459..c0ccac284c9a243bf57ea622ae7304a52099865e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
@@ -112,8 +112,8 @@ ItemLibraryPrivate::ItemLibraryPrivate(QObject *object) :
m_lineEdit(0),
m_itemsView(0),
m_resourcesView(0),
- m_itemIconSize(22, 22),
- m_resIconSize(22, 22),
+ m_itemIconSize(24, 24),
+ m_resIconSize(24, 24),
m_iconProvider(m_resIconSize)
{
Q_UNUSED(object);
diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml
index 7e879231516b6e044a163f470ab09eb8b04df80e..bccbcb6157a3c1ec574bc41b39997a33be41cd81 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml
+++ b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml
@@ -42,8 +42,8 @@ Item {
property string itemNameTextColor: "#FFFFFF"
- property string gridLineLighter: "#808080"
- property string gridLineDarker: "#606060"
+ property string gridLineLighter: "#5f5f5f"
+ property string gridLineDarker: "#3f3f3f"
property string sectionArrowColor: "#aeaeae"
property string sectionTitleTextColor: "#f0f0f0"
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
index 9094b58a00b2b51f8f38facb16a49485b106d793..ed3c4f19c974207fc01e0e7d66abdedee7d98c2c 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
@@ -126,7 +126,7 @@ QSize IconCheckboxItemDelegate::sizeHint(const QStyleOptionViewItem &option,
{
Q_UNUSED(option);
Q_UNUSED(index);
- return QSize(15,26);
+ return QSize(15,28);
}
void IconCheckboxItemDelegate::paint(QPainter *painter,
@@ -181,19 +181,21 @@ void IdItemDelegate::paint(QPainter *painter,
if (icon.isNull()) icon = QIcon(":/ItemLibrary/images/default-icon.png");
}
- QPixmap pixmap = icon.pixmap(22,22);
- painter->drawPixmap(option.rect.x(),option.rect.y()+2,pixmap);
+ // If no icon is present, leave an empty space of 24 pixels anyway
+ int pixmapSide = 24;
+ QPixmap pixmap = icon.pixmap(pixmapSide, pixmapSide);
+ painter->drawPixmap(option.rect.x()+1,option.rect.y()+2,pixmap);
QString myString = node.id();
if (myString.isEmpty())
myString = node.simplifiedTypeName();
// Check text length does not exceed available space
- int extraSpace=12+pixmap.width();
+ int extraSpace=12+pixmapSide;
QFontMetrics fm(option.font);
myString = fm.elidedText(myString,Qt::ElideMiddle,option.rect.width()-extraSpace);
- painter->drawText(option.rect.bottomLeft()+QPoint(3+pixmap.width(),-8),myString);
+ painter->drawText(option.rect.bottomLeft()+QPoint(5+pixmapSide,-9),myString);
painter->restore();
}
diff --git a/src/plugins/qmldesigner/fxplugin/fx.metainfo b/src/plugins/qmldesigner/fxplugin/fx.metainfo
index e3d587b1c2f0ff5f165f8f46ca36d1ebc1e340d4..ccbf2f550c8d51ddf60ed0c0f0e770ad030964ad 100644
--- a/src/plugins/qmldesigner/fxplugin/fx.metainfo
+++ b/src/plugins/qmldesigner/fxplugin/fx.metainfo
@@ -8,7 +8,7 @@
</itemlibraryrepresentation>
</node>
<node name="Qt/Rectangle" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/rect-icon.png">
- <itemlibraryrepresentation name="Rectangle" icon=":/fxplugin/images/rectangle-icon.png">
+ <itemlibraryrepresentation name="Rectangle" icon=":/fxplugin/images/rect-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="color" type="QColor" value="#ffffff"/>
@@ -32,10 +32,10 @@
<property name="text" type="QString" value="textEdit"/>
</itemlibraryrepresentation>
</node>
- <node name="Qt/TextInput" showInItemLibrary="true" category="Qt - Basic" isContainer="false" icon=":/fxplugin/images/text-edit-icon.png">
+ <node name="Qt/TextInput" showInItemLibrary="true" category="Qt - Basic" isContainer="false" icon=":/fxplugin/images/text-input-icon.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
- <itemlibraryrepresentation name="Text Input" icon=":/fxplugin/images/text-edit-icon.png">
+ <itemlibraryrepresentation name="Text Input" icon=":/fxplugin/images/text-input-icon.png">
<property name="width" type="int" value="80"/>
<property name="height" type="int" value="20"/>
<property name="text" type="QString" value="textInput"/>
@@ -57,10 +57,10 @@
<property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
</itemlibraryrepresentation>
</node>
- <node name="Qt/BorderImage" showInItemLibrary="true" category="Qt - Basic" icon=":/fxplugin/images/image-icon.png">
+ <node name="Qt/BorderImage" showInItemLibrary="true" category="Qt - Basic" icon=":/fxplugin/images/border-image-icon.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
- <itemlibraryrepresentation name="Border Image" icon=":/fxplugin/images/image-icon.png">
+ <itemlibraryrepresentation name="Border Image" icon=":/fxplugin/images/border-image-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
@@ -89,15 +89,15 @@
</itemlibraryrepresentation>
</node>
- <node name="Qt/ListView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/list-icon.png">
- <itemlibraryrepresentation name="List View" icon=":/fxplugin/images/list-icon.png">
+ <node name="Qt/ListView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/listview-icon.png">
+ <itemlibraryrepresentation name="List View" icon=":/fxplugin/images/listview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryrepresentation>
</node>
- <node name="Qt/PathView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/list-icon.png">
- <itemlibraryrepresentation name="Path View" icon=":/fxplugin/images/list-icon.png">
+ <node name="Qt/PathView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/pathview-icon.png">
+ <itemlibraryrepresentation name="Path View" icon=":/fxplugin/images/pathview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryrepresentation>
diff --git a/src/plugins/qmldesigner/fxplugin/fxplugin.qrc b/src/plugins/qmldesigner/fxplugin/fxplugin.qrc
index 887b467f84fc69acd7f046fbabbaa637ddd15c82..ec0c3c538a51cadd6349623de54f10368cd33540 100644
--- a/src/plugins/qmldesigner/fxplugin/fxplugin.qrc
+++ b/src/plugins/qmldesigner/fxplugin/fxplugin.qrc
@@ -1,7 +1,7 @@
<RCC>
- <qresource prefix="/fxplugin" >
+ <qresource prefix="/fxplugin">
<file>fx.metainfo</file>
- <file>images/template_image.png</file>
+ <file>images/template_image.png</file>
<file>images/item-icon.png</file>
<file>images/rect-icon.png</file>
<file>images/text-icon.png</file>
@@ -16,9 +16,6 @@
<file>images/listview-icon.png</file>
<file>images/pathview-icon.png</file>
<file>images/focusscope-icon.png</file>
- <file>images/row-icon.png</file>
- <file>images/column-icon.png</file>
- <file>images/grid-icon.png</file>
<file>images/webview-icon.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/qmldesigner/fxplugin/images/blended-image-icon.png b/src/plugins/qmldesigner/fxplugin/images/blended-image-icon.png
deleted file mode 100644
index 7c0911d63df28d558f10438cf19f1d21d3638df2..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/fxplugin/images/blended-image-icon.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png b/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png
index 4dfcae7d472d50acfc50098e28788edec8adee0d..acd3d477af740ac2c96987f6f014f60f6ba66e5b 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png and b/src/plugins/qmldesigner/fxplugin/images/border-image-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/column-icon.png b/src/plugins/qmldesigner/fxplugin/images/column-icon.png
deleted file mode 100644
index e59e2f0facc6b0744eb6464dd2db4fc2613807b0..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/fxplugin/images/column-icon.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/default-icon.png b/src/plugins/qmldesigner/fxplugin/images/default-icon.png
index a90779f02a090f925796852ade5478ed33f22cda..564226e949b294850a82250f3b79e26adefa2d45 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/default-icon.png and b/src/plugins/qmldesigner/fxplugin/images/default-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/flickable-icon.png b/src/plugins/qmldesigner/fxplugin/images/flickable-icon.png
index 3489354321ecae32a7f94d42564ba67d8bb65293..46e3f5718338f2fd8fb8d58ef63a739e83177a35 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/flickable-icon.png and b/src/plugins/qmldesigner/fxplugin/images/flickable-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/flipable-icon.png b/src/plugins/qmldesigner/fxplugin/images/flipable-icon.png
index 8b3b9b4725ff9dce423a3ecf46ee642f0faa7619..1f5f6966c046938979a1be4f2aac2833aa06950f 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/flipable-icon.png and b/src/plugins/qmldesigner/fxplugin/images/flipable-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/focusscope-icon.png b/src/plugins/qmldesigner/fxplugin/images/focusscope-icon.png
index e4b9d3cda074b2e19d7950fb3d83db2554df1988..3f6e38e4e45a4c0a2f6403f1a507a47402e76086 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/focusscope-icon.png and b/src/plugins/qmldesigner/fxplugin/images/focusscope-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/grid-icon.png b/src/plugins/qmldesigner/fxplugin/images/grid-icon.png
deleted file mode 100644
index 75846176fd1608592daa34cc001e8a9b09f0f508..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/fxplugin/images/grid-icon.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png b/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png
index 75846176fd1608592daa34cc001e8a9b09f0f508..1519fe1eb110cc70dcd496add4f69c47c19fb9ef 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png and b/src/plugins/qmldesigner/fxplugin/images/gridview-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/image-icon.png b/src/plugins/qmldesigner/fxplugin/images/image-icon.png
index 4dfcae7d472d50acfc50098e28788edec8adee0d..e7a8cff471eb641e6a0f92bf0edeeba008fd46b4 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/image-icon.png and b/src/plugins/qmldesigner/fxplugin/images/image-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/item-icon.png b/src/plugins/qmldesigner/fxplugin/images/item-icon.png
index 82587ae0ecc4d29e2fa6213874d4b32698ccb63f..fc53d38ae7f7385b7a109bcc5e27b4fc4bb31361 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/item-icon.png and b/src/plugins/qmldesigner/fxplugin/images/item-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/list-icon.png b/src/plugins/qmldesigner/fxplugin/images/list-icon.png
deleted file mode 100644
index 9c96743f0e4f3fd22a160864382f2dbf05c6de0d..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/fxplugin/images/list-icon.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/listview-icon.png b/src/plugins/qmldesigner/fxplugin/images/listview-icon.png
index 9c96743f0e4f3fd22a160864382f2dbf05c6de0d..9c1327373dff42f72b104daf2ccfe9c209248871 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/listview-icon.png and b/src/plugins/qmldesigner/fxplugin/images/listview-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/mouse-area-icon.png b/src/plugins/qmldesigner/fxplugin/images/mouse-area-icon.png
index 8c23b6c0fce201d1621cf30a0c259021ca4f5812..9260c8b3279785ab9e943abeafa1c5191c5babd1 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/mouse-area-icon.png and b/src/plugins/qmldesigner/fxplugin/images/mouse-area-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png b/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png
index 9c96743f0e4f3fd22a160864382f2dbf05c6de0d..32bb26c0594c343e602a8a1f4abfbe4c9f4aa0fc 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png and b/src/plugins/qmldesigner/fxplugin/images/pathview-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/rect-icon.png b/src/plugins/qmldesigner/fxplugin/images/rect-icon.png
index 4555d886fbc35cf63ca9408cd0aa25a08a16dc20..4a092f15195f318a6b167ae6e072b3ea6e39d003 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/rect-icon.png and b/src/plugins/qmldesigner/fxplugin/images/rect-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/row-icon.png b/src/plugins/qmldesigner/fxplugin/images/row-icon.png
deleted file mode 100644
index 9a4005eb4f3ca5921a19ffe0e6db5644cc6b0490..0000000000000000000000000000000000000000
Binary files a/src/plugins/qmldesigner/fxplugin/images/row-icon.png and /dev/null differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-edit-icon.png b/src/plugins/qmldesigner/fxplugin/images/text-edit-icon.png
index 6a064ab07c1fb301161797f48b611106f371fc9c..53f10d6c9e70069c0582cf4d6fc6c9e9c5b92db0 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/text-edit-icon.png and b/src/plugins/qmldesigner/fxplugin/images/text-edit-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-icon.png b/src/plugins/qmldesigner/fxplugin/images/text-icon.png
index 9ce62037ba3c7700e9f06dfdb48fcd61eda8f7f8..9c90cc44036996ac21bed6d61f1abca060289885 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/text-icon.png and b/src/plugins/qmldesigner/fxplugin/images/text-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png b/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png
index 6a064ab07c1fb301161797f48b611106f371fc9c..a605c16ba4ebfb0208c461df1d87e914d1fe6053 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png and b/src/plugins/qmldesigner/fxplugin/images/text-input-icon.png differ
diff --git a/src/plugins/qmldesigner/fxplugin/images/webview-icon.png b/src/plugins/qmldesigner/fxplugin/images/webview-icon.png
index 87cf8278c51db16f214a5c256a272e0b7cfc3601..22904f2f8b941d72561ace0d7898ad9e6838a878 100644
Binary files a/src/plugins/qmldesigner/fxplugin/images/webview-icon.png and b/src/plugins/qmldesigner/fxplugin/images/webview-icon.png differ