From 6cd3778838a54f1891171f2ed2916d92c7a87455 Mon Sep 17 00:00:00 2001 From: Mrs-X Date: Fri, 23 Dec 2016 12:14:00 +0100 Subject: [PATCH] Bittrex (re-) Integration --- src/Makefile.qt.include | 1 + src/qt/bitcoingui.cpp | 2 +- src/qt/bitcoingui.h | 2 +- src/qt/walletframe.cpp | 4 ++-- src/qt/walletframe.h | 2 +- src/qt/walletview.cpp | 1 - src/qt/walletview.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index f12d5e97c795..b9bc63ff962b 100755 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -420,3 +420,4 @@ moc_%.cpp: %.h @test -f $(LRELEASE) @$(MKDIR_P) $(@D) $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@ + diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 8ea771b1fa09..03b85e2164ca 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -147,7 +147,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) : { /** Create wallet frame*/ walletFrame = new WalletFrame(this); - tradingWindow = new tradingDialog(this); + tradingWindow = new tradingDialog(this); // Bittrex trading } else #endif // ENABLE_WALLET { diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 3923d0b10179..c03de74f3ab0 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -117,7 +117,7 @@ class BitcoinGUI : public QMainWindow QAction *openConfEditorAction; QAction *showBackupsAction; QAction *openAction; - QAction *openTradingwindowAction; + QAction *openTradingwindowAction; QAction *showHelpMessageAction; QSystemTrayIcon *trayIcon; diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 7c68d3cb88f2..358c4c6f6287 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -119,14 +119,14 @@ void WalletFrame::gotoHistoryPage() i.value()->gotoHistoryPage(); } -void WalletFrame::gotoMasternodePage() +void WalletFrame::gotoMasternodePage() // Masternode list { QMap::const_iterator i; for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) i.value()->gotoMasternodePage(); } -void WalletFrame::gotoTradingPage() +void WalletFrame::gotoTradingPage() // Bittrex trading { QMap::const_iterator i; for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 5eb848e1b558..31d3a8f7f9e0 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -59,7 +59,7 @@ public slots: void gotoReceiveCoinsPage(); /** Switch to send coins page */ void gotoSendCoinsPage(QString addr = ""); - /** Switch to trading page */ + /** Switch to Bittrex trading page */ void gotoTradingPage(); /** Show Sign/Verify Message dialog and switch to sign message tab */ diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 39229ce54e8e..7bbb9a148645 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -40,7 +40,6 @@ WalletView::WalletView(QWidget *parent): // Create tabs overviewPage = new OverviewPage(); tradingPage = new tradingDialog(this); - transactionsPage = new QWidget(this); QVBoxLayout *vbox = new QVBoxLayout(); QHBoxLayout *hbox_buttons = new QHBoxLayout(); diff --git a/src/qt/walletview.h b/src/qt/walletview.h index 9e10e5495726..70f441ccfe2e 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -78,7 +78,7 @@ public slots: void gotoHistoryPage(); /** Switch to masternode page */ void gotoMasternodePage(); - /** Switch to trading page */ + /** Switch to Bittrex trading page */ void gotoTradingPage(); /** Switch to receive coins page */ void gotoReceiveCoinsPage();