diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-09-12 23:09:08 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-09-12 23:09:08 +0200 |
| commit | 0609b26165cda7672b9416d94dbc161751fd6ac6 (patch) | |
| tree | 0ff2b1d09678f765f42c21a941b06f924a1b7fd9 /src | |
| parent | Removed "home" scheme (diff) | |
| download | rekonq-0609b26165cda7672b9416d94dbc161751fd6ac6.tar.xz | |
notification system made default and no more "unsettable"
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.cpp | 21 | ||||
| -rw-r--r-- | src/rekonq.kcfg | 3 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8e7a1040..da51ac2a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -188,6 +188,10 @@ void MainWindow::setupToolbar() void MainWindow::postLaunch() { + // notification system + connect(m_view, SIGNAL(showStatusBarMessage(const QString&, Rekonq::Notify)), this, SLOT(notifyMessage(const QString&, Rekonq::Notify))); + connect(m_view, SIGNAL(linkHovered(const QString&)), this, SLOT(notifyMessage(const QString&))); + // --------- connect signals and slots connect(m_view, SIGNAL(setCurrentTitle(const QString &)), this, SLOT(slotUpdateWindowTitle(const QString &))); connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *))); @@ -424,23 +428,6 @@ void MainWindow::slotUpdateConfiguration() // ============== General ================== mainView()->showTabBar(); - // "status bar" messages (new notifyMessage system) - if(ReKonfig::showUrlsPopup()) - { - connect(m_view, SIGNAL(showStatusBarMessage(const QString&, Rekonq::Notify)), - this, SLOT(notifyMessage(const QString&, Rekonq::Notify))); - connect(m_view, SIGNAL(linkHovered(const QString&)), - this, SLOT(notifyMessage(const QString&))); - } - else - { - disconnect(m_view, SIGNAL(showStatusBarMessage(const QString&, Rekonq::Notify)), - this, SLOT(notifyMessage(const QString&, Rekonq::Notify))); - disconnect(m_view, SIGNAL(linkHovered(const QString&)), - this, SLOT(notifyMessage(const QString&))); - } - - // =========== Fonts ============== QWebSettings *defaultSettings = QWebSettings::globalSettings(); diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg index 2ac9b331..56f0b18c 100644 --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -32,9 +32,6 @@ <entry name="openTabsBack" type="Bool"> <default>false</default> </entry> - <entry name="showUrlsPopup" type="Bool"> - <default>true</default> - </entry> </group> <!-- Fonts Settings --> |