Merge pull request #16 from Mrs-X/Testnet

Bittrex (re-) Integration

Author: Mrs-X

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 $@
+

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
     {

src/qt/bitcoingui.h

@@ -116,6 +116,7 @@ class BitcoinGUI : public QMainWindow
     QAction *openConfEditorAction;
     QAction *showBackupsAction;
     QAction *openAction;
+    QAction *openTradingwindowAction;
     QAction *showHelpMessageAction;
 
     QSystemTrayIcon *trayIcon;

src/qt/walletframe.cpp

@@ -119,13 +119,20 @@ void WalletFrame::gotoHistoryPage()
         i.value()->gotoHistoryPage();
 }
 
-void WalletFrame::gotoMasternodePage()
+void WalletFrame::gotoMasternodePage() // Masternode list
 {
     QMap<QString, WalletView*>::const_iterator i;
     for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
         i.value()->gotoMasternodePage();
 }
 
+void WalletFrame::gotoTradingPage()   // Bittrex trading
+{
+    QMap<QString, WalletView*>::const_iterator i;
+    for (i = mapWalletViews.constBegin(); i != mapWalletViews.constEnd(); ++i)
+        i.value()->gotoTradingPage();
+}
+
 void WalletFrame::gotoReceiveCoinsPage()
 {
     QMap<QString, WalletView*>::const_iterator i;

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 = "");

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();

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 */