[vidalia-svn] r2598: Remove the 'Run Tor as a Service' checkbox. Lots of people s (vidalia/trunk/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-25 17:19:18 -0400 (Sun, 25 May 2008)
New Revision: 2598

Modified:
   vidalia/trunk/src/vidalia/config/advancedpage.cpp
   vidalia/trunk/src/vidalia/config/advancedpage.h
   vidalia/trunk/src/vidalia/config/advancedpage.ui
Log:
Remove the 'Run Tor as a Service' checkbox. Lots of people seem to be
clicking it even though they don't really need to, and we end up leaving
them in a broken state after a reboot.


Modified: vidalia/trunk/src/vidalia/config/advancedpage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/advancedpage.cpp	2008-05-25 15:55:41 UTC (rev 2597)
+++ vidalia/trunk/src/vidalia/config/advancedpage.cpp	2008-05-25 21:19:18 UTC (rev 2598)
@@ -55,8 +55,10 @@
   /* Hide platform specific features */
 #if defined(Q_WS_WIN)
   ui.grpPermissions->setVisible(false);
+#if 0
   ui.grpService->setVisible(TorService::isSupported());
 #endif
+#endif
 }
 
 /** Destructor */
@@ -139,10 +141,12 @@
         && !ui.chkRandomPassword->isChecked())
     _settings->setControlPassword(ui.linePassword->text());
 
+#if 0
 #if defined(Q_WS_WIN)
   /* Install or uninstall the Tor service as necessary */
   setupService(ui.chkUseService->isChecked());
 #endif
+#endif
 
   return true;
 }
@@ -164,10 +168,12 @@
   if (!ui.chkRandomPassword->isChecked())
     ui.linePassword->setText(_settings->getControlPassword());
 
+#if 0
 #if defined(Q_WS_WIN)
   TorService s;
   ui.chkUseService->setChecked(s.isInstalled());
 #endif
+#endif
 }
 
 /** Called when the user selects a different authentication method from the
@@ -261,6 +267,7 @@
     ui.lineTorDataDirectory->setText(dataDir);
 }
 
+#if 0
 #if defined(Q_WS_WIN)
 /** Installs or removes the Tor service as necessary. */
 void
@@ -293,4 +300,5 @@
   }
 }
 #endif
+#endif
 

Modified: vidalia/trunk/src/vidalia/config/advancedpage.h
===================================================================
--- vidalia/trunk/src/vidalia/config/advancedpage.h	2008-05-25 15:55:41 UTC (rev 2597)
+++ vidalia/trunk/src/vidalia/config/advancedpage.h	2008-05-25 21:19:18 UTC (rev 2598)
@@ -66,11 +66,13 @@
   /** Returns the index in the authentication methods combo box for the given
    * authentication <b>method</b>. */
   int authMethodToIndex(TorSettings::AuthenticationMethod method);
-  
+ 
+#if 0 
 #if defined(Q_WS_WIN)
   /** Installs or removes the Tor service as necessary */
   void setupService(bool useService);
 #endif
+#endif
 
   /** A TorSettings object used to save/load settings */
   TorSettings* _settings;

Modified: vidalia/trunk/src/vidalia/config/advancedpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/advancedpage.ui	2008-05-25 15:55:41 UTC (rev 2597)
+++ vidalia/trunk/src/vidalia/config/advancedpage.ui	2008-05-25 21:19:18 UTC (rev 2598)
@@ -407,46 +407,6 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="grpService" >
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="contextMenuPolicy" >
-      <enum>Qt::NoContextMenu</enum>
-     </property>
-     <property name="visible" >
-      <bool>false</bool>
-     </property>
-     <property name="title" >
-      <string>Service</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="chkUseService" >
-        <property name="contextMenuPolicy" >
-         <enum>Qt::NoContextMenu</enum>
-        </property>
-        <property name="toolTip" >
-         <string>Enable this if you wish to run Tor as a Windows service</string>
-        </property>
-        <property name="text" >
-         <string>Run Tor in the background as a Windows service</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>