Skip to content

Commit

Permalink
Major Elysium UI Update
Browse files Browse the repository at this point in the history
-fixed balances ui to include anonymized amounts
-added token creation ui
-added token manage ui
-added private send ui
-removed public send ui
-added mint/anonymize token ui
  • Loading branch information
notshillo committed Dec 15, 2021
1 parent 99b342a commit fde1758
Show file tree
Hide file tree
Showing 28 changed files with 2,761 additions and 1,127 deletions.
28 changes: 20 additions & 8 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,17 @@ QT_FORMS_UI = \
qt/forms/sendtopcodedialog.ui \
qt/forms/signverifymessagedialog.ui \
qt/forms/transactiondescdialog.ui \
qt/forms/sendmpdialog.ui \
qt/forms/lookupaddressdialog.ui \
qt/forms/lookupspdialog.ui \
qt/forms/lookuptxdialog.ui \
qt/forms/txhistorydialog.ui \
qt/forms/elyassetsdialog.ui \
qt/forms/lelantusdialog.ui \
qt/forms/createpcodedialog.ui
qt/forms/createpcodedialog.ui \
qt/forms/createtokendialog.ui \
qt/forms/elysiumprivatesenddialog.ui \
qt/forms/minttokendialog.ui \
qt/forms/managetokendialog.ui

QT_MOC_CPP = \
qt/moc_addressbookpage.cpp \
Expand Down Expand Up @@ -188,7 +191,6 @@ QT_MOC_CPP = \
qt/moc_walletframe.cpp \
qt/moc_walletmodel.cpp \
qt/moc_walletview.cpp \
qt/moc_sendmpdialog.cpp \
qt/moc_lookupaddressdialog.cpp \
qt/moc_lookupspdialog.cpp \
qt/moc_lookuptxdialog.cpp \
Expand All @@ -199,7 +201,11 @@ QT_MOC_CPP = \
qt/moc_lelantuscoincontroldialog.cpp \
qt/moc_automintmodel.cpp \
qt/moc_automintnotification.cpp \
qt/moc_pcodemodel.cpp
qt/moc_pcodemodel.cpp \
qt/moc_createtokendialog.cpp \
qt/moc_elysiumprivatesenddialog.cpp \
qt/moc_minttokendialog.cpp \
qt/moc_managetokendialog.cpp

BITCOIN_MM = \
qt/macdockiconhandler.mm \
Expand Down Expand Up @@ -291,12 +297,15 @@ BITCOIN_QT_H = \
qt/lookuptxdialog.h \
qt/txhistorydialog.h \
qt/elyassetsdialog.h \
qt/sendmpdialog.h \
qt/elysium_qtutils.h \
qt/lelantusmodel.h \
qt/lelantusdialog.h \
qt/lelantuscoincontroldialog.h \
qt/automintmodel.h
qt/automintmodel.h \
qt/createtokendialog.h \
qt/elysiumprivatesenddialog.h \
qt/minttokendialog.h \
qt/managetokendialog.h

RES_ICONS = \
qt/res/icons/add.png \
Expand Down Expand Up @@ -485,14 +494,17 @@ BITCOIN_QT_WALLET_CPP = \
qt/lelantusmodel.cpp \
qt/lelantusdialog.cpp \
qt/lelantuscoincontroldialog.cpp \
qt/automintmodel.cpp
qt/automintmodel.cpp \
qt/createtokendialog.cpp \
qt/elysiumprivatesenddialog.cpp \
qt/minttokendialog.cpp \
qt/managetokendialog.cpp

FIRO_QT_ELYSIUM_CPP = \
qt/elyassetsdialog.cpp \
qt/lookupaddressdialog.cpp \
qt/lookupspdialog.cpp \
qt/lookuptxdialog.cpp \
qt/sendmpdialog.cpp \
qt/txhistorydialog.cpp

BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
Expand Down
49 changes: 14 additions & 35 deletions src/qt/bitcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
appMenuBar(0),
overviewAction(0),
#ifdef ENABLE_ELYSIUM
elyAssetsAction(0),
toolboxAction(0),
elysiumTokensAction(0),
#endif
historyAction(0),
quitAction(0),
Expand All @@ -137,7 +136,6 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
lelantusAction(0),
masternodeAction(0),
createPcodeAction(0),
logoAction(0),
trayIcon(0),
trayIconMenu(0),
notificator(0),
Expand Down Expand Up @@ -393,19 +391,12 @@ void BitcoinGUI::createActions()
bool elysiumEnabled = isElysiumEnabled();

if (elysiumEnabled) {
elyAssetsAction = new QAction(tr("E&lyAssets"), this);
elyAssetsAction->setStatusTip(tr("Show Elysium balances"));
elyAssetsAction->setToolTip(elyAssetsAction->statusTip());
elyAssetsAction->setCheckable(true);
elyAssetsAction->setShortcut(QKeySequence(Qt::ALT + key++));
tabGroup->addAction(elyAssetsAction);

toolboxAction = new QAction(tr("&Toolbox"), this);
toolboxAction->setStatusTip(tr("Tools to obtain varions Elysium information and transaction information"));
toolboxAction->setToolTip(toolboxAction->statusTip());
toolboxAction->setCheckable(true);
toolboxAction->setShortcut(QKeySequence(Qt::ALT + key++));
tabGroup->addAction(toolboxAction);
elysiumTokensAction = new QAction(tr("El&ysium"), this);
elysiumTokensAction->setStatusTip(tr("Manage Elysium tokens"));
elysiumTokensAction->setToolTip(elysiumTokensAction->statusTip());
elysiumTokensAction->setCheckable(true);
elysiumTokensAction->setShortcut(QKeySequence(Qt::ALT + key++));
tabGroup->addAction(elysiumTokensAction);
}
#endif

Expand Down Expand Up @@ -436,10 +427,8 @@ void BitcoinGUI::createActions()
connect(createPcodeAction, SIGNAL(triggered()), this, SLOT(gotoCreatePcodePage()));
#ifdef ENABLE_ELYSIUM
if (elysiumEnabled) {
connect(elyAssetsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(elyAssetsAction, SIGNAL(triggered()), this, SLOT(gotoElyAssetsPage()));
connect(toolboxAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(toolboxAction, SIGNAL(triggered()), this, SLOT(gotoToolboxPage()));
connect(elysiumTokensAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(elysiumTokensAction, SIGNAL(triggered()), this, SLOT(gotoElysiumTokensPage()));
}
#endif
#endif // ENABLE_WALLET
Expand Down Expand Up @@ -584,8 +573,7 @@ void BitcoinGUI::createToolBars()

#ifdef ENABLE_ELYSIUM
if (isElysiumEnabled()) {
toolbar->addAction(elyAssetsAction);
toolbar->addAction(toolboxAction);
toolbar->addAction(elysiumTokensAction);
}
#endif
toolbar->addAction(createPcodeAction);
Expand Down Expand Up @@ -727,8 +715,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)

#ifdef ENABLE_ELYSIUM
if (isElysiumEnabled()) {
elyAssetsAction->setEnabled(enabled);
toolboxAction->setEnabled(enabled);
elysiumTokensAction->setEnabled(enabled);
}
#endif
}
Expand Down Expand Up @@ -848,10 +835,10 @@ void BitcoinGUI::gotoOverviewPage()
}

#ifdef ENABLE_ELYSIUM
void BitcoinGUI::gotoElyAssetsPage()
void BitcoinGUI::gotoElysiumTokensPage()
{
elyAssetsAction->setChecked(true);
if (walletFrame) walletFrame->gotoElyAssetsPage();
elysiumTokensAction->setChecked(true);
if (walletFrame) walletFrame->gotoElysiumTokensPage();
}
#endif

Expand All @@ -875,14 +862,6 @@ void BitcoinGUI::gotoBitcoinHistoryTab()
if (walletFrame) walletFrame->gotoBitcoinHistoryTab();
}

#ifdef ENABLE_ELYSIUM
void BitcoinGUI::gotoToolboxPage()
{
toolboxAction->setChecked(true);
if (walletFrame) walletFrame->gotoToolboxPage();
}
#endif

void BitcoinGUI::gotoMasternodePage()
{
QSettings settings;
Expand Down
10 changes: 3 additions & 7 deletions src/qt/bitcoingui.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ class BitcoinGUI : public QMainWindow
QMenuBar *appMenuBar;
QAction *overviewAction;
#ifdef ENABLE_ELYSIUM
QAction *elyAssetsAction;
QAction *toolboxAction;
QAction *elysiumTokensAction;
#endif
QAction *historyAction;
QAction *quitAction;
Expand All @@ -123,7 +122,6 @@ class BitcoinGUI : public QMainWindow
QAction *lelantusAction;
QAction *masternodeAction;
QAction *createPcodeAction;
QAction *logoAction;

QSystemTrayIcon *trayIcon;
QMenu *trayIconMenu;
Expand Down Expand Up @@ -217,12 +215,10 @@ private Q_SLOTS:
/** Switch to overview (home) page */
void gotoOverviewPage();
#ifdef ENABLE_ELYSIUM
/** Switch to ElyAssets page */
void gotoElyAssetsPage();
/** Switch to utility page */
void gotoToolboxPage();
/** Switch directly to Elysium history tab */
void gotoElysiumHistoryTab();
/** Switch to Elysium Tokens Page */
void gotoElysiumTokensPage();
#endif
/** Switch to history (transactions) page */
void gotoHistoryPage();
Expand Down
Loading

0 comments on commit fde1758

Please sign in to comment.