Browse Source

[Qt] make Out-Of-Sync warning icon clickable

0.14
Jonas Schnelli 9 years ago
parent
commit
bd44a04dc3
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
  1. 4
      src/qt/forms/overviewpage.ui
  2. 7
      src/qt/overviewpage.cpp
  3. 2
      src/qt/overviewpage.h
  4. 6
      src/qt/walletframe.cpp
  5. 6
      src/qt/walletframe.h
  6. 6
      src/qt/walletview.cpp
  7. 5
      src/qt/walletview.h

4
src/qt/forms/overviewpage.ui

@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
<item>
<widget class="QPushButton" name="labelWalletStatus">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="maximumSize">
<size>
@ -447,7 +447,7 @@ @@ -447,7 +447,7 @@
<item>
<widget class="QPushButton" name="labelTransactionsStatus">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="maximumSize">
<size>

7
src/qt/overviewpage.cpp

@ -140,6 +140,8 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) @@ -140,6 +140,8 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
// start with displaying the "out of sync" warnings
showOutOfSyncWarning(true);
connect(ui->labelWalletStatus, SIGNAL(clicked()), this, SLOT(handleOutOfSyncWarningClicks()));
connect(ui->labelTransactionsStatus, SIGNAL(clicked()), this, SLOT(handleOutOfSyncWarningClicks()));
}
void OverviewPage::handleTransactionClicked(const QModelIndex &index)
@ -148,6 +150,11 @@ void OverviewPage::handleTransactionClicked(const QModelIndex &index) @@ -148,6 +150,11 @@ void OverviewPage::handleTransactionClicked(const QModelIndex &index)
Q_EMIT transactionClicked(filter->mapToSource(index));
}
void OverviewPage::handleOutOfSyncWarningClicks()
{
Q_EMIT outOfSyncWarningClicked();
}
OverviewPage::~OverviewPage()
{
delete ui;

2
src/qt/overviewpage.h

@ -42,6 +42,7 @@ public Q_SLOTS: @@ -42,6 +42,7 @@ public Q_SLOTS:
Q_SIGNALS:
void transactionClicked(const QModelIndex &index);
void outOfSyncWarningClicked();
private:
Ui::OverviewPage *ui;
@ -62,6 +63,7 @@ private Q_SLOTS: @@ -62,6 +63,7 @@ private Q_SLOTS:
void handleTransactionClicked(const QModelIndex &index);
void updateAlerts(const QString &warnings);
void updateWatchOnlyLabels(bool showWatchOnly);
void handleOutOfSyncWarningClicks();
};
#endif // BITCOIN_QT_OVERVIEWPAGE_H

6
src/qt/walletframe.cpp

@ -57,6 +57,8 @@ bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel) @@ -57,6 +57,8 @@ bool WalletFrame::addWallet(const QString& name, WalletModel *walletModel)
// Ensure a walletView is able to show the main window
connect(walletView, SIGNAL(showNormalIfMinimized()), gui, SLOT(showNormalIfMinimized()));
connect(walletView, SIGNAL(outOfSyncWarningClicked()), this, SLOT(outOfSyncWarningClicked()));
return true;
}
@ -195,3 +197,7 @@ WalletView *WalletFrame::currentWalletView() @@ -195,3 +197,7 @@ WalletView *WalletFrame::currentWalletView()
return qobject_cast<WalletView*>(walletStack->currentWidget());
}
void WalletFrame::outOfSyncWarningClicked()
{
Q_EMIT requestedOfSyncWarningInfo();
}

6
src/qt/walletframe.h

@ -38,6 +38,10 @@ public: @@ -38,6 +38,10 @@ public:
void showOutOfSyncWarning(bool fShow);
Q_SIGNALS:
/** Notify that the user has requested more information about the out-of-sync warning */
void requestedOfSyncWarningInfo();
private:
QStackedWidget *walletStack;
BitcoinGUI *gui;
@ -78,6 +82,8 @@ public Q_SLOTS: @@ -78,6 +82,8 @@ public Q_SLOTS:
void usedSendingAddresses();
/** Show used receiving addresses */
void usedReceivingAddresses();
/** Pass on signal over requested out-of-sync-warning information */
void outOfSyncWarningClicked();
};
#endif // BITCOIN_QT_WALLETFRAME_H

6
src/qt/walletview.cpp

@ -66,6 +66,7 @@ WalletView::WalletView(const PlatformStyle *platformStyle, QWidget *parent): @@ -66,6 +66,7 @@ WalletView::WalletView(const PlatformStyle *platformStyle, QWidget *parent):
// Clicking on a transaction on the overview pre-selects the transaction on the transaction history page
connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex)));
connect(overviewPage, SIGNAL(outOfSyncWarningClicked()), this, SLOT(requestedOfSyncWarningInfo()));
// Double-clicking on a transaction on the transaction history page shows details
connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
@ -322,3 +323,8 @@ void WalletView::showProgress(const QString &title, int nProgress) @@ -322,3 +323,8 @@ void WalletView::showProgress(const QString &title, int nProgress)
else if (progressDialog)
progressDialog->setValue(nProgress);
}
void WalletView::requestedOfSyncWarningInfo()
{
Q_EMIT outOfSyncWarningClicked();
}

5
src/qt/walletview.h

@ -110,6 +110,9 @@ public Q_SLOTS: @@ -110,6 +110,9 @@ public Q_SLOTS:
/** Show progress dialog e.g. for rescan */
void showProgress(const QString &title, int nProgress);
/** User has requested more information about the out of sync state */
void requestedOfSyncWarningInfo();
Q_SIGNALS:
/** Signal that we want to show the main window */
void showNormalIfMinimized();
@ -121,6 +124,8 @@ Q_SIGNALS: @@ -121,6 +124,8 @@ Q_SIGNALS:
void hdEnabledStatusChanged(int hdEnabled);
/** Notify that a new transaction appeared */
void incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label);
/** Notify that the out of sync warning icon has been pressed */
void outOfSyncWarningClicked();
};
#endif // BITCOIN_QT_WALLETVIEW_H

Loading…
Cancel
Save