Browse Source

Merge pull request #1569 from Diapolo/addressbookpage

replace some ugly code in addressbookpage.cpp
tags/v0.15.1
Wladimir J. van der Laan 9 years ago
parent
commit
232393e3bd
4 changed files with 16 additions and 11 deletions
  1. 2
    8
      src/qt/addressbookpage.cpp
  2. 4
    0
      src/qt/addressbookpage.h
  3. 5
    0
      src/qt/bitcoingui.cpp
  4. 5
    3
      src/qt/bitcoingui.h

+ 2
- 8
src/qt/addressbookpage.cpp View File

@@ -190,10 +190,7 @@ void AddressBookPage::on_signMessage_clicked()
addr = address.toString();
}

QObject *qoGUI = parent()->parent();
BitcoinGUI *gui = qobject_cast<BitcoinGUI *>(qoGUI);
if (gui)
gui->gotoSignMessageTab(addr);
emit signMessage(addr);
}

void AddressBookPage::on_verifyMessage_clicked()
@@ -208,10 +205,7 @@ void AddressBookPage::on_verifyMessage_clicked()
addr = address.toString();
}

QObject *qoGUI = parent()->parent();
BitcoinGUI *gui = qobject_cast<BitcoinGUI *>(qoGUI);
if (gui)
gui->gotoVerifyMessageTab(addr);
emit verifyMessage(addr);
}

void AddressBookPage::on_newAddressButton_clicked()

+ 4
- 0
src/qt/addressbookpage.h View File

@@ -76,6 +76,10 @@ private slots:

/** New entry/entries were added to address table */
void selectNewAddress(const QModelIndex &parent, int begin, int end);

signals:
void signMessage(QString addr);
void verifyMessage(QString addr);
};

#endif // ADDRESSBOOKDIALOG_H

+ 5
- 0
src/qt/bitcoingui.cpp View File

@@ -165,6 +165,11 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
rpcConsole = new RPCConsole(this);
connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));

// Clicking on "Verify Message" in the address book sends you to the verify message tab
connect(addressBookPage, SIGNAL(verifyMessage(QString)), this, SLOT(gotoVerifyMessageTab(QString)));
// Clicking on "Sign Message" in the receive coins page sends you to the sign message tab
connect(receiveCoinsPage, SIGNAL(signMessage(QString)), this, SLOT(gotoSignMessageTab(QString)));

gotoOverviewPage();
}


+ 5
- 3
src/qt/bitcoingui.h View File

@@ -132,9 +132,6 @@ public slots:
void askFee(qint64 nFeeRequired, bool *payFee);
void handleURI(QString strURI);

void gotoSignMessageTab(QString addr = "");
void gotoVerifyMessageTab(QString addr = "");

private slots:
/** Switch to overview (home) page */
void gotoOverviewPage();
@@ -147,6 +144,11 @@ private slots:
/** Switch to send coins page */
void gotoSendCoinsPage();

/** Show Sign/Verify Message dialog and switch to sign message tab */
void gotoSignMessageTab(QString addr = "");
/** Show Sign/Verify Message dialog and switch to verify message tab */
void gotoVerifyMessageTab(QString addr = "");

/** Show configuration dialog */
void optionsClicked();
/** Show about dialog */

Loading…
Cancel
Save