Skip to content

Commit 3e07444

Browse files
aejontargaryenaejontargaryen
committed
disabled wallet mining
1 parent d6e68d6 commit 3e07444

12 files changed

+266
-260
lines changed

‎CryptoNoteWallet.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

22
set(CN_PROJECT_NAME "GoldWallet")
33
set(CN_CURRENCY_DISPLAY_NAME "Fandom Gold")
4-
set(CN_CURRENCY_TICKER "XF₲")
4+
set(CN_CURRENCY_TICKER "XFG")
55
set(CN_VERSION 3.0.2)

‎cryptonote

‎src/Settings.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) 2011-2015 The Cryptonote developers
22
// Copyright (c) 2015-2016 XDN developers
33
// Copyright (c) 2016 The Karbowanec developers
4+
// Copyright (c) 2018-2019 Fandom Gold Project
5+
46
// Distributed under the MIT/X11 software license, see the accompanying
57
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
68

@@ -61,7 +63,7 @@ void Settings::load() {
6163
}
6264

6365
if (!m_settings.contains(OPTION_CONNECTION)) {
64-
m_connectionMode = "auto";
66+
m_connectionMode = "remote";
6567
}
6668

6769
if (!m_settings.contains(OPTION_DAEMON_PORT)) {
@@ -89,7 +91,7 @@ void Settings::load() {
8991
}
9092

9193
QStringList defaultPoolList;
92-
defaultPoolList << "crypto9coin.cf:18184" << "DRGL.online:8880" << "DRGL.cool-pool.net:4440";
94+
defaultPoolList ;
9395
if (!m_settings.contains(OPTION_MINING_POOLS)) {
9496
setMiningPoolList(QStringList() << defaultPoolList);
9597
} else {
@@ -103,7 +105,7 @@ void Settings::load() {
103105
}
104106

105107
QStringList defaultNodesList;
106-
defaultNodesList << "ice.zirtysperzys.info:18180" << "176.223.134.27:18180" << "fire.zirtysperzys.online:18180";
108+
defaultNodesList << "188.226.177.187:18180" << "176.223.134.27:18180" << "104.236.0.16:18180" << "178.128.164.245:18180";
107109
if (!m_settings.contains(OPTION_RPCNODES)) {
108110
setRpcNodesList(QStringList() << defaultNodesList);
109111
} else {
@@ -233,7 +235,7 @@ QString Settings::getConnection() const {
233235
connection = m_settings.value(OPTION_CONNECTION).toString();
234236
}
235237
else {
236-
connection = "auto"; // default
238+
connection = "remote"; // default
237239
}
238240
return connection;
239241
}

‎src/default.qss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,15 @@ QMainWindow {
3737
QPushButton {
3838
padding: 2px 8px;
3939
color: #fff;
40-
font-family: ZELDA;
4140
font-size: 15px;
4241
}
4342
QToolButton {
4443
padding: 0 5px;
45-
font-family: ZELDA;
4644
font-size: 12px;
4745
}
4846

4947

5048
QPushButton, QToolButton {
51-
font-family: ZELDA;
5249
line-height: 1.8;
5350
background: #000;
5451
border: 2px outset qconicalgradient(cx:0.5, cy:0.5, angle:89.1, stop:0 rgba(136, 106, 22, 255), stop:0.104478 rgba(166, 140, 41, 255), stop:0.169154 rgba(204, 181, 74, 255), stop:0.268657 rgba(235, 219, 102, 255), stop:0.333333 rgba(245, 236, 112, 255), stop:0.422886 rgba(209, 190, 76, 255), stop:0.487562 rgba(187, 156, 51, 255), stop:0.537313 rgba(168, 142, 42, 255), stop:0.606965 rgba(202, 174, 68, 255), stop:0.666667 rgba(218, 202, 86, 255), stop:0.746269 rgba(208, 187, 73, 255), stop:0.800995 rgba(187, 156, 51, 255), stop:1 rgba(137, 108, 26, 255));
@@ -60,15 +57,13 @@ QPushButton, QToolButton {
6057

6158
QPushButton:hover,
6259
QToolButton:hover {
63-
font-family: ZELDA;
6460
background-color: qconicalgradient(cx:0.5, cy:0.5, angle:89.1, stop:0 rgba(136, 106, 22, 255), stop:0.104478 rgba(166, 140, 41, 255), stop:0.169154 rgba(204, 181, 74, 255), stop:0.268657 rgba(235, 219, 102, 255), stop:0.333333 rgba(245, 236, 112, 255), stop:0.422886 rgba(209, 190, 76, 255), stop:0.487562 rgba(187, 156, 51, 255), stop:0.537313 rgba(168, 142, 42, 255), stop:0.606965 rgba(202, 174, 68, 255), stop:0.666667 rgba(218, 202, 86, 255), stop:0.746269 rgba(208, 187, 73, 255), stop:0.800995 rgba(187, 156, 51, 255), stop:1 rgba(137, 108, 26, 255));
6561
border: 2px inset #000000;
6662
color: black;
6763
}
6864

6965
QPushButton:pressed,
7066
QToolButton:pressed {
71-
font-family: ZELDA;
7267
color: #fff;
7368
background-color: qconicalgradient(cx:0.5, cy:0.5, angle:272.3, stop:0 rgba(136, 106, 22, 255), stop:0.119403 rgba(166, 140, 41, 255), stop:0.278607 rgba(202, 174, 68, 255), stop:0.537313 rgba(179, 151, 44, 255), stop:0.59204 rgba(187, 156, 51, 255), stop:0.800995 rgba(187, 156, 51, 255), stop:1 rgba(137, 108, 26, 255));
7469
border: 1px inset #ffdd00;
@@ -97,15 +92,13 @@ QToolButton:focus:hover {
9792
QPushButton:disabled,
9893
QToolButton:disabled {
9994
color: #000000;
100-
font-family: ZELDA;
10195
background-color: #444444;
10296
}
10397

10498
QPushButton::focus,
10599
QToolButton::focus {
106100
background-color: #CFB53B;
107101
border:2px outset black;
108-
font-family: ZELDA;
109102
}
110103
QPushButton#m_sendButton {
111104
color: gold;
@@ -140,12 +133,10 @@ QPushButton#m_startButton:disabled, #m_stopButton:disabled, #m_startSolo:disable
140133
color: #555;
141134
}
142135
QPushButton#m_csvButton:hover {
143-
font-family: ZELDA;
144136
font-weight: bold;
145137
}
146138

147139
QPushButton#m_okButton:hover {
148-
font-family: ZELDA;
149140
background-color: qconicalgradient(cx:0.5, cy:0.5, angle:89.1, stop:0 rgba(136, 106, 22, 255), stop:0.104478 rgba(166, 140, 41, 255), stop:0.169154 rgba(204, 181, 74, 255), stop:0.268657 rgba(235, 219, 102, 255), stop:0.333333 rgba(245, 236, 112, 255), stop:0.422886 rgba(209, 190, 76, 255), stop:0.487562 rgba(187, 156, 51, 255), stop:0.537313 rgba(168, 142, 42, 255), stop:0.606965 rgba(202, 174, 68, 255), stop:0.666667 rgba(218, 202, 86, 255), stop:0.746269 rgba(208, 187, 73, 255), stop:0.800995 rgba(187, 156, 51, 255), stop:1 rgba(137, 108, 26, 255));
150141
border: 2px inset #000000;
151142
color: black;
@@ -330,7 +321,7 @@ QSlider::handle:horizontal {
330321

331322

332323
QCheckBox:unchecked { color: red; }
333-
QCheckBox:checked { color: #aeaeae; }
324+
QCheckBox:checked { color: goldenrod; }
334325

335326

336327

‎src/gui/ConnectionSettings.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ ConnectionSettingsDialog::~ConnectionSettingsDialog() {
3131

3232
void ConnectionSettingsDialog::initConnectionSettings() {
3333
QString connection = Settings::instance().getConnection();
34-
if(connection.compare("auto") == 0) {
34+
/*if(connection.compare("auto") == 0) {
3535
m_ui->radioButton_1->setChecked(true);
3636
}
3737
else if(connection.compare("embedded") == 0) {
3838
m_ui->radioButton_2->setChecked(true);
3939
}
40-
else if(connection.compare("local") == 0) {
40+
else*/ if(connection.compare("local") == 0) {
4141
m_ui->radioButton_3->setChecked(true);
4242
}
4343
else if(connection.compare("remote") == 0) {
@@ -59,15 +59,15 @@ void ConnectionSettingsDialog::initConnectionSettings() {
5959

6060
QString ConnectionSettingsDialog::setConnectionMode() const {
6161
QString connectionMode;
62-
if(m_ui->radioButton_1->isChecked())
62+
/*if(m_ui->radioButton_1->isChecked())
6363
{
6464
connectionMode = "auto";
6565
}
6666
else if(m_ui->radioButton_2->isChecked())
6767
{
6868
connectionMode = "embedded";
6969
}
70-
else if(m_ui->radioButton_3->isChecked())
70+
else */if(m_ui->radioButton_3->isChecked())
7171
{
7272
connectionMode = "local";
7373
}

‎src/gui/MiningFrame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ MiningFrame::~MiningFrame() {
5757
void MiningFrame::enableSolo() {
5858
m_sychronized = true;
5959
if (!m_solo_mining) {
60-
m_ui->m_startSolo->setEnabled(true);
60+
m_ui->m_startSolo->setDisabled(true);
6161
}
6262
}
6363

0 commit comments

Comments
 (0)