diff options
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 57ce7da36..2b3bf3bfb 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -53,7 +53,6 @@ static SplashScreen *splashref; static bool ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style) { - // Message from network thread if(guiref) { bool modal = (style & CClientUIInterface::MODAL); @@ -160,7 +159,7 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans /* qDebug() message handler --> debug.log */ #if QT_VERSION < 0x050000 -void DebugMessageHandler(QtMsgType type, const char * msg) +void DebugMessageHandler(QtMsgType type, const char *msg) { Q_UNUSED(type); LogPrint("qt", "Bitcoin-Qt: %s\n", msg); @@ -201,6 +200,13 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(bitcoin); QApplication app(argc, argv); +#if QT_VERSION > 0x050100 + // Generate high-dpi pixmaps + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif +#ifdef Q_OS_MAC + QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); +#endif // Register meta types used for QMetaObject::invokeMethod qRegisterMetaType< bool* >(); @@ -313,11 +319,12 @@ int main(int argc, char *argv[]) splash.finish(&window); ClientModel clientModel(&optionsModel); + window.setClientModel(&clientModel); + WalletModel *walletModel = 0; if(pwalletMain) walletModel = new WalletModel(pwalletMain, &optionsModel); - window.setClientModel(&clientModel); if(walletModel) { window.addWallet("~Default", walletModel); |