Browse Source

[qt] Use fixed pitch font for the rpc console

Also:
* Preserve white space
* Make fixed font as large as default font
pull/1/head
MarcoFalke 7 years ago
parent
commit
28313b83fc
  1. 2
      src/qt/addresstablemodel.cpp
  2. 4
      src/qt/guiutil.cpp
  3. 4
      src/qt/guiutil.h
  4. 12
      src/qt/rpcconsole.cpp
  5. 1
      src/qt/rpcconsole.h
  6. 2
      src/qt/sendcoinsentry.cpp
  7. 4
      src/qt/signverifymessagedialog.cpp

2
src/qt/addresstablemodel.cpp

@ -218,7 +218,7 @@ QVariant AddressTableModel::data(const QModelIndex &index, int role) const @@ -218,7 +218,7 @@ QVariant AddressTableModel::data(const QModelIndex &index, int role) const
QFont font;
if(index.column() == Address)
{
font = GUIUtil::bitcoinAddressFont();
font = GUIUtil::fixedPitchFont();
}
return font;
}

4
src/qt/guiutil.cpp

@ -88,7 +88,7 @@ QString dateTimeStr(qint64 nTime) @@ -88,7 +88,7 @@ QString dateTimeStr(qint64 nTime)
return dateTimeStr(QDateTime::fromTime_t((qint32)nTime));
}
QFont bitcoinAddressFont()
QFont fixedPitchFont()
{
QFont font("Monospace");
#if QT_VERSION >= 0x040800
@ -103,7 +103,7 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent) @@ -103,7 +103,7 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
{
parent->setFocusProxy(widget);
widget->setFont(bitcoinAddressFont());
widget->setFont(fixedPitchFont());
#if QT_VERSION >= 0x040700
// We don't want translators to use own addresses in translations
// and this is the only place, where this address is supplied.

4
src/qt/guiutil.h

@ -37,8 +37,8 @@ namespace GUIUtil @@ -37,8 +37,8 @@ namespace GUIUtil
QString dateTimeStr(const QDateTime &datetime);
QString dateTimeStr(qint64 nTime);
// Render Bitcoin addresses in monospace font
QFont bitcoinAddressFont();
// Return a monospace font
QFont fixedPitchFont();
// Set up widgets for address and amounts
void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent);

12
src/qt/rpcconsole.cpp

@ -462,13 +462,19 @@ void RPCConsole::clear() @@ -462,13 +462,19 @@ void RPCConsole::clear()
}
// Set default style sheet
QFontInfo fixedFontInfo(GUIUtil::fixedPitchFont());
// Try to make font equally large on different OS.
QString ptSize = QString("%1pt").arg(QFontInfo(QFont()).pointSize());
ui->messagesWidget->document()->setDefaultStyleSheet(
QString(
"table { }"
"td.time { color: #808080; padding-top: 3px; } "
"td.message { font-family: %1; font-size: %2; white-space:pre-wrap; } "
"td.cmd-request { color: #006060; } "
"td.cmd-error { color: red; } "
"b { color: #006060; } "
);
).arg(fixedFontInfo.family(), ptSize)
);
message(CMD_REPLY, (tr("Welcome to the Bitcoin Core RPC console.") + "<br>" +
tr("Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.") + "<br>" +
@ -494,7 +500,7 @@ void RPCConsole::message(int category, const QString &message, bool html) @@ -494,7 +500,7 @@ void RPCConsole::message(int category, const QString &message, bool html)
if(html)
out += message;
else
out += GUIUtil::HtmlEscape(message, true);
out += GUIUtil::HtmlEscape(message, false);
out += "</td></tr></table>";
ui->messagesWidget->append(out);
}
@ -849,4 +855,4 @@ void RPCConsole::showOrHideBanTableIfRequired() @@ -849,4 +855,4 @@ void RPCConsole::showOrHideBanTableIfRequired()
bool visible = clientModel->getBanTableModel()->shouldShow();
ui->banlistWidget->setVisible(visible);
ui->banHeading->setVisible(visible);
}
}

1
src/qt/rpcconsole.h

@ -71,6 +71,7 @@ private Q_SLOTS: @@ -71,6 +71,7 @@ private Q_SLOTS:
public Q_SLOTS:
void clear();
/** Append the message to the message widget */
void message(int category, const QString &message, bool html = false);
/** Set number of connections shown in the UI */
void setNumConnections(int count);

2
src/qt/sendcoinsentry.cpp

@ -40,7 +40,7 @@ SendCoinsEntry::SendCoinsEntry(const PlatformStyle *platformStyle, QWidget *pare @@ -40,7 +40,7 @@ SendCoinsEntry::SendCoinsEntry(const PlatformStyle *platformStyle, QWidget *pare
// normal bitcoin address field
GUIUtil::setupAddressWidget(ui->payTo, this);
// just a label for displaying bitcoin address(es)
ui->payTo_is->setFont(GUIUtil::bitcoinAddressFont());
ui->payTo_is->setFont(GUIUtil::fixedPitchFont());
// Connect signals
connect(ui->payAmount, SIGNAL(valueChanged()), this, SIGNAL(payAmountChanged()));

4
src/qt/signverifymessagedialog.cpp

@ -51,8 +51,8 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *platformSt @@ -51,8 +51,8 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *platformSt
ui->messageIn_VM->installEventFilter(this);
ui->signatureIn_VM->installEventFilter(this);
ui->signatureOut_SM->setFont(GUIUtil::bitcoinAddressFont());
ui->signatureIn_VM->setFont(GUIUtil::bitcoinAddressFont());
ui->signatureOut_SM->setFont(GUIUtil::fixedPitchFont());
ui->signatureIn_VM->setFont(GUIUtil::fixedPitchFont());
}
SignVerifyMessageDialog::~SignVerifyMessageDialog()

Loading…
Cancel
Save