X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fqt%2Fbitcoin.cpp;h=daba512adc3240015bc250aa582ad151108a5bdd;hb=94723e27adf04eb62b3cdb40ead503ee5f40cab4;hp=63d1d70670fc15ebe3dd37ac0494413f6ad10f1f;hpb=c87cdc9160d27e56d7a4236d1bab87e06c9b7c31;p=novacoin.git

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 63d1d70..daba512 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -4,7 +4,7 @@
 #include "bitcoingui.h"
 #include "clientmodel.h"
 #include "walletmodel.h"
-#include "qtwin.h"
+#include "optionsmodel.h"
 
 #include "headers.h"
 #include "init.h"
@@ -12,11 +12,14 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QThread>
+#include <QTextCodec>
 #include <QLocale>
 #include <QTranslator>
+#include <QSplashScreen>
 
 // Need a global reference for the notifications to find the GUI
 BitcoinGUI *guiref;
+QSplashScreen *splashref;
 
 int MyMessageBox(const std::string& message, const std::string& caption, int style, wxWindow* parent, int x, int y)
 {
@@ -89,6 +92,15 @@ void MainFrameRepaint()
 {
 }
 
+void InitMessage(const std::string &message)
+{
+    if(splashref)
+    {
+        splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(255,255,200));
+        QApplication::instance()->processEvents();
+    }
+}
+
 /*
    Translate string to current locale using Qt.
  */
@@ -99,6 +111,9 @@ std::string _(const char* psz)
 
 int main(int argc, char *argv[])
 {
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+    QTextCodec::setCodecForCStrings(QTextCodec::codecForTr());
+
     Q_INIT_RESOURCE(bitcoin);
     QApplication app(argc, argv);
 
@@ -108,6 +123,13 @@ int main(int argc, char *argv[])
     translator.load("bitcoin_"+locale);
     app.installTranslator(&translator);
 
+    QSplashScreen splash(QPixmap(":/images/splash"), 0);
+    splash.show();
+    splash.setAutoFillBackground(true);
+    splashref = &splash;
+
+    app.processEvents();
+
     app.setQuitOnLastWindowClosed(false);
 
     try
@@ -116,33 +138,17 @@ int main(int argc, char *argv[])
         {
             {
                 // Put this in a block, so that BitcoinGUI is cleaned up properly before
-                // calling shutdown.
+                // calling Shutdown().
                 BitcoinGUI window;
-                ClientModel clientModel(pwalletMain);
-                WalletModel walletModel(pwalletMain);
+                splash.finish(&window);
+                OptionsModel optionsModel(pwalletMain);
+                ClientModel clientModel(&optionsModel);
+                WalletModel walletModel(pwalletMain, &optionsModel);
 
                 guiref = &window;
                 window.setClientModel(&clientModel);
                 window.setWalletModel(&walletModel);
 
-                if (QtWin::isCompositionEnabled())
-                {
-#ifdef Q_WS_WIN32
-                    // Windows-specific customization
-                    window.setAttribute(Qt::WA_TranslucentBackground);
-                    window.setAttribute(Qt::WA_NoSystemBackground, false);
-                    QPalette pal = window.palette();
-                    QColor bg = pal.window().color();
-                    bg.setAlpha(0);
-                    pal.setColor(QPalette::Window, bg);
-                    window.setPalette(pal);
-                    window.ensurePolished();
-                    window.setAttribute(Qt::WA_StyledBackground, false);
-#endif
-                    QtWin::extendFrameIntoClientArea(&window);
-                    window.setContentsMargins(0, 0, 0, 0);
-                }
-
                 window.show();
 
                 app.exec();