mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-11 01:26:10 +01:00
gui: Add detailed text to BitcoinGUI::message
This commit is contained in:
parent
b549cb1bd2
commit
23b9fa2e5e
2 changed files with 9 additions and 7 deletions
|
@ -1039,7 +1039,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
|
|||
progressBar->setToolTip(tooltip);
|
||||
}
|
||||
|
||||
void BitcoinGUI::message(const QString& title, QString message, unsigned int style, bool* ret)
|
||||
void BitcoinGUI::message(const QString& title, QString message, unsigned int style, bool* ret, const QString& detailed_message)
|
||||
{
|
||||
// Default title. On macOS, the window title is ignored (as required by the macOS Guidelines).
|
||||
QString strTitle{PACKAGE_NAME};
|
||||
|
@ -1093,6 +1093,7 @@ void BitcoinGUI::message(const QString& title, QString message, unsigned int sty
|
|||
showNormalIfMinimized();
|
||||
QMessageBox mBox(static_cast<QMessageBox::Icon>(nMBoxIcon), strTitle, message, buttons, this);
|
||||
mBox.setTextFormat(Qt::PlainText);
|
||||
mBox.setDetailedText(detailed_message);
|
||||
int r = mBox.exec();
|
||||
if (ret != nullptr)
|
||||
*ret = r == QMessageBox::Ok;
|
||||
|
|
|
@ -216,13 +216,14 @@ public Q_SLOTS:
|
|||
void setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool headers);
|
||||
|
||||
/** Notify the user of an event from the core network or transaction handling code.
|
||||
@param[in] title the message box / notification title
|
||||
@param[in] message the displayed text
|
||||
@param[in] style modality and style definitions (icon and used buttons - buttons only for message boxes)
|
||||
@see CClientUIInterface::MessageBoxFlags
|
||||
@param[in] ret pointer to a bool that will be modified to whether Ok was clicked (modal only)
|
||||
@param[in] title the message box / notification title
|
||||
@param[in] message the displayed text
|
||||
@param[in] style modality and style definitions (icon and used buttons - buttons only for message boxes)
|
||||
@see CClientUIInterface::MessageBoxFlags
|
||||
@param[in] ret pointer to a bool that will be modified to whether Ok was clicked (modal only)
|
||||
@param[in] detailed_message the text to be displayed in the details area
|
||||
*/
|
||||
void message(const QString& title, QString message, unsigned int style, bool* ret = nullptr);
|
||||
void message(const QString& title, QString message, unsigned int style, bool* ret = nullptr, const QString& detailed_message = QString());
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
void setCurrentWallet(WalletModel* wallet_model);
|
||||
|
|
Loading…
Add table
Reference in a new issue