Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing "Add torrent file" icon #499

Merged
merged 4 commits into from
Mar 12, 2013
Merged

Fix missing "Add torrent file" icon #499

merged 4 commits into from
Mar 12, 2013

Conversation

Driim
Copy link
Contributor

@Driim Driim commented Mar 11, 2013

Closes #412

@@ -108,10 +108,12 @@
#if defined(Q_WS_X11)
if (Preferences().useSystemIconTheme())
setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))));
else
else {
#else
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be #endif.

@cdumez
Copy link
Contributor

cdumez commented Mar 11, 2013

I don't think the fix is right. Please see inline comments. Good catch though!

@Driim
Copy link
Contributor Author

Driim commented Mar 11, 2013

ok, you want to delete else (without #) or #else tree? I don't know if "setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));" and "setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))));" do same work or not?

@Driim
Copy link
Contributor Author

Driim commented Mar 11, 2013

i think you mean else tree...

@cdumez
Copy link
Contributor

cdumez commented Mar 11, 2013

I mean:

 #if defined(Q_WS_X11)
   if (Preferences().useSystemIconTheme())
     setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))));
     else
 #endif
     setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")));

cdumez pushed a commit that referenced this pull request Mar 12, 2013
Fix missing "Add torrent file" icon
@cdumez cdumez merged commit 3519cb2 into qbittorrent:master Mar 12, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Add torrent file" icon missing in top tool barof qBittorrent v3.0.7
2 participants