From b93b0e0992c1ed7d554454f0d43df332fa85c165 Mon Sep 17 00:00:00 2001 From: Mariusz Glebocki Date: Fri, 5 Jul 2019 23:59:23 +0200 Subject: [PATCH 1/3] Use default system font for terminal header titles This is not only style change, but also a bugfix. Header and title font was unspecified, so terminal monospace font was used in most cases. However, when new split with different orientation was created, the font of splitted terminal changed to the system font. Steps to reproduce: * Split vertically - both titles use monospace font * Split horizontally - splitted header's font changes to system default --- src/TerminalHeaderBar.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/TerminalHeaderBar.cpp b/src/TerminalHeaderBar.cpp index 33cf563f..f91e8e4d 100644 --- a/src/TerminalHeaderBar.cpp +++ b/src/TerminalHeaderBar.cpp @@ -63,6 +63,8 @@ TerminalHeaderBar::TerminalHeaderBar(QWidget *parent) m_toggleExpandedMode->setToolTip(i18nc("@action:itooltip", "Maximize / Restore Terminal")); m_terminalTitle = new QLabel(this); + m_terminalTitle->setFont(QApplication::font()); + m_terminalIcon = new QLabel(this); m_terminalActivity = new QLabel(this); From 576eb9c98242cd444d9a50e852206ae359091f4a Mon Sep 17 00:00:00 2001 From: Mariusz Glebocki Date: Sun, 7 Jul 2019 17:08:39 +0200 Subject: [PATCH 2/3] Fix typo in tooltip context --- src/TerminalHeaderBar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TerminalHeaderBar.cpp b/src/TerminalHeaderBar.cpp index f91e8e4d..d3544797 100644 --- a/src/TerminalHeaderBar.cpp +++ b/src/TerminalHeaderBar.cpp @@ -51,8 +51,8 @@ TerminalHeaderBar::TerminalHeaderBar(QWidget *parent) { m_closeBtn = new QToolButton(this); m_closeBtn->setIcon(QIcon::fromTheme(QStringLiteral("tab-close"))); - m_closeBtn->setToolTip(i18nc("@action:itooltip", "Close terminal")); - m_closeBtn->setText(i18nc("@action:itooltip", "Close terminal")); + m_closeBtn->setToolTip(i18nc("@action:tooltip", "Close terminal")); + m_closeBtn->setText(i18nc("@action:tooltip", "Close terminal")); m_closeBtn->setObjectName(QStringLiteral("close-terminal-button")); m_closeBtn->setAutoRaise(true); @@ -60,7 +60,7 @@ TerminalHeaderBar::TerminalHeaderBar(QWidget *parent) m_toggleExpandedMode->setIcon(QIcon::fromTheme(QStringLiteral("view-fullscreen"))); // fake 'expand' icon. VDG input? m_toggleExpandedMode->setAutoRaise(true); m_toggleExpandedMode->setCheckable(true); - m_toggleExpandedMode->setToolTip(i18nc("@action:itooltip", "Maximize / Restore Terminal")); + m_toggleExpandedMode->setToolTip(i18nc("@action:tooltip", "Maximize / Restore Terminal")); m_terminalTitle = new QLabel(this); m_terminalTitle->setFont(QApplication::font()); From a9b1e0ae25c9d630f32d9db73c03fdfdaeed1d3e Mon Sep 17 00:00:00 2001 From: Mariusz Glebocki Date: Sun, 7 Jul 2019 17:09:23 +0200 Subject: [PATCH 3/3] Change expanded mode button tooltip Toggles use descriptions/names of an active state only. New string is consistent with KWin, which uses "Maximize" for maximization toggle action. --- src/TerminalHeaderBar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TerminalHeaderBar.cpp b/src/TerminalHeaderBar.cpp index d3544797..5d0124f3 100644 --- a/src/TerminalHeaderBar.cpp +++ b/src/TerminalHeaderBar.cpp @@ -60,7 +60,7 @@ TerminalHeaderBar::TerminalHeaderBar(QWidget *parent) m_toggleExpandedMode->setIcon(QIcon::fromTheme(QStringLiteral("view-fullscreen"))); // fake 'expand' icon. VDG input? m_toggleExpandedMode->setAutoRaise(true); m_toggleExpandedMode->setCheckable(true); - m_toggleExpandedMode->setToolTip(i18nc("@action:tooltip", "Maximize / Restore Terminal")); + m_toggleExpandedMode->setToolTip(i18nc("@action:tooltip", "Maximize terminal")); m_terminalTitle = new QLabel(this); m_terminalTitle->setFont(QApplication::font());