d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-10 22:04:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6524 from Chocobo1/dpi

Browse Source 
Opt-in DPI scaling
This commit is contained in:
sledgehammer999 2017-04-30 21:25:57 +03:00 committed by GitHub
commit 90c6bb6054
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/application.cpp
View File

@ -122,25 +122,20 @@ Application::Application(const QString &id, int &argc, char **argv)
SettingsStorage::initInstance(); SettingsStorage::initInstance();
Preferences::initInstance(); Preferences::initInstance();
if (m_commandLineArgs.webUiPort > 0) { // it will be -1 when user did not set any value if (m_commandLineArgs.webUiPort > 0) // it will be -1 when user did not set any value
Preferences::instance()->setWebUiPort(m_commandLineArgs.webUiPort); Preferences::instance()->setWebUiPort(m_commandLineArgs.webUiPort);
}
#if defined(Q_OS_MACX) && !defined(DISABLE_GUI) setApplicationName("qBittorrent");
if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_8) {
// fix Mac OS X 10.9 (mavericks) font issue
// https://bugreports.qt-project.org/browse/QTBUG-32789
QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
}
#endif
initializeTranslation(); initializeTranslation();
#ifndef DISABLE_GUI
#if !defined(DISABLE_GUI)
setAttribute(Qt::AA_UseHighDpiPixmaps, true); // opt-in to the high DPI pixmap support setAttribute(Qt::AA_UseHighDpiPixmaps, true); // opt-in to the high DPI pixmap support
setQuitOnLastWindowClosed(false); setQuitOnLastWindowClosed(false);
#ifdef Q_OS_WIN #endif
#if defined(Q_OS_WIN) && !defined(DISABLE_GUI)
connect(this, SIGNAL(commitDataRequest(QSessionManager &)), this, SLOT(shutdownCleanup(QSessionManager &)), Qt::DirectConnection); connect(this, SIGNAL(commitDataRequest(QSessionManager &)), this, SLOT(shutdownCleanup(QSessionManager &)), Qt::DirectConnection);
#endif // Q_OS_WIN #endif
#endif // DISABLE_GUI
connect(this, SIGNAL(messageReceived(const QString &)), SLOT(processMessage(const QString &))); connect(this, SIGNAL(messageReceived(const QString &)), SLOT(processMessage(const QString &)));
connect(this, SIGNAL(aboutToQuit()), SLOT(cleanup())); connect(this, SIGNAL(aboutToQuit()), SLOT(cleanup()));

30
src/app/main.cpp
View File

@ -41,6 +41,7 @@
#include <QPen> #include <QPen>
#include <QPushButton> #include <QPushButton>
#include <QSplashScreen> #include <QSplashScreen>
#ifdef QBT_STATIC_QT #ifdef QBT_STATIC_QT
#include <QtPlugin> #include <QtPlugin>
Q_IMPORT_PLUGIN(QICOPlugin) Q_IMPORT_PLUGIN(QICOPlugin)
@ -89,13 +90,18 @@ const char *sysSigName[] = {
}; };
#endif #endif
#ifndef DISABLE_GUI
void showSplashScreen();
#endif
void displayVersion(); void displayVersion();
bool userAgreesWithLegalNotice(); bool userAgreesWithLegalNotice();
void displayBadArgMessage(const QString &message); void displayBadArgMessage(const QString &message);
#if !defined(DISABLE_GUI)
void showSplashScreen();
#if defined(Q_OS_UNIX)
void setupDpi();
#endif // Q_OS_UNIX
#endif // DISABLE_GUI
// Main // Main
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -108,15 +114,21 @@ int main(int argc, char *argv[])
macMigratePlists(); macMigratePlists();
#endif #endif
#if !defined(DISABLE_GUI) && defined(Q_OS_UNIX)
setupDpi();
#endif
try { try {
// Create Application // Create Application
QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString(); QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString();
QScopedPointer<Application> app(new Application(appId, argc, argv)); QScopedPointer<Application> app(new Application(appId, argc, argv));
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
// after the application object creation because we need a profile to be set already // after the application object creation because we need a profile to be set already
// for the migration // for the migration
migrateRSS(); migrateRSS();
#endif #endif
const QBtCommandLineParameters &params = app->commandLineArgs(); const QBtCommandLineParameters &params = app->commandLineArgs();
if (!params.unknownParameter.isEmpty()) { if (!params.unknownParameter.isEmpty()) {
@ -280,7 +292,7 @@ void sigAbnormalHandler(int signum)
} }
#endif // defined(Q_OS_UNIX) || defined(STACKTRACE_WIN) #endif // defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
#ifndef DISABLE_GUI #if !defined(DISABLE_GUI)
void showSplashScreen() void showSplashScreen()
{ {
QPixmap splash_img(":/icons/skin/splash.png"); QPixmap splash_img(":/icons/skin/splash.png");
@ -294,7 +306,15 @@ void showSplashScreen()
QTimer::singleShot(1500, splash, SLOT(deleteLater())); QTimer::singleShot(1500, splash, SLOT(deleteLater()));
qApp->processEvents(); qApp->processEvents();
} }
#endif
#if defined(Q_OS_UNIX)
void setupDpi()
{
if (qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR").isEmpty())
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
}
#endif // Q_OS_UNIX
#endif // DISABLE_GUI
void displayVersion() void displayVersion()
{ {