Cleaning settings ui && making optional hovering links popups

4 files changed, 40 insertions, 39 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3cff7cff..82f95cfa 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -164,10 +164,6 @@ void MainWindow::postLaunch()
     connect(m_view, SIGNAL(loadProgress(int)), this, SLOT(slotLoadProgress(int)));
     connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *)));
 
-    // "status bar" messages (new notifyMessage 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&)));
-
     // update toolbar actions signals
     connect(m_view, SIGNAL(tabsChanged()), this, SLOT(slotUpdateActions()));
     connect(m_view, SIGNAL(currentChanged(int)), this, SLOT(slotUpdateActions()));
@@ -367,6 +363,23 @@ void MainWindow::slotUpdateConfiguration()
     mainView()->showTabBar();
     mainView()->setMakeBackTab( ReKonfig::openTabsBack() );
 
+    // "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 499258d2..d6e3a8ae 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -14,12 +14,6 @@
     <entry name="homePage" type="String">
         <default>http://www.kde.org/</default>
     </entry>
-    <entry name="downloadDir" type="Path">
-        <default>$HOME</default>
-    </entry>
-    <entry name="downloadToDefaultDir" type="Bool">
-        <default>false</default>
-    </entry>
     <entry name="alwaysShowTabBar" type="Bool">
         <default>true</default>
     </entry>
@@ -29,6 +23,9 @@
     <entry name="openTabsBack" type="Bool">
         <default>false</default>
     </entry>
+    <entry name="showUrlsPopup" type="Bool">
+        <default>false</default>
+    </entry>
   </group>
 
 <!-- Fonts Settings -->
diff --git a/src/settings.cpp b/src/settings.cpp
index 297b81d9..ab315a9d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -162,9 +162,9 @@ void SettingsDialog::setWebSettingsToolTips()
 void SettingsDialog::readConfig()
 {
     // ======= General
-    d->generalUi.downloadDirUrlRequester->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
-    d->generalUi.downloadDirUrlRequester->setUrl(ReKonfig::downloadDir());
-    connect(d->generalUi.downloadDirUrlRequester, SIGNAL(textChanged(QString)), this, SLOT(saveSettings()));
+//     d->generalUi.downloadDirUrlRequester->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
+//     d->generalUi.downloadDirUrlRequester->setUrl(ReKonfig::downloadDir());
+//     connect(d->generalUi.downloadDirUrlRequester, SIGNAL(textChanged(QString)), this, SLOT(saveSettings()));
 
     // ======= Fonts
     d->fontsUi.kcfg_fixedFont->setOnlyFixed(true);
@@ -180,7 +180,7 @@ void SettingsDialog::readConfig()
 void SettingsDialog::saveSettings()
 {
     // General
-    ReKonfig::setDownloadDir(d->generalUi.downloadDirUrlRequester->url().prettyUrl());
+//     ReKonfig::setDownloadDir(d->generalUi.downloadDirUrlRequester->url().prettyUrl());
 
     // Save
     ReKonfig::self()->writeConfig();
diff --git a/src/settings_general.ui b/src/settings_general.ui
index 95723e78..d6ce4e49 100644
--- a/src/settings_general.ui
+++ b/src/settings_general.ui
@@ -64,26 +64,6 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="1">
-       <widget class="KUrlRequester" name="downloadDirUrlRequester"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="text">
-         <string>Save downloads to:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QCheckBox" name="kcfg_downloadToDefaultDir">
-        <property name="text">
-         <string>Ask where to save downloads</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -111,6 +91,22 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>General Settings</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="kcfg_showUrlsPopup">
+        <property name="text">
+         <string>show urls in popup hovering links</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -131,11 +127,6 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>KUrlRequester</class>
-   <extends>QFrame</extends>
-   <header>kurlrequester.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>