[developerteam getadooble] SF.net SVN: dooble:[1965] trunk/browser

[<tex...@us...>]

Revision: 1965
          http://dooble.svn.sourceforge.net/dooble/?rev=1965&view=rev
Author:   textfield
Date:     2011-02-17 02:18:08 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
More state storing.

Modified Paths:
--------------
    trunk/browser/Include/dcookiewindow.h
    trunk/browser/Source/dcookiewindow.cc
    trunk/browser/Source/ddownloadwindow.cc
    trunk/browser/Source/dhistory.cc
    trunk/browser/Source/dsettings.cc

Modified: trunk/browser/Include/dcookiewindow.h
===================================================================
--- trunk/browser/Include/dcookiewindow.h	2011-02-16 22:38:42 UTC (rev 1964)
+++ trunk/browser/Include/dcookiewindow.h	2011-02-17 02:18:08 UTC (rev 1965)
@@ -79,7 +79,6 @@
   void slotDeleteAll(void);
   void slotTextChanged(const QString &text);
   void slotDeleteCookie(void);
-  void slotSaveHeaderState(void);
 
  signals:
   void iconsChanged(void);

Modified: trunk/browser/Source/dcookiewindow.cc
===================================================================
--- trunk/browser/Source/dcookiewindow.cc	2011-02-16 22:38:42 UTC (rev 1964)
+++ trunk/browser/Source/dcookiewindow.cc	2011-02-17 02:18:08 UTC (rev 1965)
@@ -389,10 +389,14 @@
 void dcookiewindow::closeEvent(QCloseEvent *event)
 {
   dooble::s_settings["cookiesWindow/size"] = size();
+  dooble::s_settings["cookiesWindow/tableColumnsState"] =
+    ui.cookies->header()->saveState();
 
   QSettings settings;
 
   settings.setValue("cookieWindow/size", size());
+  settings.setValue("cookiesWindow/tableColumnsState",
+		    ui.cookies->header()->saveState());
   QMainWindow::closeEvent(event);
 }
 
@@ -413,14 +417,3 @@
   statusBar()->showMessage(QString(tr("%1 domain(s)")).
 			   arg(m_model->rowCount() - n));
 }
-
-void dcookiewindow::slotSaveHeaderState(void)
-{
-  dooble::s_settings["cookiesWindow/tableColumnsState"] =
-    ui.cookies->header()->saveState();
-
-  QSettings settings;
-
-  settings.setValue("cookiesWindow/tableColumnsState",
-		    ui.cookies->header()->saveState());
-}

Modified: trunk/browser/Source/ddownloadwindow.cc
===================================================================
--- trunk/browser/Source/ddownloadwindow.cc	2011-02-16 22:38:42 UTC (rev 1964)
+++ trunk/browser/Source/ddownloadwindow.cc	2011-02-17 02:18:08 UTC (rev 1965)
@@ -218,10 +218,11 @@
 
 void ddownloadwindow::closeEvent(QCloseEvent *event)
 {
+  dooble::s_settings["downloadwindow/geometry"] = geometry();
+
   QSettings settings;
 
   settings.setValue("downloadwindow/geometry", geometry());
-  dooble::s_settings["downloadwindow/geometry"] = geometry();
   QMainWindow::closeEvent(event);
 }
 

Modified: trunk/browser/Source/dhistory.cc
===================================================================
--- trunk/browser/Source/dhistory.cc	2011-02-16 22:38:42 UTC (rev 1964)
+++ trunk/browser/Source/dhistory.cc	2011-02-17 02:18:08 UTC (rev 1965)
@@ -734,6 +734,12 @@
   if(timer)
     timer->stop();
 
+  dooble::s_settings["historyWindow/size"] = size();
+  dooble::s_settings["historyWindow/splitterState"] =
+    ui.splitter->saveState();
+  dooble::s_settings["historyWindow/tableColumnsState"] =
+    ui.history->horizontalHeader()->saveState();
+
   QSettings settings;
 
   settings.setValue("historyWindow/size", size());
@@ -742,10 +748,5 @@
   settings.setValue("historyWindow/tableColumnsState",
 		    ui.history->horizontalHeader()->
 		    saveState());
-  dooble::s_settings["historyWindow/size"] = size();
-  dooble::s_settings["historyWindow/splitterState"] =
-    ui.splitter->saveState();
-  dooble::s_settings["historyWindow/tableColumnsState"] =
-    ui.history->horizontalHeader()->saveState();
   QMainWindow::closeEvent(event);
 }

Modified: trunk/browser/Source/dsettings.cc
===================================================================
--- trunk/browser/Source/dsettings.cc	2011-02-16 22:38:42 UTC (rev 1964)
+++ trunk/browser/Source/dsettings.cc	2011-02-17 02:18:08 UTC (rev 1965)
@@ -180,7 +180,8 @@
   ui.ftpProxyGroupBox->setChecked
     (dooble::s_settings.value("settingsWindow/ftpProxyEnabled", false).toBool());
   ui.httpProxyGroupBox->setChecked
-    (dooble::s_settings.value("settingsWindow/httpProxyEnabled", false).toBool());
+    (dooble::s_settings.value("settingsWindow/httpProxyEnabled", false).
+     toBool());
   ui.proxyType->setCurrentIndex
     (ui.proxyType->findText
      (dooble::s_settings.value("settingsWindow/proxyType",
@@ -253,7 +254,8 @@
 
   if(!dooble::s_settings.value("settingsWindow/url12", "").toString().isEmpty())
     ui.doobleSearchLineEdit->setText
-      (dooble::s_settings.value("settingsWindow/url12", "").toString().trimmed());
+      (dooble::s_settings.value("settingsWindow/url12", "").
+       toString().trimmed());
 
   ui.automaticallyLoadImagesCheckBox->setChecked
     (dooble::s_settings.value("settingsWindow/automaticallyLoadImages",
@@ -281,7 +283,8 @@
 	  }
 
 	QSettings settings
-	  (dooble::s_settings.value(allKeys[i]).toString(), QSettings::IniFormat);
+	  (dooble::s_settings.value(allKeys[i]).toString(),
+	   QSettings::IniFormat);
 
 	settings.beginGroup("Description");
 	itemsMap[settings.value("Name").toString()] =
@@ -309,7 +312,8 @@
   ui.javaCheckBox->setChecked
     (dooble::s_settings.value("settingsWindow/javaEnabled", false).toBool());
   ui.javascriptGroupBox->setChecked
-    (dooble::s_settings.value("settingsWindow/javascriptEnabled", true).toBool());
+    (dooble::s_settings.value("settingsWindow/javascriptEnabled", true).
+     toBool());
   ui.jsAllowNewWindowsCheckBox->setChecked
     (dooble::s_settings.value("settingsWindow/javascriptAllowNewWindows",
 			      false).toBool());
@@ -618,8 +622,20 @@
   ui.alwaysShowTabBarCheckBox->setChecked
     (dooble::s_settings.value("settingsWindow/alwaysShowTabBar", true).toBool());
   ui.spatialNavigationCheckBox->setChecked
-    (dooble::s_settings.value("settingsWindow/spatialNavigation", false).toBool());
+    (dooble::s_settings.value("settingsWindow/spatialNavigation",
+			      false).toBool());
 
+  if(dooble::s_settings.value("settingsWindow/cookiesShouldBe", 0).toInt() == 0)
+    ui.cookieComboBox->setCurrentIndex(0);
+  else if(dooble::s_settings.value("settingsWindow/cookiesShouldBe",
+				   0).toInt() == 1)
+    ui.cookieComboBox->setCurrentIndex(1);
+  else if(dooble::s_settings.value("settingsWindow/cookiesShouldBe",
+				   0).toInt() == 2)
+    ui.cookieComboBox->setCurrentIndex(2);
+  else
+    ui.cookieComboBox->setCurrentIndex(0);
+
   QLocale locale;
 
   ui.languageComboBox->addItem(locale.languageToString(locale.language()));
@@ -797,6 +813,8 @@
 			ui.alwaysShowTabBarCheckBox->isChecked());
       settings.setValue("settingsWindow/spatialNavigation",
 			ui.spatialNavigationCheckBox->isChecked());
+      settings.setValue("settingsWindow/cookiesShouldBe",
+			ui.cookieComboBox->currentIndex());
 
       QFont font;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.