Browse Source

Merge pull request #1211 from Diapolo/harmonize_ellipsis

harmonize the use of ellipsis ("...") in the GUI
0.8
Wladimir J. van der Laan 13 years ago
parent
commit
e17018adcd
  1. 10
      src/qt/bitcoingui.cpp
  2. 2
      src/qt/forms/addressbookpage.ui
  3. 2
      src/qt/forms/sendcoinsdialog.ui
  4. 2
      src/qt/qrcodedialog.cpp
  5. 2
      src/qt/transactionview.cpp

10
src/qt/bitcoingui.cpp

@ -209,7 +209,7 @@ void BitcoinGUI::createActions()
sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2)); sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));
tabGroup->addAction(sendCoinsAction); tabGroup->addAction(sendCoinsAction);
messageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message"), this); messageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this);
messageAction->setToolTip(tr("Prove you control an address")); messageAction->setToolTip(tr("Prove you control an address"));
#ifdef FIRST_CLASS_MESSAGING #ifdef FIRST_CLASS_MESSAGING
messageAction->setCheckable(true); messageAction->setCheckable(true);
@ -246,12 +246,12 @@ void BitcoinGUI::createActions()
toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window")); toggleHideAction->setToolTip(tr("Show or hide the Bitcoin window"));
exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this); exportAction = new QAction(QIcon(":/icons/export"), tr("&Export..."), this);
exportAction->setToolTip(tr("Export the data in the current tab to a file")); exportAction->setToolTip(tr("Export the data in the current tab to a file"));
encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet"), this); encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);
encryptWalletAction->setToolTip(tr("Encrypt or decrypt wallet")); encryptWalletAction->setToolTip(tr("Encrypt or decrypt wallet"));
encryptWalletAction->setCheckable(true); encryptWalletAction->setCheckable(true);
backupWalletAction = new QAction(QIcon(":/icons/filesave"), tr("&Backup Wallet"), this); backupWalletAction = new QAction(QIcon(":/icons/filesave"), tr("&Backup Wallet..."), this);
backupWalletAction->setToolTip(tr("Backup wallet to another location")); backupWalletAction->setToolTip(tr("Backup wallet to another location"));
changePassphraseAction = new QAction(QIcon(":/icons/key"), tr("&Change Passphrase"), this); changePassphraseAction = new QAction(QIcon(":/icons/key"), tr("&Change Passphrase..."), this);
changePassphraseAction->setToolTip(tr("Change the passphrase used for wallet encryption")); changePassphraseAction->setToolTip(tr("Change the passphrase used for wallet encryption"));
openRPCConsoleAction = new QAction(tr("&Debug window"), this); openRPCConsoleAction = new QAction(tr("&Debug window"), this);
openRPCConsoleAction->setToolTip(tr("Open debugging and diagnostic console")); openRPCConsoleAction->setToolTip(tr("Open debugging and diagnostic console"));
@ -636,7 +636,7 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
"Do you want to pay the fee?").arg( "Do you want to pay the fee?").arg(
BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nFeeRequired)); BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, nFeeRequired));
QMessageBox::StandardButton retval = QMessageBox::question( QMessageBox::StandardButton retval = QMessageBox::question(
this, tr("Sending..."), strMessage, this, tr("Confirm transaction fee"), strMessage,
QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Yes); QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Yes);
*payFee = (retval == QMessageBox::Yes); *payFee = (retval == QMessageBox::Yes);
} }

2
src/qt/forms/addressbookpage.ui

@ -63,7 +63,7 @@
<string>Create a new address</string> <string>Create a new address</string>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;New Address...</string> <string>&amp;New Address</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">

2
src/qt/forms/sendcoinsdialog.ui

@ -64,7 +64,7 @@
<string>Send to multiple recipients at once</string> <string>Send to multiple recipients at once</string>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Add recipient...</string> <string>&amp;Add Recipient</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../bitcoin.qrc">

2
src/qt/qrcodedialog.cpp

@ -118,7 +118,7 @@ void QRCodeDialog::on_lnMessage_textChanged(const QString &arg1)
void QRCodeDialog::on_btnSaveAs_clicked() void QRCodeDialog::on_btnSaveAs_clicked()
{ {
QString fn = GUIUtil::getSaveFileName(this, tr("Save Image..."), QString(), tr("PNG Images (*.png)")); QString fn = GUIUtil::getSaveFileName(this, tr("Save QR Code"), QString(), tr("PNG Images (*.png)"));
if (!fn.isEmpty()) if (!fn.isEmpty())
myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn); myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn);
} }

2
src/qt/transactionview.cpp

@ -125,7 +125,7 @@ TransactionView::TransactionView(QWidget *parent) :
QAction *copyLabelAction = new QAction(tr("Copy label"), this); QAction *copyLabelAction = new QAction(tr("Copy label"), this);
QAction *copyAmountAction = new QAction(tr("Copy amount"), this); QAction *copyAmountAction = new QAction(tr("Copy amount"), this);
QAction *editLabelAction = new QAction(tr("Edit label"), this); QAction *editLabelAction = new QAction(tr("Edit label"), this);
QAction *showDetailsAction = new QAction(tr("Show details..."), this); QAction *showDetailsAction = new QAction(tr("Show transaction details"), this);
contextMenu = new QMenu(); contextMenu = new QMenu();
contextMenu->addAction(copyAddressAction); contextMenu->addAction(copyAddressAction);

Loading…
Cancel
Save