forked from qt-creator/qt-creator
Ssh: Move some Ssh specific images from Utils to Ssh
Removing the invalid resources dependency on Utils, cleaning up the Utils images and prevent other places from using such unthemed icons. Change-Id: I78f5cfe1f48d0853c6c3e8822cbb041c232db426 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Before Width: | Height: | Size: 862 B After Width: | Height: | Size: 862 B |
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 430 B |
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 345 B |
@@ -166,11 +166,11 @@ QVariant SftpFileSystemModel::data(const QModelIndex &index, int role) const
|
||||
switch (node->fileInfo.type) {
|
||||
case FileTypeRegular:
|
||||
case FileTypeOther:
|
||||
return QIcon(":/utils/images/unknownfile.png");
|
||||
return QIcon(":/ssh/images/unknownfile.png");
|
||||
case FileTypeDirectory:
|
||||
return QIcon(":/utils/images/dir.png");
|
||||
return QIcon(":/ssh/images/dir.png");
|
||||
case FileTypeUnknown:
|
||||
return QIcon(":/utils/images/help.png"); // Shows a question mark.
|
||||
return QIcon(":/ssh/images/help.png"); // Shows a question mark.
|
||||
}
|
||||
}
|
||||
if (index.column() == 1) {
|
||||
|
@@ -82,4 +82,6 @@ HEADERS = $$PWD/sshsendfacility_p.h \
|
||||
|
||||
FORMS = $$PWD/sshkeycreationdialog.ui
|
||||
|
||||
RESOURCES += $$PWD/ssh.qrc
|
||||
|
||||
include(../3rdparty/botan/botan.pri)
|
||||
|
@@ -22,6 +22,7 @@ Project {
|
||||
"sftpoperation.cpp", "sftpoperation_p.h",
|
||||
"sftpoutgoingpacket.cpp", "sftpoutgoingpacket_p.h",
|
||||
"sftppacket.cpp", "sftppacket_p.h",
|
||||
"ssh.qrc",
|
||||
"sshagent.cpp", "sshagent_p.h",
|
||||
"sshbotanconversions_p.h",
|
||||
"sshcapabilities_p.h", "sshcapabilities.cpp",
|
||||
|
7
src/libs/ssh/ssh.qrc
Normal file
7
src/libs/ssh/ssh.qrc
Normal file
@@ -0,0 +1,7 @@
|
||||
<RCC>
|
||||
<qresource prefix="/ssh">
|
||||
<file>images/dir.png</file>
|
||||
<file>images/help.png</file>
|
||||
<file>images/unknownfile.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
@@ -35,7 +35,6 @@
|
||||
<file>images/clean_pane_small@2x.png</file>
|
||||
<file>images/compile_error_taskbar.png</file>
|
||||
<file>images/compile_error_taskbar@2x.png</file>
|
||||
<file>images/dir.png</file>
|
||||
<file>images/editcopy.png</file>
|
||||
<file>images/editcopy@2x.png</file>
|
||||
<file>images/editcut.png</file>
|
||||
@@ -89,12 +88,10 @@
|
||||
<file>images/splitbutton_horizontal@2x.png</file>
|
||||
<file>images/undo.png</file>
|
||||
<file>images/undo@2x.png</file>
|
||||
<file>images/unknownfile.png</file>
|
||||
<file>images/extension.png</file>
|
||||
<file>images/extension@2x.png</file>
|
||||
<file>images/progressbar.png</file>
|
||||
<file>images/progressbar@2x.png</file>
|
||||
<file>images/help.png</file>
|
||||
<file>images/editclear.png</file>
|
||||
<file>images/editclear@2x.png</file>
|
||||
<file>images/arrowdown.png</file>
|
||||
|
@@ -22,10 +22,6 @@
|
||||
<property name="text">
|
||||
<string>?</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../libs/utils/utils.qrc">
|
||||
<normaloff>:/utils/images/help.png</normaloff>:/utils/images/help.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
@@ -386,8 +382,6 @@
|
||||
<tabstop>warnBeforeOpeningBigFiles</tabstop>
|
||||
<tabstop>bigFilesLimitSpinBox</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="../../libs/utils/utils.qrc"/>
|
||||
</resources>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
Reference in New Issue
Block a user