Skip to content

Commit

Permalink
[GUI][Trivial] Minor edits to written content
Browse files Browse the repository at this point in the history
Github-Pull: #1184
Rebased-From: dae64f3
  • Loading branch information
random-zebra authored and Fuzzbawls committed Jan 11, 2020
1 parent ffac2a7 commit 16441e9
Show file tree
Hide file tree
Showing 24 changed files with 59 additions and 60 deletions.
2 changes: 1 addition & 1 deletion src/qt/guiutil.cpp
Expand Up @@ -140,7 +140,7 @@ void setupAddressWidget(QValidatedLineEdit* widget, QWidget* parent)
widget->setFont(bitcoinAddressFont());
// We don't want translators to use own addresses in translations
// and this is the only place, where this address is supplied.
widget->setPlaceholderText(QObject::tr("Enter a PIVX address (e.g. %1)").arg("D7VFR83SQbiezrW72hjcWJtcfip5krte2Z"));
widget->setPlaceholderText(QObject::tr("Enter PIVX address (e.g. %1)").arg("D7VFR83SQbiezrW72hjcWJtcfip5krte2Z"));
widget->setValidator(new BitcoinAddressEntryValidator(parent));
widget->setCheckValidator(new BitcoinAddressCheckValidator(parent));
}
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/addresseswidget.cpp
Expand Up @@ -112,7 +112,7 @@ AddressesWidget::AddressesWidget(PIVXGUI* parent) :
setCssEditLine(ui->lineEditName, true);

// Address
ui->labelAddress->setText(tr("Enter a PIVX address"));
ui->labelAddress->setText(tr("Enter PIVX address"));
setCssProperty(ui->labelAddress, "text-title");
ui->lineEditAddress->setPlaceholderText("e.g. D7VFR83SQbiezrW72hjc…");
setCssEditLine(ui->lineEditAddress, true);
Expand Down
16 changes: 8 additions & 8 deletions src/qt/pivx/coldstakingwidget.cpp
Expand Up @@ -96,18 +96,18 @@ ColdStakingWidget::ColdStakingWidget(PIVXGUI* parent) :
setCssProperty(ui->pushRight, "btn-check-right");

/* Subtitle */
ui->labelSubtitle1->setText(tr("You can delegate your PIVs and let a hot node (24/7 online node)\nstake in your behalf, keeping the keys in a secure place offline."));
ui->labelSubtitle1->setText(tr("You can delegate your PIVs, letting a hot node (24/7 online node)\nstake on your behalf, while you keep the keys securely offline."));
setCssSubtitleScreen(ui->labelSubtitle1);
spacerDiv = new QSpacerItem(40, 20, QSizePolicy::Maximum, QSizePolicy::Expanding);

setCssProperty(ui->labelSubtitleDescription, "text-title");
ui->lineEditOwnerAddress->setPlaceholderText(tr("Add owner address"));
ui->lineEditOwnerAddress->setPlaceholderText(tr("Enter owner address"));
btnOwnerContact = ui->lineEditOwnerAddress->addAction(QIcon("://ic-contact-arrow-down"), QLineEdit::TrailingPosition);
setCssProperty(ui->lineEditOwnerAddress, "edit-primary-multi-book");
ui->lineEditOwnerAddress->setAttribute(Qt::WA_MacShowFocusRect, 0);
setShadow(ui->lineEditOwnerAddress);

ui->labelSubtitle2->setText(tr("Delegate or Accept PIV delegation"));
ui->labelSubtitle2->setText(tr("Accept PIV delegation / Delegate PIV"));
setCssSubtitleScreen(ui->labelSubtitle2);
ui->labelSubtitle2->setContentsMargins(0,2,0,0);

Expand All @@ -118,7 +118,7 @@ ColdStakingWidget::ColdStakingWidget(PIVXGUI* parent) :

connect(ui->pushButtonClear, SIGNAL(clicked()), this, SLOT(clearAll()));

ui->labelEditTitle->setText(tr("Add the staking address"));
ui->labelEditTitle->setText(tr("Cold Staking address"));
setCssProperty(ui->labelEditTitle, "text-title");
sendMultiRow = new SendMultiRow(this);
sendMultiRow->setOnlyStakingAddressAccepted(true);
Expand All @@ -136,8 +136,8 @@ ColdStakingWidget::ColdStakingWidget(PIVXGUI* parent) :
ui->btnCoinControl->setTitleClassAndText("btn-title-grey", "Coin Control");
ui->btnCoinControl->setSubTitleClassAndText("text-subtitle", "Select PIV outputs to delegate.");

ui->btnColdStaking->setTitleClassAndText("btn-title-grey", "Create Cold Stake Address");
ui->btnColdStaking->setSubTitleClassAndText("text-subtitle", "Creates an address to receive coin\ndelegations and be able to stake them.");
ui->btnColdStaking->setTitleClassAndText("btn-title-grey", "Create Cold Staking Address");
ui->btnColdStaking->setSubTitleClassAndText("text-subtitle", "Creates an address to receive delegated coins\nand stake them on their owner's behalf.");
ui->btnColdStaking->layout()->setMargin(0);

connect(ui->btnCoinControl, SIGNAL(clicked()), this, SLOT(onCoinControlClicked()));
Expand Down Expand Up @@ -173,8 +173,8 @@ ColdStakingWidget::ColdStakingWidget(PIVXGUI* parent) :
ui->btnMyStakingAddresses->setChecked(true);
ui->listViewStakingAddress->setVisible(false);

ui->btnMyStakingAddresses->setTitleClassAndText("btn-title-grey", "My staking addresses");
ui->btnMyStakingAddresses->setSubTitleClassAndText("text-subtitle", "List your own staking addresses.");
ui->btnMyStakingAddresses->setTitleClassAndText("btn-title-grey", "My Cold Staking Addresses");
ui->btnMyStakingAddresses->setSubTitleClassAndText("text-subtitle", "List your own cold staking addresses.");
ui->btnMyStakingAddresses->layout()->setMargin(0);
ui->btnMyStakingAddresses->setRightIconClass("ic-arrow");

Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/forms/addresseswidget.ui
Expand Up @@ -229,7 +229,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>No active Master Node yet</string>
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/forms/coldstakingwidget.ui
Expand Up @@ -351,7 +351,7 @@
padding:0px;</string>
</property>
<property name="text">
<string>Owner Address (optional, if empty a new address will be created)</string>
<string>Owner address (optional, if empty a new address will be created)</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/forms/masternodeswidget.ui
Expand Up @@ -226,7 +226,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>No active Master Node yet</string>
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down
8 changes: 4 additions & 4 deletions src/qt/pivx/forms/masternodewizarddialog.ui
Expand Up @@ -690,7 +690,7 @@
</size>
</property>
<property name="text">
<string>Create New Master Node Controller</string>
<string>Create New Masternode Controller</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -802,7 +802,7 @@
</size>
</property>
<property name="text">
<string>Set Master Node’s Name</string>
<string>Set Masternode Name</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -885,7 +885,7 @@
</size>
</property>
<property name="text">
<string>Set Master Node’s IP and port</string>
<string>Set Masternode IP and Port</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -966,7 +966,7 @@
<item>
<widget class="QLabel" name="labelSubtitlePort">
<property name="text">
<string>Enter Port</string>
<string>Enter port</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/pivx/forms/mninfodialog.ui
Expand Up @@ -101,7 +101,7 @@
<string notr="true">padding-left:24px;</string>
</property>
<property name="text">
<string>Master Node Information</string>
<string>Masternode Information</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down Expand Up @@ -554,7 +554,7 @@ background:transparent;
<number>0</number>
</property>
<property name="text">
<string>Export data to run the Master Node on a remote server</string>
<string>Export data to run the Masternode on a remote server</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/forms/privacywidget.ui
Expand Up @@ -492,7 +492,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>No active Master Node yet</string>
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down
3 changes: 1 addition & 2 deletions src/qt/pivx/mninfodialog.cpp
Expand Up @@ -17,15 +17,14 @@ MnInfoDialog::MnInfoDialog(QWidget *parent) :
ui->setupUi(this);
this->setStyleSheet(parent->styleSheet());
setCssProperty(ui->frame, "container-dialog");
ui->labelTitle->setText(tr("Master Node Information"));
setCssProperty(ui->labelTitle, "text-title-dialog");
setCssTextBodyDialog({ui->labelAmount, ui->labelSend, ui->labelInputs, ui->labelFee, ui->labelId});
setCssProperty({ui->labelDivider1, ui->labelDivider4, ui->labelDivider6, ui->labelDivider7, ui->labelDivider8, ui->labelDivider9}, "container-divider");
setCssTextBodyDialog({ui->textAmount, ui->textAddress, ui->textInputs, ui->textStatus, ui->textId, ui->textExport});
setCssProperty({ui->pushCopy, ui->pushCopyId, ui->pushExport}, "ic-copy-big");
setCssProperty(ui->btnEsc, "ic-close");
connect(ui->btnEsc, SIGNAL(clicked()), this, SLOT(closeDialog()));
connect(ui->pushCopy, &QPushButton::clicked, [this](){ copyInform(pubKey, "Master Node public key copied"); });
connect(ui->pushCopy, &QPushButton::clicked, [this](){ copyInform(pubKey, "Masternode public key copied"); });
connect(ui->pushCopyId, &QPushButton::clicked, [this](){ copyInform(txId, "Collateral tx id copied"); });
connect(ui->pushExport, &QPushButton::clicked, [this](){ exportMN = true; accept(); });
}
Expand Down
6 changes: 3 additions & 3 deletions src/qt/pivx/privacywidget.cpp
Expand Up @@ -102,7 +102,7 @@ PrivacyWidget::PrivacyWidget(PIVXGUI* parent) :
ui->layoutDenom->setVisible(false);

// List
ui->labelListHistory->setText(tr("Last Zerocoin Movements"));
ui->labelListHistory->setText(tr("Last zPIV Movements"));
setCssProperty(ui->labelListHistory, "text-title");

//ui->emptyContainer->setVisible(false);
Expand Down Expand Up @@ -131,7 +131,7 @@ PrivacyWidget::PrivacyWidget(PIVXGUI* parent) :
ui->btnRescanMints->setTitleClassAndText("btn-title-grey", "Rescan Mints");
ui->btnRescanMints->setSubTitleClassAndText("text-subtitle", "Find mints in the blockchain.");

ui->btnResetZerocoin->setTitleClassAndText("btn-title-grey", "Reset Zerocoin");
ui->btnResetZerocoin->setTitleClassAndText("btn-title-grey", "Reset Spent zPIV");
ui->btnResetZerocoin->setSubTitleClassAndText("text-subtitle", "Reset zerocoin database.");

connect(ui->btnTotalzPIV, SIGNAL(clicked()), this, SLOT(onTotalZpivClicked()));
Expand Down Expand Up @@ -336,7 +336,7 @@ void PrivacyWidget::onRescanMintsClicked(){
}

void PrivacyWidget::onResetZeroClicked(){
if (ask(tr("Reset Spent Zerocoins"),
if (ask(tr("Reset Spent zPIV"),
tr("Your zerocoin spends are going to be scanned from the blockchain from scratch"))
){
std::string strResetMintResult = walletModel->resetSpentZerocoin();
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/receivewidget.cpp
Expand Up @@ -147,7 +147,7 @@ void ReceiveWidget::updateLabel(){
if (!label.isEmpty()) {
ui->labelLabel->setVisible(true);
ui->labelLabel->setText(label);
ui->pushButtonLabel->setText(tr("Change Label"));
ui->pushButtonLabel->setText(tr("Edit Label"));
}else{
ui->labelLabel->setVisible(false);
}
Expand Down
8 changes: 4 additions & 4 deletions src/qt/pivx/requestdialog.cpp
Expand Up @@ -22,10 +22,10 @@ RequestDialog::RequestDialog(QWidget *parent) :
setCssProperty(ui->frame, "container-dialog");

// Text
ui->labelTitle->setText(tr("New Request Payment"));
ui->labelTitle->setText(tr("New Payment Request"));
setCssProperty(ui->labelTitle, "text-title-dialog");

ui->labelMessage->setText(tr("Instead of only sharing a PIVX address, you can create a Payment Request message which bundles up more information than is contained in just a PIVX address."));
ui->labelMessage->setText(tr("Instead of sharing only a PIVX address, you can create a payment request, bundling up more information."));
setCssProperty(ui->labelMessage, "text-main-grey");

// Combo Coins
Expand All @@ -35,7 +35,7 @@ RequestDialog::RequestDialog(QWidget *parent) :
// Label
ui->labelSubtitleLabel->setText(tr("Label"));
setCssProperty(ui->labelSubtitleLabel, "text-title2-dialog");
ui->lineEditLabel->setPlaceholderText(tr("Enter a label to be saved within the address"));
ui->lineEditLabel->setPlaceholderText(tr("Enter a label for the address"));
setCssEditLineDialog(ui->lineEditLabel, true);

// Amount
Expand All @@ -49,7 +49,7 @@ RequestDialog::RequestDialog(QWidget *parent) :
ui->labelSubtitleDescription->setText(tr("Description (optional)"));
setCssProperty(ui->labelSubtitleDescription, "text-title2-dialog");

ui->lineEditDescription->setPlaceholderText(tr("Add description "));
ui->lineEditDescription->setPlaceholderText(tr("Enter description"));
setCssEditLineDialog(ui->lineEditDescription, true);

// Stack
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/send.cpp
Expand Up @@ -60,7 +60,7 @@ SendWidget::SendWidget(PIVXGUI* parent) :
setCssProperty(ui->labelSubtitle2, "text-subtitle");

/* Address */
ui->labelSubtitleAddress->setText(tr("Enter a PIVX address or contact label"));
ui->labelSubtitleAddress->setText(tr("PIVX address or contact label"));
setCssProperty(ui->labelSubtitleAddress, "text-title");


Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/sendchangeaddressdialog.cpp
Expand Up @@ -24,7 +24,7 @@ SendChangeAddressDialog::SendChangeAddressDialog(QWidget *parent) :
ui->labelMessage->setText(tr("The remainder of the value resultant from the inputs minus the outputs value goes to the \"change\" PIVX address"));
ui->labelMessage->setProperty("cssClass", "text-main-grey");

ui->lineEditAddress->setPlaceholderText("Enter a PIVX address (e.g D7VFR83SQbiezrW72hjc… ");
ui->lineEditAddress->setPlaceholderText("Enter PIVX address (e.g D7VFR83SQbiezrW72hjc… ");
initCssEditLine(ui->lineEditAddress, true);

// Buttons
Expand Down
6 changes: 3 additions & 3 deletions src/qt/pivx/sendmultirow.cpp
Expand Up @@ -19,7 +19,7 @@ SendMultiRow::SendMultiRow(PWidget *parent) :
ui->setupUi(this);
this->setStyleSheet(parent->styleSheet());

ui->lineEditAddress->setPlaceholderText(tr("Add address"));
ui->lineEditAddress->setPlaceholderText(tr("Enter address"));
setCssProperty(ui->lineEditAddress, "edit-primary-multi-book");
ui->lineEditAddress->setAttribute(Qt::WA_MacShowFocusRect, 0);
setShadow(ui->stackedAddress);
Expand All @@ -29,9 +29,9 @@ SendMultiRow::SendMultiRow(PWidget *parent) :
GUIUtil::setupAmountWidget(ui->lineEditAmount, this);

/* Description */
ui->labelSubtitleDescription->setText("Label address (optional)");
ui->labelSubtitleDescription->setText("Address label (optional)");
setCssProperty(ui->labelSubtitleDescription, "text-title");
ui->lineEditDescription->setPlaceholderText(tr("Add description"));
ui->lineEditDescription->setPlaceholderText(tr("Enter label"));
initCssEditLine(ui->lineEditDescription);

// Button menu
Expand Down
8 changes: 4 additions & 4 deletions src/qt/pivx/settings/forms/settingsfaqwidget.ui
Expand Up @@ -361,7 +361,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>9) What is a Master Node?</string>
<string>9) What is a Masternode?</string>
</property>
<property name="checkable">
<bool>true</bool>
Expand All @@ -383,7 +383,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="text">
<string>10) What is a Master Node Controller?</string>
<string>10) What is a Masternode Controller?</string>
</property>
<property name="checkable">
<bool>true</bool>
Expand Down Expand Up @@ -1416,7 +1416,7 @@
<item>
<widget class="QLabel" name="labelSubtitle9">
<property name="text">
<string>What is a Master Node?</string>
<string>What is a Masternode?</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down Expand Up @@ -1547,7 +1547,7 @@
<item>
<widget class="QLabel" name="labelSubtitle10">
<property name="text">
<string>What is a Master Node Controller?</string>
<string>What is a Masternode Controller?</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/pivx/settings/forms/settingsmultisendwidget.ui
Expand Up @@ -310,7 +310,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>No active Master Node yet</string>
<string>N/A</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/pivx/settings/settingsbackupwallet.cpp
Expand Up @@ -31,7 +31,7 @@ SettingsBackupWallet::SettingsBackupWallet(PIVXGUI* _window, QWidget *parent) :
ui->labelDivider->setProperty("cssClass", "container-divider");

// Subtitle
ui->labelSubtitle1->setText(tr("Keep your wallet safe doing regular backups, store your backup file externally.\nThis option creates a wallet.dat file that can be used to recover your whole balance (transactions and addresses) from another device."));
ui->labelSubtitle1->setText(tr("Keep your wallet safe by doing regular backups and storing your backup file externally.\nThis option creates a wallet.dat file that can be used to recover your whole balance (transactions and addresses) on another device."));
ui->labelSubtitle1->setProperty("cssClass", "text-subtitle");

ui->labelSubtitle_2->setText(tr("This will decrypt the whole wallet data and encrypt it back with the new passphrase.\nRemember to write it down and store it safely, otherwise you might lose access to your funds."));
Expand All @@ -41,7 +41,7 @@ SettingsBackupWallet::SettingsBackupWallet(PIVXGUI* _window, QWidget *parent) :
ui->labelSubtitleLocation->setText(tr("Where"));
ui->labelSubtitleLocation->setProperty("cssClass", "text-title");

ui->pushButtonDocuments->setText(tr("Set a folder location"));
ui->pushButtonDocuments->setText(tr("Select folder..."));
ui->pushButtonDocuments->setProperty("cssClass", "btn-edit-primary-folder");
setShadow(ui->pushButtonDocuments);

Expand Down Expand Up @@ -74,7 +74,7 @@ void SettingsBackupWallet::backupWallet()
if(walletModel && !filename.isEmpty()) {
inform(walletModel->backupWallet(filename) ? tr("Backup created") : tr("Backup creation failed"));
filename = QString();
ui->pushButtonDocuments->setText(tr("Set a folder location"));
ui->pushButtonDocuments->setText(tr("Select folder..."));
} else {
inform(tr("Please select a folder to export the backup first."));
}
Expand Down
6 changes: 3 additions & 3 deletions src/qt/pivx/settings/settingsbittoolwidget.cpp
Expand Up @@ -81,10 +81,10 @@ SettingsBitToolWidget::SettingsBitToolWidget(PIVXGUI* _window, QWidget *parent)
// Encrypt

// Address
ui->labelSubtitleAddress->setText(tr("Enter a PIVX address"));
ui->labelSubtitleAddress->setText(tr("PIVX address"));
setCssProperty(ui->labelSubtitleAddress, "text-title");

ui->addressIn_ENC->setPlaceholderText(tr("Add address"));
ui->addressIn_ENC->setPlaceholderText(tr("Enter address"));
setCssProperty(ui->addressIn_ENC, "edit-primary-multi-book");
ui->addressIn_ENC->setAttribute(Qt::WA_MacShowFocusRect, 0);
setShadow(ui->addressIn_ENC);
Expand All @@ -94,7 +94,7 @@ SettingsBitToolWidget::SettingsBitToolWidget(PIVXGUI* _window, QWidget *parent)
setCssProperty(ui->labelSubtitleMessage, "text-title");

setCssProperty(ui->passphraseIn_ENC, "edit-primary");
ui->passphraseIn_ENC->setPlaceholderText(tr("Write a message"));
ui->passphraseIn_ENC->setPlaceholderText(tr("Enter passphrase"));
setCssProperty(ui->passphraseIn_ENC,"edit-primary");
setShadow(ui->passphraseIn_ENC);
ui->passphraseIn_ENC->setAttribute(Qt::WA_MacShowFocusRect, 0);
Expand Down

0 comments on commit 16441e9

Please sign in to comment.