Merge pull request #49 from MyHush/denio

add Halving time,Market Cap and Volume to Hushdaemon tab,fix mac icon

src/controller.cpp

@@ -162,11 +162,16 @@ void Controller::getInfoThenRefresh(bool force) {
         prevCallSucceeded = true;       
 
         int curBlock  = reply["latest_block_height"].get<json::number_integer_t>();
+        int blocks_until_halving= 340000 - curBlock;
+        char halving_days[8];
+        sprintf(halving_days, "%.2f", (double) (blocks_until_halving * 150) / (60*60*24) );
         bool doUpdate = force || (model->getLatestBlock() != curBlock);
         model->setLatestBlock(curBlock);
         ui->blockHeight->setText(QString::number(curBlock));
+        ui->halvingTime->setText( QString::number(blocks_until_halving) % " blocks, " % QString::fromStdString(halving_days)  % " days" );
         ui->Version->setText(QString::fromStdString(reply["version"].get<json::string_t>())); 
         ui->Vendor->setText(QString::fromStdString(reply["vendor"].get<json::string_t>()));
+        ui->volumeExchange->setText(" BTC " + QString::number((double)  Settings::getInstance()->getBTCVolume() ,'f',8));
 
         main->logger->write(QString("Refresh. curblock ") % QString::number(curBlock) % ", update=" % (doUpdate ? "true" : "false") );
 
@@ -181,29 +186,53 @@ void Controller::getInfoThenRefresh(bool force) {
 
         if (Settings::getInstance()->get_currency_name() == "USD") {
         main->statusLabel->setText(" HUSH/USD=$ " + QString::number( (double) Settings::getInstance()->getZECPrice() ,'f',2));
+        ui->volumeExchange->setText(" $ " + QString::number((double)  Settings::getInstance()->getUSDVolume() ,'f',2));
+        ui->marketcapTab->setText(" $ " + QString::number((double)  Settings::getInstance()->getUSDCAP() ,'f',2));
     }   else if (Settings::getInstance()->get_currency_name() == "EUR") {
         main->statusLabel->setText(" HUSH/EUR=€ " + QString::number( (double) Settings::getInstance()->getEURPrice() ,'f',2));
+        ui->volumeExchange->setText(" € " + QString::number((double)  Settings::getInstance()->getEURVolume() ,'f',2));
+        ui->marketcapTab->setText(" € " + QString::number((double)  Settings::getInstance()->getEURCAP() ,'f',2));
     }   else if  (Settings::getInstance()->get_currency_name() == "BTC") {
         main->statusLabel->setText(" HUSH/BTC=BTC " + QString::number((double)  Settings::getInstance()->getBTCPrice() ,'f',8));
+        ui->volumeExchange->setText(" BTC " + QString::number((double)  Settings::getInstance()->getBTCVolume() ,'f',8));
+          ui->marketcapTab->setText(" BTC " + QString::number((double)  Settings::getInstance()->getBTCCAP() ,'f',8));
     }   else if (Settings::getInstance()->get_currency_name() == "CNY") {
         main->statusLabel->setText(" HUSH/CNY=¥ /元 " + QString::number( (double) Settings::getInstance()->getCNYPrice() ,'f',2));
+        ui->volumeExchange->setText(" ¥ /元  " + QString::number((double)  Settings::getInstance()->getCNYVolume() ,'f',2));
+        ui->marketcapTab->setText(" ¥ /元  " + QString::number((double)  Settings::getInstance()->getCNYCAP() ,'f',2));
     }   else if  (Settings::getInstance()->get_currency_name() == "RUB") {
         main->statusLabel->setText(" HUSH/RUB=₽ " + QString::number((double)  Settings::getInstance()->getRUBPrice() ,'f',2));
+        ui->volumeExchange->setText(" ₽  " + QString::number((double)  Settings::getInstance()->getRUBVolume() ,'f',2));
+        ui->marketcapTab->setText(" ₽  " + QString::number((double)  Settings::getInstance()->getRUBCAP() ,'f',2));
     }   else if (Settings::getInstance()->get_currency_name() == "CAD") {
         main->statusLabel->setText(" HUSH/CAD=$ " + QString::number( (double) Settings::getInstance()->getCADPrice() ,'f',2));
+        ui->volumeExchange->setText(" $  " + QString::number((double)  Settings::getInstance()->getCADVolume() ,'f',2));
+        ui->marketcapTab->setText(" $  " + QString::number((double)  Settings::getInstance()->getCADCAP() ,'f',2));
     }   else if  (Settings::getInstance()->get_currency_name() == "SGD") {
         main->statusLabel->setText(" HUSH/SGD=$ " + QString::number((double)  Settings::getInstance()->getSGDPrice() ,'f',2));
+        ui->volumeExchange->setText(" $  " + QString::number((double)  Settings::getInstance()->getSGDVolume() ,'f',2));
+        ui->marketcapTab->setText(" $  " + QString::number((double)  Settings::getInstance()->getSGDCAP() ,'f',2));
     }   else if  (Settings::getInstance()->get_currency_name() == "CHF") {
         main->statusLabel->setText(" HUSH/CHF=CHF " + QString::number((double)  Settings::getInstance()->getCHFPrice() ,'f',2));
+        ui->volumeExchange->setText(" CHF  " + QString::number((double)  Settings::getInstance()->getCHFVolume() ,'f',2));
+        ui->marketcapTab->setText(" CHF  " + QString::number((double)  Settings::getInstance()->getCHFCAP() ,'f',2));
     }   else if (Settings::getInstance()->get_currency_name() == "INR") {
         main->statusLabel->setText(" HUSH/INR=₹ " + QString::number( (double) Settings::getInstance()->getINRPrice() ,'f',2));
+        ui->volumeExchange->setText(" ₹  " + QString::number((double)  Settings::getInstance()->getINRVolume() ,'f',2));
+        ui->marketcapTab->setText(" ₹  " + QString::number((double)  Settings::getInstance()->getINRCAP() ,'f',2));
     }   else if  (Settings::getInstance()->get_currency_name() == "GBP") {
         main->statusLabel->setText(" HUSH/GBP=£ " + QString::number((double)  Settings::getInstance()->getGBPPrice() ,'f',2));
+        ui->volumeExchange->setText(" £  " + QString::number((double)  Settings::getInstance()->getGBPVolume() ,'f',2));
+        ui->marketcapTab->setText(" £  " + QString::number((double)  Settings::getInstance()->getRUBCAP() ,'f',2));
         }else if  (Settings::getInstance()->get_currency_name() == "AUD") {
         main->statusLabel->setText(" HUSH/AUD=$ " + QString::number((double)  Settings::getInstance()->getAUDPrice() ,'f',2));
+        ui->volumeExchange->setText(" $  " + QString::number((double)  Settings::getInstance()->getAUDVolume() ,'f',2));
+        ui->marketcapTab->setText(" $  " + QString::number((double)  Settings::getInstance()->getAUDCAP() ,'f',2));
         
     } else {
     main->statusLabel->setText(" HUSH/USD=$" + QString::number(Settings::getInstance()->getZECPrice(),'f',2 ));
+    ui->volumeExchange->setText(" $  " + QString::number((double)  Settings::getInstance()->getUSDVolume() ,'f',2));
+    ui->marketcapTab->setText(" $  " + QString::number((double)  Settings::getInstance()->getUSDCAP() ,'f',2));
     }
         main->statusLabel->setToolTip(tooltip);
         main->statusIcon->setPixmap(i.pixmap(16, 16));
@@ -336,6 +365,7 @@ void Controller::updateUIBalances() {
     ui->balVerified   ->setToolTip(balVerified.toDecimalEURString());
     ui->balTransparent->setToolTip(balT.toDecimalEURString());
     ui->balTotal      ->setToolTip(balTotal.toDecimalEURString());
+    
 
     } else if (Settings::getInstance()->get_currency_name() == "BTC") {
     ui->balSheilded   ->setToolTip(balZ.toDecimalBTCString());
@@ -764,6 +794,28 @@ void Controller::refreshZECPrice() {
                 Settings::getInstance()->setGBPPrice(0);
                 Settings::getInstance()->setAUDPrice(0);
                 Settings::getInstance()->setINRPrice(0);
+                Settings::getInstance()->setUSDVolume(0);
+                Settings::getInstance()->setEURVolume(0);
+                Settings::getInstance()->setBTCVolume(0);
+                Settings::getInstance()->setCNYVolume(0);
+                Settings::getInstance()->setRUBVolume(0);
+                Settings::getInstance()->setCADVolume(0);
+                Settings::getInstance()->setINRVolume(0);
+                Settings::getInstance()->setSGDVolume(0);
+                Settings::getInstance()->setCHFVolume(0);
+                Settings::getInstance()->setGBPVolume(0);
+                Settings::getInstance()->setAUDVolume(0);
+                Settings::getInstance()->setUSDCAP(0);
+                Settings::getInstance()->setEURCAP(0);
+                Settings::getInstance()->setBTCCAP(0);
+                Settings::getInstance()->setCNYCAP(0);
+                Settings::getInstance()->setRUBCAP(0);
+                Settings::getInstance()->setCADCAP(0);
+                Settings::getInstance()->setINRCAP(0);
+                Settings::getInstance()->setSGDCAP(0);
+                Settings::getInstance()->setCHFCAP(0);
+                Settings::getInstance()->setGBPCAP(0);
+                Settings::getInstance()->setAUDCAP(0);
                
                 return;
             }
@@ -784,6 +836,28 @@ void Controller::refreshZECPrice() {
                 Settings::getInstance()->setGBPPrice(0);
                 Settings::getInstance()->setAUDPrice(0);
                 Settings::getInstance()->setINRPrice(0);
+                Settings::getInstance()->setUSDVolume(0);
+                Settings::getInstance()->setEURVolume(0);
+                Settings::getInstance()->setBTCVolume(0);
+                Settings::getInstance()->setCNYVolume(0);
+                Settings::getInstance()->setRUBVolume(0);
+                Settings::getInstance()->setCADVolume(0);
+                Settings::getInstance()->setINRVolume(0);
+                Settings::getInstance()->setSGDVolume(0);
+                Settings::getInstance()->setCHFVolume(0);
+                Settings::getInstance()->setGBPVolume(0);
+                Settings::getInstance()->setAUDVolume(0);
+                Settings::getInstance()->setUSDCAP(0);
+                Settings::getInstance()->setEURCAP(0);
+                Settings::getInstance()->setBTCCAP(0);
+                Settings::getInstance()->setCNYCAP(0);
+                Settings::getInstance()->setRUBCAP(0);
+                Settings::getInstance()->setCADCAP(0);
+                Settings::getInstance()->setINRCAP(0);
+                Settings::getInstance()->setSGDCAP(0);
+                Settings::getInstance()->setCHFCAP(0);
+                Settings::getInstance()->setGBPCAP(0);
+                Settings::getInstance()->setAUDCAP(0);
                 return;
             }
 
@@ -857,8 +931,138 @@ void Controller::refreshZECPrice() {
                 qDebug() << "HUSH = AUD" << QString::number((double)hush["aud"]);
                 Settings::getInstance()->setAUDPrice( hush["aud"]);
             }
-
+             if (hush["btc_24h_vol"] >= 0)
-
+            {
+              
+                qDebug() << "HUSH = usd_24h_vol" << QString::number((double)hush["usd_24h_vol"]);
+                Settings::getInstance()->setUSDVolume( hush["usd_24h_vol"]);
+            }
+                if (hush["btc_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = euro_24h_vol" << QString::number((double)hush["eur_24h_vol"]);
+                Settings::getInstance()->setEURVolume( hush["eur_24h_vol"]);
+            }
+                if (hush["btc_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = btc_24h_vol" << QString::number((double)hush["btc_24h_vol"]);
+                Settings::getInstance()->setBTCVolume( hush["btc_24h_vol"]);
+            }
+                if (hush["cny_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = cny_24h_vol" << QString::number((double)hush["cny_24h_vol"]);
+                Settings::getInstance()->setCNYVolume( hush["cny_24h_vol"]);
+            }
+                if (hush["rub_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = rub_24h_vol" << QString::number((double)hush["rub_24h_vol"]);
+                Settings::getInstance()->setRUBVolume( hush["rub_24h_vol"]);
+            }
+                if (hush["cad_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = cad_24h_vol" << QString::number((double)hush["cad_24h_vol"]);
+                Settings::getInstance()->setCADVolume( hush["cad_24h_vol"]);
+            }
+                if (hush["sgd_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = sgd_24h_vol" << QString::number((double)hush["sgd_24h_vol"]);
+                Settings::getInstance()->setSGDVolume( hush["sgd_24h_vol"]);
+            }
+                if (hush["chf_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = chf_24h_vol" << QString::number((double)hush["chf_24h_vol"]);
+                Settings::getInstance()->setCHFVolume( hush["chf_24h_vol"]);
+            }
+             if (hush["inr_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = inr_24h_vol" << QString::number((double)hush["inr_24h_vol"]);
+                Settings::getInstance()->setINRVolume( hush["inr_24h_vol"]);
+            }
+                if (hush["gbp_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = gbp_24h_vol" << QString::number((double)hush["gbp_24h_vol"]);
+                Settings::getInstance()->setGBPVolume( hush["gbp_24h_vol"]);
+            }
+                if (hush["aud_24h_vol"] >= 0)
+            {
+              
+                qDebug() << "HUSH = aud_24h_vol" << QString::number((double)hush["aud_24h_vol"]);
+                Settings::getInstance()->setAUDVolume( hush["aud_24h_vol"]);
+            }
+             if (hush["usd_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = usd_market_cap" << QString::number((double)hush["usd_market_cap"]);
+                Settings::getInstance()->setUSDCAP( hush["usd_market_cap"]);
+            }
+                if (hush["eur_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = eur_market_cap" << QString::number((double)hush["eur_market_cap"]);
+                Settings::getInstance()->setEURCAP( hush["eur_market_cap"]);
+            }
+                if (hush["btc_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = btc_market_cap" << QString::number((double)hush["btc_market_cap"]);
+                Settings::getInstance()->setBTCCAP( hush["btc_market_cap"]);
+            }
+                if (hush["cny_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = cny_market_cap" << QString::number((double)hush["cny_market_cap"]);
+                Settings::getInstance()->setCNYCAP( hush["cny_market_cap"]);
+            }
+                if (hush["rub_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = rub_market_cap" << QString::number((double)hush["rub_market_cap"]);
+                Settings::getInstance()->setRUBCAP( hush["rub_market_cap"]);
+            }
+                if (hush["cad_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = cad_market_cap" << QString::number((double)hush["cad_market_cap"]);
+                Settings::getInstance()->setCADCAP( hush["cad_market_cap"]);
+            }
+                if (hush["sgd_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = sgd_market_cap" << QString::number((double)hush["sgd_market_cap"]);
+                Settings::getInstance()->setSGDCAP( hush["sgd_market_cap"]);
+            }
+                if (hush["chf_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = chf_market_cap" << QString::number((double)hush["chf_market_cap"]);
+                Settings::getInstance()->setCHFCAP( hush["chf_market_cap"]);
+            }
+             if (hush["inr_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = inr_market_cap" << QString::number((double)hush["inr_market_cap"]);
+                Settings::getInstance()->setINRCAP( hush["inr_market_cap"]);
+            }
+                if (hush["gbp_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = gbp_market_cap" << QString::number((double)hush["gbp_market_cap"]);
+                Settings::getInstance()->setGBPCAP( hush["gbp_market_cap"]);
+            }
+                if (hush["aud_market_cap"] >= 0)
+            {
+              
+                qDebug() << "HUSH = aud_market_cap" << QString::number((double)hush["aud_market_cap"]);
+                Settings::getInstance()->setAUDCAP( hush["aud_market_cap"]);
+            }
             return;
          } catch (const std::exception& e) {
             // If anything at all goes wrong, just set the price to 0 and move on.
@@ -877,6 +1081,29 @@ void Controller::refreshZECPrice() {
                 Settings::getInstance()->setGBPPrice(0);
                 Settings::getInstance()->setAUDPrice(0);
                 Settings::getInstance()->setINRPrice(0);
+                Settings::getInstance()->setBTCVolume(0);
+                Settings::getInstance()->setUSDVolume(0);
+                Settings::getInstance()->setEURVolume(0);
+                Settings::getInstance()->setBTCVolume(0);
+                Settings::getInstance()->setCNYVolume(0);
+                Settings::getInstance()->setRUBVolume(0);
+                Settings::getInstance()->setCADVolume(0);
+                Settings::getInstance()->setINRVolume(0);
+                Settings::getInstance()->setSGDVolume(0);
+                Settings::getInstance()->setCHFVolume(0);
+                Settings::getInstance()->setGBPVolume(0);
+                Settings::getInstance()->setAUDVolume(0);
+                Settings::getInstance()->setUSDCAP(0);
+                Settings::getInstance()->setEURCAP(0);
+                Settings::getInstance()->setBTCCAP(0);
+                Settings::getInstance()->setCNYCAP(0);
+                Settings::getInstance()->setRUBCAP(0);
+                Settings::getInstance()->setCADCAP(0);
+                Settings::getInstance()->setINRCAP(0);
+                Settings::getInstance()->setSGDCAP(0);
+                Settings::getInstance()->setCHFCAP(0);
+                Settings::getInstance()->setGBPCAP(0);
+                Settings::getInstance()->setAUDCAP(0);
     });
 
 }

src/controller.h

@@ -47,6 +47,28 @@ public:
     void refreshINRPrice();
     void refreshGBPPrice();
     void refreshAUDPrice();
+    void refreshUSDVolume();
+    void refreshEURVolume();
+    void refreshBTCVolume();
+    void refreshCNYVolume();
+    void refreshRUBVolume();
+    void refreshCADVolume();
+    void refreshSGDVolume();
+    void refreshCHFVolume();
+    void refreshINRVolume();
+    void refreshGBPVolume();
+    void refreshAUDVolume();
+    void refreshUSDCAP();
+    void refreshEURCAP();
+    void refreshBTCCAP();
+    void refreshCNYCAP();
+    void refreshRUBCAP();
+    void refreshCADCAP();
+    void refreshSGDCAP();
+    void refreshCHFCAP();
+    void refreshINRCAP();
+    void refreshGBPCAP();
+    void refreshAUDCAP();
     
     
     void executeStandardUITransaction(Tx tx); 

src/mainwindow.cpp

@@ -1170,7 +1170,7 @@ void MainWindow::setupReceiveTab() {
         } else if (Settings::getInstance()->get_currency_name() == "AUD") {
             ui->rcvBal->setText(rpc->getModel()->getAllBalances().value(addr).toDecimalhushAUDString());
             }
-
+        
         ui->txtReceive->setPlainText(addr);       
         ui->qrcodeDisplay->setQrcodeString(addr);
         if (rpc->getModel()->getUsedAddresses().value(addr, false)) {

src/mainwindow.ui

@@ -22,7 +22,7 @@
     <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>0</number>
+       <number>4</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">
@@ -399,8 +399,8 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>1162</width>
+                <width>1226</width>
-                <height>344</height>
+                <height>504</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="sendToLayout">
@@ -950,138 +950,242 @@
        <attribute name="title">
         <string>Hush Daemon</string>
        </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_7">
+       <layout class="QHBoxLayout" name="horizontalLayout_14">
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_14">
+         <widget class="FilledIconLabel" name="hushdlogo">
-          <item>
+          <property name="sizePolicy">
-           <widget class="FilledIconLabel" name="hushdlogo">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <property name="sizePolicy">
+            <horstretch>0</horstretch>
-             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <verstretch>0</verstretch>
-              <horstretch>0</horstretch>
+           </sizepolicy>
-              <verstretch>0</verstretch>
+          </property>
-             </sizepolicy>
+          <property name="text">
-            </property>
+           <string/>
-            <property name="text">
+          </property>
-             <string/>
+          <property name="scaledContents">
-            </property>
+           <bool>false</bool>
-            <property name="scaledContents">
+          </property>
-             <bool>false</bool>
+         </widget>
-            </property>
+        </item>
-           </widget>
+        <item>
-          </item>
+         <widget class="QGroupBox" name="groupBox_5">
-          <item>
+          <property name="title">
-           <widget class="QGroupBox" name="groupBox_5">
+           <string/>
-            <property name="title">
+          </property>
-             <string/>
+          <layout class="QGridLayout" name="gridLayout_5">
-            </property>
+           <item row="0" column="0">
-            <layout class="QGridLayout" name="gridLayout_5">
+            <spacer name="verticalSpacer_3">
-             <item row="5" column="0" colspan="3">
+             <property name="orientation">
-              <widget class="QLabel" name="label_14">
+              <enum>Qt::Vertical</enum>
-               <property name="text">
+             </property>
-                <string>This is a Lightwallet, you cant mine with it!</string>
+             <property name="sizeHint" stdset="0">
-               </property>
+              <size>
-              </widget>
+               <width>20</width>
-             </item>
+               <height>40</height>
-             <item row="6" column="0">
+              </size>
-              <spacer name="verticalSpacer_4">
+             </property>
-               <property name="orientation">
+            </spacer>
-                <enum>Qt::Vertical</enum>
+           </item>
-               </property>
+           <item row="1" column="0" colspan="3">
-               <property name="sizeHint" stdset="0">
+            <widget class="QLabel" name="label_16">
-                <size>
+             <property name="font">
-                 <width>20</width>
+              <font>
-                 <height>40</height>
+               <pointsize>15</pointsize>
-                </size>
+              </font>
-               </property>
+             </property>
-              </spacer>
+             <property name="text">
-             </item>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Hush Blockchain Information&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             <item row="2" column="2">
+             </property>
-              <widget class="QLabel" name="Vendor">
+            </widget>
-               <property name="text">
+           </item>
-                <string>Loading...</string>
+           <item row="2" column="0" colspan="3">
-               </property>
+            <widget class="Line" name="line_3">
-              </widget>
+             <property name="orientation">
-             </item>
+              <enum>Qt::Horizontal</enum>
-             <item row="1" column="0">
+             </property>
-              <widget class="QLabel" name="Vendor">
+            </widget>
-               <property name="text">
+           </item>
-                <string>blockHeight</string>
+           <item row="3" column="0">
-               </property>
+            <widget class="QLabel" name="label_30">
-              </widget>
+             <property name="text">
-             </item>
+              <string>BlockHeight</string>
-             <item row="3" column="2">
+             </property>
-              <widget class="QLabel" name="Version">
+            </widget>
-               <property name="text">
+           </item>
-                <string>Loading...</string>
+           <item row="3" column="1">
-               </property>
+            <widget class="QLabel" name="label_23">
-              </widget>
+             <property name="text">
-             </item>
+              <string>|</string>
-             <item row="3" column="0">
+             </property>
-              <widget class="QLabel" name="label_12">
+            </widget>
-               <property name="text">
+           </item>
-                <string>Version hushlightd</string>
+           <item row="3" column="2">
-               </property>
+            <widget class="QLabel" name="blockHeight">
-              </widget>
+             <property name="text">
-             </item>
+              <string>Loading...</string>
-             <item row="2" column="0">
+             </property>
-              <widget class="QLabel" name="label_8">
+            </widget>
-               <property name="text">
+           </item>
-                <string>Vendor</string>
+           <item row="4" column="0">
-               </property>
+            <widget class="QLabel" name="label_8">
-              </widget>
+             <property name="text">
-             </item>
+              <string>Vendor</string>
-             <item row="1" column="2">
+             </property>
-              <widget class="QLabel" name="blockHeight">
+            </widget>
-               <property name="text">
+           </item>
-                <string>Loading...</string>
+           <item row="4" column="1">
-               </property>
+            <widget class="QLabel" name="label_22">
-              </widget>
+             <property name="text">
-             </item>
+              <string>|</string>
-             <item row="4" column="0" colspan="3">
+             </property>
-              <widget class="Line" name="line_2">
+            </widget>
-               <property name="orientation">
+           </item>
-                <enum>Qt::Horizontal</enum>
+           <item row="4" column="2">
-               </property>
+            <widget class="QLabel" name="Vendor">
-              </widget>
+             <property name="text">
-             </item>
+              <string>Loading...</string>
-             <item row="0" column="0">
+             </property>
-              <spacer name="verticalSpacer_3">
+            </widget>
-               <property name="orientation">
+           </item>
-                <enum>Qt::Vertical</enum>
+           <item row="5" column="0">
-               </property>
+            <widget class="QLabel" name="label_19">
-               <property name="sizeHint" stdset="0">
+             <property name="text">
-                <size>
+              <string>Version hushlightd</string>
-                 <width>20</width>
+             </property>
-                 <height>40</height>
+            </widget>
-                </size>
+           </item>
-               </property>
+           <item row="5" column="1">
-              </spacer>
+            <widget class="QLabel" name="label_20">
-             </item>
+             <property name="text">
-             <item row="3" column="1">
+              <string>|</string>
-              <widget class="QLabel" name="label_9">
+             </property>
-               <property name="text">
+            </widget>
-                <string>|</string>
+           </item>
-               </property>
+           <item row="5" column="2">
-              </widget>
+            <widget class="QLabel" name="Version">
-             </item>
+             <property name="text">
-             <item row="2" column="1">
+              <string>Loading...</string>
-              <widget class="QLabel" name="label_11">
+             </property>
-               <property name="text">
+            </widget>
-                <string>|</string>
+           </item>
-               </property>
+           <item row="6" column="0">
-              </widget>
+            <widget class="QLabel" name="label_32">
-             </item>
+             <property name="text">
-             <item row="1" column="1">
+              <string>Next Halving</string>
-              <widget class="QLabel" name="label_13">
+             </property>
-               <property name="text">
+            </widget>
-                <string>|</string>
+           </item>
-               </property>
+           <item row="6" column="1">
-              </widget>
+            <widget class="QLabel" name="label_13">
-             </item>
+             <property name="text">
-            </layout>
+              <string>|</string>
-           </widget>
+             </property>
-          </item>
+            </widget>
-         </layout>
+           </item>
+           <item row="6" column="2">
+            <widget class="QLabel" name="halvingTime">
+             <property name="text">
+              <string>Loading...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="7" column="0" colspan="3">
+            <widget class="Line" name="line_2">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="8" column="0" colspan="3">
+            <widget class="QLabel" name="label_24">
+             <property name="font">
+              <font>
+               <pointsize>15</pointsize>
+              </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;&quot;&gt;Hush Market Information&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+            </widget>
+           </item>
+           <item row="9" column="0" colspan="3">
+            <widget class="Line" name="line_5">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="10" column="0">
+            <widget class="QLabel" name="label_31">
+             <property name="text">
+              <string>Market Cap</string>
+             </property>
+            </widget>
+           </item>
+           <item row="10" column="1">
+            <widget class="QLabel" name="label_11">
+             <property name="text">
+              <string>|</string>
+             </property>
+            </widget>
+           </item>
+           <item row="10" column="2">
+            <widget class="QLabel" name="marketcapTab">
+             <property name="text">
+              <string>Loading...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="11" column="0">
+            <widget class="QLabel" name="label_12">
+             <property name="text">
+              <string>Volume on Exchanges</string>
+             </property>
+            </widget>
+           </item>
+           <item row="11" column="1">
+            <widget class="QLabel" name="label_9">
+             <property name="text">
+              <string>|</string>
+             </property>
+            </widget>
+           </item>
+           <item row="11" column="2">
+            <widget class="QLabel" name="volumeExchange">
+             <property name="text">
+              <string>Loading...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="12" column="0" colspan="3">
+            <widget class="Line" name="line_4">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="13" column="0" colspan="3">
+            <widget class="QLabel" name="label_14">
+             <property name="text">
+              <string>This is a Lightwallet, you cant mine with it!</string>
+             </property>
+            </widget>
+           </item>
+           <item row="14" column="0">
+            <spacer name="verticalSpacer_4">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
         </item>
        </layout>
       </widget>
@@ -1095,7 +1199,7 @@
      <x>0</x>
      <y>0</y>
      <width>1274</width>
-     <height>39</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

src/settings.cpp

@@ -135,6 +135,73 @@ double Settings::getGBPPrice() {
 double Settings::getAUDPrice() { 
     return AUDPrice; 
 }
+double Settings::getUSDVolume() { 
+    return USDVolume; 
+}
+double Settings::getEURVolume() { 
+    return EURVolume; 
+}
+double Settings::getBTCVolume() { 
+    return BTCVolume; 
+}
+double Settings::getCNYVolume() { 
+    return CNYVolume; 
+}
+double Settings::getRUBVolume() { 
+    return RUBVolume; 
+}
+double Settings::getCADVolume() { 
+    return CADVolume; 
+}
+double Settings::getSGDVolume() { 
+    return SGDVolume; 
+}
+double Settings::getCHFVolume() { 
+    return CHFVolume; 
+}
+double Settings::getINRVolume() { 
+    return INRVolume; 
+}
+double Settings::getGBPVolume() { 
+    return GBPVolume; 
+}
+double Settings::getAUDVolume() { 
+    return AUDVolume; 
+}
+double Settings::getUSDCAP() { 
+    return USDCAP; 
+}
+double Settings::getEURCAP() { 
+    return EURCAP; 
+}
+double Settings::getBTCCAP() { 
+    return BTCCAP; 
+}
+double Settings::getCNYCAP() { 
+    return CNYCAP; 
+}
+double Settings::getRUBCAP() { 
+    return RUBCAP; 
+}
+double Settings::getCADCAP() { 
+    return CADCAP; 
+}
+double Settings::getSGDCAP() { 
+    return SGDCAP; 
+}
+double Settings::getCHFCAP() { 
+    return CHFCAP; 
+}
+double Settings::getINRCAP() { 
+    return INRCAP; 
+}
+double Settings::getGBPCAP() { 
+    return GBPCAP; 
+}
+double Settings::getAUDCAP() { 
+    return AUDCAP; 
+}
+
 
 bool Settings::getCheckForUpdates() {
     return QSettings().value("options/allowcheckupdates", true).toBool();

src/settings.h

@@ -80,6 +80,28 @@ public:
     void    setINRPrice(double p) { INRPrice = p; }
     void    setGBPPrice(double p) { GBPPrice = p; }
     void    setAUDPrice(double p) { AUDPrice = p; }
+    void    setUSDVolume(double p) { USDVolume = p; }
+    void    setEURVolume(double p) { EURVolume = p; }
+    void    setBTCVolume(double p) { BTCVolume = p; }
+    void    setCNYVolume(double p) { CNYVolume = p; }
+    void    setRUBVolume(double p) { RUBVolume = p; }
+    void    setCADVolume(double p) { CADVolume = p; }
+    void    setSGDVolume(double p) { SGDVolume = p; }
+    void    setCHFVolume(double p) { CHFVolume = p; }
+    void    setINRVolume(double p) { INRVolume = p; }
+    void    setGBPVolume(double p) { GBPVolume = p; }
+    void    setAUDVolume(double p) { AUDVolume = p; }
+    void    setUSDCAP(double p) { USDCAP = p; }
+    void    setEURCAP(double p) { EURCAP = p; }
+    void    setBTCCAP(double p) { BTCCAP = p; }
+    void    setCNYCAP(double p) { CNYCAP = p; }
+    void    setRUBCAP(double p) { RUBCAP = p; }
+    void    setCADCAP(double p) { CADCAP = p; }
+    void    setSGDCAP(double p) { SGDCAP = p; }
+    void    setCHFCAP(double p) { CHFCAP = p; }
+    void    setINRCAP(double p) { INRCAP = p; }
+    void    setGBPCAP(double p) { GBPCAP = p; }
+    void    setAUDCAP(double p) { AUDCAP = p; }
     double  getZECPrice();
     double  getEURPrice();
     double  getBTCPrice();
@@ -91,6 +113,29 @@ public:
     double  getINRPrice();
     double  getGBPPrice();
     double  getAUDPrice();
+    double  getUSDVolume();
+    double  getEURVolume();
+    double  getBTCVolume();
+    double  getCNYVolume();
+    double  getRUBVolume();
+    double  getCADVolume();
+    double  getSGDVolume();
+    double  getCHFVolume();
+    double  getINRVolume();
+    double  getGBPVolume();
+    double  getAUDVolume();
+    double  getUSDCAP();
+    double  getEURCAP();
+    double  getBTCCAP();
+    double  getCNYCAP();
+    double  getRUBCAP();
+    double  getCADCAP();
+    double  getSGDCAP();
+    double  getCHFCAP();
+    double  getINRCAP();
+    double  getGBPCAP();
+    double  getAUDCAP();
+    
 
     // Static stuff
     static const QString txidStatusMessage;
@@ -153,6 +198,28 @@ private:
     double  INRPrice          = 0.0;
     double  GBPPrice          = 0.0;
     double  AUDPrice          = 0.0;
+    double  USDVolume          = 0.0;
+    double  EURVolume          = 0.0;
+    double  BTCVolume          = 0.0;
+    double  CNYVolume          = 0.0;
+    double  RUBVolume          = 0.0;
+    double  CADVolume          = 0.0;
+    double  SGDVolume          = 0.0;
+    double  CHFVolume          = 0.0;
+    double  INRVolume          = 0.0;
+    double  GBPVolume          = 0.0;
+    double  AUDVolume          = 0.0;
+    double  USDCAP          = 0.0;
+    double  EURCAP          = 0.0;
+    double  BTCCAP          = 0.0;
+    double  CNYCAP          = 0.0;
+    double  RUBCAP          = 0.0;
+    double  CADCAP          = 0.0;
+    double  SGDCAP          = 0.0;
+    double  CHFCAP          = 0.0;
+    double  INRCAP          = 0.0;
+    double  GBPCAP          = 0.0;
+    double  AUDCAP          = 0.0;
 };