#include <QLocale>
#include <QTranslator>
#include <QSplashScreen>
+#include <QLibraryInfo>
// Need a global reference for the notifications to find the GUI
BitcoinGUI *guiref;
int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style, wxWindow* parent, int x, int y)
{
+ bool modal = style & wxMODAL;
+
+ if (modal)
+ while (!guiref)
+ sleep(1);
+
// Message from network thread
if(guiref)
{
QMetaObject::invokeMethod(guiref, "error", Qt::QueuedConnection,
Q_ARG(QString, QString::fromStdString(caption)),
- Q_ARG(QString, QString::fromStdString(message)));
+ Q_ARG(QString, QString::fromStdString(message)),
+ Q_ARG(bool, modal));
}
else
{
void MainFrameRepaint()
{
+ if(guiref)
+ QMetaObject::invokeMethod(guiref, "refreshStatusBar", Qt::QueuedConnection);
}
void InitMessage(const std::string &message)
Q_INIT_RESOURCE(bitcoin);
QApplication app(argc, argv);
- // Load language file for system locale
- QString locale = QLocale::system().name();
- QTranslator translator;
- translator.load(":/translations/"+locale);
+ // Load language files for system locale:
+ // - First load the translator for the base language, without territory
+ // - Then load the more specific locale translator
+ QString lang_territory = QLocale::system().name(); // "en_US"
+ QString lang = lang_territory;
+ lang.truncate(lang_territory.lastIndexOf('_')); // "en"
+ QTranslator qtTranslatorBase, qtTranslator, translatorBase, translator;
+
+ qtTranslatorBase.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" + lang);
+ if (!qtTranslatorBase.isEmpty())
+ app.installTranslator(&qtTranslatorBase);
+
+ qtTranslator.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" + lang_territory);
+ if (!qtTranslator.isEmpty())
+ app.installTranslator(&qtTranslator);
+
+ translatorBase.load(":/translations/"+lang);
+ if (!translatorBase.isEmpty())
+ app.installTranslator(&translatorBase);
+
+ translator.load(":/translations/"+lang_territory);
if (!translator.isEmpty())
app.installTranslator(&translator);
+ app.setApplicationName(QApplication::translate("main", "Bitcoin-Qt"));
+
QSplashScreen splash(QPixmap(":/images/splash"), 0);
- splash.show();
- splash.setAutoFillBackground(true);
- splashref = &splash;
+ if (!GetBoolArg("-min"))
+ {
+ splash.show();
+ splash.setAutoFillBackground(true);
+ splashref = &splash;
+ }
app.processEvents();
// Put this in a block, so that BitcoinGUI is cleaned up properly before
// calling Shutdown().
BitcoinGUI window;
- splash.finish(&window);
+ if (splashref)
+ splash.finish(&window);
OptionsModel optionsModel(pwalletMain);
ClientModel clientModel(&optionsModel);
WalletModel walletModel(pwalletMain, &optionsModel);