Skip to content

Commit 08d3a2a

Browse files
devfscalejandromgk
devfsc
authored and
alejandromgk
committed
Update gui wallet (#2)
* Fix bug on interface * Light theme * Rebranding privatePAC and instantPAC
1 parent ebe1a91 commit 08d3a2a

19 files changed

+158
-120
lines changed

‎src/qt/bitcoingui.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,9 @@ void BitcoinGUI::createActions()
438438
showHelpMessageAction->setMenuRole(QAction::NoRole);
439439
showHelpMessageAction->setStatusTip(tr("Show the $PAC Core help message to get a list with possible $PAC Core command-line options"));
440440

441-
showPrivateSendHelpAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&PrivateSend information"), this);
441+
showPrivateSendHelpAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&PrivatePAC information"), this);
442442
showPrivateSendHelpAction->setMenuRole(QAction::NoRole);
443-
showPrivateSendHelpAction->setStatusTip(tr("Show the PrivateSend basic information"));
443+
showPrivateSendHelpAction->setStatusTip(tr("Show the PrivatePAC basic information"));
444444

445445
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
446446
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));

‎src/qt/coincontroldialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
441441
int nRounds = pwalletMain->GetOutpointPrivateSendRounds(outpt);
442442
if (coinControl->fUsePrivateSend && nRounds < privateSendClient.nPrivateSendRounds) {
443443
QMessageBox::warning(this, windowTitle(),
444-
tr("Non-anonymized input selected. <b>PrivateSend will be disabled.</b><br><br>If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again."),
444+
tr("Non-anonymized input selected. <b>PrivatePAC will be disabled.</b><br><br>If you still want to use PrivatePAC, please deselect all non-nonymized inputs first and then check PrivatePAC checkbox again."),
445445
QMessageBox::Ok, QMessageBox::Ok);
446446
coinControl->fUsePrivateSend = false;
447447
}

‎src/qt/darksendconfig.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ void DarksendConfig::clickBasic()
4040

4141
QString strAmount(BitcoinUnits::formatWithUnit(
4242
model->getOptionsModel()->getDisplayUnit(), 100000 * COIN));
43-
QMessageBox::information(this, tr("PrivateSend Configuration"),
43+
QMessageBox::information(this, tr("PrivatePAC Configuration"),
4444
tr(
45-
"PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening $PAC's configuration screen."
45+
"PrivatePAC was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening $PAC's configuration screen."
4646
).arg(strAmount)
4747
);
4848

@@ -55,9 +55,9 @@ void DarksendConfig::clickHigh()
5555

5656
QString strAmount(BitcoinUnits::formatWithUnit(
5757
model->getOptionsModel()->getDisplayUnit(), 100000 * COIN));
58-
QMessageBox::information(this, tr("PrivateSend Configuration"),
58+
QMessageBox::information(this, tr("PrivatePAC Configuration"),
5959
tr(
60-
"PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening $PAC's configuration screen."
60+
"PrivatePAC was successfully set to high (%1 and 8 rounds). You can change this at any time by opening $PAC's configuration screen."
6161
).arg(strAmount)
6262
);
6363

@@ -72,7 +72,7 @@ void DarksendConfig::clickMax()
7272
model->getOptionsModel()->getDisplayUnit(), 100000 * COIN));
7373
QMessageBox::information(this, tr("PrivateSend Configuration"),
7474
tr(
75-
"PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening $PAC's configuration screen."
75+
"PrivatePAC was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening $PAC's configuration screen."
7676
).arg(strAmount)
7777
);
7878

@@ -83,8 +83,8 @@ void DarksendConfig::configure(bool enabled, int coins, int rounds) {
8383

8484
QSettings settings;
8585

86-
settings.setValue("nPrivateSendRounds", rounds);
87-
settings.setValue("nPrivateSendAmount", coins);
86+
settings.setValue("nPrivatePACRounds", rounds);
87+
settings.setValue("nPrivatePACAmount", coins);
8888

8989
privateSendClient.nPrivateSendRounds = rounds;
9090
privateSendClient.nPrivateSendAmount = coins;

‎src/qt/forms/masternodelist.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>968</width>
10-
<height>433</height>
10+
<height>409</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎src/qt/forms/modaloverlay.ui‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>640</width>
10-
<height>401</height>
10+
<height>382</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -128,7 +128,7 @@
128128
<item>
129129
<widget class="QLabel" name="infoText">
130130
<property name="text">
131-
<string>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Paccoin network, as detailed below.</string>
131+
<string>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the $PAC network, as detailed below.</string>
132132
</property>
133133
<property name="textFormat">
134134
<enum>Qt::RichText</enum>
@@ -147,7 +147,7 @@
147147
</font>
148148
</property>
149149
<property name="text">
150-
<string>Attempting to spend Paccoin that are affected by not-yet-displayed transactions will not be accepted by the network.</string>
150+
<string>Attempting to spend $PAC that are affected by not-yet-displayed transactions will not be accepted by the network.</string>
151151
</property>
152152
<property name="textFormat">
153153
<enum>Qt::RichText</enum>

‎src/qt/forms/overviewpage.ui‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,23 @@
5454
<layout class="QVBoxLayout" name="verticalLayout_4">
5555
<item>
5656
<layout class="QHBoxLayout" name="horizontalLayout_4">
57+
<item>
58+
<widget class="QLabel" name="label_5">
59+
<property name="text">
60+
<string> Balances</string>
61+
</property>
62+
</widget>
63+
</item>
5764
<item>
5865
<widget class="QLabel" name="labelWalletStatus">
59-
<property name="toolTip">
60-
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Paccoin network after a connection is established, but this process has not completed yet.</string>
66+
<property name="statusTip">
67+
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the $PAC network after a connection is established, but this process has not completed yet.</string>
6168
</property>
6269
<property name="styleSheet">
63-
<string notr="true">QLabel { color: red; }</string>
70+
<string notr="true">QLabel { color: transparent; }</string>
6471
</property>
6572
<property name="text">
66-
<string notr="true">(out of sync)</string>
67-
</property>
68-
<property name="alignment">
69-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
73+
<string/>
7074
</property>
7175
</widget>
7276
</item>
@@ -405,7 +409,7 @@
405409
</font>
406410
</property>
407411
<property name="text">
408-
<string>PrivateSend</string>
412+
<string>PrivatePAC</string>
409413
</property>
410414
</widget>
411415
</item>
@@ -415,7 +419,7 @@
415419
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Paccoin network after a connection is established, but this process has not completed yet.</string>
416420
</property>
417421
<property name="styleSheet">
418-
<string notr="true">QLabel { color: red; }</string>
422+
<string notr="true">QLabel { color: transparent; }</string>
419423
</property>
420424
<property name="text">
421425
<string notr="true">(out of sync)</string>
@@ -501,7 +505,7 @@
501505
</font>
502506
</property>
503507
<property name="text">
504-
<string notr="true">0 PAC</string>
508+
<string notr="true">0 $PAC</string>
505509
</property>
506510
</widget>
507511
</item>
@@ -515,7 +519,7 @@
515519
<item row="3" column="1">
516520
<widget class="QLabel" name="labelAmountRounds">
517521
<property name="text">
518-
<string>0 PAC / 0 Rounds</string>
522+
<string>0 $PAC / 0 Rounds</string>
519523
</property>
520524
</widget>
521525
</item>
@@ -674,7 +678,7 @@
674678
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Paccoin network after a connection is established, but this process has not completed yet.</string>
675679
</property>
676680
<property name="styleSheet">
677-
<string notr="true">QLabel { color: red; }</string>
681+
<string notr="true">QLabel { color: transparent; }</string>
678682
</property>
679683
<property name="text">
680684
<string notr="true">(out of sync)</string>

‎src/qt/forms/receivecoinsdialog.ui‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>776</width>
10-
<height>387</height>
9+
<width>1550</width>
10+
<height>438</height>
1111
</rect>
1212
</property>
1313
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
@@ -241,6 +241,12 @@
241241
</item>
242242
<item>
243243
<widget class="QTableView" name="recentRequestsView">
244+
<property name="minimumSize">
245+
<size>
246+
<width>0</width>
247+
<height>0</height>
248+
</size>
249+
</property>
244250
<property name="contextMenuPolicy">
245251
<enum>Qt::CustomContextMenu</enum>
246252
</property>

‎src/qt/forms/sendcoinsdialog.ui‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>850</width>
10-
<height>526</height>
10+
<height>584</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -411,7 +411,7 @@
411411
</property>
412412
</widget>
413413
</item>
414-
</layout>
414+
</layout>
415415
</item>
416416
<item>
417417
<layout class="QFormLayout" name="formLayoutCoinControl4">
@@ -587,8 +587,8 @@
587587
<rect>
588588
<x>0</x>
589589
<y>0</y>
590-
<width>830</width>
591-
<height>69</height>
590+
<width>824</width>
591+
<height>72</height>
592592
</rect>
593593
</property>
594594
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
@@ -1295,7 +1295,7 @@
12951295
</size>
12961296
</property>
12971297
<property name="text">
1298-
<string>PrivateSend</string>
1298+
<string>PrivatePAC</string>
12991299
</property>
13001300
<property name="checked">
13011301
<bool>false</bool>
@@ -1314,7 +1314,7 @@
13141314
</size>
13151315
</property>
13161316
<property name="text">
1317-
<string>InstantSend</string>
1317+
<string>InstantPAC</string>
13181318
</property>
13191319
</widget>
13201320
</item>
@@ -1368,7 +1368,7 @@
13681368
</resources>
13691369
<connections/>
13701370
<buttongroups>
1371-
<buttongroup name="groupCustomFee"/>
13721371
<buttongroup name="groupFee"/>
1372+
<buttongroup name="groupCustomFee"/>
13731373
</buttongroups>
13741374
</ui>

‎src/qt/overviewpage.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -498,28 +498,28 @@ void OverviewPage::privateSendStatus()
498498
"saved in some safe place</span>!") + "<br><br>" +
499499
tr("Note: You turn this message off in options.");
500500
ui->labelPrivateSendEnabled->setToolTip(strWarn);
501-
LogPrintf("OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n");
502-
QMessageBox::warning(this, tr("PrivateSend"), strWarn, QMessageBox::Ok, QMessageBox::Ok);
501+
LogPrintf("OverviewPage::privatePACStatus -- Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n");
502+
QMessageBox::warning(this, tr("PrivatePAC"), strWarn, QMessageBox::Ok, QMessageBox::Ok);
503503
} else {
504-
LogPrintf("OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, skipping warning and trying to create new backup...\n");
504+
LogPrintf("OverviewPage::privatePACStatus -- Very low number of keys left since last automatic backup, skipping warning and trying to create new backup...\n");
505505
}
506506

507507
std::string strBackupWarning;
508508
std::string strBackupError;
509509
if(!AutoBackupWallet(pwalletMain, "", strBackupWarning, strBackupError)) {
510510
if (!strBackupWarning.empty()) {
511511
// It's still more or less safe to continue but warn user anyway
512-
LogPrintf("OverviewPage::privateSendStatus -- WARNING! Something went wrong on automatic backup: %s\n", strBackupWarning);
512+
LogPrintf("OverviewPage::privatePACStatus -- WARNING! Something went wrong on automatic backup: %s\n", strBackupWarning);
513513

514-
QMessageBox::warning(this, tr("PrivateSend"),
514+
QMessageBox::warning(this, tr("PrivatePAC"),
515515
tr("WARNING! Something went wrong on automatic backup") + ":<br><br>" + strBackupWarning.c_str(),
516516
QMessageBox::Ok, QMessageBox::Ok);
517517
}
518518
if (!strBackupError.empty()) {
519519
// Things are really broken, warn user and stop mixing immediately
520-
LogPrintf("OverviewPage::privateSendStatus -- ERROR! Failed to create automatic backup: %s\n", strBackupError);
520+
LogPrintf("OverviewPage::privatePACStatus -- ERROR! Failed to create automatic backup: %s\n", strBackupError);
521521

522-
QMessageBox::warning(this, tr("PrivateSend"),
522+
QMessageBox::warning(this, tr("PrivatePAC"),
523523
tr("ERROR! Failed to create automatic backup") + ":<br><br>" + strBackupError.c_str() + "<br>" +
524524
tr("Mixing is disabled, please close your wallet and fix the issue!"),
525525
QMessageBox::Ok, QMessageBox::Ok);
@@ -557,10 +557,10 @@ void OverviewPage::privateSendStatus()
557557

558558
QString strStatus = QString(privateSendClient.GetStatus().c_str());
559559

560-
QString s = tr("Last PrivateSend message:\n") + strStatus;
560+
QString s = tr("Last PrivatePAC message:\n") + strStatus;
561561

562562
if(s != ui->labelPrivateSendLastMessage->text())
563-
LogPrintf("OverviewPage::privateSendStatus -- Last PrivateSend message: %s\n", strStatus.toStdString());
563+
LogPrintf("OverviewPage::privatePACStatus -- Last PrivatePAC message: %s\n", strStatus.toStdString());
564564

565565
ui->labelPrivateSendLastMessage->setText(s);
566566

@@ -580,8 +580,8 @@ void OverviewPage::privateSendAuto(){
580580
void OverviewPage::privateSendReset(){
581581
privateSendClient.ResetPool();
582582

583-
QMessageBox::warning(this, tr("PrivateSend"),
584-
tr("PrivateSend was successfully reset."),
583+
QMessageBox::warning(this, tr("PrivatePAC"),
584+
tr("PrivatePAC was successfully reset."),
585585
QMessageBox::Ok, QMessageBox::Ok);
586586
}
587587

@@ -595,17 +595,17 @@ void OverviewPage::togglePrivateSend(){
595595
// Popup some information on first mixing
596596
QString hasMixed = settings.value("hasMixed").toString();
597597
if(hasMixed.isEmpty()){
598-
QMessageBox::information(this, tr("PrivateSend"),
599-
tr("If you don't want to see internal PrivateSend fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."),
598+
QMessageBox::information(this, tr("PrivatePAC"),
599+
tr("If you don't want to see internal PrivatePAC fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."),
600600
QMessageBox::Ok, QMessageBox::Ok);
601601
settings.setValue("hasMixed", "hasMixed");
602602
}
603603
if(!privateSendClient.fEnablePrivateSend){
604604
const CAmount nMinAmount = CPrivateSend::GetSmallestDenomination() + CPrivateSend::GetMaxCollateralAmount();
605605
if(currentBalance < nMinAmount){
606606
QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, nMinAmount));
607-
QMessageBox::warning(this, tr("PrivateSend"),
608-
tr("PrivateSend requires at least %1 to use.").arg(strMinAmount),
607+
QMessageBox::warning(this, tr("PrivatePAC"),
608+
tr("PrivatePAC requires at least %1 to use.").arg(strMinAmount),
609609
QMessageBox::Ok, QMessageBox::Ok);
610610
return;
611611
}
@@ -618,10 +618,10 @@ void OverviewPage::togglePrivateSend(){
618618
{
619619
//unlock was cancelled
620620
privateSendClient.nCachedNumBlocks = std::numeric_limits<int>::max();
621-
QMessageBox::warning(this, tr("PrivateSend"),
622-
tr("Wallet is locked and user declined to unlock. Disabling PrivateSend."),
621+
QMessageBox::warning(this, tr("PrivatePAC"),
622+
tr("Wallet is locked and user declined to unlock. Disabling PrivatePAC."),
623623
QMessageBox::Ok, QMessageBox::Ok);
624-
LogPrint("privatesend", "OverviewPage::togglePrivateSend -- Wallet is locked and user declined to unlock. Disabling PrivateSend.\n");
624+
LogPrint("privatesend", "OverviewPage::togglePrivatePAC -- Wallet is locked and user declined to unlock. Disabling PrivatePAC.\n");
625625
return;
626626
}
627627
}

0 commit comments

Comments
 (0)