From 7b50bb2f1b96cb8964819e03eb044c3b88746946 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 16 Jan 2014 16:05:44 +0100 Subject: [PATCH] [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 --- contrib/bitcoin-qt.pro | 1 + src/qt/Makefile.am | 9 ++- src/qt/aboutdialog.cpp | 38 --------- src/qt/aboutdialog.h | 34 -------- src/qt/bitcoin.cpp | 17 +--- src/qt/bitcoingui.cpp | 2 +- src/qt/forms/aboutdialog.ui | 16 ++-- src/qt/forms/helpmessagedialog.ui | 128 ++++++++++++++++++++++++++++++ src/qt/guiutil.cpp | 41 ---------- src/qt/guiutil.h | 20 ----- src/qt/rpcconsole.cpp | 5 +- src/qt/utilitydialog.cpp | 125 +++++++++++++++++++++++++++++ src/qt/utilitydialog.h | 69 ++++++++++++++++ 13 files changed, 343 insertions(+), 162 deletions(-) delete mode 100644 src/qt/aboutdialog.cpp delete mode 100644 src/qt/aboutdialog.h create mode 100644 src/qt/forms/helpmessagedialog.ui create mode 100644 src/qt/utilitydialog.cpp create mode 100644 src/qt/utilitydialog.h diff --git a/contrib/bitcoin-qt.pro b/contrib/bitcoin-qt.pro index 8bfa4a18a..3a72d10f4 100644 --- a/contrib/bitcoin-qt.pro +++ b/contrib/bitcoin-qt.pro @@ -4,6 +4,7 @@ FORMS += \ ../src/qt/forms/askpassphrasedialog.ui \ ../src/qt/forms/coincontroldialog.ui \ ../src/qt/forms/editaddressdialog.ui \ + ../src/qt/forms/helpmessagedialog.ui \ ../src/qt/forms/intro.ui \ ../src/qt/forms/openuridialog.ui \ ../src/qt/forms/optionsdialog.ui \ diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 274cebcf3..3dfe8ee6c 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -80,6 +80,7 @@ QT_FORMS_UI = \ forms/askpassphrasedialog.ui \ forms/coincontroldialog.ui \ forms/editaddressdialog.ui \ + forms/helpmessagedialog.ui \ forms/intro.ui \ forms/openuridialog.ui \ forms/optionsdialog.ui \ @@ -93,7 +94,6 @@ QT_FORMS_UI = \ forms/transactiondescdialog.ui QT_MOC_CPP = \ - moc_aboutdialog.cpp \ moc_addressbookpage.cpp \ moc_addresstablemodel.cpp \ moc_askpassphrasedialog.cpp \ @@ -133,6 +133,7 @@ QT_MOC_CPP = \ moc_transactionfilterproxy.cpp \ moc_transactiontablemodel.cpp \ moc_transactionview.cpp \ + moc_utilitydialog.cpp \ moc_walletframe.cpp \ moc_walletmodel.cpp \ moc_walletview.cpp @@ -155,7 +156,6 @@ PROTOBUF_H = paymentrequest.pb.h PROTOBUF_PROTO = paymentrequest.proto BITCOIN_QT_H = \ - aboutdialog.h \ addressbookpage.h \ addresstablemodel.h \ askpassphrasedialog.h \ @@ -198,6 +198,7 @@ BITCOIN_QT_H = \ transactionrecord.h \ transactiontablemodel.h \ transactionview.h \ + utilitydialog.h \ walletframe.h \ walletmodel.h \ walletmodeltransaction.h \ @@ -248,7 +249,6 @@ RES_ICONS = \ res/icons/tx_mined.png BITCOIN_QT_CPP = \ - aboutdialog.cpp \ bitcoin.cpp \ bitcoinaddressvalidator.cpp \ bitcoinamountfield.cpp \ @@ -267,7 +267,8 @@ BITCOIN_QT_CPP = \ rpcconsole.cpp \ signverifymessagedialog.cpp \ splashscreen.cpp \ - trafficgraphwidget.cpp + trafficgraphwidget.cpp \ + utilitydialog.cpp if ENABLE_WALLET BITCOIN_QT_CPP += \ diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp deleted file mode 100644 index 6581a19c1..000000000 --- a/src/qt/aboutdialog.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2011-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#include "aboutdialog.h" -#include "ui_aboutdialog.h" - -#include "clientmodel.h" - -#include "clientversion.h" - -AboutDialog::AboutDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::AboutDialog) -{ - ui->setupUi(this); - - // Set current copyright year - ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin Core developers")); -} - -void AboutDialog::setModel(ClientModel *model) -{ - if(model) - { - ui->versionLabel->setText(model->formatFullVersion()); - } -} - -AboutDialog::~AboutDialog() -{ - delete ui; -} - -void AboutDialog::on_buttonBox_accepted() -{ - close(); -} diff --git a/src/qt/aboutdialog.h b/src/qt/aboutdialog.h deleted file mode 100644 index 1b131c4dc..000000000 --- a/src/qt/aboutdialog.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2011-2013 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#ifndef ABOUTDIALOG_H -#define ABOUTDIALOG_H - -#include - -class ClientModel; - -namespace Ui { - class AboutDialog; -} - -/** "About" dialog box */ -class AboutDialog : public QDialog -{ - Q_OBJECT - -public: - explicit AboutDialog(QWidget *parent); - ~AboutDialog(); - - void setModel(ClientModel *model); - -private: - Ui::AboutDialog *ui; - -private slots: - void on_buttonBox_accepted(); -}; - -#endif // ABOUTDIALOG_H diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 3cf7e53c0..848e50deb 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 #include #include -#include -#include #if defined(QT_STATICPLUGIN) #include @@ -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...") + "

" + - 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; } diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 692fb6dc1..1008ef2b0 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -4,7 +4,6 @@ #include "bitcoingui.h" -#include "aboutdialog.h" #include "bitcoinunits.h" #include "clientmodel.h" #include "guiconstants.h" @@ -14,6 +13,7 @@ #include "optionsdialog.h" #include "optionsmodel.h" #include "rpcconsole.h" +#include "utilitydialog.h" #ifdef ENABLE_WALLET #include "walletframe.h" #include "walletmodel.h" diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 10a5857ca..3ab4675bf 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -160,12 +160,12 @@ This product includes software developed by the OpenSSL Project for use in the O accept() - 360 - 308 + 20 + 20 - 157 - 274 + 20 + 20 @@ -176,12 +176,12 @@ This product includes software developed by the OpenSSL Project for use in the O reject() - 428 - 308 + 20 + 20 - 286 - 274 + 20 + 20 diff --git a/src/qt/forms/helpmessagedialog.ui b/src/qt/forms/helpmessagedialog.ui new file mode 100644 index 000000000..f68fea7e6 --- /dev/null +++ b/src/qt/forms/helpmessagedialog.ui @@ -0,0 +1,128 @@ + + + HelpMessageDialog + + + + 0 + 0 + 800 + 400 + + + + + 10 + + + + Bitcoin Core - Command-line options + + + + + + + 0 + 0 + + + + :/images/about + + + + + + + + + Qt::ScrollBarAlwaysOn + + + true + + + + + 0 + 0 + 659 + 348 + + + + + + + + Terminal + + + + IBeamCursor + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + + + + + + + + + + okButton + accepted() + HelpMessageDialog + accept() + + + 20 + 20 + + + 20 + 20 + + + + + okButton + rejected() + HelpMessageDialog + reject() + + + 20 + 20 + + + 20 + 20 + + + + + diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index b87498402..2d8a6afe2 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -591,47 +591,6 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize, parent->move(pos); } -HelpMessageBox::HelpMessageBox(QWidget *parent) : - QMessageBox(parent) -{ - header = tr("Bitcoin Core") + " " + tr("version") + " " + - QString::fromStdString(FormatFullVersion()) + "\n\n" + - tr("Usage:") + "\n" + - " bitcoin-qt [" + tr("command-line options") + "] " + "\n"; - - coreOptions = QString::fromStdString(HelpMessage(HMM_BITCOIN_QT)); - - uiOptions = tr("UI options") + ":\n" + - " -lang= " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" + - " -min " + tr("Start minimized") + "\n" + - " -splash " + tr("Show splash screen on startup (default: 1)") + "\n" + - " -choosedatadir " + tr("Choose data directory on startup (default: 0)") + "\n"; - - setWindowTitle(tr("Bitcoin Core")); - setTextFormat(Qt::PlainText); - // setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider. - setText(header + QString(QChar(0x2003)).repeated(50)); - setDetailedText(coreOptions + "\n" + uiOptions); -} - -void HelpMessageBox::printToConsole() -{ - // On other operating systems, the expected action is to print the message to the console. - QString strUsage = header + "\n" + coreOptions + "\n" + uiOptions; - fprintf(stdout, "%s", strUsage.toStdString().c_str()); -} - -void HelpMessageBox::showOrPrint() -{ -#if defined(WIN32) - // On Windows, show a message box, as there is no stderr/stdout in windowed applications - exec(); -#else - // On other operating systems, print help text to console - printToConsole(); -#endif -} - void setClipboard(const QString& str) { QApplication::clipboard()->setText(str, QClipboard::Clipboard); diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 14d4ff17c..c894850a9 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -123,26 +123,6 @@ namespace GUIUtil /** Restore window size and position */ void restoreWindowGeometry(const QString& strSetting, const QSize &defaultSizeIn, QWidget *parent); - /** Help message for Bitcoin-Qt, shown with --help. */ - class HelpMessageBox : public QMessageBox - { - Q_OBJECT - - public: - HelpMessageBox(QWidget *parent = 0); - - /** Show message box or print help message to standard output, based on operating system. */ - void showOrPrint(); - - /** Print help message to console */ - void printToConsole(); - - private: - QString header; - QString coreOptions; - QString uiOptions; - }; - } // namespace GUIUtil #endif // GUIUTIL_H diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index a8470572d..abb6ceb13 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -7,6 +7,7 @@ #include "clientmodel.h" #include "guiutil.h" +#include "utilitydialog.h" #include "rpcserver.h" #include "rpcclient.h" @@ -443,8 +444,8 @@ void RPCConsole::scrollToEnd() void RPCConsole::on_showCLOptionsButton_clicked() { - GUIUtil::HelpMessageBox help; - help.exec(); + HelpMessageDialog *help = new HelpMessageDialog(this); + help->show(); } void RPCConsole::on_sldGraphRange_valueChanged(int value) diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp new file mode 100644 index 000000000..05a01c744 --- /dev/null +++ b/src/qt/utilitydialog.cpp @@ -0,0 +1,125 @@ +// Copyright (c) 2011-2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "utilitydialog.h" + +#include "ui_aboutdialog.h" +#include "ui_helpmessagedialog.h" + +#include "bitcoingui.h" +#include "clientmodel.h" +#include "guiutil.h" + +#include "clientversion.h" +#include "init.h" +#include "util.h" + +#include +#include + +/** "About" dialog box */ +AboutDialog::AboutDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::AboutDialog) +{ + ui->setupUi(this); + + // Set current copyright year + ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin Core developers")); +} + +void AboutDialog::setModel(ClientModel *model) +{ + if(model) + { + ui->versionLabel->setText(model->formatFullVersion()); + } +} + +AboutDialog::~AboutDialog() +{ + delete ui; +} + +void AboutDialog::on_buttonBox_accepted() +{ + close(); +} + +/** "Help message" dialog box */ +HelpMessageDialog::HelpMessageDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::HelpMessageDialog) +{ + ui->setupUi(this); + GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this); + + header = tr("Bitcoin Core") + " " + tr("version") + " " + + QString::fromStdString(FormatFullVersion()) + "\n\n" + + tr("Usage:") + "\n" + + " bitcoin-qt [" + tr("command-line options") + "] " + "\n"; + + coreOptions = QString::fromStdString(HelpMessage(HMM_BITCOIN_QT)); + + uiOptions = tr("UI options") + ":\n" + + " -lang= " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" + + " -min " + tr("Start minimized") + "\n" + + " -splash " + tr("Show splash screen on startup (default: 1)") + "\n" + + " -choosedatadir " + tr("Choose data directory on startup (default: 0)"); + + ui->helpMessageLabel->setFont(GUIUtil::bitcoinAddressFont()); + + // Set help message text + ui->helpMessageLabel->setText(header + "\n" + coreOptions + "\n" + uiOptions); +} + +HelpMessageDialog::~HelpMessageDialog() +{ + GUIUtil::saveWindowGeometry("nHelpMessageDialogWindow", this); + delete ui; +} + +void HelpMessageDialog::printToConsole() +{ + // On other operating systems, the expected action is to print the message to the console. + QString strUsage = header + "\n" + coreOptions + "\n" + uiOptions; + fprintf(stdout, "%s", strUsage.toStdString().c_str()); +} + +void HelpMessageDialog::showOrPrint() +{ +#if defined(WIN32) + // On Windows, show a message box, as there is no stderr/stdout in windowed applications + exec(); +#else + // On other operating systems, print help text to console + printToConsole(); +#endif +} + +void HelpMessageDialog::on_okButton_accepted() +{ + close(); +} + + +/** "Shutdown" window */ +void ShutdownWindow::showShutdownWindow(BitcoinGUI *window) +{ + if (!window) + return; + + // 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...") + "

" + + 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(); +} diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h new file mode 100644 index 000000000..874daf6a7 --- /dev/null +++ b/src/qt/utilitydialog.h @@ -0,0 +1,69 @@ +// Copyright (c) 2011-2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef UTILITYDIALOG_H +#define UTILITYDIALOG_H + +#include +#include + +class BitcoinGUI; +class ClientModel; + +namespace Ui { + class AboutDialog; + class HelpMessageDialog; +} + +/** "About" dialog box */ +class AboutDialog : public QDialog +{ + Q_OBJECT + +public: + explicit AboutDialog(QWidget *parent); + ~AboutDialog(); + + void setModel(ClientModel *model); + +private: + Ui::AboutDialog *ui; + +private slots: + void on_buttonBox_accepted(); +}; + +/** "Help message" dialog box */ +class HelpMessageDialog : public QDialog +{ + Q_OBJECT + +public: + explicit HelpMessageDialog(QWidget *parent); + ~HelpMessageDialog(); + + void printToConsole(); + void showOrPrint(); + +private: + Ui::HelpMessageDialog *ui; + QString header; + QString coreOptions; + QString uiOptions; + +private slots: + void on_okButton_accepted(); +}; + + +/** "Shutdown" window */ +class ShutdownWindow : public QObject +{ + Q_OBJECT + +public: + static void showShutdownWindow(BitcoinGUI *window); +}; + +#endif // UTILITYDIALOG_H