Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
Merge Wallet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
7
Issues
7
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Merge
Merge Wallet
Commits
188e1d97
Commit
188e1d97
authored
Mar 27, 2019
by
barrystyle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove related qt resources for zerocoin/privacy
parent
246232bd
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
0 additions
and
2288 deletions
+0
-2288
bitcoingui.cpp
src/qt/bitcoingui.cpp
+0
-16
bitcoingui.h
src/qt/bitcoingui.h
+0
-1
privacydialog.ui
src/qt/forms/privacydialog.ui
+0
-2198
merge.qrc
src/qt/merge.qrc
+0
-1
default.css
src/qt/res/css/default.css
+0
-71
privacy.png
src/qt/res/icons/privacy.png
+0
-0
walletview.h
src/qt/walletview.h
+0
-1
No files found.
src/qt/bitcoingui.cpp
View file @
188e1d97
...
@@ -87,7 +87,6 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle* networkStyle, QWidget* parent) : QMai
...
@@ -87,7 +87,6 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle* networkStyle, QWidget* parent) : QMai
multisigSignAction
(
0
),
multisigSignAction
(
0
),
aboutAction
(
0
),
aboutAction
(
0
),
receiveCoinsAction
(
0
),
receiveCoinsAction
(
0
),
privacyAction
(
0
),
optionsAction
(
0
),
optionsAction
(
0
),
toggleHideAction
(
0
),
toggleHideAction
(
0
),
encryptWalletAction
(
0
),
encryptWalletAction
(
0
),
...
@@ -328,17 +327,6 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle)
...
@@ -328,17 +327,6 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle)
#endif
#endif
tabGroup
->
addAction
(
historyAction
);
tabGroup
->
addAction
(
historyAction
);
privacyAction
=
new
QAction
(
QIcon
(
":/icons/privacy"
),
tr
(
"&Privacy"
),
this
);
privacyAction
->
setStatusTip
(
tr
(
"Privacy Actions for zMERGE"
));
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
#ifdef ENABLE_WALLET
QSettings
settings
;
QSettings
settings
;
...
@@ -365,7 +353,6 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle)
...
@@ -365,7 +353,6 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle)
connect
(
sendCoinsAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
gotoSendCoinsPage
()));
connect
(
sendCoinsAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
gotoSendCoinsPage
()));
connect
(
receiveCoinsAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showNormalIfMinimized
()));
connect
(
receiveCoinsAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showNormalIfMinimized
()));
connect
(
receiveCoinsAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
gotoReceiveCoinsPage
()));
connect
(
receiveCoinsAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
gotoReceiveCoinsPage
()));
connect
(
privacyAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showNormalIfMinimized
()));
connect
(
historyAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showNormalIfMinimized
()));
connect
(
historyAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showNormalIfMinimized
()));
connect
(
historyAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
gotoHistoryPage
()));
connect
(
historyAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
gotoHistoryPage
()));
#endif // ENABLE_WALLET
#endif // ENABLE_WALLET
...
@@ -540,7 +527,6 @@ void BitcoinGUI::createToolBars()
...
@@ -540,7 +527,6 @@ void BitcoinGUI::createToolBars()
toolbar
->
addAction
(
overviewAction
);
toolbar
->
addAction
(
overviewAction
);
toolbar
->
addAction
(
sendCoinsAction
);
toolbar
->
addAction
(
sendCoinsAction
);
toolbar
->
addAction
(
receiveCoinsAction
);
toolbar
->
addAction
(
receiveCoinsAction
);
//toolbar->addAction(privacyAction);
toolbar
->
addAction
(
historyAction
);
toolbar
->
addAction
(
historyAction
);
QSettings
settings
;
QSettings
settings
;
if
(
settings
.
value
(
"fShowMasternodesTab"
).
toBool
())
{
if
(
settings
.
value
(
"fShowMasternodesTab"
).
toBool
())
{
...
@@ -631,7 +617,6 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
...
@@ -631,7 +617,6 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
overviewAction
->
setEnabled
(
enabled
);
overviewAction
->
setEnabled
(
enabled
);
sendCoinsAction
->
setEnabled
(
enabled
);
sendCoinsAction
->
setEnabled
(
enabled
);
receiveCoinsAction
->
setEnabled
(
enabled
);
receiveCoinsAction
->
setEnabled
(
enabled
);
privacyAction
->
setEnabled
(
enabled
);
historyAction
->
setEnabled
(
enabled
);
historyAction
->
setEnabled
(
enabled
);
QSettings
settings
;
QSettings
settings
;
if
(
settings
.
value
(
"fShowMasternodesTab"
).
toBool
())
{
if
(
settings
.
value
(
"fShowMasternodesTab"
).
toBool
())
{
...
@@ -688,7 +673,6 @@ void BitcoinGUI::createTrayIconMenu()
...
@@ -688,7 +673,6 @@ void BitcoinGUI::createTrayIconMenu()
trayIconMenu
->
addSeparator
();
trayIconMenu
->
addSeparator
();
trayIconMenu
->
addAction
(
sendCoinsAction
);
trayIconMenu
->
addAction
(
sendCoinsAction
);
trayIconMenu
->
addAction
(
receiveCoinsAction
);
trayIconMenu
->
addAction
(
receiveCoinsAction
);
//trayIconMenu->addAction(privacyAction);
trayIconMenu
->
addSeparator
();
trayIconMenu
->
addSeparator
();
trayIconMenu
->
addAction
(
signMessageAction
);
trayIconMenu
->
addAction
(
signMessageAction
);
trayIconMenu
->
addAction
(
verifyMessageAction
);
trayIconMenu
->
addAction
(
verifyMessageAction
);
...
...
src/qt/bitcoingui.h
View file @
188e1d97
...
@@ -106,7 +106,6 @@ private:
...
@@ -106,7 +106,6 @@ private:
QAction
*
multisigSignAction
;
QAction
*
multisigSignAction
;
QAction
*
aboutAction
;
QAction
*
aboutAction
;
QAction
*
receiveCoinsAction
;
QAction
*
receiveCoinsAction
;
QAction
*
privacyAction
;
QAction
*
optionsAction
;
QAction
*
optionsAction
;
QAction
*
toggleHideAction
;
QAction
*
toggleHideAction
;
QAction
*
encryptWalletAction
;
QAction
*
encryptWalletAction
;
...
...
src/qt/forms/privacydialog.ui
deleted
100644 → 0
View file @
246232bd
This diff is collapsed.
Click to expand it.
src/qt/merge.qrc
View file @
188e1d97
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
<file alias="eye_plus">res/icons/eye_plus.png</file>
<file alias="eye_plus">res/icons/eye_plus.png</file>
<file alias="options">res/icons/configure.png</file>
<file alias="options">res/icons/configure.png</file>
<file alias="receiving_addresses">res/icons/receive.png</file>
<file alias="receiving_addresses">res/icons/receive.png</file>
<file alias="privacy">res/icons/privacy.png</file>
<file alias="editpaste">res/icons/editpaste.png</file>
<file alias="editpaste">res/icons/editpaste.png</file>
<file alias="editcopy">res/icons/editcopy.png</file>
<file alias="editcopy">res/icons/editcopy.png</file>
<file alias="add">res/icons/add.png</file>
<file alias="add">res/icons/add.png</file>
...
...
src/qt/res/css/default.css
View file @
188e1d97
...
@@ -675,77 +675,6 @@ QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */
...
@@ -675,77 +675,6 @@ QWidget#AddressBookPage QHeaderView::section { /* Min width for Windows fix */
min-width
:
260px
;
min-width
:
260px
;
}
}
/**************************** Privacy Dialog ********************************************/
QWidget
#PrivacyDialog
QFrame
{
background-color
:
transparent
;
border
:
1px
solid
#000
;
}
QWidget
#PrivacyDialog
QFrame
#labelMintStatus
{
/* background-color:transparent; */
background-color
:
#eee
;
/* border-style: inset; */
/* border-width:2; */
/* border:2px solid #00; */
border
:
1px
inset
gray
;
}
QWidget
#PrivacyDialog
QLabel
{
border
:
0px
solid
#000
;
}
QWidget
#PrivacyDialog
QLabel
#zMERGELabel
{
font-size
:
14px
;
color
:
#ffffff
;
background-color
:
#5B4C7C
;
}
QWidget
#PrivacyDialog
QLabel
#oMERGELabel
{
font-size
:
14px
;
color
:
#ffffff
;
background-color
:
#5B4C7C
;
}
QWidget
#PrivacyDialog
QPushButton
{
background-color
:
qlineargradient
(
x1
:
0
,
y1
:
0
,
x2
:
0
,
y2
:
1
,
stop
:
.01
#64ACD2
,
stop
:
.1
#382f44
,
stop
:
.95
#382f44
,
stop
:
1
#1D80B5
);
border
:
0
;
border-radius
:
3px
;
color
:
#ffffff
;
font-size
:
12px
;
font-weight
:
normal
;
padding-left
:
5px
;
padding-right
:
5px
;
padding-top
:
5px
;
padding-bottom
:
5px
;
}
QWidget
#PrivacyDialog
QPushButton
:hover
{
background-color
:
qlineargradient
(
x1
:
0
,
y1
:
0
,
x2
:
0
,
y2
:
1
,
stop
:
.01
#5B4C9A
,
stop
:
.1
#5B4C86
,
stop
:
.95
#5B4C86
,
stop
:
1
#5B4C7C
);
}
QWidget
#PrivacyDialog
QPushButton
:focus
{
border
:
none
;
outline
:
none
;
}
QWidget
#PrivacyDialog
QPushButton
:pressed
{
border
:
1px
solid
#333
;
}
QWidget
#PrivacyDialog
QProgressBar
#obfuscationProgress
{
/* Obfuscation Completion */
border
:
1px
solid
#818181
;
border-radius
:
1px
;
margin-right
:
43px
;
text-align
:
right
;
color
:
#818181
;
}
QWidget
#PrivacyDialog
QProgressBar
#obfuscationProgress
::chunk
{
background-color
:
#382f44
;
width
:
1px
;
}
/**************************** SETTINGS MENU *********************************************/
/**************************** SETTINGS MENU *********************************************/
/* Encrypt Wallet and Change Passphrase Dialog */
/* Encrypt Wallet and Change Passphrase Dialog */
...
...
src/qt/res/icons/privacy.png
deleted
100644 → 0
View file @
246232bd
7.51 KB
src/qt/walletview.h
View file @
188e1d97
...
@@ -14,7 +14,6 @@ class BitcoinGUI;
...
@@ -14,7 +14,6 @@ class BitcoinGUI;
class
ClientModel
;
class
ClientModel
;
class
OverviewPage
;
class
OverviewPage
;
class
ReceiveCoinsDialog
;
class
ReceiveCoinsDialog
;
class
PrivacyDialog
;
class
SendCoinsDialog
;
class
SendCoinsDialog
;
class
SendCoinsRecipient
;
class
SendCoinsRecipient
;
class
TransactionView
;
class
TransactionView
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment