aboutsummaryrefslogtreecommitdiff
path: root/src/browser.cpp
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-05-01 18:38:54 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2018-05-01 18:38:54 +0200
commit19ff096cd450780f16bfe8f699e76f6dc68fe193 (patch)
tree859a86ab8f3612a4bdef2e9fcf797622ae3d225d /src/browser.cpp
parentSplit off addressbar into lib/ (diff)
downloadsmolbote-19ff096cd450780f16bfe8f699e76f6dc68fe193.tar.xz
Don't open additional tabs when creating subwindows
Diffstat (limited to 'src/browser.cpp')
-rw-r--r--src/browser.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/browser.cpp b/src/browser.cpp
index 3f4805a..ddaf345 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -83,16 +83,20 @@ void Browser::createSession(const QString &profileName, bool newWindow, const QS
auto *mainwindow = m_windows.last();
if(newWindow) {
- QUrl firstUrl = WebProfile::defaultProfile()->homepage();
+ QString firstUrl;// = WebProfile::defaultProfile()->homepage();
if(!urls.isEmpty())
- firstUrl = QUrl::fromUserInput(urls.at(0));
+ firstUrl = urls.at(0);
auto *w = mainwindow->createSubWindow(firstUrl);
for(int i = 1; i < urls.count() - 1; i++) {
w->addTab(QUrl::fromUserInput(urls.at(i)));
}
} else {
- for(const QString &url : urls) {
- mainwindow->createTab(QUrl::fromUserInput(url));
+ if(urls.isEmpty())
+ mainwindow->createTab(WebProfile::defaultProfile()->homepage());
+ else {
+ for(const QString &url : urls) {
+ mainwindow->createTab(QUrl::fromUserInput(url));
+ }
}
}
}
@@ -102,7 +106,7 @@ MainWindow *Browser::createWindow()
// the window will delete itself when it closes, so we don't need to delete it
MainWindow *window = new MainWindow(m_config);
connect(window->addressBar, &AddressBar::complete, m_bookmarks.get(), &BookmarksWidget::search);
- window->createSubWindow(WebProfile::defaultProfile()->newtab());
+ //window->createSubWindow(WebProfile::defaultProfile()->newtab());
auto *bookmarksAction = new QAction(tr("Bookmarks"), window);
bookmarksAction->setShortcut(QKeySequence(QString::fromStdString(m_config->value<std::string>("bookmarks.shortcut").value())));