GUI: Label fixups #5833

pull luke-jr wants to merge 2 commits into bitcoin:master from luke-jr:gui_label_fixups changing 6 files +19 −17

luke-jr commented at 9:04 PM on February 26, 2015: member

Note: This needs adapting if #5861 gets merged first. git will NOT detect the conflict.
GUI: Clarify terminology; use "Label" heading for labels row, and "Node/Service" rather than [IP] "Address" e96028c78e

in src/qt/peertablemodel.cpp:None in cdf0dd8fa4 outdated

 114 | @@ -115,7 +115,7 @@ PeerTableModel::PeerTableModel(ClientModel *parent) :
 115 |      clientModel(parent),
 116 |      timer(0)
 117 |  {
 118 | -    columns << tr("Address/Hostname") << tr("User Agent") << tr("Ping Time");
 119 | +    columns << tr("Node/Service") << tr("User Agent") << tr("Ping Time");

Diapolo commented at 7:36 AM on February 27, 2015:

Why are you changing this?

luke-jr commented at 7:42 AM on February 27, 2015:

"Address" can be easily confused with bitcoin addresses, and it never displays a hostname. It does, however, display the service (port).

in src/qt/bitcoingui.cpp:None in cdf0dd8fa4 outdated

 866 | +    QString msg = tr("Date: %1\n").arg(date) +
 867 | +                  tr("Amount: %1\n").arg(BitcoinUnits::formatWithUnit(unit, amount, true));
 868 | +                  tr("Type: %1\n").arg(type);
 869 | +    if (!label.isEmpty())
 870 | +        msg += tr("Label: %1\n").arg(label);
 871 | +    else

Diapolo commented at 7:36 AM on February 27, 2015:

Nit: else if

laanwj added the label GUI on Feb 27, 2015

in src/qt/bitcoingui.cpp:None in cdf0dd8fa4 outdated

 863 | +void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address, const QString& label)
 864 |  {
 865 |      // On new transaction, make an info balloon
 866 | +    QString msg = tr("Date: %1\n").arg(date) +
 867 | +                  tr("Amount: %1\n").arg(BitcoinUnits::formatWithUnit(unit, amount, true));
 868 | +                  tr("Type: %1\n").arg(type);

jonasschnelli commented at 8:47 AM on March 6, 2015:

qt/bitcoingui.cpp:867:19: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result]
                  tr("Type: %1\n").arg(type);

jonasschnelli commented at 9:01 AM on March 6, 2015: contributor

Hmm... i'm not sure about this one (see below). If one not uses labels, it looks uncommon.
GUI: Display label rather than address on popups 721cb557aa
luke-jr force-pushed on Mar 6, 2015
luke-jr commented at 3:08 PM on March 6, 2015: member

I'm not sure it makes sense to not use labels in the real world? You wouldn't be able to tell who paid you or for what... or for what you paid.
in src/qt/transactiontablemodel.cpp:None in 721cb557aa
```
 625 | @@ -626,7 +626,7 @@ QVariant TransactionTableModel::headerData(int section, Qt::Orientation orientat
 626 |              case Watchonly:
 627 |                  return tr("Whether or not a watch-only address is involved in this transaction.");
 628 |              case ToAddress:
 629 | -                return tr("Destination address of transaction.");
 630 | +                return tr("User-defined intent/purpose of the transaction.");
```
laanwj commented at 8:50 AM on March 9, 2015:

This reminds me of philosophy textbooks. Is there a simpler way to word "User-defined intent/purpose"?

luke-jr commented at 12:07 PM on March 9, 2015:

"User-provided payment request description"?

laanwj commented at 12:21 PM on March 18, 2015:

What about Destination label of the transaction?

luke-jr commented at 1:17 PM on March 18, 2015:

I imagine someone looking at the tooltip will be wondering what a label is, so just repeating it won't really help.

laanwj commented at 2:57 PM on March 20, 2015:

"A user defined label for the destination of the transaction" ?

luke-jr commented at 3:35 PM on March 20, 2015:

For received transactions, it generally describes the sender or purpose of payment.
laanwj merged this on Apr 1, 2015
laanwj closed this on Apr 1, 2015
laanwj referenced this in commit 5ff4065cc6 on Apr 1, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#5861 Restore ability to display addresses in GUI