diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1419,7 +1419,7 @@ int max_width = 0; const QFontMetrics fm(font()); for (const BitcoinUnits::Unit unit : units) { - max_width = qMax(max_width, fm.width(BitcoinUnits::name(unit))); + max_width = qMax(max_width, fm.width(BitcoinUnits::longName(unit))); } setMinimumSize(max_width, 0); setAlignment(Qt::AlignRight | Qt::AlignVCenter); @@ -1437,7 +1437,8 @@ void UnitDisplayStatusBarControl::createContextMenu() { menu = new QMenu(this); for (const BitcoinUnits::Unit u : BitcoinUnits::availableUnits()) { - QAction *menuAction = new QAction(QString(BitcoinUnits::name(u)), this); + QAction *menuAction = + new QAction(QString(BitcoinUnits::longName(u)), this); menuAction->setData(QVariant(u)); menu->addAction(menuAction); } @@ -1464,7 +1465,7 @@ /** When Display Units are changed on OptionsModel it will refresh the display * text of the control on the status bar */ void UnitDisplayStatusBarControl::updateDisplayUnit(int newUnits) { - setText(BitcoinUnits::name(newUnits)); + setText(BitcoinUnits::longName(newUnits)); } /** Shows context menu with Display Unit options by the mouse coordinates */ diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -68,8 +68,10 @@ static QList availableUnits(); //! Is unit ID valid? static bool valid(int unit); + //! Long name + static QString longName(int unit); //! Short name - static QString name(int unit); + static QString shortName(int unit); //! Longer description static QString description(int unit); //! Number of Satoshis (1e-8) per unit diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -30,7 +30,7 @@ } } -QString BitcoinUnits::name(int unit) { +QString BitcoinUnits::longName(int unit) { switch (unit) { case BCH: return QString("BCH"); @@ -43,6 +43,10 @@ } } +QString BitcoinUnits::shortName(int unit) { + return longName(unit); +} + QString BitcoinUnits::description(int unit) { switch (unit) { case BCH: @@ -132,7 +136,7 @@ QString BitcoinUnits::formatWithUnit(int unit, const Amount amount, bool plussign, SeparatorStyle separators) { return format(unit, amount, plussign, separators) + QString(" ") + - name(unit); + shortName(unit); } QString BitcoinUnits::formatHtmlWithUnit(int unit, const Amount amount, @@ -184,7 +188,7 @@ QString BitcoinUnits::getAmountColumnTitle(int unit) { QString amountTitle = QObject::tr("Amount"); if (BitcoinUnits::valid(unit)) { - amountTitle += " (" + BitcoinUnits::name(unit) + ")"; + amountTitle += " (" + BitcoinUnits::shortName(unit) + ")"; } return amountTitle; } @@ -201,7 +205,7 @@ switch (role) { case Qt::EditRole: case Qt::DisplayRole: - return QVariant(name(unit)); + return QVariant(longName(unit)); case Qt::ToolTipRole: return QVariant(description(unit)); case UnitRole: diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -119,8 +119,9 @@ QString RecentRequestsTableModel::getAmountTitle() { return (this->walletModel->getOptionsModel() != nullptr) ? tr("Requested") + " (" + - BitcoinUnits::name(this->walletModel->getOptionsModel() - ->getDisplayUnit()) + + BitcoinUnits::shortName( + this->walletModel->getOptionsModel() + ->getDisplayUnit()) + ")" : ""; }