github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-13 00:33:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Better icon theme integration

Browse source
This commit is contained in:
Christophe Dumez 2010-12-14 19:13:02 +00:00
parent ebf97a9ee8
commit 25ead318da
7 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/Icons/oxygen/insert-link.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/Icons/skin/open.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
src/Icons/skin/url.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

3
src/icons.qrc
View file

@ -17,7 +17,6 @@
<file>Icons/skin/tabs.gif</file> <file>Icons/skin/tabs.gif</file>
<file>Icons/skin/qbittorrent16.png</file> <file>Icons/skin/qbittorrent16.png</file>
<file>Icons/skin/connected.png</file> <file>Icons/skin/connected.png</file>
<file>Icons/skin/url.png</file>
<file>Icons/skin/qbittorrent22.png</file> <file>Icons/skin/qbittorrent22.png</file>
<file>Icons/skin/disconnected.png</file> <file>Icons/skin/disconnected.png</file>
<file>Icons/skin/mascot.png</file> <file>Icons/skin/mascot.png</file>
@ -29,7 +28,6 @@
<file>Icons/skin/handle-icon-horizontal.gif</file> <file>Icons/skin/handle-icon-horizontal.gif</file>
<file>Icons/skin/qbittorrent32.png</file> <file>Icons/skin/qbittorrent32.png</file>
<file>Icons/skin/knob.gif</file> <file>Icons/skin/knob.gif</file>
<file>Icons/skin/open.png</file>
<file>Icons/skin/filterall.png</file> <file>Icons/skin/filterall.png</file>
<file>Icons/skin/uploading.png</file> <file>Icons/skin/uploading.png</file>
<file>Icons/skin/queued.png</file> <file>Icons/skin/queued.png</file>
@ -295,6 +293,7 @@
<file>Icons/oxygen/edit-clear-history.png</file> <file>Icons/oxygen/edit-clear-history.png</file>
<file>Icons/oxygen/edit-copy.png</file> <file>Icons/oxygen/edit-copy.png</file>
<file>Icons/oxygen/folder-documents.png</file> <file>Icons/oxygen/folder-documents.png</file>
<file>Icons/oxygen/insert-link.png</file>
<file>Icons/oxygen/network-wired.png</file> <file>Icons/oxygen/network-wired.png</file>
<file>Icons/oxygen/mail-mark-read.png</file> <file>Icons/oxygen/mail-mark-read.png</file>
<file>Icons/oxygen/go-up.png</file> <file>Icons/oxygen/go-up.png</file>

6
src/mainwindow.cpp
View file

@ -101,8 +101,8 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession())); connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession()));
// Setting icons // Setting icons
this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));
actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png"))); // FIXME actionOpen->setIcon(misc::getIcon("list-add"));
actionDownload_from_URL->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/url.png"))); // FIXME actionDownload_from_URL->setIcon(misc::getIcon("insert-link"));
actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png"))); actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png")));
actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));
@ -122,7 +122,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
actionPause_All->setIcon(misc::getIcon("media-playback-pause")); actionPause_All->setIcon(misc::getIcon("media-playback-pause"));
actionStart->setIcon(misc::getIcon("media-playback-start")); actionStart->setIcon(misc::getIcon("media-playback-start"));
actionStart_All->setIcon(misc::getIcon("media-playback-start")); actionStart_All->setIcon(misc::getIcon("media-playback-start"));
action_Import_Torrent->setIcon(misc::getIcon("list-add")); action_Import_Torrent->setIcon(misc::getIcon("document-import"));
actionShow_console->setIcon(misc::getIcon("view-calendar-journal")); actionShow_console->setIcon(misc::getIcon("view-calendar-journal"));
QMenu *startAllMenu = new QMenu(this); QMenu *startAllMenu = new QMenu(this);

1
src/mainwindow.ui
View file

@ -123,7 +123,6 @@
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="actionOpen"/> <addaction name="actionOpen"/>
<addaction name="actionDownload_from_URL"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionDelete"/> <addaction name="actionDelete"/>
<addaction name="separator"/> <addaction name="separator"/>

8
src/webui/html/index.html
View file

@ -35,8 +35,8 @@
<li> <li>
<a class="returnFalse">_(File)</a> <a class="returnFalse">_(File)</a>
<ul> <ul>
<li><a id="uploadLink"><img class="MyMenuIcon" alt="_(Download local torrent)" src="images/skin/open.png" width="16" height="16" onload="fixPNG(this)"/>_(&Add File...)</a></li> <li><a id="uploadLink"><img class="MyMenuIcon" src="theme/list-add" width="16" height="16" onload="fixPNG(this)"/>_(&Add File...)</a></li>
<li><a id="downloadLink"><img class="MyMenuIcon" alt="_(Download local torrent)" src="images/skin/url.png" width="16" height="16" onload="fixPNG(this)"/>_(Add &URL...)</a></li> <li><a id="downloadLink"><img class="MyMenuIcon" src="theme/insert-link" width="16" height="16" onload="fixPNG(this)"/>_(Add &URL...)</a></li>
</ul> </ul>
</li> </li>
@ -70,8 +70,8 @@
</ul> </ul>
</div> </div>
<div id="mochaToolbar"> <div id="mochaToolbar">
<a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="images/skin/open.png" width="32" height="32" onload="fixPNG(this)"/></a> <a id="uploadButton"><img class="mochaToolButton" title="_(Download local torrent)" src="theme/list-add" width="32" height="32" onload="fixPNG(this)"/></a>
<a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="images/skin/url.png" width="32" height="32" onload="fixPNG(this)"/></a> <a id="downloadButton"><img class="mochaToolButton" title="_(Download from URL)" src="theme/insert-link" width="32" height="32" onload="fixPNG(this)"/></a>
<a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/edit-delete" width="32" height="32" onload="fixPNG(this)"/></a> <a id="deleteButton" class="divider"><img class="mochaToolButton" title="_(Delete)" src="theme/edit-delete" width="32" height="32" onload="fixPNG(this)"/></a>
<a id="deletePermButton"><img class="mochaToolButton" title="_(Delete from HD)" src="images/skin/delete_perm.png" width="32" height="32" onload="fixPNG(this)"/></a> <a id="deletePermButton"><img class="mochaToolButton" title="_(Delete from HD)" src="images/skin/delete_perm.png" width="32" height="32" onload="fixPNG(this)"/></a>
<a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="32" height="32" onload="fixPNG(this)"/></a> <a id="resumeButton" class="divider"><img class="mochaToolButton" title="_(Start)" src="theme/media-playback-start" width="32" height="32" onload="fixPNG(this)"/></a>