Skip to content
This repository has been archived by the owner on Dec 14, 2019. It is now read-only.

Commit

Permalink
Delete zzija from GUI wallet
Browse files Browse the repository at this point in the history
  • Loading branch information
@smartinsider
smartinsider committed Jan 19, 2019
1 parent dc93d55 commit 25c52df
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 609 deletions.
4 changes: 2 additions & 2 deletions configure.ac
View file
@@ -1,9 +1,9 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_BUILD, 7)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
AC_INIT([Zija Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[zija.icu],[zija])
Expand Down
27 changes: 3 additions & 24 deletions src/qt/bitcoingui.cpp
View file
Expand Up @@ -353,16 +353,6 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle)
#endif
tabGroup->addAction(historyAction);

privacyAction = new QAction(QIcon(":/icons/privacy"), tr("&Privacy"), this);
privacyAction->setStatusTip(tr("Privacy Actions for zZIJA"));
privacyAction->setToolTip(privacyAction->statusTip());
privacyAction->setCheckable(true);
#ifdef Q_OS_MAC
privacyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_5));
#else
privacyAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));
#endif
tabGroup->addAction(privacyAction);

#ifdef ENABLE_WALLET

Expand Down Expand Up @@ -577,9 +567,7 @@ void BitcoinGUI::createToolBars()
toolbar->addAction(overviewAction);
toolbar->addAction(sendCoinsAction);
toolbar->addAction(receiveCoinsAction);
toolbar->addAction(privacyAction);
toolbar->addAction(historyAction);
toolbar->addAction(privacyAction);
QSettings settings;
if (settings.value("fShowMasternodesTab").toBool()) {
toolbar->addAction(masternodeAction);
Expand Down Expand Up @@ -682,7 +670,6 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
overviewAction->setEnabled(enabled);
sendCoinsAction->setEnabled(enabled);
receiveCoinsAction->setEnabled(enabled);
privacyAction->setEnabled(enabled);
historyAction->setEnabled(enabled);
QSettings settings;
if (settings.value("fShowMasternodesTab").toBool()) {
Expand Down Expand Up @@ -837,8 +824,8 @@ void BitcoinGUI::gotoReceiveCoinsPage()

void BitcoinGUI::gotoPrivacyPage()
{
privacyAction->setChecked(true);
if (walletFrame) walletFrame->gotoPrivacyPage();
// privacyAction->setChecked(true);
// if (walletFrame) walletFrame->gotoPrivacyPage();
}

void BitcoinGUI::gotoSendCoinsPage(QString addr)
Expand Down Expand Up @@ -1199,15 +1186,7 @@ void BitcoinGUI::setStakingStatus()

void BitcoinGUI::setAutoMintStatus()
{
if (fEnableZeromint) {
labelAutoMintIcon->show();
labelAutoMintIcon->setIcon(QIcon(":/icons/automint_active").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
labelAutoMintIcon->setToolTip(tr("AutoMint is currently enabled and set to ") + QString::number(nZeromintPercentage) + "%.\n");
} else {
labelAutoMintIcon->show();
labelAutoMintIcon->setIcon(QIcon(":/icons/automint_inactive").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
labelAutoMintIcon->setToolTip(tr("AutoMint is disabled"));
}
labelAutoMintIcon->hide();
}

bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient)
Expand Down
79 changes: 0 additions & 79 deletions src/qt/forms/optionsdialog.ui
View file
Expand Up @@ -130,85 +130,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBoxZeromintEnable">
<property name="toolTip">
<string>Enable automatic minting of ZIJA units to zZIJA</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Enable zZIJA Automint</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="percentage_label">
<property name="toolTip">
<string>Percentage of incoming ZIJA which get automatically converted to zZIJA via Zerocoin Protocol (min: 10%)</string>
</property>
<property name="text">
<string>Percentage of autominted zZIJA</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="zeromintPercentage">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="labelPreferredDenom">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Wait with automatic conversion to Zerocoin until enough ZIJA for this denomination is available</string>
</property>
<property name="text">
<string>Preferred Automint zZIJA Denomination</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="preferredDenom">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>27</height>
</size>
</property>
<property name="toolTip">
<string>Wait with automatic conversion to Zerocoin until enough ZIJA for this denomination is available</string>
</property>
<property name="maxVisibleItems">
<number>9</number>
</property>
<property name="maxCount">
<number>9</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabWallet">
Expand Down

0 comments on commit 25c52df

Please sign in to comment.