Merge pull request #14 from MERP-Solutions/master

Adapted Icons

Author: CryptoCoderz

src/qt/bitcoin.qrc

@@ -54,6 +54,9 @@
         <file alias="bitcoin">res/icons/digitalnote.png</file>
         <file alias="toolbar_testnet">res/icons/digitalnote-16_testnet.png</file>
         <file alias="mnodes">res/icons/mnodes.png</file>
+        <file alias="message">res/icons/message.png</file>
+        <file alias="address-book-sidebar">res/icons/address-book-sidebar.png</file>
+        <file alias="send-sidebar">res/icons/send-sidebar.png</file>
     </qresource>
     <qresource prefix="/icons/dark">
         <file alias="connect_0">res/icons/dark/connect0_16.png</file>
@@ -128,4 +131,5 @@
         <file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
         <file alias="zh_TW">locale/bitcoin_zh_TW.qm</file>
     </qresource>
+    <qresource prefix="/"/>
 </RCC>

src/qt/bitcoingui.cpp

@@ -290,7 +290,7 @@ void DigitalNoteGUI::createActions()
     receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));
     tabGroup->addAction(receiveCoinsAction);
 
-    sendCoinsAction = new QAction(QIcon(":/icons/send"), tr("&Send"), this);
+    sendCoinsAction = new QAction(QIcon(":/icons/send-sidebar"), tr("&Send"), this);
     sendCoinsAction->setToolTip(tr("Send coins to a DigitalNote address"));
     sendCoinsAction->setCheckable(true);
     sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));
@@ -302,7 +302,7 @@ void DigitalNoteGUI::createActions()
     historyAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));
     tabGroup->addAction(historyAction);
 
-    addressBookAction = new QAction(QIcon(":/icons/address-book"), tr("&Addresses"), this);
+    addressBookAction = new QAction(QIcon(":/icons/address-book-sidebar"), tr("&Addresses"), this);
     addressBookAction->setToolTip(tr("Edit the list of stored addresses and labels"));
     addressBookAction->setCheckable(true);
     addressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));
@@ -313,7 +313,7 @@ void DigitalNoteGUI::createActions()
     masternodeManagerAction->setCheckable(true);
     tabGroup->addAction(masternodeManagerAction);
 
-    messageAction = new QAction(QIcon(":/icons/edit"), tr("&Messages"), this);
+    messageAction = new QAction(QIcon(":/icons/message"), tr("&Messages"), this);
     messageAction->setToolTip(tr("View and Send Encrypted messages"));
     messageAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_7));
     messageAction->setCheckable(true);

src/qt/forms/optionsdialog.ui

@@ -26,7 +26,7 @@
       <enum>QTabWidget::North</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="tabMain">
       <attribute name="title">
@@ -465,6 +465,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QValidatedLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>qvalidatedlineedit.h</header>
+  </customwidget>
   <customwidget>
    <class>DigitalNoteAmountField</class>
    <extends>QSpinBox</extends>
@@ -476,11 +481,6 @@
    <extends>QComboBox</extends>
    <header>qvaluecombobox.h</header>
   </customwidget>
-  <customwidget>
-   <class>QValidatedLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>qvalidatedlineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>