refactor, qt: Use std::chrono in ConfirmMessage parameter
This commit is contained in:
4 files changed
+14
-5
No files matched your search
@@ -20,6 +20,8 @@
|
|||||||
#include <wallet/wallet.h>
|
#include <wallet/wallet.h>
|
||||||
#include <walletinitinterface.h>
|
#include <walletinitinterface.h>
|
||||||
|
|
||||||
|
#include <chrono>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
@@ -40,7 +42,7 @@ void EditAddressAndSubmit(
|
|||||||
dialog->findChild<QLineEdit*>("labelEdit")->setText(label);
|
dialog->findChild<QLineEdit*>("labelEdit")->setText(label);
|
||||||
dialog->findChild<QValidatedLineEdit*>("addressEdit")->setText(address);
|
dialog->findChild<QValidatedLineEdit*>("addressEdit")->setText(address);
|
||||||
|
|
||||||
ConfirmMessage(&warning_text, 5);
|
ConfirmMessage(&warning_text, 5ms);
|
||||||
dialog->accept();
|
dialog->accept();
|
||||||
QCOMPARE(warning_text, expected_msg);
|
QCOMPARE(warning_text, expected_msg);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
// Distributed under the MIT software license, see the accompanying
|
// Distributed under the MIT software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#include <chrono>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
@@ -9,7 +11,7 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
void ConfirmMessage(QString* text, int msec)
|
void ConfirmMessage(QString* text, std::chrono::milliseconds msec)
|
||||||
{
|
{
|
||||||
QTimer::singleShot(msec, [text]() {
|
QTimer::singleShot(msec, [text]() {
|
||||||
for (QWidget* widget : QApplication::topLevelWidgets()) {
|
for (QWidget* widget : QApplication::topLevelWidgets()) {
|
||||||
|
|||||||
+6
-2
@@ -5,7 +5,11 @@
|
|||||||
#ifndef BITCOIN_QT_TEST_UTIL_H
|
#ifndef BITCOIN_QT_TEST_UTIL_H
|
||||||
#define BITCOIN_QT_TEST_UTIL_H
|
#define BITCOIN_QT_TEST_UTIL_H
|
||||||
|
|
||||||
#include <QString>
|
#include <chrono>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
class QString;
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Press "Ok" button in message box dialog.
|
* Press "Ok" button in message box dialog.
|
||||||
@@ -13,6 +17,6 @@
|
|||||||
* @param text - Optionally store dialog text.
|
* @param text - Optionally store dialog text.
|
||||||
* @param msec - Number of milliseconds to pause before triggering the callback.
|
* @param msec - Number of milliseconds to pause before triggering the callback.
|
||||||
*/
|
*/
|
||||||
void ConfirmMessage(QString* text = nullptr, int msec = 0);
|
void ConfirmMessage(QString* text, std::chrono::milliseconds msec);
|
||||||
|
|
||||||
#endif // BITCOIN_QT_TEST_UTIL_H
|
#endif // BITCOIN_QT_TEST_UTIL_H
|
||||||
@@ -26,6 +26,7 @@
|
|||||||
#include <qt/recentrequeststablemodel.h>
|
#include <qt/recentrequeststablemodel.h>
|
||||||
#include <qt/receiverequestdialog.h>
|
#include <qt/receiverequestdialog.h>
|
||||||
|
|
||||||
|
#include <chrono>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include <QAbstractButton>
|
#include <QAbstractButton>
|
||||||
@@ -112,7 +113,7 @@ void BumpFee(TransactionView& view, const uint256& txid, bool expectDisabled, st
|
|||||||
if (expectError.empty()) {
|
if (expectError.empty()) {
|
||||||
ConfirmSend(&text, cancel);
|
ConfirmSend(&text, cancel);
|
||||||
} else {
|
} else {
|
||||||
ConfirmMessage(&text);
|
ConfirmMessage(&text, 0ms);
|
||||||
}
|
}
|
||||||
action->trigger();
|
action->trigger();
|
||||||
QVERIFY(text.indexOf(QString::fromStdString(expectError)) != -1);
|
QVERIFY(text.indexOf(QString::fromStdString(expectError)) != -1);
|
||||||
|
|||||||
Reference in new issue
Block a user