Merge pull request #12 from barrystyle/0.14-pacglobalui

0.14 pacglobalui
PACGlobalOfficial · Sep 3, 2019 · 10931b9 · 10931b9
2 parents 20c30d6 + 9bf7c99
commit 10931b9
Show file tree

Hide file tree

Showing 443 changed files with 440 additions and 9,424 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
diff --git a/src/dashd-res.rc → src/pacglobal-tx-res.rc b/src/dashd-res.rc → src/pacglobal-tx-res.rc
@@ -17,13 +17,13 @@ BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
             VALUE "CompanyName",        "PACGlobal"
-            VALUE "FileDescription",    "dashd (PACGlobal node with a JSON-RPC server)"
+            VALUE "FileDescription",    "pacglobal-tx (CLI PACGlobal transaction editor utility)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
-            VALUE "InternalName",       "dashd"
+            VALUE "InternalName",       "pacglobal-tx"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
-            VALUE "OriginalFilename",   "dashd.exe"
-            VALUE "ProductName",        "dashd"
+            VALUE "OriginalFilename",   "pacglobal-tx.exe"
+            VALUE "ProductName",        "pacglobal-tx"
             VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
         END
     END

diff --git a/src/dash-tx-res.rc → src/pacglobald-res.rc b/src/dash-tx-res.rc → src/pacglobald-res.rc
@@ -17,13 +17,13 @@ BEGIN
         BLOCK "040904E4" // U.S. English - multilingual (hex)
         BEGIN
             VALUE "CompanyName",        "PACGlobal"
-            VALUE "FileDescription",    "dash-tx (CLI PACGlobal transaction editor utility)"
+            VALUE "FileDescription",    "pacglobald (PACGlobal node with a JSON-RPC server)"
             VALUE "FileVersion",        VER_FILEVERSION_STR
-            VALUE "InternalName",       "dash-tx"
+            VALUE "InternalName",       "pacglobald"
             VALUE "LegalCopyright",     COPYRIGHT_STR
             VALUE "LegalTrademarks1",   "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
-            VALUE "OriginalFilename",   "dash-tx.exe"
-            VALUE "ProductName",        "dash-tx"
+            VALUE "OriginalFilename",   "pacglobald.exe"
+            VALUE "ProductName",        "pacglobald"
             VALUE "ProductVersion",     VER_PRODUCTVERSION_STR
         END
     END

diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
@@ -39,10 +39,10 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
         ui->deleteAddress->setIcon(QIcon());
         ui->exportButton->setIcon(QIcon());
     } else {
-        ui->newAddress->setIcon(QIcon(":/icons/" + theme + "/add"));
-        ui->copyAddress->setIcon(QIcon(":/icons/" + theme + "/editcopy"));
-        ui->deleteAddress->setIcon(QIcon(":/icons/" + theme + "/remove"));
-        ui->exportButton->setIcon(QIcon(":/icons/" + theme + "/export"));
+        ui->newAddress->setIcon(QIcon(":/icons/add"));
+        ui->copyAddress->setIcon(QIcon(":/icons/editcopy"));
+        ui->deleteAddress->setIcon(QIcon(":/icons/remove"));
+        ui->exportButton->setIcon(QIcon(":/icons/export"));
     }
     ui->showAddressQRCode->setIcon(QIcon());
 

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -17,6 +17,7 @@
 #include <QMenu>
 #include <QPoint>
 #include <QPushButton>
+#include <QToolButton>
 #include <QSystemTrayIcon>
 
 #ifdef Q_OS_MAC
@@ -138,6 +139,12 @@ class BitcoinGUI : public QMainWindow
     HelpMessageDialog *helpMessageDialog;
     ModalOverlay *modalOverlay;
 
+    QFrame *headerFrame;
+    QPushButton *btnImg;
+    QToolButton *btnRefresh;
+    QToolButton *btnCopyNews;
+    QLabel *messageLabel;
+
 #ifdef Q_OS_MAC
     CAppNapInhibitor* m_app_nap_inhibitor = nullptr;
 #endif

diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -229,7 +229,7 @@ void CoinControlDialog::buttonToggleLockClicked()
             else{
                 model->lockCoin(outpt);
                 item->setDisabled(true);
-                item->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/" + theme + "/lock_closed"));
+                item->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/lock_closed"));
             }
             updateLabelLocked();
         }
@@ -320,7 +320,7 @@ void CoinControlDialog::lockCoin()
     COutPoint outpt(uint256S(contextMenuItem->text(COLUMN_TXHASH).toStdString()), contextMenuItem->text(COLUMN_VOUT_INDEX).toUInt());
     model->lockCoin(outpt);
     contextMenuItem->setDisabled(true);
-    contextMenuItem->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/" + theme + "/lock_closed"));
+    contextMenuItem->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/lock_closed"));
     updateLabelLocked();
 }
 
@@ -787,7 +787,7 @@ void CoinControlDialog::updateView()
                 COutPoint outpt(txhash, out.i);
                 coinControl->UnSelect(outpt); // just to be sure
                 itemOutput->setDisabled(true);
-                itemOutput->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/" + theme + "/lock_closed"));
+                itemOutput->setIcon(COLUMN_CHECKBOX, QIcon(":/icons/lock_closed"));
             }
 
             // set checkbox