Skip to content
This repository was archived by the owner on Jul 23, 2021. It is now read-only.

Commit b415930

Browse files
authored
Merge pull request #17 from MERP-Solutions/master
Corrected messaging page GUI issue, re-enabled back button for message page GUI
2 parents ea2103d + 76f42d9 commit b415930

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/qt/bitcoin.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "clientmodel.h"
99
#include "walletmodel.h"
1010
#include "optionsmodel.h"
11+
#include "messagemodel.h"
1112
#include "guiutil.h"
1213
#include "guiconstants.h"
1314
#include "init.h"
@@ -283,9 +284,11 @@ int main(int argc, char *argv[])
283284

284285
ClientModel clientModel(&optionsModel);
285286
WalletModel walletModel(pwalletMain, &optionsModel);
287+
MessageModel messageModel(pwalletMain, &walletModel);
286288

287289
window.setClientModel(&clientModel);
288290
window.setWalletModel(&walletModel);
291+
window.setMessageModel(&messageModel);
289292

290293
// If -min option passed, start window minimized.
291294
if(GetBoolArg("-min", false))

src/qt/bitcoingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ void DigitalNoteGUI::createToolBars()
479479
toolbar->addAction(addressBookAction);
480480
toolbar->addAction(masternodeManagerAction);
481481
if (!fLiteMode){
482-
toolbar->addAction(messageAction);
482+
toolbar->addAction(messageAction);
483483
}
484484
toolbar->addAction(blockAction);
485485
netLabel = new QLabel();

src/qt/forms/messagepage.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<item>
8787
<widget class="QPushButton" name="backButton">
8888
<property name="enabled">
89-
<bool>false</bool>
89+
<bool>true</bool>
9090
</property>
9191
<property name="text">
9292
<string>&amp;Back</string>

0 commit comments

Comments
 (0)