UI overhaul and update config

Author: MBornemann

CMakeLists.txt

@@ -179,7 +179,7 @@ elseif (UNIX)
     set(PLATFORM_DIR OSX)
     set(MACOSX_BUNDLE_INFO_STRING "Cryptonote GUI wallet")
     set(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
-    set(MACOSX_BUNDLE_BUNDLE_NAME BlockChain-Coin.net)
+    set(MACOSX_BUNDLE_BUNDLE_NAME BLOC.MONEY)
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
     set(MACOSX_BUNDLE_BUNDLE_VERSION "$${VERSION_VERSION}.${VERSION_MINOR}.${VERSION_PATCH}")
 
@@ -191,8 +191,8 @@ elseif (UNIX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -maes -D_DARWIN_C_SOURCE")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa -framework OpenGL -framework CoreFoundation -framework Carbon -framework IOKit -L/usr/lib")
 
-    set(MACOSX_BUNDLE_ICON_FILE blockchain-coin.icns)
-    set(APPLICATION_ICON src/images/blockchain-coin.icns)
+    set(MACOSX_BUNDLE_ICON_FILE bloc.icns)
+    set(APPLICATION_ICON src/images/bloc.icns)
     set_source_files_properties(${APPLICATION_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
     set(BUILD_PLATFORM MACOSX_BUNDLE)

CryptoNoteWallet.cmake

@@ -1,4 +1,4 @@
-set(CN_PROJECT_NAME "BlockChain-Coin")
-set(CN_CURRENCY_DISPLAY_NAME "blockchaincoin")
+set(CN_PROJECT_NAME "BLOC")
+set(CN_CURRENCY_DISPLAY_NAME "BLOC")
 set(CN_CURRENCY_TICKER "BLOC")
 set(CN_VERSION 1.2.0)

Fireice_uk

@@ -58,7 +58,7 @@ BlogReader::~BlogReader() {
 }
 
 QString BlogReader::getName() const {
-  return tr("Blockchain-coin.net News:");
+  return tr("BLOC.MONEY NEWS:");
 }
 
 QPixmap BlogReader::getIcon() const {

LICENSE

@@ -60,7 +60,7 @@ namespace WalletGui {
 
 namespace {
 
-const char BYTECOIN_URI_SCHEME_NAME[] = "blockchain-coin";
+const char BYTECOIN_URI_SCHEME_NAME[] = "BLOC";
 const QRegularExpression LOG_SPLASH_REG_EXP("\\[Core\\] Imported block with index");
 
 quint16 findPort() {
@@ -105,7 +105,7 @@ WalletApplication::WalletApplication(int& _argc, char** _argv) : QApplication(_a
   m_systemTrayIcon(new QSystemTrayIcon(this)), m_applicationEventHandler(new ApplicationEventHandler(this)),
   m_optimizationManager(nullptr), m_blogReader(new BlogReader(this)), m_mainWindow(nullptr), m_splash(nullptr),
   m_logWatcher(nullptr), m_isAboutToQuit(false) {
-  setApplicationName("blockchain-coinwallet");
+  setApplicationName("blocwallet");
   setApplicationVersion(Settings::instance().getVersion());
   setQuitOnLastWindowClosed(false);
   setStyle(QStyleFactory::create("fusion"));
@@ -141,7 +141,7 @@ bool WalletApplication::init() {
   makeDataDir();
   WalletLogger::init(Settings::instance().getDataDir(), Settings::instance().hasDebugOption(), this);
   WalletLogger::info(tr("[Application] Initializing..."));
-  m_lockFile = new QLockFile(Settings::instance().getDataDir().absoluteFilePath("blockchain-coinwallet.lock"));
+  m_lockFile = new QLockFile(Settings::instance().getDataDir().absoluteFilePath("blocwallet.lock"));
   QUrl paymentUrl = QUrl::fromUserInput(arguments().last());
   if (paymentUrl.scheme() != BYTECOIN_URI_SCHEME_NAME) {
     paymentUrl = QUrl();
@@ -153,9 +153,9 @@ bool WalletApplication::init() {
   }
 #endif
   if (!m_lockFile->tryLock()) {
-    WalletLogger::warning(tr("[Application] Blockchain-Coin wallet already running"));
+    WalletLogger::warning(tr("[Application] BLOC wallet already running"));
     if (!paymentUrl.isValid()) {
-      QMessageBox::warning(nullptr, QObject::tr("Fail"), "Blockchain-Coin wallet already running");
+      QMessageBox::warning(nullptr, QObject::tr("Fail"), "BLOC wallet already running");
     }
 
     return false;
@@ -241,7 +241,7 @@ bool WalletApplication::initCryptoNoteAdapter() {
   for (;;) {
     if (m_splash != nullptr) {
       m_splash->show();
-      m_splash->showMessage(QObject::tr("Loading blockchain..."), Qt::AlignLeft | Qt::AlignBottom, Qt::white);
+      m_splash->showMessage(QObject::tr("Loading BLOC.MONEY..."), Qt::AlignLeft | Qt::AlignBottom, Qt::white);
       if (m_logWatcher == nullptr) {
         m_logWatcher = new LogFileWatcher(Settings::instance().getDataDir().absoluteFilePath(CORE_LOG_FILE_NAME), this);
         connect(m_logWatcher, &LogFileWatcher::newLogStringSignal, this, &WalletApplication::newLogString);
@@ -346,7 +346,7 @@ void WalletApplication::initUi() {
   m_optimizationManager= new OptimizationManager(m_cryptoNoteAdapter, this);
   m_miningManager = new MiningManager(m_cryptoNoteAdapter, m_donationManager, this);
   if (m_splash != nullptr) {
-    m_splash->showMessage(QObject::tr("Initializing GUI..."), Qt::AlignLeft | Qt::AlignBottom, Qt::white);
+    m_splash->showMessage(QObject::tr("Initializing GUI..."), Qt::AlignCenter | Qt::AlignBottom, Qt::white);
   }
 
   QFile styleSheetFile(":style/qss");

Platform/Linux/ApplicationEventHandler.cpp

@@ -55,6 +55,8 @@ const char BLOCK_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
 
 "#BlockDetailsDialog > #m_blockDetailsTabBar QTabBar::tab {"
   "font-size: %fontSizeLarge%;"
+  "font-color: #FFFFFF;"
+  "color: #FFFFFF;"
   "font-weight: bold;"
   "min-width: 380px;"
   "max-width: 380px;"
@@ -68,18 +70,18 @@ const char BLOCK_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
 "}"
 
 "#BlockDetailsDialog > #m_blockDetailsTabBar QTabBar::tab:selected {"
-  "background: #ffffff;"
+  "background: #031b46;"
   "border: 1px solid %borderColorDark%;"
-  "border-bottom: 1px solid #ffffff;"
+  "border-bottom: 1px solid #031b46;"
 "}"
 
 "#BlockDetailsDialog > #m_blockDetailsTabBar QTabBar::tab:!selected {"
-  "background: %backgroundColorGray%;"
+  "background: #031b46;"
   "border: 1px solid %borderColorDark%;"
 "}"
 
 "#m_generalTab {"
-  "background-color: #ffffff;"
+  "background-color: #031b46;"
   "border: none;"
 "}"
 
@@ -90,6 +92,7 @@ const char BLOCK_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
   "padding-left: 30px;"
   "padding-right: 30px;"
   "border: none;"
+"font-color: #FFFFFF;"
 "}"
 
 "#m_generalTab > #m_blockTextLabel,"
@@ -99,7 +102,7 @@ const char BLOCK_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
 "}"
 
 "#m_generalTab, #m_transactionsTab {"
-  "background-color: #ffffff;"
+  "background-color: #031b46;"
 "}"
 
 "#m_generalTab > #m_heightTextLabel,"

Platform/Linux/ApplicationEventHandler.h

@@ -29,7 +29,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>About BlockChain-Coin</string>
+   <string>About BLOC</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
    <item>
@@ -41,7 +41,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;BlockChain-Coin version %1-%2&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;BlockChain-Coin is the next generation anonymous cryptocurrency.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;Copyright © 2012-%3 The Bytecoin developers&lt;br&gt;Copyright © BlockChain-Coin developers&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;This is free software.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;Distributed under the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;Distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://www.gnu.org/licenses/lgpl.html&quot;&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.gnu.org/licenses/lgpl.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://BlockChain-Coin.net/&quot;&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px; text-decoration: underline; color:#0000ff;&quot;&gt;https://BlockChain-Coin.net/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;BLOC version %1-%2&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;BLOC is the next generation anonymous cryptocurrency.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;Copyright © 2012-%3 The Bytecoin developers&lt;br&gt;Copyright © BLOC developers&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;This is free software.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;Distributed under the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px;&quot;&gt;Distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details:&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://www.gnu.org/licenses/lgpl.html&quot;&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.gnu.org/licenses/lgpl.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://bloc.money/&quot;&gt;&lt;span style=&quot; font-family:'Open Sans'; font-size:14px; text-decoration: underline; color:#0000ff;&quot;&gt;https://bloc.money/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>

Platform/OSX/ApplicationEventHandler.h

@@ -48,7 +48,7 @@ const char NEWS_FRAME_STYLE_SHEEET_TEMPLATE[] =
     "max-width: 45px;"
     "border: none;"
     "border-left: 1px solid %borderColor%;"
-    "background-color: %headerBackgroundColor%;"
+    "background-color: #031b46;"
   "}"
 
   "WalletGui--NewsFrame #m_scrollFrame QPushButton {"
@@ -74,7 +74,7 @@ const char NEWS_FRAME_STYLE_SHEEET_TEMPLATE[] =
 
 const char TEXT_HTML_TEMPLATE[] =
   "<html><body style=\"font-family:%fontFamily%;font-size:%fontSizeNormal%;\"><p><font color=\"%fontColorGray%\">%1</font>"
-  " <font color=\"black\">%2</font></p></body></html>";
+  " <font color=\"white\">%2</font></p></body></html>";
 
 }
 

Platform/OSX/ApplicationEventHandler.mm

@@ -35,7 +35,7 @@ const char POOL_TRANSACTION_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--PoolTransactionDetailsDialog {"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
   "}"
 
   "WalletGui--PoolTransactionDetailsDialog WalletGui--WalletNormalGrayTextLabel, "

Platform/OSX/INotificationMonitorObserver.h

@@ -37,6 +37,7 @@ namespace {
 const char TRANSACTION_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
   "* {"
     "font-family: %fontFamily%;"
+    "background-color: #031b46;"
   "}"
 
   "WalletGui--TransactionDetailsDialog {"
@@ -86,6 +87,8 @@ const char TRANSACTION_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
 
   "WalletGui--TransactionDetailsDialog > #m_transactionDetailsTabBar QTabBar::tab {"
     "font-size: %fontSizeLarge%;"
+    "font-color: #FFFFFF;"
+   "color: #FFFFFF;"
     "font-weight: bold;"
     "min-width: 300px;"
     "max-width: 300px;"
@@ -99,9 +102,9 @@ const char TRANSACTION_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--TransactionDetailsDialog > #m_transactionDetailsTabBar QTabBar::tab:selected {"
-    "background: #ffffff;"
+    "background: #031b46;"
     "border: 1px solid %borderColorDark%;"
-    "border-bottom: 1px solid #ffffff;"
+    "border-bottom: 1px solid #031b46;"
   "}"
 
   "WalletGui--TransactionDetailsDialog > #m_transactionDetailsTabBar QTabBar::tab:!selected {"
@@ -111,7 +114,7 @@ const char TRANSACTION_DETAILS_DIALOG_STYLE_SHEET_TEMPLATE[] =
 
   "WalletGui--TransactionDetailsDialog #m_transactionTab,"
   "WalletGui--TransactionDetailsDialog #m_transfersTab {"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
     "border: none;"
   "}";
 

Platform/OSX/NotificationMonitor.h

@@ -34,8 +34,8 @@ const int AMOUNT_DECIMAL_COUNT = 3;
 TransactionsAmountDelegate::TransactionsAmountDelegate(bool _hideLongAmounts, QObject* _parent) : QStyledItemDelegate(_parent),
   m_hideLongAmounts(_hideLongAmounts), m_amountGradient(0, 0, 1, 0) {
   m_amountGradient.setCoordinateMode(QLinearGradient::ObjectBoundingMode);
-  m_amountGradient.setColorAt(0, Qt::black);
-  m_amountGradient.setColorAt(0.7, Qt::black);
+  m_amountGradient.setColorAt(0, Qt::white);
+  m_amountGradient.setColorAt(0.7, Qt::white);
   m_amountGradient.setColorAt(1, Settings::instance().getCurrentStyle().backgroundColorAlternate());
 }
 

Platform/OSX/NotificationMonitor.mm

@@ -41,7 +41,7 @@ const char WALLET_NAVIGATION_BUTTON_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--WalletNavigationButton:hover {"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
     "color: %fontColorBlueHover%;"
   "}"
 

Platform/OSX/WalletApplication.mm

@@ -39,7 +39,8 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
   "WalletGui--WalletTableView {"
     "border: none;"
     "font-size: %fontSizeNormal%;"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
+    "color: #ffffff;"
     "border-bottom: 1px solid transparent;"
   "}"
 
@@ -49,7 +50,7 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--WalletTableView > QHeaderView {"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
     "border: none;"
     "border-bottom: 1px solid %borderColor%;"
   "}"
@@ -58,7 +59,7 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
     "height: 20px;"
     "font-size: %fontSizeSmall%;"
     "color: %fontColorGray%;"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
     "border: none;"
     "border-left: 23px solid transparent;"
     "border-right: 20px solid transparent;"
@@ -72,7 +73,7 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--WalletTableView::item:alternate {"
-    "background: #ffffff;"
+    "background: #031b46;"
   "}"
 
   "WalletGui--WalletTableView::item:selected {"
@@ -82,7 +83,7 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
 
   "WalletGui--WalletTableView[hoverIsVisible=\"true\"]::item:hover {"
     "background: #e9eaec;"
-    "alternate-background-color: #e9eaec;"
+    "alternate-background-color: #031b46;"
   "}";
 
 }

Platform/Posix/System/MemoryMappedFile.cpp

@@ -49,7 +49,7 @@ const char WALLET_TEXT_LABEL_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--WalletSmallBlackTextLabel {"
-    "color: #000000;"
+    "color: #ffffff;"
     "font-size: %fontSizeSmall%;"
   "}"
 
@@ -70,29 +70,30 @@ const char WALLET_TEXT_LABEL_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--WalletNormalBlackTextLabel {"
-    "color: #000000;"
+    "color: #ffffff;"
     "font-size: %fontSizeNormal%;"
   "}"
 
   "WalletGui--WalletExtraNormalBlackTextLabel {"
-    "color: #000000;"
+    "color: #ffffff;"
     "font-size: %fontSizeExtraNormal%;"
   "}"
 
   "WalletGui--WalletLargeBlackTextLabel {"
-    "color: #000000;"
+    "color: #ffffff;"
     "font-size: %fontSizeLarge%;"
   "}"
 
   "WalletGui--WalletExtraLargeBlackTextLabel {"
-    "color: #000000;"
+    "color: #ffffff;"
     "font-size: %fontSizeExtraLarge%;"
   "}"
 
   "WalletGui--WalletHeaderLabel {"
     "min-height: 17;"
     "font-size: %fontSizeLarge%;"
     "font-weight: bold;"
+	"color: #ffffff;"
   "}";
 
 }

Platform/Posix/System/MemoryMappedFile.h

@@ -38,7 +38,7 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
   "WalletGui--WalletTreeView {"
     "border: none;"
     "font-size: %fontSizeNormal%;"
-    "background-color: #ffffff;"
+    "color: #ffffff;"
     "border-bottom: 1px solid transparent;"
   "}"
 
@@ -50,15 +50,15 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
   "WalletGui--WalletTreeView > QHeaderView {"
     "min-height: 20px;"
     "max-height: 20px;"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
     "border: none;"
     "border-bottom: 1px solid %borderColor%;"
   "}"
 
   "WalletGui--WalletTreeView > QHeaderView::section {"
     "font-size: %fontSizeSmall%;"
     "color: %fontColorGray%;"
-    "background-color: #ffffff;"
+    "background-color: #031b46;"
     "border: none;"
     "border-left: 23px solid transparent;"
     "border-right: 20px solid transparent;"
@@ -74,7 +74,7 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--WalletTreeView::item:alternate {"
-    "background: #ffffff;"
+    "background: #031b46;"
   "}"
 
   "WalletGui--WalletTreeView::item:selected {"
@@ -83,8 +83,8 @@ const char WALLET_VIEW_STYLE_SHEET_TEMPLATE[] =
   "}"
 
   "WalletGui--WalletTreeView::item:hover[hoverIsVisible=\"true\"] {"
-    "background: #e9eaec;"
-    "alternate-background-color: #e9eaec;"
+    "background: #031b46;"
+    "alternate-background-color: #031b46;"
   "}";
 
 }