Merge pull request #18 from carsenk/dev

v1.0.5.0

denarius-qt.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = Denarius
-VERSION = 1.0.4
+VERSION = 1.0.5
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd

src/checkpoints.cpp

@@ -35,6 +35,8 @@ namespace Checkpoints
 		( 30000,  uint256("0x000000000282bafc3e63bb0f86134329de9ff387d04764ad6a4ca700c47fbf7e") )
 		( 50000,  uint256("0x00000000000b5e89366f583548f77c0e88476d6ff1ddd4b391d00ec7fd1d4bb3") )
 		( 104999,  uint256("0x0000000000116592035fde4848d187a48a67a37c2a8e3e6c12150e40121054d8") )
+		( 144999,  uint256("0x00000000008509564a6a3fb42a9f9d77a93218e1c5738758cb6753fc03dee1ae") )
+		( 150001,  uint256("0x00000000005aaad7814e1eb4ec9c2e33846078f80b45a99e3f37cb6c3b1e07bd") )
     	;
 
     // TestNet has no checkpoints

src/clientversion.h

@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       0
-#define CLIENT_VERSION_REVISION    4
+#define CLIENT_VERSION_REVISION    5
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

src/qt/bitcoinunits.cpp

@@ -12,7 +12,8 @@ QList<BitcoinUnits::Unit> BitcoinUnits::availableUnits()
 {
     QList<BitcoinUnits::Unit> unitlist;
     unitlist.append(BTC);
-	unitlist.append(USD);
+    //unitlist.append(dBTC);
+    //unitlist.append(USD);
     unitlist.append(mBTC);
     unitlist.append(uBTC);
     return unitlist;
@@ -23,7 +24,8 @@ bool BitcoinUnits::valid(int unit)
     switch(unit)
     {
     case BTC:
-	case USD:
+    case dBTC:
+    case USD:
     case mBTC:
     case uBTC:
         return true;
@@ -37,7 +39,8 @@ QString BitcoinUnits::name(int unit)
     switch(unit)
     {
     case BTC: return QString("DNR");
-	case USD: return QString("USD");
+    case dBTC: return QString("BTC");
+    case USD: return QString("USD");
     case mBTC: return QString("mDNR");
     case uBTC: return QString::fromUtf8("μDNR");
     default: return QString("???");
@@ -49,7 +52,8 @@ QString BitcoinUnits::description(int unit)
     switch(unit)
     {
     case BTC: return QString("Denarius");
-	case USD: return QString("USD");
+    case dBTC: return QString("Bitcoin");
+    case USD: return QString("USD");
     case mBTC: return QString("Milli-Denarius (1 / 1,000)");
     case uBTC: return QString("Micro-Denarius (1 / 1,000,000)");
     default: return QString("???");
@@ -61,7 +65,8 @@ qint64 BitcoinUnits::factor(int unit)
     switch(unit)
     {
     case BTC:  return 100000000;
-	case USD:  return 100000000;
+    case dBTC: return 100000000;
+    case USD:  return 100000000;
     case mBTC: return 100000;
     case uBTC: return 100;
     default:   return 100000000;
@@ -73,7 +78,8 @@ int BitcoinUnits::amountDigits(int unit)
     switch(unit)
     {
     case BTC: return 8; // 21,000,000 (# digits, without commas)
-	case USD: return 8;
+    case dBTC: return 8;
+    case USD: return 8;
     case mBTC: return 11; // 21,000,000,000
     case uBTC: return 14; // 21,000,000,000,000
     default: return 0;
@@ -85,7 +91,8 @@ int BitcoinUnits::decimals(int unit)
     switch(unit)
     {
     case BTC: return 8;
-	case USD: return 2;
+    case dBTC: return 8;
+    case USD: return 2;
     case mBTC: return 5;
     case uBTC: return 2;
     default: return 0;

src/qt/bitcoinunits.h

@@ -18,7 +18,8 @@ class BitcoinUnits: public QAbstractListModel
     enum Unit
     {
         BTC,
-		USD,
+        dBTC,
+	USD,
         mBTC,
         uBTC
     };

src/qt/forms/overviewpage.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>917</width>
-    <height>491</height>
+    <height>587</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -57,6 +57,19 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QLabel" name="labelTradeLink">
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
+            <property name="text">
+             <string>&lt;div style=&quot;color: #fff;&quot;&gt;(&lt;a href=&quot;https://www.cryptopia.co.nz/Exchange/?market=DNR_BTC&quot; style=&quot;color: #fff;&quot;&gt;Trade DNR&lt;/a&gt;)&lt;/div&gt;</string>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item>
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
@@ -247,11 +260,43 @@
               <bold>true</bold>
              </font>
             </property>
+            <property name="cursor">
+             <cursorShape>IBeamCursor</cursorShape>
+            </property>
+            <property name="toolTip">
+             <string>Your current total balance in USD, Rate is not updated often</string>
+            </property>
             <property name="text">
              <string>0 USD</string>
             </property>
            </widget>
           </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>BTC Total:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLabel" name="labelBTCTotal">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="cursor">
+             <cursorShape>IBeamCursor</cursorShape>
+            </property>
+            <property name="toolTip">
+             <string>Your current total balance in BTC, Rate is not updated often</string>
+            </property>
+            <property name="text">
+             <string>0 BTC</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>

src/qt/overviewpage.cpp

@@ -133,7 +133,8 @@ OverviewPage::~OverviewPage()
 void OverviewPage::setBalance(qint64 balance, qint64 stake, qint64 unconfirmedBalance, qint64 immatureBalance)
 {
     int unit = model->getOptionsModel()->getDisplayUnit();
-	int unitUSD = BitcoinUnits::USD;
+    int unitUSD = BitcoinUnits::USD;
+    int unitdBTC = BitcoinUnits::dBTC;
     currentBalance = balance;
     currentStake = stake;
     currentUnconfirmedBalance = unconfirmedBalance;
@@ -143,7 +144,11 @@ void OverviewPage::setBalance(qint64 balance, qint64 stake, qint64 unconfirmedBa
     ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance));
     ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, immatureBalance));
     ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balance + stake + unconfirmedBalance + immatureBalance));
-	ui->labelUSDTotal->setText(BitcoinUnits::formatWithUnit(unitUSD, dollarg.toDouble() * (balance + stake + unconfirmedBalance + immatureBalance)));
+    ui->labelUSDTotal->setText(BitcoinUnits::formatWithUnit(unitUSD, dollarg.toDouble() * (balance + stake + unconfirmedBalance + immatureBalance)));
+    ui->labelBTCTotal->setText(BitcoinUnits::formatWithUnit(unitdBTC, bitcoing.toDouble() * (balance + stake + unconfirmedBalance + immatureBalance)));
+    ui->labelTradeLink->setTextFormat(Qt::RichText);
+    ui->labelTradeLink->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    ui->labelTradeLink->setOpenExternalLinks(true);
 
     // only show immature (newly mined) balance if it's non-zero, so as not to complicate things
     // for the non-mining users

src/qt/res/themes/qdarkstyle/style.qrc

@@ -19,7 +19,14 @@
     <file>rc/right_arrow.png</file>
     <file>rc/left_arrow_disabled.png</file>
     <file>rc/Hsepartoolbar.png</file>
-    <file>rc/checkbox.png</file>
+    <file>rc/checkbox_checked_disabled.png</file>
+    <file>rc/checkbox_checked_focus.png</file>
+    <file>rc/checkbox_checked.png</file>
+    <file>rc/checkbox_indeterminate.png</file>
+    <file>rc/checkbox_indeterminate_focus.png</file>
+    <file>rc/checkbox_unchecked_disabled.png</file>
+    <file>rc/checkbox_unchecked_focus.png</file>
+    <file>rc/checkbox_unchecked.png</file>
     <file>rc/branch_open.png</file>
     <file>rc/Vsepartoolbar.png</file>
     <file>rc/down_arrow_disabled.png</file>

src/qt/res/themes/qdarkstyle/style.qss

@@ -79,7 +79,7 @@ QGroupBox::indicator
 
 QCheckBox::indicator:unchecked
 {
-    image: url(:/qss_icons/rc/uncheckbox.png);
+    image: url(:/qss_icons/rc/checkbox_unchecked.png);
 }
 
 QCheckBox::indicator:unchecked:hover,
@@ -89,13 +89,12 @@ QGroupBox::indicator:unchecked:hover,
 QGroupBox::indicator:unchecked:focus,
 QGroupBox::indicator:unchecked:pressed
 {
-  border: none;
-    image: url(:/qss_icons/rc/uncheckbox.png);
+    image: url(:/qss_icons/rc/checkbox_unchecked.png);
 }
 
 QCheckBox::indicator:checked
 {
-    image: url(:/qss_icons/rc/checkbox.png);
+    image: url(:/qss_icons/rc/checkbox_checked.png);
 }
 
 QCheckBox::indicator:checked:hover,
@@ -105,8 +104,7 @@ QGroupBox::indicator:checked:hover,
 QGroupBox::indicator:checked:focus,
 QGroupBox::indicator:checked:pressed
 {
-  border: none;
-    image: url(:/qss_icons/rc/checkbox.png);
+    image: url(:/qss_icons/rc/checkbox_checked.png);
 }
 
 
@@ -1089,8 +1087,8 @@ QTableView, QHeaderView
     border-radius: 0px;
 }
 
-QTableView::item:pressed, QListView::item:pressed, QTreeView::item:pressed  {
-    background: #959595;
+QTableView::item:pressed, QListView::item:pressed, QTreeView::item, QTreeView::item:pressed  {
+    background: #000;
     color: #eff0f1;
 }