From e7d03940ff45b509b1b650fa6b684f973dcfe1d6 Mon Sep 17 00:00:00 2001
From: Infernoman <jjaauto@hotmail.com>
Date: Wed, 2 Dec 2015 18:19:56 -0500
Subject: [PATCH] Forgot some things

---
 src/qt/forms/tradingdialog.ui | 352 ++++++++++++++++++++++++++++------
 src/qt/tradingdialog.cpp      |  25 ++-
 2 files changed, 304 insertions(+), 73 deletions(-)

diff --git a/src/qt/forms/tradingdialog.ui b/src/qt/forms/tradingdialog.ui
index f5d8490..5d22db0 100644
--- a/src/qt/forms/tradingdialog.ui
+++ b/src/qt/forms/tradingdialog.ui
@@ -38,7 +38,7 @@
     <enum>QTabWidget::Rounded</enum>
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>0</number>
    </property>
    <widget class="QWidget" name="BuyTab">
     <attribute name="title">
@@ -47,12 +47,15 @@
     <widget class="QPushButton" name="BuyBSTY">
      <property name="geometry">
       <rect>
-       <x>140</x>
-       <y>240</y>
+       <x>110</x>
+       <y>130</y>
        <width>75</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Buy BSTY</string>
      </property>
@@ -61,7 +64,7 @@
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>110</y>
+       <y>40</y>
        <width>46</width>
        <height>23</height>
       </rect>
@@ -79,8 +82,8 @@
     <widget class="QLineEdit" name="UnitsInput">
      <property name="geometry">
       <rect>
-       <x>150</x>
-       <y>110</y>
+       <x>120</x>
+       <y>43</y>
        <width>101</width>
        <height>23</height>
       </rect>
@@ -96,8 +99,8 @@
     <widget class="QLineEdit" name="BuyBidPriceEdit">
      <property name="geometry">
       <rect>
-       <x>150</x>
-       <y>140</y>
+       <x>120</x>
+       <y>70</y>
        <width>101</width>
        <height>23</height>
       </rect>
@@ -113,8 +116,8 @@
     <widget class="QLabel" name="label_4">
      <property name="geometry">
       <rect>
-       <x>260</x>
-       <y>110</y>
+       <x>230</x>
+       <y>43</y>
        <width>31</width>
        <height>23</height>
       </rect>
@@ -126,8 +129,8 @@
     <widget class="QLabel" name="label_5">
      <property name="geometry">
       <rect>
-       <x>260</x>
-       <y>140</y>
+       <x>230</x>
+       <y>70</y>
        <width>21</width>
        <height>23</height>
       </rect>
@@ -140,7 +143,7 @@
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>140</y>
+       <y>70</y>
        <width>46</width>
        <height>23</height>
       </rect>
@@ -155,12 +158,12 @@
       <string>Bid</string>
      </property>
     </widget>
-    <widget class="QLabel" name="label_7">
+    <widget class="QLabel" name="OrderTypeL">
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>170</y>
-       <width>71</width>
+       <y>100</y>
+       <width>31</width>
        <height>16</height>
       </rect>
      </property>
@@ -177,10 +180,10 @@
     <widget class="QPushButton" name="Buy_Max_Amount">
      <property name="geometry">
       <rect>
-       <x>80</x>
-       <y>110</y>
+       <x>50</x>
+       <y>40</y>
        <width>61</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
      <property name="font">
@@ -188,6 +191,9 @@
        <pointsize>10</pointsize>
       </font>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Max</string>
      </property>
@@ -195,12 +201,18 @@
     <widget class="QComboBox" name="BuyBidcomboBox">
      <property name="geometry">
       <rect>
-       <x>80</x>
-       <y>140</y>
+       <x>50</x>
+       <y>70</y>
        <width>61</width>
        <height>23</height>
       </rect>
      </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
@@ -210,12 +222,18 @@
     <widget class="QComboBox" name="buyOrdertypeCombo">
      <property name="geometry">
       <rect>
-       <x>80</x>
-       <y>170</y>
+       <x>50</x>
+       <y>100</y>
        <width>61</width>
        <height>23</height>
       </rect>
      </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
@@ -225,7 +243,7 @@
     <widget class="QWidget" name="layoutWidget">
      <property name="geometry">
       <rect>
-       <x>20</x>
+       <x>50</x>
        <y>11</y>
        <width>221</width>
        <height>16</height>
@@ -694,8 +712,8 @@
     <widget class="QWidget" name="layoutWidget_2">
      <property name="geometry">
       <rect>
-       <x>10</x>
-       <y>300</y>
+       <x>30</x>
+       <y>100</y>
        <width>271</width>
        <height>16</height>
       </rect>
@@ -1166,7 +1184,7 @@
     <widget class="QWidget" name="layoutWidget_3">
      <property name="geometry">
       <rect>
-       <x>330</x>
+       <x>400</x>
        <y>10</y>
        <width>221</width>
        <height>16</height>
@@ -1635,10 +1653,10 @@
     <widget class="QPushButton" name="Sell_Max_Amount">
      <property name="geometry">
       <rect>
-       <x>380</x>
-       <y>110</y>
+       <x>400</x>
+       <y>40</y>
        <width>61</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
      <property name="font">
@@ -1646,6 +1664,9 @@
        <pointsize>10</pointsize>
       </font>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Max</string>
      </property>
@@ -1653,8 +1674,8 @@
     <widget class="QLineEdit" name="UnitsInputBSTY">
      <property name="geometry">
       <rect>
-       <x>450</x>
-       <y>110</y>
+       <x>470</x>
+       <y>43</y>
        <width>101</width>
        <height>23</height>
       </rect>
@@ -1670,8 +1691,8 @@
     <widget class="QLabel" name="label_22">
      <property name="geometry">
       <rect>
-       <x>560</x>
-       <y>110</y>
+       <x>580</x>
+       <y>43</y>
        <width>31</width>
        <height>23</height>
       </rect>
@@ -1683,12 +1704,24 @@
     <widget class="QComboBox" name="SellBidcomboBox">
      <property name="geometry">
       <rect>
-       <x>380</x>
-       <y>140</y>
+       <x>400</x>
+       <y>70</y>
        <width>61</width>
        <height>23</height>
       </rect>
      </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
@@ -1698,8 +1731,8 @@
     <widget class="QLineEdit" name="SellBidPriceEdit">
      <property name="geometry">
       <rect>
-       <x>450</x>
-       <y>140</y>
+       <x>470</x>
+       <y>70</y>
        <width>101</width>
        <height>23</height>
       </rect>
@@ -1715,8 +1748,8 @@
     <widget class="QLabel" name="label_16">
      <property name="geometry">
       <rect>
-       <x>560</x>
-       <y>140</y>
+       <x>580</x>
+       <y>70</y>
        <width>21</width>
        <height>23</height>
       </rect>
@@ -1728,12 +1761,18 @@
     <widget class="QComboBox" name="SellOrdertypeCombo">
      <property name="geometry">
       <rect>
-       <x>380</x>
-       <y>170</y>
+       <x>400</x>
+       <y>100</y>
        <width>61</width>
        <height>23</height>
       </rect>
      </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
@@ -1743,8 +1782,8 @@
     <widget class="QWidget" name="layoutWidget_4">
      <property name="geometry">
       <rect>
-       <x>320</x>
-       <y>300</y>
+       <x>380</x>
+       <y>100</y>
        <width>271</width>
        <height>16</height>
       </rect>
@@ -2215,18 +2254,47 @@
     <widget class="QPushButton" name="SellBSTYBTN">
      <property name="geometry">
       <rect>
-       <x>440</x>
-       <y>240</y>
+       <x>460</x>
+       <y>130</y>
        <width>75</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Sell BSTY</string>
      </property>
     </widget>
+    <zorder>BuyBSTY</zorder>
+    <zorder>label_3</zorder>
+    <zorder>UnitsInput</zorder>
+    <zorder>label_4</zorder>
+    <zorder>label_5</zorder>
+    <zorder>label_6</zorder>
+    <zorder>OrderTypeL</zorder>
+    <zorder>Buy_Max_Amount</zorder>
+    <zorder>BuyBidcomboBox</zorder>
+    <zorder>buyOrdertypeCombo</zorder>
+    <zorder>layoutWidget</zorder>
+    <zorder>layoutWidget_2</zorder>
+    <zorder>layoutWidget_3</zorder>
+    <zorder>Sell_Max_Amount</zorder>
+    <zorder>UnitsInputBSTY</zorder>
+    <zorder>label_22</zorder>
+    <zorder>SellBidcomboBox</zorder>
+    <zorder>SellBidPriceEdit</zorder>
+    <zorder>label_16</zorder>
+    <zorder>SellOrdertypeCombo</zorder>
+    <zorder>layoutWidget_4</zorder>
+    <zorder>SellBSTYBTN</zorder>
+    <zorder>BuyBidPriceEdit</zorder>
    </widget>
-   <widget class="QWidget" name="tab">
+   <widget class="QWidget" name="SellTab">
     <attribute name="title">
      <string>Send</string>
     </attribute>
@@ -2794,9 +2862,12 @@
        <x>90</x>
        <y>180</y>
        <width>75</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Send</string>
      </property>
@@ -3509,7 +3580,7 @@
       </font>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Instructions:&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;To use the cross sending feature you need to have &lt;/p&gt;&lt;p align=&quot;center&quot;&gt;BSTY available to spend on Bittrex. If you don't have any &lt;/p&gt;&lt;p align=&quot;center&quot;&gt;you can find your deposit address on the &amp;quot;Balance&amp;quot; tab.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;1. Enter the amount you want to receive in Bitcoin.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;2. Enter the Bitcoin address you are sending to.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;3. Check that the Total with fee's is correct.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;4. Press send and watch the magic happen.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Notes.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;Total w/ fees.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;N/A means you dont have enough BSTY to sell !&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;All trades are done through Bittrex using your own balance and API keys.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;The only 3rd party that needs to be trusted in this instance is the exchange !&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Instructions:&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;To use the cross sending feature you need to have &lt;/p&gt;&lt;p align=&quot;center&quot;&gt;BSTY available to spend on Bittrex. If you don't have any &lt;/p&gt;&lt;p align=&quot;center&quot;&gt;you can find your deposit address on the &amp;quot;Balance&amp;quot; BSTY.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;1. Enter the amount you want to receive in Bitcoin.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;2. Enter the Bitcoin address you are sending to.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;3. Check that the Total with fee's is correct.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;4. Press send and watch the magic happen.&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Notes.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;Total w/ fees.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;N/A means you dont have enough BSTY to sell !&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;All trades are done through Bittrex using your own balance and API keys.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:7pt;&quot;&gt;The only 3rd party that needs to be trusted in this instance is the exchange !&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
     </widget>
     <widget class="QLabel" name="label232_3">
@@ -3536,7 +3607,7 @@
       <rect>
        <x>180</x>
        <y>41</y>
-       <width>72</width>
+       <width>101</width>
        <height>16</height>
       </rect>
      </property>
@@ -3974,7 +4045,7 @@
        <x>10</x>
        <y>70</y>
        <width>61</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
      <property name="font">
@@ -3982,10 +4053,33 @@
        <pointsize>10</pointsize>
       </font>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Max</string>
      </property>
     </widget>
+    <widget class="QLabel" name="label232_18">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>320</y>
+       <width>391</width>
+       <height>21</height>
+      </rect>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>10</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Written by: Infernoman</string>
+     </property>
+    </widget>
     <zorder>label232_3</zorder>
     <zorder>BSTYAvailableLabel_3</zorder>
     <zorder>CSUnitsInput</zorder>
@@ -4009,6 +4103,7 @@
     <zorder>label232_6</zorder>
     <zorder>label232_7</zorder>
     <zorder>CS_Max_Amount</zorder>
+    <zorder>label232_18</zorder>
    </widget>
    <widget class="QWidget" name="OrderBook">
     <attribute name="title">
@@ -4454,9 +4549,12 @@
        <x>20</x>
        <y>130</y>
        <width>411</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Generate BSTY Coin Deposit Address</string>
      </property>
@@ -4556,7 +4654,7 @@
        <x>110</x>
        <y>280</y>
        <width>81</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
      <property name="font">
@@ -4564,6 +4662,9 @@
        <pointsize>10</pointsize>
       </font>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Max</string>
      </property>
@@ -4573,7 +4674,7 @@
       <rect>
        <x>20</x>
        <y>240</y>
-       <width>81</width>
+       <width>111</width>
        <height>16</height>
       </rect>
      </property>
@@ -4669,7 +4770,7 @@
        <x>110</x>
        <y>350</y>
        <width>75</width>
-       <height>23</height>
+       <height>27</height>
       </rect>
      </property>
      <property name="text">
@@ -4720,7 +4821,7 @@
      <property name="geometry">
       <rect>
        <x>30</x>
-       <y>90</y>
+       <y>80</y>
        <width>71</width>
        <height>20</height>
       </rect>
@@ -4758,7 +4859,7 @@
      <property name="geometry">
       <rect>
        <x>200</x>
-       <y>90</y>
+       <y>80</y>
        <width>300</width>
        <height>23</height>
       </rect>
@@ -4767,21 +4868,146 @@
     <widget class="QPushButton" name="UpdateKeys">
      <property name="geometry">
       <rect>
-       <x>560</x>
-       <y>90</y>
-       <width>191</width>
-       <height>23</height>
+       <x>190</x>
+       <y>150</y>
+       <width>151</width>
+       <height>27</height>
       </rect>
      </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
      <property name="text">
       <string>Update API Keys</string>
      </property>
     </widget>
+    <widget class="QPushButton" name="SaveKeys">
+     <property name="geometry">
+      <rect>
+       <x>350</x>
+       <y>150</y>
+       <width>151</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
+     <property name="text">
+      <string>Save API Keys</string>
+     </property>
+    </widget>
+    <widget class="QPushButton" name="LoadKeys">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>150</y>
+       <width>151</width>
+       <height>27</height>
+      </rect>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">text-align:center;</string>
+     </property>
+     <property name="text">
+      <string>Load API Keys</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label232_16">
+     <property name="geometry">
+      <rect>
+       <x>20</x>
+       <y>200</y>
+       <width>231</width>
+       <height>131</height>
+      </rect>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>10</pointsize>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saving keys:&lt;/p&gt;&lt;p&gt;1) Enter in API Keys found at &lt;a href=&quot;https://bittrex.com/Account/ManageApiKey&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Bittrex&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;2) Enter Password&lt;/p&gt;&lt;p&gt;3) Save API Keys&lt;/p&gt;&lt;p&gt;4) Start trading on Bittrex&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label232_17">
+     <property name="geometry">
+      <rect>
+       <x>280</x>
+       <y>190</y>
+       <width>221</width>
+       <height>121</height>
+      </rect>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>10</pointsize>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Loading keys:&lt;/p&gt;&lt;p&gt;1) Enter Password&lt;/p&gt;&lt;p&gt;2) Load API Keys&lt;/p&gt;&lt;p&gt;3) Start trading on Bittrex&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="label_28">
+     <property name="geometry">
+      <rect>
+       <x>30</x>
+       <y>110</y>
+       <width>71</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Password</string>
+     </property>
+    </widget>
+    <widget class="QLineEdit" name="PasswordInput">
+     <property name="geometry">
+      <rect>
+       <x>200</x>
+       <y>110</y>
+       <width>300</width>
+       <height>23</height>
+      </rect>
+     </property>
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
     <zorder>label</zorder>
     <zorder>ApiKeyInput</zorder>
     <zorder>label_2</zorder>
     <zorder>SecretKeyInput</zorder>
     <zorder>UpdateKeys</zorder>
+    <zorder>SaveKeys</zorder>
+    <zorder>LoadKeys</zorder>
+    <zorder>label232_16</zorder>
+    <zorder>label232_17</zorder>
+    <zorder>label_28</zorder>
+    <zorder>PasswordInput</zorder>
    </widget>
   </widget>
   <widget class="QFrame" name="tradingHeaderContainer">
diff --git a/src/qt/tradingdialog.cpp b/src/qt/tradingdialog.cpp
index 5e03308..39ba0a1 100644
--- a/src/qt/tradingdialog.cpp
+++ b/src/qt/tradingdialog.cpp
@@ -115,9 +115,12 @@ tradingDialog::tradingDialog(QWidget *parent) :
 
     /*populate static combo values*/
     ui->BuyBidcomboBox   -> addItems(QStringList()<<"Last"<<"Bid"<<"Ask");
-    ui->buyOrdertypeCombo-> addItems(QStringList()<<"Limit"<<"Market");
+    //ui->buyOrdertypeCombo-> addItems(QStringList()<<"Limit"<<"Market");
+    ui->buyOrdertypeCombo->hide();
     ui->SellBidcomboBox  -> addItems(QStringList()<<"Last"<<"Bid"<<"Ask");
-    ui->SellOrdertypeCombo-> addItems(QStringList()<<"Limit"<<"Market");
+    //ui->SellOrdertypeCombo-> addItems(QStringList()<<"Limit"<<"Market");
+    ui->SellOrdertypeCombo->hide();
+    ui->OrderTypeL->hide();
     //ui->BuyTimeInForceCombo-> addItems(QStringList()<<"Good 'Til Cancelled"<<"Immediate Or Cancel");
     //ui->BuyConditionCombo->   addItems(QStringList()<<"Greater Than Or Equal To"<<"Less Than Or Equal To");
     //ui->BuyConditionCombo->hide();
@@ -860,6 +863,7 @@ void tradingDialog::on_SaveKeys_clicked()
     }
     if (fSuccess) {
         QMessageBox::information(this,"Success !","Saved keys successfully to APIcache.txt");
+        on_UpdateKeys_clicked();
     }
 
 }
@@ -900,6 +904,7 @@ void tradingDialog::on_LoadKeys_clicked()
     }
     if (fSuccess) {
         QMessageBox::information(this,"Success !","Loaded keys successfully from APIcache.txt");
+        on_UpdateKeys_clicked();
     }
 
 }
@@ -979,8 +984,8 @@ void tradingDialog::on_CS_Max_Amount_clicked()
             Received += ((Price * Quantity) - ((Price * Quantity / 100) * 0.25));
             Qty += Quantity;
 
-            if ((Quantity * x) < 0.00055){
-                Quantity = (0.00055 / x);
+            if ((Quantity * x) < 0.00051){
+                Quantity = (0.00051 / x);
             }
 
             break;
@@ -1113,7 +1118,7 @@ void tradingDialog::on_BuyBSTY_clicked()
     Rate     = ui->BuyBidPriceEdit->text().toDouble();
     Quantity = ui->UnitsInput->text().toDouble();
 
-    QString OrderType = ui->buyOrdertypeCombo->currentText();
+    QString OrderType = "Limit";
     QString Order;
 
     if(OrderType == "Limit"){Order = "buylimit";}else if (OrderType == "Market"){ Order = "buymarket";}
@@ -1155,7 +1160,7 @@ void tradingDialog::on_SellBSTYBTN_clicked()
     Rate     = ui->SellBidPriceEdit->text().toDouble();
     Quantity = ui->UnitsInputBSTY->text().toDouble();
 
-    QString OrderType = ui->SellOrdertypeCombo->currentText();
+    QString OrderType = "Limit";
     QString Order;
 
     if(OrderType == "Limit"){Order = "selllimit";}else if (OrderType == "Market"){ Order = "sellmarket";}
@@ -1250,7 +1255,7 @@ void tradingDialog::on_CSUnitsBtn_clicked()
 
                 if (SellResponseObject["success"].toBool() == false){
                     if (SellResponseObject["message"] == "DUST_TRADE_DISALLOWED_MIN_VALUE_50K_SAT"){
-                        Add = y;
+                        Add += y;
                         continue;
                     }
                     QMessageBox::information(this,"sFailed",SellResponse);
@@ -1262,9 +1267,9 @@ void tradingDialog::on_CSUnitsBtn_clicked()
                 Price = x;
                 Received += ((Price * (Quantity / x)) - ((Price * (Quantity / x) / 100) * 0.25));
                 Qty += (Quantity / x);
-                Quantity += (Add / x);
-                if (Quantity < 0.00055){
-                    Quantity = 0.00055;
+                Quantity += (Add * x);
+                if (Quantity < 0.00051){
+                    Quantity = 0.00051;
                 }
                 QString SellResponse = SellBSTY(Order,(Quantity / x),x);
                 QJsonDocument SelljsonResponse = QJsonDocument::fromJson(SellResponse.toUtf8());          //get json from str.