Merge branch 'blsct' of http://github.com/0x2830/navcoin-core into HEAD

navcoin · Oct 26, 2020 · 737812d · 737812d
2 parents a450825 + be7d790
commit 737812d
Show file tree

Hide file tree

Showing 23 changed files with 548 additions and 108 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 5)
+define(_CLIENT_VERSION_MAJOR, 6)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_CLIENT_BUILD_IS_TEST_RELEASE, false)

diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -34,7 +34,7 @@ PROJECT_NAME           = NavCoin
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 5.0.1
+PROJECT_NUMBER         = 6.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -203,6 +203,7 @@ QT_MOC_CPP = \
   qt/moc_daopage.cpp \
   qt/moc_daoconsultationvote.cpp \
   qt/moc_daoconsultationcreate.cpp \
+  qt/moc_swapxnav.cpp \
   qt/moc_navcoinlistwidget.cpp \
   qt/moc_navcoinpushbutton.cpp \
   qt/moc_daoproposeanswer.cpp \
@@ -315,6 +316,7 @@ NAVCOIN_QT_H = \
 	qt/walletview.h \
   qt/winshutdownmonitor.h \
   qt/daopage.h \
+  qt/swapxnav.h \
   qt/daoconsultationvote.h \
   qt/daoconsultationcreate.h \
   qt/navcoinlistwidget.h \
@@ -328,6 +330,9 @@ RES_ICONS = \
 	qt/res/icons/navcoin.icns \
 	qt/res/icons/navcoin.ico \
 	qt/res/icons/navcoin.png \
+	qt/res/icons/mininav.png \
+	qt/res/icons/swap.png \
+	qt/res/icons/minixnav.png \
 	qt/res/icons/navcoin_full.png
 
 # Vector Icons
@@ -551,6 +556,7 @@ NAVCOIN_QT_CPP += \
 	qt/walletmodeltransaction.cpp \
   qt/walletview.cpp \
   qt/daopage.cpp \
+  qt/swapxnav.cpp \
   qt/daoconsultationvote.cpp \
   qt/daoconsultationcreate.cpp \
   qt/daoproposeanswer.cpp \

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -14,9 +14,9 @@
  */
 
 //! These need to be macros, as clientversion.cpp's and navcoin*-res.rc's voodoo requires it
-#define CLIENT_VERSION_MAJOR 5
+#define CLIENT_VERSION_MAJOR 6
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/qt/forms/getaddresstoreceive.ui b/src/qt/forms/getaddresstoreceive.ui
@@ -45,9 +45,9 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
        <item>
-        <spacer name="horizontalSpacer">
+        <spacer name="horizontalSpacer_7">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -60,19 +60,10 @@
         </spacer>
        </item>
        <item>
-        <widget class="QLabel" name="label">
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Use the following address to receive NavCoins:</string>
-         </property>
-        </widget>
+        <widget class="QComboBox" name="typeBox"/>
        </item>
        <item>
-        <spacer name="horizontalSpacer_2">
+        <spacer name="horizontalSpacer_8">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -151,10 +142,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QLineEdit" name="lblAddress">
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
+            <widget class="QTextEdit" name="textAddress">
              <property name="readOnly">
               <bool>true</bool>
              </property>
@@ -278,13 +266,6 @@
          </property>
         </spacer>
        </item>
-       <item>
-        <widget class="QPushButton" name="privateAddressButton">
-         <property name="text">
-          <string>Show private address</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QPushButton" name="requestNewAddressButton">
          <property name="text">

diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
@@ -49,14 +49,14 @@
         <property name="formAlignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
-        <item row="0" column="0">
+        <item row="1" column="0">
          <widget class="QLabel" name="labelAvailableText">
           <property name="text">
            <string>Available Public</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
+        <item row="1" column="1">
          <widget class="QLabel" name="labelBalance">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -66,14 +66,14 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
+        <item row="2" column="0">
          <widget class="QLabel" name="labelPendingText">
           <property name="text">
            <string>- Pending</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
+        <item row="2" column="1">
          <widget class="QLabel" name="labelUnconfirmed">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -83,14 +83,14 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
+        <item row="3" column="0">
          <widget class="QLabel" name="labelAvailableText_2">
           <property name="text">
            <string>Available Private</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1">
+        <item row="3" column="1">
          <widget class="QLabel" name="labelPrivateBalance">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -100,14 +100,14 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="4" column="0">
          <widget class="QLabel" name="labelAvailableText_3">
           <property name="text">
            <string>- Pending</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="4" column="1">
          <widget class="QLabel" name="labelPrivateBalancePending">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -117,14 +117,14 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="6" column="0">
          <widget class="QLabel" name="labelColdStakingText">
           <property name="text">
            <string>Cold Staking</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="1">
+        <item row="6" column="1">
          <widget class="QLabel" name="labelColdStaking">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -134,14 +134,14 @@
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
+        <item row="7" column="0">
          <widget class="QLabel" name="labelImmatureText">
           <property name="text">
            <string>Immature</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="1">
+        <item row="7" column="1">
          <widget class="QLabel" name="labelImmature">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -151,14 +151,14 @@
           </property>
          </widget>
         </item>
-        <item row="6" column="0">
+        <item row="8" column="0">
          <widget class="QLabel" name="labelWatchedBalanceText">
           <property name="text">
            <string>Watched</string>
           </property>
          </widget>
         </item>
-        <item row="6" column="1">
+        <item row="8" column="1">
          <widget class="QLabel" name="labelWatchedBalance">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -168,14 +168,14 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
+        <item row="9" column="0">
          <widget class="QLabel" name="labelTotalText">
           <property name="text">
            <string>Total</string>
           </property>
          </widget>
         </item>
-        <item row="7" column="1">
+        <item row="9" column="1">
          <widget class="QLabel" name="labelTotal">
           <property name="text">
            <string>1 000.00000000 NAV</string>
@@ -185,9 +185,19 @@
           </property>
          </widget>
         </item>
+        <item row="5" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout"/>
+        </item>
        </layout>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="swapButton">
+       <property name="text">
+        <string>Swap NAV/xNAV</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QGroupBox" name="stakingGroup">
        <property name="title">

diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
@@ -255,30 +255,24 @@
     <item row="1" column="3">
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QRadioButton" name="sendPublic">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="sizeIncrement">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Public coins</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="sendPrivate">
-        <property name="text">
-         <string>Private coins</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QComboBox" name="fromBox"/>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
      </layout>
     </item>
@@ -311,6 +305,12 @@
     </item>
     <item row="1" column="1">
      <widget class="QLabel" name="payToLabel_2">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="font">
        <font>
         <pointsize>10</pointsize>