Implements Timeout UI

4 files changed, 33 insertions, 2 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 71bfa6d..7de50e1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 
 void GenericSettings::load(QSettings &settings)
 {
+    network_timeout = settings.value("network_timeout", 5000).toInt();
     start_page = settings.value("start_page", "about:favourites").toString();
 
     if(settings.value("text_display", "fancy").toString() == "plain")
@@ -93,4 +94,5 @@ void GenericSettings::save(QSettings &settings) const
     settings.setValue("use_os_scheme_handler", use_os_scheme_handler);
     settings.setValue("max_redirections", max_redirections);
     settings.setValue("redirection_policy", int(redirection_policy));
+    settings.setValue("network_timeout", network_timeout);
 }
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index eb9858b..20ac58a 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -243,6 +243,8 @@ void SettingsDialog::setOptions(const GenericSettings &options)
             break;
         }
     }
+
+    this->ui->network_timeout->setValue(this->current_options.network_timeout);
 }
 
 GenericSettings SettingsDialog::options() const
@@ -648,3 +650,8 @@ void SettingsDialog::on_max_redirects_valueChanged(int max_redirections)
 {
     this->current_options.max_redirections = max_redirections;
 }
+
+void SettingsDialog::on_network_timeout_valueChanged(int timeout)
+{
+    this->current_options.network_timeout = timeout;
+}
diff --git a/src/settingsdialog.hpp b/src/settingsdialog.hpp
index 1be2e68..d0b0d22 100644
--- a/src/settingsdialog.hpp
+++ b/src/settingsdialog.hpp
@@ -123,6 +123,8 @@ private slots:
 
     void on_max_redirects_valueChanged(int arg1);
 
+    void on_network_timeout_valueChanged(int arg1);
+
 private:
     void reloadStylePreview();
 
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index c8dbb7b..897f68f 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -265,6 +265,26 @@
        <item row="8" column="1">
         <widget class="QComboBox" name="redirection_mode"/>
        </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="label_28">
+         <property name="text">
+          <string>Network Timeout</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QSpinBox" name="network_timeout">
+         <property name="suffix">
+          <string> ms</string>
+         </property>
+         <property name="minimum">
+          <number>100</number>
+         </property>
+         <property name="maximum">
+          <number>90000</number>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="style_tab">
@@ -975,10 +995,10 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="buttonGroup_2"/>
   <buttongroup name="buttonGroup"/>
+  <buttongroup name="buttonGroup_2"/>
+  <buttongroup name="gophermapBtnGroup"/>
   <buttongroup name="textRenderingBtnGroup"/>
   <buttongroup name="textHighlightsBtnGroup"/>
-  <buttongroup name="gophermapBtnGroup"/>
  </buttongroups>
 </ui>