diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index fd3042586465d..e395dd49d1292 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -438,9 +438,9 @@ void BitcoinGUI::createActions() showHelpMessageAction->setMenuRole(QAction::NoRole); showHelpMessageAction->setStatusTip(tr("Show the $PAC Core help message to get a list with possible $PAC Core command-line options")); - showPrivateSendHelpAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&PrivateSend information"), this); + showPrivateSendHelpAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&PrivatePAC information"), this); showPrivateSendHelpAction->setMenuRole(QAction::NoRole); - showPrivateSendHelpAction->setStatusTip(tr("Show the PrivateSend basic information")); + showPrivateSendHelpAction->setStatusTip(tr("Show the PrivatePAC basic information")); connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 12d1f7f6301ec..aae7d2ab4a63a 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -441,7 +441,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column) int nRounds = pwalletMain->GetOutpointPrivateSendRounds(outpt); if (coinControl->fUsePrivateSend && nRounds < privateSendClient.nPrivateSendRounds) { QMessageBox::warning(this, windowTitle(), - tr("Non-anonymized input selected. PrivateSend will be disabled.

If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again."), + tr("Non-anonymized input selected. PrivatePAC will be disabled.

If you still want to use PrivatePAC, please deselect all non-nonymized inputs first and then check PrivatePAC checkbox again."), QMessageBox::Ok, QMessageBox::Ok); coinControl->fUsePrivateSend = false; } diff --git a/src/qt/darksendconfig.cpp b/src/qt/darksendconfig.cpp index 86fe8e74ae2ba..1ec1f51d9ddbe 100644 --- a/src/qt/darksendconfig.cpp +++ b/src/qt/darksendconfig.cpp @@ -40,9 +40,9 @@ void DarksendConfig::clickBasic() QString strAmount(BitcoinUnits::formatWithUnit( model->getOptionsModel()->getDisplayUnit(), 100000 * COIN)); - QMessageBox::information(this, tr("PrivateSend Configuration"), + QMessageBox::information(this, tr("PrivatePAC Configuration"), tr( - "PrivateSend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening $PAC's configuration screen." + "PrivatePAC was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening $PAC's configuration screen." ).arg(strAmount) ); @@ -55,9 +55,9 @@ void DarksendConfig::clickHigh() QString strAmount(BitcoinUnits::formatWithUnit( model->getOptionsModel()->getDisplayUnit(), 100000 * COIN)); - QMessageBox::information(this, tr("PrivateSend Configuration"), + QMessageBox::information(this, tr("PrivatePAC Configuration"), tr( - "PrivateSend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening $PAC's configuration screen." + "PrivatePAC was successfully set to high (%1 and 8 rounds). You can change this at any time by opening $PAC's configuration screen." ).arg(strAmount) ); @@ -72,7 +72,7 @@ void DarksendConfig::clickMax() model->getOptionsModel()->getDisplayUnit(), 100000 * COIN)); QMessageBox::information(this, tr("PrivateSend Configuration"), tr( - "PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening $PAC's configuration screen." + "PrivatePAC was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening $PAC's configuration screen." ).arg(strAmount) ); @@ -83,8 +83,8 @@ void DarksendConfig::configure(bool enabled, int coins, int rounds) { QSettings settings; - settings.setValue("nPrivateSendRounds", rounds); - settings.setValue("nPrivateSendAmount", coins); + settings.setValue("nPrivatePACRounds", rounds); + settings.setValue("nPrivatePACAmount", coins); privateSendClient.nPrivateSendRounds = rounds; privateSendClient.nPrivateSendAmount = coins; diff --git a/src/qt/forms/masternodelist.ui b/src/qt/forms/masternodelist.ui index 715764453bcc2..e4e10d2336785 100644 --- a/src/qt/forms/masternodelist.ui +++ b/src/qt/forms/masternodelist.ui @@ -7,7 +7,7 @@ 0 0 968 - 433 + 409 diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui index d098425f84fde..6de1abcac63d7 100644 --- a/src/qt/forms/modaloverlay.ui +++ b/src/qt/forms/modaloverlay.ui @@ -7,7 +7,7 @@ 0 0 640 - 401 + 382 @@ -128,7 +128,7 @@ - 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. + 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. Qt::RichText @@ -147,7 +147,7 @@ - Attempting to spend Paccoin that are affected by not-yet-displayed transactions will not be accepted by the network. + Attempting to spend $PAC that are affected by not-yet-displayed transactions will not be accepted by the network. Qt::RichText diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index ed31af99e99fe..6e35fb8fce9a9 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -54,19 +54,23 @@ + + + + Balances + + + - - 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. + + 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. - QLabel { color: red; } + QLabel { color: transparent; } - (out of sync) - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + @@ -405,7 +409,7 @@ - PrivateSend + PrivatePAC @@ -415,7 +419,7 @@ 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. - QLabel { color: red; } + QLabel { color: transparent; } (out of sync) @@ -501,7 +505,7 @@ - 0 PAC + 0 $PAC @@ -515,7 +519,7 @@ - 0 PAC / 0 Rounds + 0 $PAC / 0 Rounds @@ -674,7 +678,7 @@ 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. - QLabel { color: red; } + QLabel { color: transparent; } (out of sync) diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index dedf7c28fbb71..a5d9199816b2c 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -6,8 +6,8 @@ 0 0 - 776 - 387 + 1550 + 438 @@ -241,6 +241,12 @@ + + + 0 + 0 + + Qt::CustomContextMenu diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 78849f6bc90f7..4ec296db1b356 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -7,7 +7,7 @@ 0 0 850 - 526 + 584 @@ -411,7 +411,7 @@ - + @@ -587,8 +587,8 @@ 0 0 - 830 - 69 + 824 + 72 @@ -1295,7 +1295,7 @@ - PrivateSend + PrivatePAC false @@ -1314,7 +1314,7 @@ - InstantSend + InstantPAC @@ -1368,7 +1368,7 @@ - + diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 7a12f80337f2c..b80dc0102f96f 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -498,10 +498,10 @@ void OverviewPage::privateSendStatus() "saved in some safe place!") + "

" + tr("Note: You turn this message off in options."); ui->labelPrivateSendEnabled->setToolTip(strWarn); - LogPrintf("OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n"); - QMessageBox::warning(this, tr("PrivateSend"), strWarn, QMessageBox::Ok, QMessageBox::Ok); + LogPrintf("OverviewPage::privatePACStatus -- Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n"); + QMessageBox::warning(this, tr("PrivatePAC"), strWarn, QMessageBox::Ok, QMessageBox::Ok); } else { - LogPrintf("OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, skipping warning and trying to create new backup...\n"); + LogPrintf("OverviewPage::privatePACStatus -- Very low number of keys left since last automatic backup, skipping warning and trying to create new backup...\n"); } std::string strBackupWarning; @@ -509,17 +509,17 @@ void OverviewPage::privateSendStatus() if(!AutoBackupWallet(pwalletMain, "", strBackupWarning, strBackupError)) { if (!strBackupWarning.empty()) { // It's still more or less safe to continue but warn user anyway - LogPrintf("OverviewPage::privateSendStatus -- WARNING! Something went wrong on automatic backup: %s\n", strBackupWarning); + LogPrintf("OverviewPage::privatePACStatus -- WARNING! Something went wrong on automatic backup: %s\n", strBackupWarning); - QMessageBox::warning(this, tr("PrivateSend"), + QMessageBox::warning(this, tr("PrivatePAC"), tr("WARNING! Something went wrong on automatic backup") + ":

" + strBackupWarning.c_str(), QMessageBox::Ok, QMessageBox::Ok); } if (!strBackupError.empty()) { // Things are really broken, warn user and stop mixing immediately - LogPrintf("OverviewPage::privateSendStatus -- ERROR! Failed to create automatic backup: %s\n", strBackupError); + LogPrintf("OverviewPage::privatePACStatus -- ERROR! Failed to create automatic backup: %s\n", strBackupError); - QMessageBox::warning(this, tr("PrivateSend"), + QMessageBox::warning(this, tr("PrivatePAC"), tr("ERROR! Failed to create automatic backup") + ":

" + strBackupError.c_str() + "
" + tr("Mixing is disabled, please close your wallet and fix the issue!"), QMessageBox::Ok, QMessageBox::Ok); @@ -557,10 +557,10 @@ void OverviewPage::privateSendStatus() QString strStatus = QString(privateSendClient.GetStatus().c_str()); - QString s = tr("Last PrivateSend message:\n") + strStatus; + QString s = tr("Last PrivatePAC message:\n") + strStatus; if(s != ui->labelPrivateSendLastMessage->text()) - LogPrintf("OverviewPage::privateSendStatus -- Last PrivateSend message: %s\n", strStatus.toStdString()); + LogPrintf("OverviewPage::privatePACStatus -- Last PrivatePAC message: %s\n", strStatus.toStdString()); ui->labelPrivateSendLastMessage->setText(s); @@ -580,8 +580,8 @@ void OverviewPage::privateSendAuto(){ void OverviewPage::privateSendReset(){ privateSendClient.ResetPool(); - QMessageBox::warning(this, tr("PrivateSend"), - tr("PrivateSend was successfully reset."), + QMessageBox::warning(this, tr("PrivatePAC"), + tr("PrivatePAC was successfully reset."), QMessageBox::Ok, QMessageBox::Ok); } @@ -595,8 +595,8 @@ void OverviewPage::togglePrivateSend(){ // Popup some information on first mixing QString hasMixed = settings.value("hasMixed").toString(); if(hasMixed.isEmpty()){ - QMessageBox::information(this, tr("PrivateSend"), - tr("If you don't want to see internal PrivateSend fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), + QMessageBox::information(this, tr("PrivatePAC"), + tr("If you don't want to see internal PrivatePAC fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), QMessageBox::Ok, QMessageBox::Ok); settings.setValue("hasMixed", "hasMixed"); } @@ -604,8 +604,8 @@ void OverviewPage::togglePrivateSend(){ const CAmount nMinAmount = CPrivateSend::GetSmallestDenomination() + CPrivateSend::GetMaxCollateralAmount(); if(currentBalance < nMinAmount){ QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, nMinAmount)); - QMessageBox::warning(this, tr("PrivateSend"), - tr("PrivateSend requires at least %1 to use.").arg(strMinAmount), + QMessageBox::warning(this, tr("PrivatePAC"), + tr("PrivatePAC requires at least %1 to use.").arg(strMinAmount), QMessageBox::Ok, QMessageBox::Ok); return; } @@ -618,10 +618,10 @@ void OverviewPage::togglePrivateSend(){ { //unlock was cancelled privateSendClient.nCachedNumBlocks = std::numeric_limits::max(); - QMessageBox::warning(this, tr("PrivateSend"), - tr("Wallet is locked and user declined to unlock. Disabling PrivateSend."), + QMessageBox::warning(this, tr("PrivatePAC"), + tr("Wallet is locked and user declined to unlock. Disabling PrivatePAC."), QMessageBox::Ok, QMessageBox::Ok); - LogPrint("privatesend", "OverviewPage::togglePrivateSend -- Wallet is locked and user declined to unlock. Disabling PrivateSend.\n"); + LogPrint("privatesend", "OverviewPage::togglePrivatePAC -- Wallet is locked and user declined to unlock. Disabling PrivatePAC.\n"); return; } } diff --git a/src/qt/paccoinstrings.cpp b/src/qt/paccoinstrings.cpp index d2d5359ca9c6d..ba85e49ff7f3c 100644 --- a/src/qt/paccoinstrings.cpp +++ b/src/qt/paccoinstrings.cpp @@ -51,8 +51,8 @@ QT_TRANSLATE_NOOP("paccoin-core", "" "Delete all wallet transactions and only recover those parts of the " "blockchain through -rescan on startup"), QT_TRANSLATE_NOOP("paccoin-core", "" -"Disable all Paccoin specific functionality (Masternodes, PrivateSend, " -"InstantSend, Governance) (0-1, default: %u)"), +"Disable all Paccoin specific functionality (Masternodes, PrivatePAC, " +"InstantPAC, Governance) (0-1, default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "" "Discover own IP addresses (default: 1 when listening and no -externalip or -" "proxy)"), @@ -62,13 +62,13 @@ QT_TRANSLATE_NOOP("paccoin-core", "" QT_TRANSLATE_NOOP("paccoin-core", "" "Do not keep transactions in the mempool longer than hours (default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "" -"Enable InstantSend, show confirmations for locked transactions (0-1, " +"Enable InstantPAC, show confirmations for locked transactions (0-1, " "default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "" -"Enable multiple PrivateSend mixing sessions per block, experimental (0-1, " +"Enable multiple PrivatePAC mixing sessions per block, experimental (0-1, " "default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "" -"Enable use of automated PrivateSend for funds stored in this wallet (0-1, " +"Enable use of automated PrivatePAC for funds stored in this wallet (0-1, " "default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "" "Error loading %s: You can't enable HD on a already existing non-HD wallet"), @@ -81,7 +81,7 @@ QT_TRANSLATE_NOOP("paccoin-core", "" "Execute command when a relevant alert is received or we see a really long " "fork (%s in cmd is replaced by message)"), QT_TRANSLATE_NOOP("paccoin-core", "" -"Execute command when a wallet InstantSend transaction is successfully locked " +"Execute command when a wallet InstantPAC transaction is successfully locked " "(%s in cmd is replaced by TxID)"), QT_TRANSLATE_NOOP("paccoin-core", "" "Execute command when a wallet transaction changes (%s in cmd is replaced by " @@ -118,10 +118,10 @@ QT_TRANSLATE_NOOP("paccoin-core", "" "potentially skip their script verification (0 to verify all, default: %s, " "testnet: %s)"), QT_TRANSLATE_NOOP("paccoin-core", "" -"InstantSend doesn't support sending values that high yet. Transactions are " +"InstantPAC doesn't support sending values that high yet. Transactions are " "currently limited to %1 PAC."), QT_TRANSLATE_NOOP("paccoin-core", "" -"InstantSend requires inputs with at least %d confirmations, you might need " +"InstantPAC requires inputs with at least %d confirmations, you might need " "to wait a few minutes and try again."), QT_TRANSLATE_NOOP("paccoin-core", "" "Invalid amount for -maxtxfee=: '%s' (must be at least the minrelay " @@ -160,10 +160,10 @@ QT_TRANSLATE_NOOP("paccoin-core", "" "Please check that your computer's date and time are correct! If your clock " "is wrong Paccoin Core will not work properly."), QT_TRANSLATE_NOOP("paccoin-core", "" -"PrivateSend uses exact denominated amounts to send funds, you might simply " +"PrivatePAC uses exact denominated amounts to send funds, you might simply " "need to anonymize some more coins."), QT_TRANSLATE_NOOP("paccoin-core", "" -"Provide liquidity to PrivateSend by infrequently mixing coins on a continual " +"Provide liquidity to PrivatePAC by infrequently mixing coins on a continual " "basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, " "low fees)"), QT_TRANSLATE_NOOP("paccoin-core", "" @@ -223,9 +223,9 @@ QT_TRANSLATE_NOOP("paccoin-core", "" QT_TRANSLATE_NOOP("paccoin-core", "" "Unable to bind to %s on this computer. Paccoin Core is probably already running."), QT_TRANSLATE_NOOP("paccoin-core", "" -"Unable to locate enough PrivateSend denominated funds for this transaction."), +"Unable to locate enough PrivatePAC denominated funds for this transaction."), QT_TRANSLATE_NOOP("paccoin-core", "" -"Unable to locate enough PrivateSend non-denominated funds for this " +"Unable to locate enough PrivatePAC non-denominated funds for this " "transaction that are not equal 1000 PAC."), QT_TRANSLATE_NOOP("paccoin-core", "" "Unable to locate enough funds for this transaction that are not equal 1000 " @@ -342,10 +342,10 @@ QT_TRANSLATE_NOOP("paccoin-core", "Do you want to rebuild the block database now QT_TRANSLATE_NOOP("paccoin-core", "Done loading"), QT_TRANSLATE_NOOP("paccoin-core", "ERROR! Failed to create automatic backup"), QT_TRANSLATE_NOOP("paccoin-core", "Enable publish hash block in
"), -QT_TRANSLATE_NOOP("paccoin-core", "Enable publish hash transaction (locked via InstantSend) in
"), +QT_TRANSLATE_NOOP("paccoin-core", "Enable publish hash transaction (locked via InstantPAC) in
"), QT_TRANSLATE_NOOP("paccoin-core", "Enable publish hash transaction in
"), QT_TRANSLATE_NOOP("paccoin-core", "Enable publish raw block in
"), -QT_TRANSLATE_NOOP("paccoin-core", "Enable publish raw transaction (locked via InstantSend) in
"), +QT_TRANSLATE_NOOP("paccoin-core", "Enable publish raw transaction (locked via InstantPAC) in
"), QT_TRANSLATE_NOOP("paccoin-core", "Enable publish raw transaction in
"), QT_TRANSLATE_NOOP("paccoin-core", "Enable the client to act as a masternode (0-1, default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "Enable transaction replacement in the memory pool (default: %u)"), @@ -387,7 +387,7 @@ QT_TRANSLATE_NOOP("paccoin-core", "Incorrect or no genesis block found. Wrong da QT_TRANSLATE_NOOP("paccoin-core", "Information"), QT_TRANSLATE_NOOP("paccoin-core", "Initialization sanity check failed. Paccoin Core is shutting down."), QT_TRANSLATE_NOOP("paccoin-core", "Input is not valid."), -QT_TRANSLATE_NOOP("paccoin-core", "InstantSend options:"), +QT_TRANSLATE_NOOP("paccoin-core", "InstantPAC options:"), QT_TRANSLATE_NOOP("paccoin-core", "Insufficient funds."), QT_TRANSLATE_NOOP("paccoin-core", "Invalid -onion address: '%s'"), QT_TRANSLATE_NOOP("paccoin-core", "Invalid -proxy address: '%s'"), @@ -407,8 +407,8 @@ QT_TRANSLATE_NOOP("paccoin-core", "Keep N PAC anonymized (default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "Keep at most unconnectable transactions in memory (default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "Keep the transaction memory pool below megabytes (default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "Keypool ran out, please call keypoolrefill first"), -QT_TRANSLATE_NOOP("paccoin-core", "Last PrivateSend was too recent."), -QT_TRANSLATE_NOOP("paccoin-core", "Last successful PrivateSend action was too recent."), +QT_TRANSLATE_NOOP("paccoin-core", "Last PrivatePAC was too recent."), +QT_TRANSLATE_NOOP("paccoin-core", "Last successful PrivatePAC action was too recent."), QT_TRANSLATE_NOOP("paccoin-core", "Line: %d"), QT_TRANSLATE_NOOP("paccoin-core", "Listen for JSON-RPC connections on (default: %u or testnet: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "Listen for connections on (default: %u or testnet: %u)"), @@ -453,10 +453,10 @@ QT_TRANSLATE_NOOP("paccoin-core", "Password for JSON-RPC connections"), QT_TRANSLATE_NOOP("paccoin-core", "Port: %d"), QT_TRANSLATE_NOOP("paccoin-core", "Prepend debug output with timestamp (default: %u)"), QT_TRANSLATE_NOOP("paccoin-core", "Print version and exit"), -QT_TRANSLATE_NOOP("paccoin-core", "PrivateSend is idle."), -QT_TRANSLATE_NOOP("paccoin-core", "PrivateSend options:"), -QT_TRANSLATE_NOOP("paccoin-core", "PrivateSend request complete:"), -QT_TRANSLATE_NOOP("paccoin-core", "PrivateSend request incomplete:"), +QT_TRANSLATE_NOOP("paccoin-core", "PrivatePAC is idle."), +QT_TRANSLATE_NOOP("paccoin-core", "PrivatePAC options:"), +QT_TRANSLATE_NOOP("paccoin-core", "PrivatePAC request complete:"), +QT_TRANSLATE_NOOP("paccoin-core", "PrivatePAC request incomplete:"), QT_TRANSLATE_NOOP("paccoin-core", "Prune cannot be configured with a negative value."), QT_TRANSLATE_NOOP("paccoin-core", "Prune mode is incompatible with -txindex."), QT_TRANSLATE_NOOP("paccoin-core", "Pruning blockstore..."), diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index 41fc59b5eb9bc..670126f310824 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -149,7 +149,7 @@ void ReceiveRequestDialog::update() html += ""+tr("Label")+": " + GUIUtil::HtmlEscape(info.label) + "
"; if(!info.message.isEmpty()) html += ""+tr("Message")+": " + GUIUtil::HtmlEscape(info.message) + "
"; - html += ""+tr("InstantSend")+": " + (info.fUseInstantSend ? tr("Yes") : tr("No")) + "
"; + html += ""+tr("InstantPAC")+": " + (info.fUseInstantSend ? tr("Yes") : tr("No")) + "
"; ui->outUri->setText(html); #ifdef USE_QRCODE diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index c8790c77468fe..c13df877536dc 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -751,7 +751,7 @@ QDialog#AboutDialog { background-color:#F8F6F6; } -QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ +QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About PAC Contents */ margin-left:10px; } @@ -774,7 +774,10 @@ padding-right:5px; /* OVERVIEW SCREEN */ QWidget .QFrame#frame { /* Wallet Balance */ -min-width:490px; +background-color:transparent; +/*max-width: 451px;*/ +min-width: 451px; +max-height: 350px; } QWidget .QFrame#frame > .QLabel { @@ -783,18 +786,35 @@ font-weight:normal; min-height:30px; } +/*QWidget .QFrame#frame .QHBoxLayout#HorizontalLayout_4 { +background-color:transparent; +max-width: 421px; +min-width: 421px; +max-height: 350px; +}*/ + + QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ -qproperty-alignment: 'AlignVCenter | AlignRight'; -min-width:160px; -background-color:#F8F6F6; +qproperty-alignment: 'AlignVCenter | AlignCenter'; +max-width: 421px; +min-width: 421px; +/*background-color:#F8F6F6;*/ +background-color:#CCC7C7; color:#000000; -margin-right:5px; -padding-right:5px; +margin-right: 5px; +padding-right: 5px; +font-weight:bold; +font-size:14px; +min-height:35px; +max-height:35px; + } QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; -margin-left:3px; +margin-left:2px; +padding-right:5px; + } QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ @@ -812,7 +832,8 @@ margin-left:16px; QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; -background-color:#F8F6F6; +/*background-color:#F8F6F6;*/ +background-color:transparent; color:#000000; margin-right:5px; padding-right:5px; @@ -826,6 +847,7 @@ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:16px; color:#000000; margin-left:0px; +background-color:transparent; /*font-weight: bold;*/ } @@ -839,7 +861,8 @@ QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; font-size:12px; -background-color:#F8F6F6; +/*background-color:#F8F6F6;*/ +background-color:transparent; margin-right:5px; padding-right:5px; } @@ -860,7 +883,8 @@ QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; font-size:12px; -background-color:#F8F6F6; +/*background-color:#F8F6F6;*/ +background-color:transparent; margin-right:5px; padding-right:5px; } @@ -881,7 +905,8 @@ QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; font-size:12px; -background-color:#F8F6F6; +/*background-color:#F8F6F6;*/ +background-color: transparent; margin-right:5px; padding-right:5px; } @@ -916,7 +941,8 @@ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend qproperty-alignment: 'AlignVCenter | AlignCenter'; max-width: 421px; min-width: 421px; -background-color:#F8F6F6; +/*background-color:#F8F6F6;*/ +background-color:#CCC7C7; color:#000000; margin-right: 5px; padding-right: 5px; @@ -1313,7 +1339,8 @@ padding-left:10px; /* SEND COINS ENTRY */ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ -background-color:#F8F6F6; +/*background-color:#F8F6F6;*/ +background-color:transparent min-width:102px; font-weight:normal; /*font-size:11px;*/ @@ -1325,7 +1352,8 @@ padding-right:5px; QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { color: #000000; -background-color:#F8F6F6; +/*background-color:#F8F6F6;*/ +background-color: transparent; } QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field */ @@ -1501,7 +1529,7 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin /* RECEIVE COINS */ QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2 { /* Label Label */ -background-color:#F8F6F6; +background-color:transparent; border: 0px solid #fff; min-width:102px; color:#333; @@ -1511,7 +1539,7 @@ padding-right:5px; } QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label { /* Amount Label */ -background-color:#F8F6F6; +background-color:#transparent; border: 0px solid #333; min-width:102px; /*color:#ffffff;*/ @@ -1521,7 +1549,7 @@ padding-right:5px; } QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3 { /* Message Label */ -background-color:#F8F6F6; +background-color:#transparent; border: 0px solid #fff; min-width:102px; color:#333; diff --git a/src/qt/res/images/light/drkblue_walletFrame_bg.png b/src/qt/res/images/light/drkblue_walletFrame_bg.png index 7457982d4f2d6..dceb6d56a2095 100644 Binary files a/src/qt/res/images/light/drkblue_walletFrame_bg.png and b/src/qt/res/images/light/drkblue_walletFrame_bg.png differ diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 4242dfba04e68..2c51400e7b96f 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -261,7 +261,7 @@ void SendCoinsDialog::on_sendButton_clicked() BitcoinUnits::formatWithUnit( model->getOptionsModel()->getDisplayUnit(), CPrivateSend::GetSmallestDenomination())); strFee = QString(tr( - "(privatesend requires this amount to be rounded up to the nearest %1)." + "(privatepac requires this amount to be rounded up to the nearest %1)." ).arg(strNearestAmount)); } else { recipients[0].inputType = ALL_COINS; @@ -271,7 +271,7 @@ void SendCoinsDialog::on_sendButton_clicked() if(ui->checkUseInstantSend->isChecked()) { recipients[0].fUseInstantSend = true; strFunds += " "; - strFunds += tr("and InstantSend"); + strFunds += tr("and InstantPAC"); } else { recipients[0].fUseInstantSend = false; } diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 3c6887a84fe10..f24d4c3f726ff 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -59,11 +59,11 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) // InstantSend strTxStatus += " ("; if(instantsend.IsLockedInstantSendTransaction(wtx.GetHash())) { - strTxStatus += tr("verified via InstantSend"); + strTxStatus += tr("verified via InstantPAC"); } else if(!instantsend.IsTxLockCandidateTimedOut(wtx.GetHash())) { - strTxStatus += tr("InstantSend verification in progress - %1 of %2 signatures").arg(nSignatures).arg(nSignaturesMax); + strTxStatus += tr("InstantPAC verification in progress - %1 of %2 signatures").arg(nSignatures).arg(nSignaturesMax); } else { - strTxStatus += tr("InstantSend verification failed"); + strTxStatus += tr("InstantPAC verification failed"); } strTxStatus += ")"; diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 5ba8e02229e7f..d4c3364fd9b19 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -374,7 +374,7 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const case TransactionRecord::RecvFromOther: return tr("Received from"); case TransactionRecord::RecvWithPrivateSend: - return tr("Received via PrivateSend"); + return tr("Received via PrivatePAC"); case TransactionRecord::SendToAddress: case TransactionRecord::SendToOther: return tr("Sent to"); @@ -384,15 +384,15 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const return tr("Mined"); case TransactionRecord::PrivateSendDenominate: - return tr("PrivateSend Denominate"); + return tr("PrivatePAC Denominate"); case TransactionRecord::PrivateSendCollateralPayment: - return tr("PrivateSend Collateral Payment"); + return tr("PrivatePAC Collateral Payment"); case TransactionRecord::PrivateSendMakeCollaterals: - return tr("PrivateSend Make Collateral Inputs"); + return tr("PrivatePAC Make Collateral Inputs"); case TransactionRecord::PrivateSendCreateDenominations: - return tr("PrivateSend Create Denominations"); + return tr("PrivatePAC Create Denominations"); case TransactionRecord::PrivateSend: - return tr("PrivateSend"); + return tr("PrivatePAC"); default: return QString(); diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 56de76d97b9f3..61a4d4c97c449 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -93,11 +93,11 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther)); typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) | TransactionFilterProxy::TYPE(TransactionRecord::SendToOther)); - typeWidget->addItem(tr("PrivateSend"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSend)); - typeWidget->addItem(tr("PrivateSend Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendMakeCollaterals)); - typeWidget->addItem(tr("PrivateSend Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendCreateDenominations)); - typeWidget->addItem(tr("PrivateSend Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendDenominate)); - typeWidget->addItem(tr("PrivateSend Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendCollateralPayment)); + typeWidget->addItem(tr("PrivatePAC"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSend)); + typeWidget->addItem(tr("PrivatePAC Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendMakeCollaterals)); + typeWidget->addItem(tr("PrivatePAC Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendCreateDenominations)); + typeWidget->addItem(tr("PrivatePAC Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendDenominate)); + typeWidget->addItem(tr("PrivatePAC Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::PrivateSendCollateralPayment)); typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf)); typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated)); typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other)); diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 4511eb0f522af..e67ec2ed04bc6 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -128,19 +128,19 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, HelpMode helpMode) : ui->scrollArea->setVisible(false); ui->aboutLogo->setVisible(false); } else if (helpMode == pshelp) { - setWindowTitle(tr("PrivateSend information")); + setWindowTitle(tr("PrivatePAC information")); ui->aboutMessage->setTextFormat(Qt::RichText); ui->scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); ui->aboutMessage->setText(tr("\ -

PrivateSend Basics

\ -PrivateSend gives you true financial privacy by obscuring the origins of your funds. \ +

PrivatePAC Basics

\ +PrivatePAC gives you true financial privacy by obscuring the origins of your funds. \ All the $PAC in your wallet is comprised of different \"inputs\" which you can think of as separate, discrete coins.
\ -PrivateSend uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. \ +PrivatePAC uses an innovative process to mix your inputs with the inputs of two other people, without having your coins ever leave your wallet. \ You retain control of your money at all times..
\ -The PrivateSend process works like this:\ +The PrivatePAC process works like this:\
    \ -
  1. PrivateSend begins by breaking your transaction inputs down into standard denominations. \ +
  2. PrivatePAC begins by breaking your transaction inputs down into standard denominations. \ These denominations are 0.01 $PAC, 0.1 $PAC, 1 $PAC and $10 PAC -- sort of like the paper money you use every day.
    3. \
  3. Your wallet then sends requests to specially configured software nodes on the network, called \"masternodes.\" \ These masternodes are informed then that you are interested in mixing a certain denomination. \ @@ -149,14 +149,14 @@ No identifiable information is sent to the masternodes, so they never know \"who The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. \ Your wallet pays that denomination directly to itself, but in a different address (called a change address).
    4. \
  4. In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. \ -Each time the process is completed, it's called a \"round.\" Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.
    5. \ +Each time the process is completed, it's called a \"round.\" Each round of PrivatePAC makes it exponentially more difficult to determine where your funds originated. \
  5. This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, \ your funds will already be anonymized. No additional waiting is required.
    6. \
\ IMPORTANT: Your wallet only contains 1000 of these \"change addresses.\" Every time a mixing event happens, up to 9 of your addresses are used up. \ This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. \ It can only do this, however, if you have automatic backups enabled.
\ -Consequently, users who have backups disabled will also have PrivateSend disabled.
\ +Consequently, users who have backups disabled will also have PrivatePAC disabled.
\ ")); //For more info see https://paccoinpay.atlassian.net/wiki/display/DOC/PrivateSend \ // ")); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 792ae68b6efa2..d96f48836ef92 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -307,7 +307,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact CReserveKey *keyChange = transaction.getPossibleKeyChange(); if(recipients[0].fUseInstantSend && total > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN){ - Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 PAC.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)), + Q_EMIT message(tr("Send Coins"), tr("InstantPAC doesn't support sending values that high yet. Transactions are currently limited to %1 PAC.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)), CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; } @@ -319,12 +319,12 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact if(recipients[0].fUseInstantSend) { if(newTx->GetValueOut() > sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)*COIN) { - Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 PAC.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)), + Q_EMIT message(tr("Send Coins"), tr("InstantPAC doesn't support sending values that high yet. Transactions are currently limited to %1 PAC.").arg(sporkManager.GetSporkValue(SPORK_5_INSTANTSEND_MAX_VALUE)), CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; } if(newTx->vin.size() > CTxLockRequest::WARN_MANY_INPUTS) { - Q_EMIT message(tr("Send Coins"), tr("Used way too many inputs (>%1) for this InstantSend transaction, fees could be huge.").arg(CTxLockRequest::WARN_MANY_INPUTS), + Q_EMIT message(tr("Send Coins"), tr("Used way too many inputs (>%1) for this InstantPAC transaction, fees could be huge.").arg(CTxLockRequest::WARN_MANY_INPUTS), CClientUIInterface::MSG_WARNING); } }