From dac3a1a0ca3eed03975f436c08ba6f10882da57c Mon Sep 17 00:00:00 2001 From: Driim Date: Mon, 11 Mar 2013 19:33:57 +0400 Subject: [PATCH 1/4] Fix missing "Add torrent file" icon --- src/mainwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4edad454f..484013f7b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -108,10 +108,12 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa #if defined(Q_WS_X11) if (Preferences().useSystemIconTheme()) setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")))); - else + else { #else setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); #endif + } + actionOpen->setIcon(IconProvider::instance()->getIcon("list-add")); actionDownload_from_URL->setIcon(IconProvider::instance()->getIcon("insert-link")); actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); From eb035e2199e7f23a594ca8f7f4d9040a1a525b46 Mon Sep 17 00:00:00 2001 From: Driim Date: Mon, 11 Mar 2013 22:45:32 +0400 Subject: [PATCH 2/4] Fix add torrent icon version 2 --- src/mainwindow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 484013f7b..7556e1eda 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -108,11 +108,9 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa #if defined(Q_WS_X11) if (Preferences().useSystemIconTheme()) setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")))); - else { #else setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); #endif - } actionOpen->setIcon(IconProvider::instance()->getIcon("list-add")); actionDownload_from_URL->setIcon(IconProvider::instance()->getIcon("insert-link")); From f445c8f872a0179cf8b57d837d18a1f33d58b7ba Mon Sep 17 00:00:00 2001 From: Driim Date: Mon, 11 Mar 2013 22:50:32 +0400 Subject: [PATCH 3/4] Fix add torrent icon version 3 --- src/mainwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 7556e1eda..d08997eb6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -108,9 +108,10 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa #if defined(Q_WS_X11) if (Preferences().useSystemIconTheme()) setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")))); -#else - setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); + else #endif + setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); + actionOpen->setIcon(IconProvider::instance()->getIcon("list-add")); actionDownload_from_URL->setIcon(IconProvider::instance()->getIcon("insert-link")); From df23fc1de2433194b837ab03639a33f4219ec147 Mon Sep 17 00:00:00 2001 From: Driim Date: Mon, 11 Mar 2013 22:52:49 +0400 Subject: [PATCH 4/4] delete not needed space --- src/mainwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d08997eb6..87f2bb816 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -112,7 +112,6 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa #endif setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); - actionOpen->setIcon(IconProvider::instance()->getIcon("list-add")); actionDownload_from_URL->setIcon(IconProvider::instance()->getIcon("insert-link")); actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")));