Add URL toolbar spacers. https://redmine.stoutner.com/issues/1249

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index c92c61390beb3340c235348659f602df39e47061..dcc884d69d586a883dabb02a44d5c34724bed4f6 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -521,10 +521,23 @@ BrowserWindow::BrowserWindow(bool firstWindow, QString *initialUrlStringPointer)
     // Set the default label text.
     findTextLabelPointer->setText(QLatin1String("  ") + i18nc("Default find results.", "0/0") + QLatin1String("  "));
 
     // Set the default label text.
     findTextLabelPointer->setText(QLatin1String("  ") + i18nc("Default find results.", "0/0") + QLatin1String("  "));
 

+    // Create the spacer widgets.
+    QWidget *blockedRequestsInitialSpacerWidgetPointer = new QWidget();
+    QWidget *blockedRequestsFinalSpacerWidgetPointer = new QWidget();
+    QWidget *findTextSpacerWidgetPointer = new QWidget();
+
+    // Set the widths for the spacer widgets.
+    blockedRequestsInitialSpacerWidgetPointer->setFixedSize(3, 0);
+    blockedRequestsFinalSpacerWidgetPointer->setFixedSize(2, 0);
+    findTextSpacerWidgetPointer->setFixedSize(2, 0);
+

     // Insert the widgets into the toolbars.
     urlToolBarPointer->insertWidget(blockedRequestsActionPointer, urlLineEditPointer);
     // Insert the widgets into the toolbars.
     urlToolBarPointer->insertWidget(blockedRequestsActionPointer, urlLineEditPointer);

+    urlToolBarPointer->insertWidget(blockedRequestsActionPointer, blockedRequestsInitialSpacerWidgetPointer);
+    urlToolBarPointer->insertWidget(javaScriptActionPointer, blockedRequestsFinalSpacerWidgetPointer);

     findTextLineEditActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLineEditPointer);
     findTextLabelActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLabelPointer);
     findTextLineEditActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLineEditPointer);
     findTextLabelActionPointer = urlToolBarPointer->insertWidget(findNextActionPointer, findTextLabelPointer);

+    findTextSpacerActionPointer = urlToolBarPointer->insertWidget(findTextLineEditActionPointer, findTextSpacerWidgetPointer);

 
     // Initially hide the find text actions.
     hideFindTextActions();
 
     // Initially hide the find text actions.
     hideFindTextActions();


@@ -1106,6 +1119,7 @@ void BrowserWindow::getZoomFactorFromUser()
 void BrowserWindow::hideFindTextActions() const
 {
     // Hide the find text actions.
 void BrowserWindow::hideFindTextActions() const
 {
     // Hide the find text actions.

+    findTextSpacerActionPointer->setVisible(false);

     findTextLineEditActionPointer->setVisible(false);
     findTextLabelActionPointer->setVisible(false);
     findNextActionPointer->setVisible(false);
     findTextLineEditActionPointer->setVisible(false);
     findTextLabelActionPointer->setVisible(false);
     findNextActionPointer->setVisible(false);


@@ -1642,6 +1656,7 @@ void BrowserWindow::showFilterListsDialog()
 void BrowserWindow::showFindTextActions() const
 {
     // Show the find text actions.
 void BrowserWindow::showFindTextActions() const
 {
     // Show the find text actions.

+    findTextSpacerActionPointer->setVisible(true);

     findTextLineEditActionPointer->setVisible(true);
     findTextLabelActionPointer->setVisible(true);
     findNextActionPointer->setVisible(true);
     findTextLineEditActionPointer->setVisible(true);
     findTextLabelActionPointer->setVisible(true);
     findNextActionPointer->setVisible(true);

diff --git a/src/windows/BrowserWindow.h b/src/windows/BrowserWindow.h
index 4b8cc0b02d7857bdd7a6b0d131d43a6f50631d7b..525cb85a63e9a9c913a805548518542a4e64d7c6 100644 (file)
--- a/src/windows/BrowserWindow.h
+++ b/src/windows/BrowserWindow.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
 /* SPDX-License-Identifier: GPL-3.0-or-later

- * SPDX-FileCopyrightText: 2022-2024 Soren Stoutner <soren@stoutner.com>
+ * SPDX-FileCopyrightText: 2022-2025 Soren Stoutner <soren@stoutner.com>

  *
  * This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc/>.
  *
  *
  * This file is part of Privacy Browser PC <https://www.stoutner.com/privacy-browser-pc/>.
  *


@@ -153,6 +153,7 @@ private:
     QLabel *findTextLabelPointer;
     QAction *findTextLineEditActionPointer;
     KLineEdit *findTextLineEditPointer;
     QLabel *findTextLabelPointer;
     QAction *findTextLineEditActionPointer;
     KLineEdit *findTextLineEditPointer;

+    QAction *findTextSpacerActionPointer;

     KToggleFullScreenAction *fullScreenActionPointer;
     QAction *hideFindTextActionPointer;
     QAction *javaScriptActionPointer;
     KToggleFullScreenAction *fullScreenActionPointer;
     QAction *hideFindTextActionPointer;
     QAction *javaScriptActionPointer;