refactor: PrivateSend -> CoinJoin + Move the tab

src/privatesend/privatesend-client.cpp

@@ -315,7 +315,7 @@ std::string CPrivateSendClientSession::GetStatus(bool fWaitForBlock)
 
     switch (nState) {
     case POOL_STATE_IDLE:
-        return _("PrivateSend is idle.");
+        return _("CoinJoin is idle.");
     case POOL_STATE_QUEUE:
         if (nStatusMessageProgress % 70 <= 30)
             strSuffix = ".";
@@ -337,7 +337,7 @@ std::string CPrivateSendClientSession::GetStatus(bool fWaitForBlock)
             strSuffix = "...";
         return strprintf(_("Found enough users, signing ( waiting %s )"), strSuffix);
     case POOL_STATE_ERROR:
-        return _("PrivateSend request incomplete:") + " " + strLastMessage + " " + _("Will retry...");
+        return _("CoinJoin request incomplete:") + " " + strLastMessage + " " + _("Will retry...");
     default:
         return strprintf(_("Unknown state: id = %u"), nState);
     }
@@ -982,7 +982,7 @@ bool CPrivateSendClientManager::DoAutomaticDenominating(CConnman& connman, bool
 
         if (WaitForAnotherBlock()) {
             LogPrint(BCLog::PRIVATESEND, "CPrivateSendClientManager::DoAutomaticDenominating -- Last successful PrivateSend action was too recent\n");
-            strAutoDenomResult = _("Last successful PrivateSend action was too recent.");
+            strAutoDenomResult = _("Last successful CoinJoin action was too recent.");
             return false;
         }
 
@@ -1297,7 +1297,7 @@ bool CPrivateSendClientSession::SelectDenominate(std::string& strErrorRet, std::
     }
 
     if (GetEntriesCount() > 0) {
-        strErrorRet = "Already have pending entries in the PrivateSend pool";
+        strErrorRet = "Already have pending entries in the CoinJoin pool";
         return false;
     }
 

src/privatesend/privatesend.cpp

@@ -499,7 +499,7 @@ std::string CPrivateSend::GetMessageByID(PoolMessage nMessageID)
     case ERR_QUEUE_FULL:
         return _("Masternode queue is full.");
     case ERR_RECENT:
-        return _("Last PrivateSend was too recent.");
+        return _("Last CoinJoin was too recent.");
     case ERR_SESSION:
         return _("Session not complete!");
     case ERR_MISSING_TX:

src/qt/bitcoingui.cpp

@@ -374,8 +374,8 @@ void BitcoinGUI::createActions()
     sendCoinsMenuAction->setStatusTip(tr("Send coins to a Dash address"));
     sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip());
 
-    privateSendCoinsMenuAction = new QAction("&PrivateSend", this);
-    privateSendCoinsMenuAction->setStatusTip(tr("PrivateSend coins to a Dash address"));
+    privateSendCoinsMenuAction = new QAction("&CoinJoin", this);
+    privateSendCoinsMenuAction->setStatusTip(tr("Send CoinJoin funds to a Dash address"));
     privateSendCoinsMenuAction->setToolTip(privateSendCoinsMenuAction->statusTip());
 
     receiveCoinsMenuAction = new QAction(tr("&Receive"), this);
@@ -458,9 +458,9 @@ void BitcoinGUI::createActions()
     showHelpMessageAction->setMenuRole(QAction::NoRole);
     showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Dash command-line options").arg(tr(PACKAGE_NAME)));
 
-    showPrivateSendHelpAction = new QAction(tr("&PrivateSend information"), this);
+    showPrivateSendHelpAction = new QAction(tr("&CoinJoin information"), this);
     showPrivateSendHelpAction->setMenuRole(QAction::NoRole);
-    showPrivateSendHelpAction->setStatusTip(tr("Show the PrivateSend basic information"));
+    showPrivateSendHelpAction->setStatusTip(tr("Show the CoinJoin basic information"));
 
     connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
@@ -593,11 +593,6 @@ void BitcoinGUI::createToolBars()
         sendCoinsButton->setStatusTip(sendCoinsMenuAction->statusTip());
         tabGroup->addButton(sendCoinsButton);
 
-        privateSendCoinsButton = new QToolButton(this);
-        privateSendCoinsButton->setText(privateSendCoinsMenuAction->text());
-        privateSendCoinsButton->setStatusTip(privateSendCoinsMenuAction->statusTip());
-        tabGroup->addButton(privateSendCoinsButton);
-
         receiveCoinsButton = new QToolButton(this);
         receiveCoinsButton->setText(receiveCoinsMenuAction->text());
         receiveCoinsButton->setStatusTip(receiveCoinsMenuAction->statusTip());
@@ -608,6 +603,11 @@ void BitcoinGUI::createToolBars()
         historyButton->setStatusTip(tr("Browse transaction history"));
         tabGroup->addButton(historyButton);
 
+        privateSendCoinsButton = new QToolButton(this);
+        privateSendCoinsButton->setText(privateSendCoinsMenuAction->text());
+        privateSendCoinsButton->setStatusTip(privateSendCoinsMenuAction->statusTip());
+        tabGroup->addButton(privateSendCoinsButton);
+
         QSettings settings;
         if (settings.value("fShowMasternodesTab").toBool()) {
             masternodeButton = new QToolButton(this);
@@ -1152,7 +1152,7 @@ void BitcoinGUI::updatePrivateSendVisibility()
     // Hiding the QToolButton itself doesn't work for the GUI part
     // but is still needed for shortcuts to work properly.
     if (appToolBar != nullptr) {
-        appToolBar->actions()[2]->setVisible(fEnabled);
+        appToolBar->actions()[4]->setVisible(fEnabled);
         privateSendCoinsButton->setVisible(fEnabled);
         GUIUtil::updateButtonGroupShortcuts(tabGroup);
     }

src/qt/coincontroldialog.cpp

@@ -668,11 +668,11 @@ void CoinControlDialog::updateView()
         if (fHideAdditional) {
             strHideButton = tr("Show all coins");
         } else {
-            strHideButton = tr("Hide PrivateSend coins");
+            strHideButton = tr("Hide CoinJoin coins");
         }
     } else {
         if (fHideAdditional) {
-            strHideButton = tr("Show all PrivateSend coins");
+            strHideButton = tr("Show all CoinJoin coins");
         } else {
             strHideButton = tr("Show spendable coins only");
         }

src/qt/forms/optionsdialog.ui

@@ -54,7 +54,7 @@
      <item>
       <widget class="QPushButton" name="btnPrivateSend">
        <property name="text">
-        <string>PrivateSend</string>
+        <string>CoinJoin</string>
        </property>
        <property name="checkable">
         <bool>true</bool>
@@ -278,10 +278,10 @@
           <item>
            <widget class="QCheckBox" name="privateSendEnabled">
             <property name="toolTip">
-             <string>Show mixing interface on Overview screen and reveal PrivateSend screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</string>
+             <string>Show mixing interface on Overview screen and reveal CoinJoin screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</string>
             </property>
             <property name="text">
-             <string>Enable PrivateSend features</string>
+             <string>Enable CoinJoin features</string>
             </property>
            </widget>
           </item>
@@ -307,40 +307,40 @@
        <item>
         <widget class="QCheckBox" name="showAdvancedPSUI">
          <property name="toolTip">
-          <string>Show additional information and buttons for PrivateSend on overview screen.</string>
+          <string>Show additional information and buttons for CoinJoin on overview screen.</string>
          </property>
          <property name="text">
-          <string>Enable advanced PrivateSend interface</string>
+          <string>Enable advanced CoinJoin interface</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="showPrivateSendPopups">
          <property name="toolTip">
-          <string>Show system popups for PrivateSend mixing transactions&lt;br/&gt;just like for all other transaction types.</string>
+          <string>Show system popups for CoinJoin mixing transactions&lt;br/&gt;just like for all other transaction types.</string>
          </property>
          <property name="text">
-          <string>Show popups for PrivateSend transactions</string>
+          <string>Show popups for CoinJoin transactions</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="lowKeysWarning">
          <property name="toolTip">
-          <string>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</string>
+          <string>Show warning dialog when CoinJoin detects that wallet has very low number of keys left.</string>
          </property>
          <property name="text">
-          <string>Warn if PrivateSend is running out of keys</string>
+          <string>Warn if CoinJoin is running out of keys</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="privateSendMultiSession">
          <property name="toolTip">
-          <string>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</string>
+          <string>Whether to use experimental CoinJoin mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</string>
          </property>
          <property name="text">
-          <string>Enable PrivateSend &amp;multi-session</string>
+          <string>Enable CoinJoin &amp;multi-session</string>
          </property>
         </widget>
        </item>
@@ -352,7 +352,7 @@
             <string>This setting determines the amount of individual masternodes that an input will be mixed through.&lt;br/&gt;More rounds of mixing gives a higher degree of privacy, but also costs more in fees.</string>
            </property>
            <property name="text">
-            <string>PrivateSend rounds to use</string>
+            <string>CoinJoin rounds to use</string>
            </property>
           </widget>
          </item>
@@ -376,7 +376,7 @@
          <item>
           <widget class="QLabel" name="lblPrivateSendAmountText">
            <property name="toolTip">
-            <string>This amount acts as a threshold to turn off PrivateSend once it's reached.</string>
+            <string>This amount acts as a threshold to turn off CoinJoin once it's reached.</string>
            </property>
            <property name="statusTip">
             <string notr="true"/>
@@ -391,7 +391,7 @@
             <string notr="true"/>
            </property>
            <property name="text">
-            <string>Target PrivateSend balance</string>
+            <string>Target CoinJoin balance</string>
            </property>
           </widget>
          </item>

src/qt/forms/overviewpage.ui

@@ -368,7 +368,7 @@
             <item>
              <widget class="QLabel" name="labelPrivateSendHeader">
               <property name="text">
-               <string>PrivateSend</string>
+               <string>CoinJoin</string>
               </property>
              </widget>
             </item>
@@ -448,7 +448,7 @@
             <item row="2" column="0">
              <widget class="QLabel" name="labelAnonymizedText">
               <property name="text">
-               <string>PrivateSend Balance:</string>
+               <string>CoinJoin Balance:</string>
               </property>
              </widget>
             </item>

src/qt/overviewpage.cpp

@@ -511,7 +511,7 @@ void OverviewPage::privateSendStatus(bool fForce)
         }
 
         setWidgetsVisible(false);
-        ui->togglePrivateSend->setText(tr("Start Mixing"));
+        ui->togglePrivateSend->setText(tr("Start CoinJoin"));
 
         QString strEnabled = tr("Disabled");
         // Show how many keys left in advanced PS UI mode only
@@ -539,7 +539,7 @@ void OverviewPage::privateSendStatus(bool fForce)
                                 tr("Note: You can turn this message off in options.");
             ui->labelPrivateSendEnabled->setToolTip(strWarn);
             LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n");
-            QMessageBox::warning(this, "PrivateSend", strWarn, QMessageBox::Ok, QMessageBox::Ok);
+            QMessageBox::warning(this, "CoinJoin", strWarn, QMessageBox::Ok, QMessageBox::Ok);
         } else {
             LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, skipping warning and trying to create new backup...\n");
         }
@@ -551,15 +551,15 @@ void OverviewPage::privateSendStatus(bool fForce)
                 // It's still more or less safe to continue but warn user anyway
                 LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- WARNING! Something went wrong on automatic backup: %s\n", strBackupWarning.toStdString());
 
-                QMessageBox::warning(this, "PrivateSend",
+                QMessageBox::warning(this, "CoinJoin",
                     tr("WARNING! Something went wrong on automatic backup") + ":<br><br>" + strBackupWarning,
                     QMessageBox::Ok, QMessageBox::Ok);
             }
             if (!strBackupError.isEmpty()) {
                 // Things are really broken, warn user and stop mixing immediately
                 LogPrint(BCLog::PRIVATESEND, "OverviewPage::privateSendStatus -- ERROR! Failed to create automatic backup: %s\n", strBackupError.toStdString());
 
-                QMessageBox::warning(this, "PrivateSend",
+                QMessageBox::warning(this, "CoinJoin",
                     tr("ERROR! Failed to create automatic backup") + ":<br><br>" + strBackupError + "<br>" +
                     tr("Mixing is disabled, please close your wallet and fix the issue!"),
                     QMessageBox::Ok, QMessageBox::Ok);
@@ -605,8 +605,8 @@ void OverviewPage::togglePrivateSend(){
     // Popup some information on first mixing
     QString hasMixed = settings.value("hasMixed").toString();
     if(hasMixed.isEmpty()){
-        QMessageBox::information(this, "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, "CoinJoin",
+                tr("If you don't want to see internal CoinJoin fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."),
                 QMessageBox::Ok, QMessageBox::Ok);
         settings.setValue("hasMixed", "hasMixed");
     }
@@ -616,8 +616,8 @@ void OverviewPage::togglePrivateSend(){
         const CAmount nMinAmount = options.getSmallestDenomination() + options.getMaxCollateralAmount();
         if(m_balances.balance < nMinAmount) {
             QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, nMinAmount));
-            QMessageBox::warning(this, "PrivateSend",
-                tr("PrivateSend requires at least %1 to use.").arg(strMinAmount),
+            QMessageBox::warning(this, "CoinJoin",
+                tr("CoinJoin requires at least %1 to use.").arg(strMinAmount),
                 QMessageBox::Ok, QMessageBox::Ok);
             return;
         }
@@ -630,10 +630,10 @@ void OverviewPage::togglePrivateSend(){
             {
                 //unlock was cancelled
                 walletModel->privateSend().resetCachedBlocks();
-                QMessageBox::warning(this, "PrivateSend",
-                    tr("Wallet is locked and user declined to unlock. Disabling PrivateSend."),
+                QMessageBox::warning(this, "CoinJoin",
+                    tr("Wallet is locked and user declined to unlock. Disabling CoinJoin."),
                     QMessageBox::Ok, QMessageBox::Ok);
-                LogPrint(BCLog::PRIVATESEND, "OverviewPage::togglePrivateSend -- Wallet is locked and user declined to unlock. Disabling PrivateSend.\n");
+                LogPrint(BCLog::PRIVATESEND, "OverviewPage::togglePrivateSend -- Wallet is locked and user declined to unlock. Disabling CoinJoin.\n");
                 return;
             }
         }
@@ -643,11 +643,11 @@ void OverviewPage::togglePrivateSend(){
     walletModel->privateSend().resetCachedBlocks();
 
     if (walletModel->privateSend().isMixing()) {
-        ui->togglePrivateSend->setText(tr("Start Mixing"));
+        ui->togglePrivateSend->setText(tr("Start CoinJoin"));
         walletModel->privateSend().resetPool();
         walletModel->privateSend().stopMixing();
     } else {
-        ui->togglePrivateSend->setText(tr("Stop Mixing"));
+        ui->togglePrivateSend->setText(tr("Stop CoinJoin"));
         walletModel->privateSend().startMixing();
     }
 }

src/qt/sendcoinsdialog.cpp

@@ -157,8 +157,8 @@ SendCoinsDialog::SendCoinsDialog(bool _fPrivateSend, QWidget* parent) :
     minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());
 
     if (_fPrivateSend) {
-        ui->sendButton->setText("PrivateS&end");
-        ui->sendButton->setToolTip(tr("Confirm the PrivateSend action"));
+        ui->sendButton->setText("Send");
+        ui->sendButton->setToolTip(tr("Confirm the send action"));
     } else {
         ui->sendButton->setText(tr("S&end"));
         ui->sendButton->setToolTip(tr("Confirm the send action"));
@@ -377,7 +377,7 @@ void SendCoinsDialog::send(QList<SendCoinsRecipient> recipients)
 
 
     if(m_coin_control->IsUsingPrivateSend()) {
-        questionString.append(tr("using") + " <b>" + tr("PrivateSend funds only") + "</b>");
+        questionString.append(tr("using") + " <b>" + tr("CoinJoin funds only") + "</b>");
     } else {
         questionString.append(tr("using") + " <b>" + tr("any available funds") + "</b>");
     }
@@ -400,7 +400,7 @@ void SendCoinsDialog::send(QList<SendCoinsRecipient> recipients)
         questionString.append(tr("are added as transaction fee"));
 
         if (m_coin_control->IsUsingPrivateSend()) {
-            questionString.append(" " + tr("(PrivateSend transactions have higher fees usually due to no change output being allowed)"));
+            questionString.append(" " + tr("(CoinJoin transactions have higher fees usually due to no change output being allowed)"));
         }
     }
 
@@ -422,7 +422,7 @@ void SendCoinsDialog::send(QList<SendCoinsRecipient> recipients)
         if (nInputs >= 10 && m_coin_control->IsUsingPrivateSend()) {
             questionString.append("<br />");
             questionString.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR) + "'>");
-            questionString.append(tr("Warning: Using PrivateSend with %1 or more inputs can harm your privacy and is not recommended").arg(10));
+            questionString.append(tr("Warning: Using CoinJoin with %1 or more inputs can harm your privacy and is not recommended").arg(10));
             questionString.append("</span> ");
         }
     }

src/qt/transactiontablemodel.cpp

@@ -380,7 +380,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 CoinJoin");
     case TransactionRecord::SendToAddress:
     case TransactionRecord::SendToOther:
         return tr("Sent to");
@@ -390,15 +390,15 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
         return tr("Mined");
 
     case TransactionRecord::PrivateSendDenominate:
-        return tr("PrivateSend Denominate");
+        return tr("CoinJoin Denominate");
     case TransactionRecord::PrivateSendCollateralPayment:
-        return tr("PrivateSend Collateral Payment");
+        return tr("CoinJoin Collateral Payment");
     case TransactionRecord::PrivateSendMakeCollaterals:
-        return tr("PrivateSend Make Collateral Inputs");
+        return tr("CoinJoin Make Collateral Inputs");
     case TransactionRecord::PrivateSendCreateDenominations:
-        return tr("PrivateSend Create Denominations");
+        return tr("CoinJoin Create Denominations");
     case TransactionRecord::PrivateSend:
-        return "PrivateSend";
+        return "CoinJoin";
 
     default:
         return QString();