[vidalia-svn] r3246: Revert the "how often to check for updates" stuff (r3239 and (vidalia/branches/auto-updates/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-10-19 17:32:38 -0400 (Sun, 19 Oct 2008)
New Revision: 3246

Modified:
   vidalia/branches/auto-updates/src/vidalia/config/generalpage.cpp
   vidalia/branches/auto-updates/src/vidalia/config/generalpage.ui
   vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.cpp
   vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.h
Log:
Revert the "how often to check for updates" stuff (r3239 and r3244).


Modified: vidalia/branches/auto-updates/src/vidalia/config/generalpage.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/generalpage.cpp	2008-10-19 19:19:34 UTC (rev 3245)
+++ vidalia/branches/auto-updates/src/vidalia/config/generalpage.cpp	2008-10-19 21:32:38 UTC (rev 3246)
@@ -43,11 +43,6 @@
   ui.chkRunVidaliaAtSystemStartup->setVisible(false);
   ui.lineHorizontalSeparator->setVisible(false);
   ui.grpSoftwareUpdates->setVisible(false);
-  ui.cmbUpdateInterval->setVisible(false);
-#else
-  ui.cmbUpdateInterval->addItem(tr("Daily"), "daily");
-  ui.cmbUpdateInterval->addItem(tr("Weekly"), "weekly");
-  ui.cmbUpdateInterval->addItem(tr("Monthly"), "monthly");
 #endif
 }
 
@@ -130,15 +125,8 @@
     ui.chkRunVidaliaAtSystemStartup->isChecked());
   _vidaliaSettings->setRunProxyAtStart(
     ui.chkRunProxyAtTorStartup->isChecked());
-
-#if defined(Q_OS_WIN32)
   _vidaliaSettings->setAutoUpdateEnabled(
     ui.chkAutoUpdates->isChecked());
-
-  int idx = ui.cmbUpdateInterval->currentIndex();
-  QString interval = ui.cmbUpdateInterval->itemData(idx).toString();
-  _vidaliaSettings->setCheckForUpdatesInterval(interval);
-#endif
   return true;
 }
 
@@ -156,16 +144,7 @@
   ui.lineProxyExecutableArguments->setText(
     string_format_arguments(_vidaliaSettings->getProxyExecutableArguments()));
   ui.chkRunProxyAtTorStartup->setChecked(_vidaliaSettings->runProxyAtStart());
-
-#if defined(Q_OS_WIN32)
   ui.chkAutoUpdates->setChecked(_vidaliaSettings->isAutoUpdateEnabled());
-
-  QString interval = _vidaliaSettings->checkForUpdatesInterval();
-  int idx = ui.cmbUpdateInterval->findData(interval);
-  if (idx < 0)
-    idx = 1;
-  ui.cmbUpdateInterval->setCurrentIndex(idx);
-#endif
 }
 
 void

Modified: vidalia/branches/auto-updates/src/vidalia/config/generalpage.ui
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/generalpage.ui	2008-10-19 19:19:34 UTC (rev 3245)
+++ vidalia/branches/auto-updates/src/vidalia/config/generalpage.ui	2008-10-19 21:32:38 UTC (rev 3246)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>488</width>
-    <height>380</height>
+    <width>492</width>
+    <height>402</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -162,11 +162,17 @@
        </widget>
       </item>
       <item>
-       <widget class="QComboBox" name="cmbUpdateInterval" >
-        <property name="maxVisibleItems" >
-         <number>10</number>
+       <spacer name="horizontalSpacer_2" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-       </widget>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
       <item>
        <spacer name="horizontalSpacer" >

Modified: vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.cpp
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.cpp	2008-10-19 19:19:34 UTC (rev 3245)
+++ vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.cpp	2008-10-19 21:32:38 UTC (rev 3246)
@@ -38,7 +38,6 @@
 #define SETTING_PROXY_EXECUTABLE_ARGUMENTS  "ProxyExecutableArguments"
 #define SETTING_CHECK_FOR_UPDATES   "CheckForUpdates"
 #define SETTING_LAST_UPDATE_CHECK   "LastUpdateCheck"
-#define SETTING_CHECK_FOR_UPDATES_INTERVAL "CheckForUpdatesInterval"
 
 #if defined(Q_OS_WIN32)
 #define STARTUP_REG_KEY        "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
@@ -80,7 +79,6 @@
   setDefault(SETTING_CHECK_FOR_UPDATES, false);
 #endif
   setDefault(SETTING_LAST_UPDATE_CHECK, QDateTime());
-  setDefault(SETTING_CHECK_FOR_UPDATES_INTERVAL, "weekly");
 }
 
 /** Gets the currently preferred language code for Vidalia. */
@@ -280,20 +278,3 @@
   setValue(SETTING_LAST_UPDATE_CHECK, checkedAt);
 }
 
-/** Returns the interval between automated checks for available software
- * updates. */
-QString
-VidaliaSettings::checkForUpdatesInterval() const
-{
-  return value(SETTING_CHECK_FOR_UPDATES_INTERVAL).toString();
-}
-
-/** Sets to <b>interval</b> the frequency with which we will automatically
- * check for available software updates. */
-void
-VidaliaSettings::setCheckForUpdatesInterval(const QString &interval)
-{
-  setValue(SETTING_CHECK_FOR_UPDATES_INTERVAL, interval);
-}
-
-

Modified: vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.h
===================================================================
--- vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.h	2008-10-19 19:19:34 UTC (rev 3245)
+++ vidalia/branches/auto-updates/src/vidalia/config/vidaliasettings.h	2008-10-19 21:32:38 UTC (rev 3246)
@@ -107,13 +107,6 @@
   /** Sets to <b>checkedAt</b> the time at which Vidalia last checked for
    * available software updates. */
   void setLastCheckedForUpdates(const QDateTime &checkedAt);
-
-  /** Returns the interval between automated checks for available software
-   * updates. */
-  QString checkForUpdatesInterval() const;
-  /** Sets to <b>interval</b> the frequency with which we will automatically
-   * check for available software updates. */
-  void setCheckForUpdatesInterval(const QString &interval);
 };
 
 #endif