[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2671: Beutified UI. Added checks for 'right' Tor version. Missing: (vidalia/branches/exit-country/src/vidalia/config)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2671: Beutified UI. Added checks for 'right' Tor version. Missing: (vidalia/branches/exit-country/src/vidalia/config)
From: cviecco@xxxxxxxxxxxxxxxxxxx
Date: Thu, 5 Jun 2008 13:17:36 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Thu, 05 Jun 2008 13:17:42 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: cviecco
Date: 2008-06-05 13:17:36 -0400 (Thu, 05 Jun 2008)
New Revision: 2671

Modified:
   vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp
   vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h
   vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui
   vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp
   vidalia/branches/exit-country/src/vidalia/config/networksettings.h
   vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.cpp
   vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.h
Log:
Beutified UI. Added checks for 'right' Tor version.
Missing: short Country names to long names, QA testing.






Modified: vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp	2008-06-05 00:44:11 UTC (rev 2670)
+++ vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp	2008-06-05 17:17:36 UTC (rev 2671)
@@ -56,6 +56,13 @@
 */
   connect(ui.pButtonApplyCountry,SIGNAL(clicked()),
           this, SLOT( copyCountryToText() ));
+
+  connect(ui.chkNodePolicy,SIGNAL(clicked()),
+          this, SLOT( HideUnhide() ));
+  connect(ui.chkExitNodePolicy,SIGNAL(clicked()),
+          this, SLOT( HideUnhide() ));
+
+
 }
 
 /** Destructor */
@@ -81,11 +88,17 @@
   ///* Set to new style 
   Vidalia::setStyle(ui.cmboStyle->currentText());
 */
- 
-  settings.setUseNodePolicy(ui.chkNodePolicy->isChecked());
-  /*Need to add validation?*/
-  settings.setExitNodeList(ui.lineEditExitNodes->text().split(",", QString::SkipEmptyParts) );    
+  _settings->setUseNodePolicy(ui.chkNodePolicy->isChecked());
 
+  /*Now save only is settings have been enabled*/
+  if((ui.chkNodePolicy->isChecked())){
+  settings.setUseExitNodePolicy(ui.chkExitNodePolicy->isChecked());
+    /*Only save if we have enabled saving exit policies!*/
+    if(ui.chkExitNodePolicy->isChecked()){
+        /*Need to add validation?*/
+        settings.setExitNodeList(ui.lineEditExitNodes->text().split(",", QString::SkipEmptyParts) );    
+    }
+  }
   /*if clear connections is set, clear them up!*/
   if(ui.chkCloseAllActiveCircuits->isChecked()){
      closeAllCircuits();     
@@ -114,15 +127,18 @@
   index = ui.cmboStyle->findData(Vidalia::style().toLower());
   ui.cmboStyle->setCurrentIndex(index);
   */
+  ui.chkNodePolicy->setChecked(_settings->getUseNodePolicy()); 
+  ui.chkExitNodePolicy->setChecked(settings.getUseExitNodePolicy());
  
-  ui.chkNodePolicy->setChecked(settings.getUseNodePolicy());
-  QStringList exit_nodes = settings.getExitNodeList();
+ QStringList exit_nodes = settings.getExitNodeList();
   ui.lineEditExitNodes->setText(exit_nodes.join(","));
 
   //cmboExitNodesbyCountry->ui.cmboStyle("")
-
+  
   ui.chkCloseAllActiveCircuits->setChecked(false);
-  ui.chkCloseAllActiveCircuits->setEnabled(false);
+  //ui.chkCloseAllActiveCircuits->setEnabled(false);
+  
+  HideUnhide();
 
 }
 
@@ -141,9 +157,17 @@
   QString count;
   int flags;
   QString uniqueRouterName;
+  quint32 torVersion = Vidalia::torControl()->getTorVersion();
+
+  if (torVersion < 0x020100) {
+    //ui.grpBridgeSettings->setEnabled(false);
+    //ui.lblNoBridgeSupport->setVisible(true);
+    ui.cmboExitNodesbyCountry->setEnabled(false);
+    ui.chkCloseAllActiveCircuits->setEnabled(true);
+    ui.pButtonApplyCountry->setEnabled(false);
+    return;
+  }
  
-  //fprintf(stderr,"hello2\n");
- 
   /*Fill up the internal structure*/
   foreach( RouterStatus router, networkStatus){
      //fprintf(stderr,"*");
@@ -228,6 +252,25 @@
   //remove data from the country combo box?
 
 }
+
+
+void 
+NetworkoutPage::HideUnhide(){
+ //  if(ui.chkNodePolicy->isChecked()){
+      //enable all other stuff!
+   ui.chkExitNodePolicy->setEnabled(ui.chkNodePolicy->isChecked());
+   ui.grpExitNodeSettings->setVisible(ui.chkExitNodePolicy->isChecked() & ui.chkNodePolicy->isChecked()); 
+    
+   /*
+      //disable all other stuff!
+       ui.chkExitNodePolicy->setEnabled(false);
+       ui.grpExitNodeSettings->setVisible(ui.chkExitNodePolicy->isChecked()); 
+    */
+
+}
+
+
+
 void
 NetworkoutPage::closeAllCircuits(){
   //get list of circuits

Modified: vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h	2008-06-05 00:44:11 UTC (rev 2670)
+++ vidalia/branches/exit-country/src/vidalia/config/networkoutpage.h	2008-06-05 17:17:36 UTC (rev 2671)
@@ -45,6 +45,11 @@
   void load();
   
 private slots:
+  
+  /*This is an ugly thing!*/
+  void HideUnhide();
+
+  /*copies country nodes into exit node text*/
   void copyCountryToText();
   /*Do stuff once authenticated*/
   void onAuthenticated();  

Modified: vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui	2008-06-05 00:44:11 UTC (rev 2670)
+++ vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui	2008-06-05 17:17:36 UTC (rev 2671)
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>519</width>
-    <height>395</height>
+    <height>430</height>
    </rect>
   </property>
   <property name="contextMenuPolicy" >
@@ -29,9 +29,9 @@
    <property name="geometry" >
     <rect>
      <x>10</x>
-     <y>30</y>
-     <width>501</width>
-     <height>181</height>
+     <y>60</y>
+     <width>481</width>
+     <height>171</height>
     </rect>
    </property>
    <property name="title" >
@@ -110,6 +110,19 @@
     </property>
    </widget>
   </widget>
+  <widget class="QCheckBox" name="chkExitNodePolicy" >
+   <property name="geometry" >
+    <rect>
+     <x>10</x>
+     <y>40</y>
+     <width>481</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <property name="text" >
+    <string>Enable Strict Exit Node Management (Might change your exit node configuration)</string>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>

Modified: vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp	2008-06-05 00:44:11 UTC (rev 2670)
+++ vidalia/branches/exit-country/src/vidalia/config/networksettings.cpp	2008-06-05 17:17:36 UTC (rev 2671)
@@ -29,7 +29,7 @@
 #define SETTING_UPDATE_BRIDGES      "UpdateBridgesFromAuthority"
 #define SETTING_TUNNEL_DIR_CONNS    "TunnelDirConns"
 #define SETTING_PREFER_TUNNELED_DIR_CONNS "PreferTunneledDirConns"
-#define SETTING_USE_NODE_POLICY      "UseNodePolicy"
+#define SETTING_USE_EXIT_NODE_POLICY "UseExitNodePolicy"
 #define SETTING_EXIT_NODE_LIST       "ExitNode"
 
 
@@ -49,7 +49,8 @@
   setDefault(SETTING_TUNNEL_DIR_CONNS,  true);
   setDefault(SETTING_REACHABLE_ADDRESSES,
     QStringList() << "*:80" << "*:443");
-  setDefault(SETTING_USE_NODE_POLICY ,  false);
+//  setDefault(SETTING_USE_NODE_POLICY ,  false);
+  setDefault(SETTING_USE_EXIT_NODE_POLICY ,  false);
   setDefault(SETTING_EXIT_NODE_LIST, 
     QStringList() << "blutmagie" << "chaoscomputerclub23");
 }
@@ -67,7 +68,7 @@
     (getFascistFirewall() ? 
       localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : "")); 
  
-  if(getUseNodePolicy()){
+  if(getUseExitNodePolicy()){
     conf.insert(SETTING_EXIT_NODE_LIST,
         localValue(SETTING_EXIT_NODE_LIST).toStringList().join(","));
     conf.insert("StrictExitNodes","1");
@@ -316,15 +317,15 @@
 /** Returns true if Tor should use network policies for its nodes
  * network. */
 bool 
-NetworkSettings::getUseNodePolicy(){
-  return value(SETTING_USE_NODE_POLICY).toBool();
+NetworkSettings::getUseExitNodePolicy(){
+  return value(SETTING_USE_EXIT_NODE_POLICY).toBool();
 }
 
 /** Sets to <b>useNodePolicy</b> whether Tor should try
  to use node policies to access the newtowk. */
 void 
-NetworkSettings::setUseNodePolicy(bool useNodePolicy){
-  setValue(SETTING_USE_NODE_POLICY, useNodePolicy);
+NetworkSettings::setUseExitNodePolicy(bool useNodePolicy){
+  setValue(SETTING_USE_EXIT_NODE_POLICY, useNodePolicy);
 }
 
 /** Returns a list of bridge nodes Tor should use. */
@@ -342,3 +343,4 @@
 }
 
 
+

Modified: vidalia/branches/exit-country/src/vidalia/config/networksettings.h
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networksettings.h	2008-06-05 00:44:11 UTC (rev 2670)
+++ vidalia/branches/exit-country/src/vidalia/config/networksettings.h	2008-06-05 17:17:36 UTC (rev 2671)
@@ -114,12 +114,19 @@
    * connections through a one-hop circuit. */
   bool getTunnelDirConns();
 
-  /** Returns true if Tor should use network policies for its nodes
+
+/*
+  // determines if vidalia should try to manage Tor's Nodes
+  bool getUseNodePolicy();
+  void setUseNodePolicy(bool useNodePolicy);
+*/
+
+  /** Returns true if vidalia should manage Tor's exit nodes
    * network. */
-  bool getUseNodePolicy();
+  bool getUseExitNodePolicy();
   /** Sets to <b>useNodePolicy</b> whether Tor should try
    to use node policies to access the newtowk. */
-  void setUseNodePolicy(bool useNodePolicy);
+  void setUseExitNodePolicy(bool useNodePolicy);
 
 
   /** Returns a list of bridge nodes Tor should use. */

Modified: vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.cpp	2008-06-05 00:44:11 UTC (rev 2670)
+++ vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.cpp	2008-06-05 17:17:36 UTC (rev 2671)
@@ -35,6 +35,7 @@
 #define SETTING_RUN_PROXY_AT_START  "RunProxyAtStart"
 #define SETTING_PROXY_EXECUTABLE    "ProxyExecutable"
 #define SETTING_PROXY_EXECUTABLE_ARGUMENTS  "ProxyExecutableArguments"
+#define SETTING_USE_NODE_POLICY     "UseNodePolicy"
 
 #if defined(Q_OS_WIN32)
 #define STARTUP_REG_KEY        "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
@@ -228,3 +229,17 @@
   setValue(SETTING_PROXY_EXECUTABLE_ARGUMENTS, proxyExecutableArguments);
 }
 
+
+bool
+VidaliaSettings::getUseNodePolicy(){
+  return value(SETTING_USE_NODE_POLICY).toBool();
+
+}
+
+void
+VidaliaSettings::setUseNodePolicy(bool useNodePolicy){
+  setValue(SETTING_USE_NODE_POLICY, useNodePolicy);
+}
+
+
+

Modified: vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.h
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.h	2008-06-05 00:44:11 UTC (rev 2670)
+++ vidalia/branches/exit-country/src/vidalia/config/vidaliasettings.h	2008-06-05 17:17:36 UTC (rev 2671)
@@ -86,6 +86,12 @@
   QStringList getProxyExecutableArguments() const;
   /** Sets the additional arguments to be passed to Proxy Executable */
   void setProxyExecutableArguments(const QStringList &proxyExecutableArguments);
+
+
+  // determines if vidalia should try to manage Tor's Nodes
+  bool getUseNodePolicy();
+  void setUseNodePolicy(bool useNodePolicy);
+
 };
 
 #endif

Prev by Author: [vidalia-svn] r2666: Aesthetic modificaitons... now with country maps. Reset of o (vidalia/branches/exit-country/src/vidalia/config)
Next by Author: [vidalia-svn] r2720: Try to use client geo ip file. if not found use local. Signi (vidalia/branches/exit-country/src/vidalia/config)
Previous by thread: [vidalia-svn] r2670: Use https instead of http for the Tor links in the bundle. (in vidalia: . trunk/pkg/win32)
Next by thread: [vidalia-svn] r2672: Corrected couple of Finnish windows installer strings (vidalia/trunk/pkg/win32)
Index(es):
- Author
- Thread