feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix icons that moved from core to utils

Browse Source 
Change-Id: Id3151b1cce2d97b2bfb6debaf3cebe53cd6d88ed
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2016-10-27 10:54:54 +03:00
committed by Orgad Shaneh
parent 7b25da7e22
commit a6427453f4
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/themes/dark.creatortheme
View File

@@ -242,5 +242,5 @@ IconOverlayCppSource=:/cppeditor/images/dark_qt_cpp.png
IconOverlayPrf=:/qtsupport/images/dark_qt_project.png
IconOverlayPri=:/qtsupport/images/dark_qt_project.png
IconOverlayPro=:/qtsupport/images/dark_qt_project.png
StandardPixmapFileIcon=:/core/images/dark_fileicon.png
StandardPixmapDirIcon=:/core/images/dark_foldericon.png
StandardPixmapFileIcon=:/utils/images/dark_fileicon.png
StandardPixmapDirIcon=:/utils/images/dark_foldericon.png

6
src/libs/ssh/sftpfilesystemmodel.cpp
View File

@@ -166,11 +166,11 @@ QVariant SftpFileSystemModel::data(const QModelIndex &index, int role) const
switch (node->fileInfo.type) {
case FileTypeRegular:
case FileTypeOther:
return QIcon(QLatin1String(":/core/images/unknownfile.png"));
return QIcon(":/utils/images/unknownfile.png");
case FileTypeDirectory:
return QIcon(QLatin1String(":/core/images/dir.png"));
return QIcon(":/utils/images/dir.png");
case FileTypeUnknown:
return QIcon(QLatin1String(":/core/images/help.png")); // Shows a question mark.
return QIcon(":/utils/images/help.png"); // Shows a question mark.
}
}
if (index.column() == 1) {

5
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -340,9 +340,8 @@ QIcon ManhattanStyle::standardIcon(StandardPixmap standardIcon, const QStyleOpti
if (standardIcon == QStyle::SP_ComputerIcon) {
// Ubuntu has in some versions a 16x16 icon, see QTCREATORBUG-12832
const QList<QSize> &sizes = icon.availableSizes();
if (Utils::allOf(sizes, [](const QSize &size) { return size.width() < 32;})) {
icon = QIcon(QLatin1String(":/core/images/Desktop.png"));
}
if (Utils::allOf(sizes, [](const QSize &size) { return size.width() < 32;}))
icon = QIcon(":/utils/images/Desktop.png");
}
return icon;
}

6
src/plugins/coreplugin/systemsettings.ui
View File

@@ -23,8 +23,8 @@
<string>?</string>
</property>
<property name="icon">
<iconset resource="core.qrc">
<normaloff>:/core/images/help.png</normaloff>:/core/images/help.png</iconset>
<iconset resource="../../libs/utils/utils.qrc">
<normaloff>:/utils/images/help.png</normaloff>:/utils/images/help.png</iconset>
</property>
</widget>
</item>
@@ -390,7 +390,7 @@
<tabstop>bigFilesLimitSpinBox</tabstop>
</tabstops>
<resources>
<include location="core.qrc"/>
<include location="../../libs/utils/utils.qrc"/>
</resources>
<connections/>
</ui>