diff options
author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2014-01-16 16:05:44 +0100 |
---|---|---|
committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2014-01-18 16:57:02 +0100 |
commit | 7b50bb2f1b96cb8964819e03eb044c3b88746946 (patch) | |
tree | bf67dbda25f0be285c549e528c031ee76e1eef69 /src/qt/bitcoin.cpp | |
parent | 490d6a30461d11aa112efe9fb3006797651ba4d5 (diff) |
[Qt] add utilitydialog.cpp/h and helpmessage class
- adds a nice and well formated dialog, which displays our -? help message
(all options/paramaters)
- moves aboutdialog.cpp/h to the new utilitydialog
- move GUI shutdown window to utilitydialog
Diffstat (limited to 'src/qt/bitcoin.cpp')
-rw-r--r-- | src/qt/bitcoin.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 3cf7e53c02..848e50deb0 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -14,6 +14,7 @@ #include "intro.h" #include "optionsmodel.h" #include "splashscreen.h" +#include "utilitydialog.h" #ifdef ENABLE_WALLET #include "paymentserver.h" #include "walletmodel.h" @@ -36,8 +37,6 @@ #include <QTimer> #include <QTranslator> #include <QThread> -#include <QVBoxLayout> -#include <QLabel> #if defined(QT_STATICPLUGIN) #include <QtPlugin> @@ -356,17 +355,7 @@ void BitcoinApplication::requestShutdown() clientModel = 0; // Show a simple window indicating shutdown status - QWidget *shutdownWindow = new QWidget(); - QVBoxLayout *layout = new QVBoxLayout(); - layout->addWidget(new QLabel( - tr("Bitcoin Core is shutting down...") + "<br /><br />" + - tr("Do not shut down the computer until this window disappears."))); - shutdownWindow->setLayout(layout); - - // Center shutdown window at where main window was - const QPoint global = window->mapToGlobal(window->rect().center()); - shutdownWindow->move(global.x() - shutdownWindow->width() / 2, global.y() - shutdownWindow->height() / 2); - shutdownWindow->show(); + ShutdownWindow::showShutdownWindow(window); // Request shutdown from core thread emit requestedShutdown(); @@ -503,7 +492,7 @@ int main(int argc, char *argv[]) // but before showing splash screen. if (mapArgs.count("-?") || mapArgs.count("--help")) { - GUIUtil::HelpMessageBox help; + HelpMessageDialog help(NULL); help.showOrPrint(); return 1; } |