@@ -196,7 +196,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)), m_bookmarksToolbar, SLOT(setVisible(bool))); connect(m_tabWidget, SIGNAL(lastTabClosed()), - this, SLOT(close())); + this, SLOT(lastTabClosed())); updateWindowTitle(); loadDefaultState(); @@ -384,6 +384,18 @@ bool BrowserMainWindow::restoreState(const QByteArray &state) return true; } +void BrowserMainWindow::lastTabClosed() +{ + QSettings settings; + settings.beginGroup(QLatin1String("tabs")); + bool quit = settings.value(QLatin1String("quitAsLastTabClosed"), true).toBool(); + + if (quit) + close(); + else + m_tabWidget->makeNewTab(true); +} + QAction *BrowserMainWindow::showMenuBarAction() const { return m_viewShowMenuBarAction; src/browsermainwindow.cpp @@ -115,6 +115,8 @@ protected: private slots: void save(); + void lastTabClosed(); + void loadProgress(int); void updateStatusbar(const QString &string); void updateWindowTitle(const QString &title = QString()); src/browsermainwindow.h @@ -230,6 +230,7 @@ void SettingsDialog::loadFromSettings() #if QT_VERSION >= 0x040500 oneCloseButton->setChecked(settings.value(QLatin1String("oneCloseButton"),false).toBool()); #endif + quitAsLastTabClosed->setChecked(settings.value(QLatin1String("quitAsLastTabClosed"), true).toBool()); openTargetBlankLinksIn->setCurrentIndex(settings.value(QLatin1String("openTargetBlankLinksIn"), TabWidget::NewSelectedTab).toInt()); openLinksFromAppsIn->setCurrentIndex(settings.value(QLatin1String("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt()); settings.endGroup(); @@ -336,6 +337,7 @@ void SettingsDialog::saveToSettings() #if QT_VERSION >= 0x040500 settings.setValue(QLatin1String("oneCloseButton"), oneCloseButton->isChecked()); #endif + settings.setValue(QLatin1String("quitAsLastTabClosed"), quitAsLastTabClosed->isChecked()); settings.setValue(QLatin1String("openTargetBlankLinksIn"), openTargetBlankLinksIn->currentIndex()); settings.setValue(QLatin1String("openLinksFromAppsIn"), openLinksFromAppsIn->currentIndex()); settings.endGroup(); src/settings.cpp @@ -536,6 +536,16 @@ </widget> </item> <item> + <widget class="QCheckBox" name="quitAsLastTabClosed"> + <property name="text"> + <string>Quit the application when last tab is closed</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> <widget class="QGroupBox" name="openLinksGroupBox"> <property name="title"> <string>Opening links</string> src/settings.ui 1d50a96b3637337a4d6ccadd5477c40a37f2068f Jakub Wieczorek faw217@gmail.com http://github.com/Arora/arora/commit/ca6cf65947ca10ace90291efa6b7160c9bb6d2a3 ca6cf65947ca10ace90291efa6b7160c9bb6d2a3 2009-05-03T10:33:01-07:00 2009-04-14T03:42:45-07:00 Add a setting specifying if the application should quit when last tab is closed. This addresses ticket #260. 403603e726fc03442b57948d663f6db8b1fd6f20 Jakub Wieczorek faw217@gmail.com