Pull request #21: windows fixes/cleanup by Matoking

[novacoin.git] / src / qt / bitcoin.cpp

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 749afb4..daba512 100644 (file)
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -5,7 +5,6 @@
 #include "clientmodel.h"
 #include "walletmodel.h"
 #include "optionsmodel.h"
-#include "qtwin.h"
 
 #include "headers.h"
 #include "init.h"
@@ -13,10 +12,10 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QThread>
+#include <QTextCodec>
 #include <QLocale>
 #include <QTranslator>
 #include <QSplashScreen>
-#include <QDebug>
 
 // Need a global reference for the notifications to find the GUI
 BitcoinGUI *guiref;
@@ -97,7 +96,7 @@ void InitMessage(const std::string &message)
 {
     if(splashref)
     {
-        splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom, QColor(255,255,255));
+        splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(255,255,200));
         QApplication::instance()->processEvents();
     }
 }
@@ -112,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);
 
@@ -121,7 +123,7 @@ int main(int argc, char *argv[])
     translator.load("bitcoin_"+locale);
     app.installTranslator(&translator);
 
-    QSplashScreen splash(QPixmap(":/images/splash"), Qt::WindowStaysOnTopHint);
+    QSplashScreen splash(QPixmap(":/images/splash"), 0);
     splash.show();
     splash.setAutoFillBackground(true);
     splashref = &splash;
@@ -136,7 +138,7 @@ 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;
                 splash.finish(&window);
                 OptionsModel optionsModel(pwalletMain);
@@ -147,24 +149,6 @@ int main(int argc, char *argv[])
                 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();