Merge pull request #16 from MERP-Solutions/master

Logo's updated and messaging added

src/qt/bitcoin.qrc

@@ -57,6 +57,8 @@
         <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>
+        <file alias="lock_closed_toolbar">res/icons/lock_closed_toolbar.png</file>
+        <file alias="lock_open_toolbar">res/icons/lock_open_toolbar .png</file>
     </qresource>
     <qresource prefix="/icons/dark">
         <file alias="connect_0">res/icons/dark/connect0_16.png</file>

src/qt/bitcoingui.cpp

@@ -358,17 +358,17 @@ void DigitalNoteGUI::createActions()
     optionsAction->setToolTip(tr("Modify configuration options for DigitalNote"));
     optionsAction->setMenuRole(QAction::PreferencesRole);
     toggleHideAction = new QAction(QIcon(fUseDarkTheme ? ":/icons/dark/bitcoin-dark" : ":/icons/bitcoin"), tr("&Show / Hide"), this);
-    encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);
+    encryptWalletAction = new QAction(QIcon(":/icons/lock_closed_toolbar"), tr("&Encrypt Wallet..."), this);
     encryptWalletAction->setToolTip(tr("Encrypt or decrypt wallet"));
     backupWalletAction = new QAction(QIcon(":/icons/filesave"), tr("&Backup Wallet..."), this);
     backupWalletAction->setToolTip(tr("Backup wallet to another location"));
     importPrivateKeyAction = new QAction(QIcon(":/icons/key"), tr("&Import private key..."), this);
     importPrivateKeyAction->setToolTip(tr("Import a private key"));
     changePassphraseAction = new QAction(QIcon(":/icons/key"), tr("&Change Passphrase..."), this);
     changePassphraseAction->setToolTip(tr("Change the passphrase used for wallet encryption"));
-    unlockWalletAction = new QAction(QIcon(":/icons/lock_open"),tr("&Unlock Wallet..."), this);
+    unlockWalletAction = new QAction(QIcon(":/icons/lock_open_toolbar"),tr("&Unlock Wallet..."), this);
     unlockWalletAction->setToolTip(tr("Unlock wallet"));
-    lockWalletAction = new QAction(QIcon(":/icons/lock_closed"),tr("&Lock Wallet"), this);
+    lockWalletAction = new QAction(QIcon(":/icons/lock_closed_toolbar"),tr("&Lock Wallet"), this);
     lockWalletAction->setToolTip(tr("Lock wallet"));
     signMessageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this);
     verifyMessageAction = new QAction(QIcon(":/icons/transaction_0"), tr("&Verify message..."), this);
@@ -1026,14 +1026,14 @@ void DigitalNoteGUI::gotoVerifyMessageTab(QString addr)
 }
 
 void DigitalNoteGUI::gotoMessagePage()
-{/*
+{
     messageAction->setChecked(true);
     centralStackedWidget->setCurrentWidget(messagePage);
 
     exportAction->setEnabled(true);
     disconnect(exportAction, SIGNAL(triggered()), 0, 0);
     connect(exportAction, SIGNAL(triggered()), messagePage, SLOT(exportClicked()));
-*/}
+}
 
 void DigitalNoteGUI::dragEnterEvent(QDragEnterEvent *event)
 {

src/qt/forms/messagepage.ui

@@ -85,6 +85,9 @@
          <layout class="QHBoxLayout" name="horizontalLayout_3">
           <item>
            <widget class="QPushButton" name="backButton">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="text">
              <string>&amp;Back</string>
             </property>