From 84971cbfbdfd41f33880075009bec9030facfb8a Mon Sep 17 00:00:00 2001 From: Nikhil Tanwar <2002nikhiltanwar@gmail.com> Date: Sat, 13 Nov 2021 01:00:19 +0530 Subject: [PATCH 1/7] Fix Back & Forward button alignment for -reverse launch --- src/topwidget.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/topwidget.cpp b/src/topwidget.cpp index c82e962..3fb5479 100644 --- a/src/topwidget.cpp +++ b/src/topwidget.cpp @@ -16,14 +16,21 @@ TopWidget::TopWidget(QWidget *parent) : connect(back, &QAction::triggered, [](){ KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back); }); - addAction(back); - widgetForAction(back)->setObjectName("backButton"); // For CSS QAction *forward = app->getAction(KiwixApp::HistoryForwardAction); connect(forward, &QAction::triggered, [](){ KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward); }); - addAction(forward); + + if(QGuiApplication::isLeftToRight()) { + addAction(back); + widgetForAction(back)->setObjectName("backButton"); // For CSS + addAction(forward); + } else { + addAction(forward); + addAction(back); + widgetForAction(back)->setObjectName("backButton"); // For CSS + } addSeparator(); From a3a4f1547bda7cd3dd0294a6cd1602e045ea2c6e Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 13 Nov 2021 16:24:46 +0100 Subject: [PATCH 2/7] Put space after 'if' --- src/topwidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/topwidget.cpp b/src/topwidget.cpp index 3fb5479..02731dc 100644 --- a/src/topwidget.cpp +++ b/src/topwidget.cpp @@ -22,7 +22,7 @@ TopWidget::TopWidget(QWidget *parent) : KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward); }); - if(QGuiApplication::isLeftToRight()) { + if (QGuiApplication::isLeftToRight()) { addAction(back); widgetForAction(back)->setObjectName("backButton"); // For CSS addAction(forward); @@ -84,7 +84,7 @@ void TopWidget::handleWebActionEnabledChanged(QWebEnginePage::WebAction action, void TopWidget::mousePressEvent(QMouseEvent *event) { - if(event->button() != Qt::LeftButton) + if (event->button() != Qt::LeftButton) return; m_cursorPos = event->globalPos() + frameGeometry().topLeft() - parentWidget()->frameGeometry().topLeft(); @@ -93,7 +93,7 @@ void TopWidget::mousePressEvent(QMouseEvent *event) { } void TopWidget::mouseMoveEvent(QMouseEvent *event) { - if(event->timestamp() <= m_timestamp) + if (event->timestamp() <= m_timestamp) return; m_timestamp = event->timestamp(); From 1da48a8d1546b8d62b616cac0bbc9c99dba96c1c Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 13 Nov 2021 16:31:23 +0100 Subject: [PATCH 3/7] Better history button CSS names --- resources/css/style.css | 2 +- src/topwidget.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/css/style.css b/resources/css/style.css index 27f65eb..22829af 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -70,7 +70,7 @@ TopWidget QToolButton::menu-arrow { image: none; } -TopWidget QToolButton#backButton { +TopWidget QToolButton#leftHistoryButton { margin-left: 6px; } diff --git a/src/topwidget.cpp b/src/topwidget.cpp index 02731dc..b720d7c 100644 --- a/src/topwidget.cpp +++ b/src/topwidget.cpp @@ -24,14 +24,16 @@ TopWidget::TopWidget(QWidget *parent) : if (QGuiApplication::isLeftToRight()) { addAction(back); - widgetForAction(back)->setObjectName("backButton"); // For CSS addAction(forward); } else { addAction(forward); addAction(back); - widgetForAction(back)->setObjectName("backButton"); // For CSS } + // For CSS + widgetForAction(back)->setObjectName("leftHistoryButton"); + widgetForAction(back)->setObjectName("rightHistoryButton"); + addSeparator(); addWidget(&m_searchEntry); From 92376bf8d6ed32bb9f3d18b0c4bec48bb310c8d5 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 13 Nov 2021 16:38:41 +0100 Subject: [PATCH 4/7] Proper history buttons based on language direction --- src/kiwixapp.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp index 83318e5..11ecaab 100644 --- a/src/kiwixapp.cpp +++ b/src/kiwixapp.cpp @@ -355,10 +355,18 @@ void KiwixApp::createAction() CREATE_ACTION_SHORTCUT(OpenHomePageAction, gt("home-page"), QKeySequence(Qt::ALT + Qt::Key_Home)); - CREATE_ACTION_ICON_SHORTCUT(HistoryBackAction, "back", gt("back"), QKeySequence(Qt::ALT + Qt::Key_Left)); + if (QGuiApplication::isLeftToRight()) { + CREATE_ACTION_ICON_SHORTCUT(HistoryBackAction, "back", gt("back"), QKeySequence(Qt::ALT + Qt::Key_Left)); + } else { + CREATE_ACTION_ICON_SHORTCUT(HistoryBackAction, "forward", gt("back"), QKeySequence(Qt::ALT + Qt::Key_RightLeft)); + } DISABLE_ACTION(HistoryBackAction); - CREATE_ACTION_ICON_SHORTCUT(HistoryForwardAction, "forward", gt("forward"), QKeySequence(Qt::ALT + Qt::Key_Right)); + if (QGuiApplication::isLeftToRight()) { + CREATE_ACTION_ICON_SHORTCUT(HistoryForwardAction, "forward", gt("forward"), QKeySequence(Qt::ALT + Qt::Key_Right)); + } else { + CREATE_ACTION_ICON_SHORTCUT(HistoryForwardAction, "back", gt("forward"), QKeySequence(Qt::ALT + Qt::Key_Left)); + } DISABLE_ACTION(HistoryForwardAction); CREATE_ACTION_ICON_SHORTCUT(PrintAction, "print", gt("print"), QKeySequence::Print); From 6cde03bbebde7a2f8d36858cbf09c05db7a219a2 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 13 Nov 2021 16:40:09 +0100 Subject: [PATCH 5/7] Better history button icon filenames --- resources/icons/{back.svg => history-left.svg} | 0 resources/icons/{forward.svg => history-right.svg} | 0 resources/kiwix.qrc | 4 ++-- src/kiwixapp.cpp | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) rename resources/icons/{back.svg => history-left.svg} (100%) rename resources/icons/{forward.svg => history-right.svg} (100%) diff --git a/resources/icons/back.svg b/resources/icons/history-left.svg similarity index 100% rename from resources/icons/back.svg rename to resources/icons/history-left.svg diff --git a/resources/icons/forward.svg b/resources/icons/history-right.svg similarity index 100% rename from resources/icons/forward.svg rename to resources/icons/history-right.svg diff --git a/resources/kiwix.qrc b/resources/kiwix.qrc index 1537bf8..5d65a97 100644 --- a/resources/kiwix.qrc +++ b/resources/kiwix.qrc @@ -4,8 +4,8 @@ icons/minimize.svg icons/download.svg icons/checkbox.svg - icons/back.svg - icons/forward.svg + icons/history-left.svg + icons/history-right.svg icons/help.svg icons/tick.svg icons/menu.svg diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp index 11ecaab..653b6b8 100644 --- a/src/kiwixapp.cpp +++ b/src/kiwixapp.cpp @@ -356,16 +356,16 @@ void KiwixApp::createAction() CREATE_ACTION_SHORTCUT(OpenHomePageAction, gt("home-page"), QKeySequence(Qt::ALT + Qt::Key_Home)); if (QGuiApplication::isLeftToRight()) { - CREATE_ACTION_ICON_SHORTCUT(HistoryBackAction, "back", gt("back"), QKeySequence(Qt::ALT + Qt::Key_Left)); + CREATE_ACTION_ICON_SHORTCUT(HistoryBackAction, "history-left", gt("back"), QKeySequence(Qt::ALT + Qt::Key_Left)); } else { - CREATE_ACTION_ICON_SHORTCUT(HistoryBackAction, "forward", gt("back"), QKeySequence(Qt::ALT + Qt::Key_RightLeft)); + CREATE_ACTION_ICON_SHORTCUT(HistoryBackAction, "history-right", gt("back"), QKeySequence(Qt::ALT + Qt::Key_Right)); } DISABLE_ACTION(HistoryBackAction); if (QGuiApplication::isLeftToRight()) { - CREATE_ACTION_ICON_SHORTCUT(HistoryForwardAction, "forward", gt("forward"), QKeySequence(Qt::ALT + Qt::Key_Right)); + CREATE_ACTION_ICON_SHORTCUT(HistoryForwardAction, "history-right", gt("forward"), QKeySequence(Qt::ALT + Qt::Key_Right)); } else { - CREATE_ACTION_ICON_SHORTCUT(HistoryForwardAction, "back", gt("forward"), QKeySequence(Qt::ALT + Qt::Key_Left)); + CREATE_ACTION_ICON_SHORTCUT(HistoryForwardAction, "history-left", gt("forward"), QKeySequence(Qt::ALT + Qt::Key_Left)); } DISABLE_ACTION(HistoryForwardAction); From 542cc14ca7d70841aef1633e57b9d187d4133a0f Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 14 Nov 2021 15:35:13 +0100 Subject: [PATCH 6/7] Proper CSS class assigment for History buttons --- src/topwidget.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/topwidget.cpp b/src/topwidget.cpp index b720d7c..5692ba9 100644 --- a/src/topwidget.cpp +++ b/src/topwidget.cpp @@ -16,23 +16,22 @@ TopWidget::TopWidget(QWidget *parent) : connect(back, &QAction::triggered, [](){ KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Back); }); + addAction(back); QAction *forward = app->getAction(KiwixApp::HistoryForwardAction); connect(forward, &QAction::triggered, [](){ KiwixApp::instance()->getTabWidget()->triggerWebPageAction(QWebEnginePage::Forward); }); - - if (QGuiApplication::isLeftToRight()) { - addAction(back); - addAction(forward); - } else { - addAction(forward); - addAction(back); - } + addAction(forward); // For CSS - widgetForAction(back)->setObjectName("leftHistoryButton"); - widgetForAction(back)->setObjectName("rightHistoryButton"); + if (QGuiApplication::isLeftToRight()) { + widgetForAction(back)->setObjectName("leftHistoryButton"); + widgetForAction(forward)->setObjectName("rightHistoryButton"); + } else { + widgetForAction(forward)->setObjectName("leftHistoryButton"); + widgetForAction(back)->setObjectName("rightHistoryButton"); + } addSeparator(); From 24182b52e0fb66e055a2d0b1d6817cd047ab7eb1 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 14 Nov 2021 15:53:15 +0100 Subject: [PATCH 7/7] Sligh CSS fix of history buttons margins --- resources/css/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/css/style.css b/resources/css/style.css index 22829af..74eb2ff 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -71,9 +71,12 @@ TopWidget QToolButton::menu-arrow { } TopWidget QToolButton#leftHistoryButton { - margin-left: 6px; + margin-left: 4px; } +TopWidget QToolButton#rightHistoryButton { + margin-right: 4px; +} TopWidget QToolButton#fullScreenButton { margin-right: 6px;