Open new tabs adjacent to the current tab. https://redmine.stoutner.com/issues/1110

diff --git a/src/widgets/PrivacyWebEngineView.cpp b/src/widgets/PrivacyWebEngineView.cpp
index 8f61f9156acd62994e26da68eab4dbb845a8cc8d..05c765925d8aa6da639c4f4f019634ffc3d956f5 100644 (file)
--- a/src/widgets/PrivacyWebEngineView.cpp
+++ b/src/widgets/PrivacyWebEngineView.cpp
@@ -259,9 +259,9 @@ QWebEngineView* PrivacyWebEngineView::createWindow(QWebEnginePage::WebWindowType
     {
         case QWebEnginePage::WebBrowserTab:
         {
-            // Create the new tab and return the privacy WebEngine view pointer.  `true` removes the focus from the blank URL line edit.
+            // Create the new tab and return the privacy WebEngine view pointer.  `true` removes the focus from the blank URL line edit.  `true` adds the new tab adjacent to the current tab.
             // The new privacy WebEngine view pointer is returned so it can be populated with the link from the context menu.
-            return browserWindowPointer->tabWidgetPointer->addTab(true);
+            return browserWindowPointer->tabWidgetPointer->addTab(true, true);
         }
 
         case QWebEnginePage::WebBrowserWindow:
@@ -278,9 +278,10 @@ QWebEngineView* PrivacyWebEngineView::createWindow(QWebEnginePage::WebWindowType
 
         case QWebEnginePage::WebBrowserBackgroundTab:
         {
-            // Create the new tab and return the privacy WebEngine view pointer.  `false` does not clear the URL line edit.  `true` creates a background tab.
+            // Create the new tab and return the privacy WebEngine view pointer.  `false` does not clear the URL line edit.  `true` adds the new tab adjacent to the current tab.
+            // `true` creates a background tab.
             // The new privacy WebEngine view pointer is returned so it can be populated with the link from the context menu.
-            return browserWindowPointer->tabWidgetPointer->addTab(false, true);
+            return browserWindowPointer->tabWidgetPointer->addTab(false, true, true);
         }
 
         default:

diff --git a/src/widgets/TabWidget.cpp b/src/widgets/TabWidget.cpp
index bd3882dcbeadd35dae184850d2e07d6e3b0d915a..efd677d73e636d37f9018839a019edaf54c1feb8 100644 (file)
--- a/src/widgets/TabWidget.cpp
+++ b/src/widgets/TabWidget.cpp
@@ -178,7 +178,7 @@ void TabWidget::addFirstTab()
     qTabWidgetPointer->currentWidget()->setFocus();
 }
 
-PrivacyWebEngineView* TabWidget::addTab(const bool removeUrlLineEditFocus, const bool backgroundTab, const QString urlString)
+PrivacyWebEngineView* TabWidget::addTab(const bool removeUrlLineEditFocus, const bool adjacent, const bool backgroundTab, const QString urlString)
 {
     // Create a splitter widget.
     QSplitter *splitterPointer = new QSplitter();
@@ -197,8 +197,14 @@ PrivacyWebEngineView* TabWidget::addTab(const bool removeUrlLineEditFocus, const
     splitterPointer->addWidget(privacyWebEngineViewPointer);
     splitterPointer->addWidget(devToolsWebEngineViewPointer);
 
+    // Initialize the new tab index.
+    int newTabIndex = 0;
+
     // Add a new tab.
-    int newTabIndex = qTabWidgetPointer->addTab(splitterPointer, i18nc("New tab label.", "New Tab"));
+    if (adjacent)  // Add the new tab adjacent to the current tab.
+        newTabIndex = qTabWidgetPointer->insertTab((qTabWidgetPointer->currentIndex() + 1), splitterPointer, i18nc("New tab label.", "New Tab"));
+    else  // Add the new tab at the end of the list.
+        newTabIndex = qTabWidgetPointer->addTab(splitterPointer, i18nc("New tab label.", "New Tab"));
 
     // Set the default tab icon.
     qTabWidgetPointer->setTabIcon(newTabIndex, defaultFavoriteIcon);

diff --git a/src/widgets/TabWidget.h b/src/widgets/TabWidget.h
index 4cbfe97eb5bcd92cbf25f7055666f64fc5e2a704..e47370c3ec4480e811091e757966e5533d95cf6c 100644 (file)
--- a/src/widgets/TabWidget.h
+++ b/src/widgets/TabWidget.h
@@ -100,7 +100,7 @@ signals:
 public Q_SLOTS:
     // The public slots.
     void addCookieToStore(QNetworkCookie cookie, QWebEngineCookieStore *webEngineCookieStorePointer = nullptr) const;
-    PrivacyWebEngineView* addTab(const bool removeUrlLineEditFocus = false, const bool backgroundTab = false, const QString urlString = nullptr);
+    PrivacyWebEngineView* addTab(const bool removeUrlLineEditFocus = false, const bool adjacent = false, const bool backgroundTab = false, const QString urlString = nullptr);
     void applyApplicationSettings();
     void applyDomainSettingsAndReload();
     void applyOnTheFlySearchEngine(QAction *searchEngineActionPointer);

diff --git a/src/windows/BrowserWindow.cpp b/src/windows/BrowserWindow.cpp
index 99fc2fac5f92d8f9a3d628d678443426ac822e26..394340bb9ba56c996e9b2f90c4bcc159cf1e287a 100644 (file)
--- a/src/windows/BrowserWindow.cpp
+++ b/src/windows/BrowserWindow.cpp
@@ -625,9 +625,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
             // Get all the folder URLs.
             QList<QString> *folderUrlsListPointer = BookmarksDatabase::getAllFolderUrls(folderId);
 
-            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `false` does not load a background tab.
+            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `true` opens the new tabs in an adjacent tab.  `false` does not load a background tab.
             for (QString url : *folderUrlsListPointer)
-                tabWidgetPointer->addTab(true, false, url);
+                tabWidgetPointer->addTab(true, true, false, url);
         }
     );
 
@@ -638,9 +638,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
             // Get all the folder URLs.
             QList<QString> *folderUrlsListPointer = BookmarksDatabase::getAllFolderUrls(folderId);
 
-            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `true` loads a background tab.
+            // Open the URLs in new tabs.  `true` removes the URL line edit focus, `true` opens the new tabs in an adjacent tab.  `true` loads a background tab.
             for (QString url : *folderUrlsListPointer)
-                tabWidgetPointer->addTab(true, true, url);
+                tabWidgetPointer->addTab(true, true, true, url);
         }
     );
 
@@ -656,9 +656,9 @@ void BrowserWindow::addFinalBookmarkFolderMenuActions(QMenu *menuPointer, double
             // Get a count of the folder URLs.
             const int folderUrls = folderUrlsListPointer->count();
 
-            // Load all the other URLs.  `true` removes the URL line edit focus, `true` loads a background tab.
+            // Load all the other URLs.  `true` removes the URL line edit focus, `false` does not load the new tabs in adjacent tabs.  `true` loads a background tab.
             for (int i = 1; i < folderUrls; ++i)
-                browserWindowPointer->tabWidgetPointer->addTab(true, true, folderUrlsListPointer->value(i));
+                browserWindowPointer->tabWidgetPointer->addTab(true, false, true, folderUrlsListPointer->value(i));
 
             // Show the new browser window.
             browserWindowPointer->show();
@@ -1322,8 +1322,8 @@ void BrowserWindow::showBookmarkContextMenu(const QPoint &point)
                     // Get the bookmark.
                     BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId);
 
-                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `false` does not load a background tab.
-                    tabWidgetPointer->addTab(true, false, bookmarkStructPointer->url);
+                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab.  `false` does not load a background tab.
+                    tabWidgetPointer->addTab(true, true, false, bookmarkStructPointer->url);
                 }
             );
 
@@ -1333,8 +1333,8 @@ void BrowserWindow::showBookmarkContextMenu(const QPoint &point)
                     // Get the bookmark.
                     BookmarkStruct *bookmarkStructPointer = BookmarksDatabase::getBookmark(databaseId);
 
-                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `true` loads a background tab.
-                    tabWidgetPointer->addTab(true, true, bookmarkStructPointer->url);
+                    // Open the bookmark in a new tab.  `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab.  `true` loads a background tab.
+                    tabWidgetPointer->addTab(true, true, true, bookmarkStructPointer->url);
                 }
             );
 
@@ -1823,8 +1823,8 @@ void BrowserWindow::toggleViewSourceInNewTab() const
         url = url.prepend(QLatin1String("view-source:"));
     }
 
-    // Add the new tab.  `true` removes the URL line edit focus, `false` does not open a background tab.
-    tabWidgetPointer->addTab(true, false, url);
+    // Add the new tab.  `true` removes the URL line edit focus, `true` opens the new tab in an adjacent tab.  `false` does not open a background tab.
+    tabWidgetPointer->addTab(true, true, false, url);
 }
 
 void BrowserWindow::updateBookmarkedAction() const