mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Enable to choose dark/light tray icons on all platforms.

Browse source
This commit is contained in:
Chocobo1 2015-05-13 21:50:15 +08:00 committed by sledgehammer999
parent cf41f41b16
commit 75979cc4d5
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gui/mainwindow.cpp
View file

@ -1589,6 +1589,10 @@ void MainWindow::checkForActiveTorrents()
QIcon MainWindow::getSystrayIcon() const
{
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
if (Preferences::instance()->useSystemIconTheme())
return QIcon::fromTheme("qbittorrent");
#endif
TrayIcon::Style style = Preferences::instance()->trayIconStyle();
switch(style) {
case TrayIcon::MONO_DARK:
@ -1598,18 +1602,11 @@ QIcon MainWindow::getSystrayIcon() const
default:
break;
}
#endif
QIcon icon;
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
if (Preferences::instance()->useSystemIconTheme())
icon = QIcon::fromTheme("qbittorrent");
#endif
if (icon.isNull()) {
icon.addFile(":/icons/skin/qbittorrent22.png", QSize(22, 22));
icon.addFile(":/icons/skin/qbittorrent16.png", QSize(16, 16));
icon.addFile(":/icons/skin/qbittorrent32.png", QSize(32, 32));
}
QIcon icon;
icon.addFile(":/icons/skin/qbittorrent16.png");
icon.addFile(":/icons/skin/qbittorrent22.png");
icon.addFile(":/icons/skin/qbittorrent32.png");
return icon;
}

13
src/gui/options_imp.cpp
View file

@ -113,11 +113,10 @@ options_imp::options_imp(QWidget *parent):
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
checkShowSystray->setChecked(false);
checkShowSystray->setEnabled(false);
label_trayIconStyle->setVisible(false);
comboTrayIcon->setVisible(false);
}
#if (!defined(Q_OS_UNIX) || defined(Q_OS_MAC))
label_trayIconStyle->setVisible(false);
comboTrayIcon->setVisible(false);
#endif
#if defined(QT_NO_OPENSSL)
checkWebUiHttps->setVisible(false);
#endif
@ -270,7 +269,7 @@ options_imp::options_imp(QWidget *parent):
// Adapt size
show();
loadWindowState();
loadWindowState();
}
void options_imp::initializeLanguageCombo()
@ -281,7 +280,7 @@ void options_imp::initializeLanguageCombo()
foreach (QString lang_file, lang_files) {
QString localeStr = lang_file.mid(12); // remove "qbittorrent_"
localeStr.chop(3); // Remove ".qm"
QLocale locale(localeStr);
QLocale locale(localeStr);
QString language_name = languageToLocalizedString(locale);
comboI18n->addItem(/*QIcon(":/icons/flags/"+country+".png"), */language_name, localeStr);
qDebug() << "Supported locale:" << localeStr;
@ -790,7 +789,7 @@ void options_imp::loadOptions() {
domainNameTxt->setText(pref->getDynDomainName());
DNSUsernameTxt->setText(pref->getDynDNSUsername());
DNSPasswordTxt->setText(pref->getDynDNSPassword());
// End Web UI
// End Web UI
}
// return min & max ports