mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
qt: drop salvage wallet from user interface
This commit is contained in:
parent
07a4d48249
commit
cf0142a6cf
@ -1419,30 +1419,11 @@
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="pageRepair">
|
||||
<widget class="QPushButton" name="btn_salvagewallet">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>100</y>
|
||||
<width>301</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>180</width>
|
||||
<height>23</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Salvage wallet</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="btn_rescan1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>150</y>
|
||||
<y>100</y>
|
||||
<width>301</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
@ -1461,7 +1442,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>200</y>
|
||||
<y>150</y>
|
||||
<width>301</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
@ -1480,7 +1461,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>250</y>
|
||||
<y>200</y>
|
||||
<width>301</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
@ -1499,7 +1480,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>300</y>
|
||||
<y>250</y>
|
||||
<width>301</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
@ -1518,7 +1499,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>350</y>
|
||||
<y>300</y>
|
||||
<width>301</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
@ -1549,27 +1530,11 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_repair_salvage">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>90</y>
|
||||
<width>411</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-salvagewallet: Attempt to recover private keys from a corrupt wallet.dat.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_repair_rescan1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>140</y>
|
||||
<y>90</y>
|
||||
<width>411</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
@ -1585,7 +1550,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>190</y>
|
||||
<y>140</y>
|
||||
<width>411</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
@ -1601,7 +1566,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>240</y>
|
||||
<y>190</y>
|
||||
<width>411</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
@ -1617,7 +1582,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>290</y>
|
||||
<y>240</y>
|
||||
<width>411</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
@ -1633,7 +1598,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>340</y>
|
||||
<y>290</y>
|
||||
<width>411</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
@ -1665,7 +1630,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>400</y>
|
||||
<y>350</y>
|
||||
<width>301</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
@ -1678,7 +1643,7 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>330</x>
|
||||
<y>390</y>
|
||||
<y>340</y>
|
||||
<width>411</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
|
@ -54,7 +54,6 @@ const char fontSizeSettingsKey[] = "consoleFontSize";
|
||||
const TrafficGraphData::GraphRange INITIAL_TRAFFIC_GRAPH_SETTING = TrafficGraphData::Range_30m;
|
||||
|
||||
// Repair parameters
|
||||
const QString SALVAGEWALLET("-salvagewallet");
|
||||
const QString RESCAN1("-rescan=1");
|
||||
const QString RESCAN2("-rescan=2");
|
||||
const QString ZAPTXES1("-zapwallettxes=1 -persistmempool=0");
|
||||
@ -491,9 +490,6 @@ RPCConsole::RPCConsole(interfaces::Node& node, QWidget* parent, Qt::WindowFlags
|
||||
ui->WalletSelectorLabel->setVisible(false);
|
||||
|
||||
// Wallet Repair Buttons
|
||||
// connect(ui->btn_salvagewallet, &QPushButton::clicked, this, &RPCConsole::walletSalvage);
|
||||
// Disable salvage option in GUI, it's way too powerful and can lead to funds loss
|
||||
ui->btn_salvagewallet->setEnabled(false);
|
||||
// Disable wallet repair options that require a wallet (enable them later when a wallet is added)
|
||||
ui->btn_rescan1->setEnabled(false);
|
||||
ui->btn_rescan2->setEnabled(false);
|
||||
@ -810,12 +806,6 @@ void RPCConsole::setFontSize(int newSize)
|
||||
ui->messagesWidget->verticalScrollBar()->setValue(oldPosFactor * ui->messagesWidget->verticalScrollBar()->maximum());
|
||||
}
|
||||
|
||||
/** Restart wallet with "-salvagewallet" */
|
||||
void RPCConsole::walletSalvage()
|
||||
{
|
||||
buildParameterlist(SALVAGEWALLET);
|
||||
}
|
||||
|
||||
/** Restart wallet with "-rescan=1" */
|
||||
void RPCConsole::walletRescan1()
|
||||
{
|
||||
@ -860,7 +850,6 @@ void RPCConsole::buildParameterlist(QString arg)
|
||||
args.removeFirst();
|
||||
|
||||
// Remove existing repair-options
|
||||
args.removeAll(SALVAGEWALLET);
|
||||
args.removeAll(RESCAN1);
|
||||
args.removeAll(RESCAN2);
|
||||
args.removeAll(ZAPTXES1);
|
||||
|
@ -104,7 +104,6 @@ public Q_SLOTS:
|
||||
void setFontSize(int newSize);
|
||||
|
||||
/** Wallet repair options */
|
||||
void walletSalvage();
|
||||
void walletRescan1();
|
||||
void walletRescan2();
|
||||
void walletZaptxes1();
|
||||
|
Loading…
Reference in New Issue
Block a user