diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index e5222bfc53b1..42676d9b091f 100755 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -414,3 +414,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 e915b3fc9d47..11ec05c042b2 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -145,6 +145,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) : { /** Create wallet frame*/ walletFrame = new WalletFrame(this); + tradingWindow = new tradingDialog(this); // Bittrex trading } else #endif // ENABLE_WALLET { diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 0d3d95650fb9..21235a0e7876 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -116,6 +116,7 @@ class BitcoinGUI : public QMainWindow QAction *openConfEditorAction; QAction *showBackupsAction; QAction *openAction; + QAction *openTradingwindowAction; QAction *showHelpMessageAction; QSystemTrayIcon *trayIcon; diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index 48c6aef80a5e..358c4c6f6287 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -119,13 +119,20 @@ 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() // Bittrex trading +{ + QMap::const_iterator i; + for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i) + i.value()->gotoTradingPage(); +} + void WalletFrame::gotoReceiveCoinsPage() { QMap::const_iterator i; diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 07229cde1e77..fcd05a33ae9f 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -57,7 +57,9 @@ public slots: /** Switch to receive coins page */ void gotoReceiveCoinsPage(); /** Switch to send coins page */ - void gotoSendCoinsPage(QString addr = ""); + void gotoSendCoinsPage(QString addr = ""); + /** Switch to Bittrex trading page */ + void gotoTradingPage(); /** Show Sign/Verify Message dialog and switch to sign message tab */ void gotoSignMessageTab(QString addr = ""); diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index c2e210988719..7e170ecf696e 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -38,7 +38,7 @@ 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 c6a7b78b1e65..b4993a88c89c 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -76,6 +76,8 @@ public slots: void gotoHistoryPage(); /** Switch to masternode page */ void gotoMasternodePage(); + /** Switch to Bittrex trading page */ + void gotoTradingPage(); /** Switch to receive coins page */ void gotoReceiveCoinsPage(); /** Switch to send coins page */