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

[vidalia-svn] r2829: Fix GUI, remove warnings from netviewer. Updated behavior of (in vidalia/branches/exit-country/src/vidalia: config network)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2829: Fix GUI, remove warnings from netviewer. Updated behavior of (in vidalia/branches/exit-country/src/vidalia: config network)
From: cviecco@xxxxxxxxxxxxxxxxxxx
Date: Wed, 2 Jul 2008 17:00:30 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Wed, 02 Jul 2008 17:00:36 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx

Author: cviecco
Date: 2008-07-02 17:00:30 -0400 (Wed, 02 Jul 2008)
New Revision: 2829

Modified:
   vidalia/branches/exit-country/src/vidalia/config/configdialog.cpp
   vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp
   vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui
   vidalia/branches/exit-country/src/vidalia/network/netviewer.cpp
Log:
Fix GUI, remove warnings from netviewer. Updated behavior of checkboxes.


Modified: vidalia/branches/exit-country/src/vidalia/config/configdialog.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/configdialog.cpp	2008-07-02 17:02:17 UTC (rev 2828)
+++ vidalia/branches/exit-country/src/vidalia/config/configdialog.cpp	2008-07-02 21:00:30 UTC (rev 2829)
@@ -95,7 +95,7 @@
 
   ui.stackPages->add(new NetworkoutPage(ui.stackPages),
                        createPageAction(QIcon(IMAGE_NETWORK),
-                                        tr("Network out"), grp));
+                                        tr("Relay Policy"), grp));
 
 
   foreach (ConfigPage *page, ui.stackPages->pages()) {

Modified: vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp	2008-07-02 17:02:17 UTC (rev 2828)
+++ vidalia/branches/exit-country/src/vidalia/config/networkoutpage.cpp	2008-07-02 21:00:30 UTC (rev 2829)
@@ -247,7 +247,7 @@
       country_flag.addFile(":/images/flags/" + country + ".png");
     }
     else{
-      country_flag.addFile(":/images/flags/unkown.png");
+      country_flag.addFile(":/images/flags/unknown.png");
     }
     /*finally add the country information to the combo box!*/
     QString countryCount(country);
@@ -367,6 +367,7 @@
       //enable all other stuff!
    ui.chkExitNodePolicy->setEnabled(ui.chkNodePolicy->isChecked());
    ui.grpExitNodeSettings->setVisible(ui.chkExitNodePolicy->isChecked() & ui.chkNodePolicy->isChecked()); 
+   ui.chkExcludeNodePolicy->setEnabled(ui.chkNodePolicy->isChecked());
    ui.grpExcludeNodeSettings->setVisible(ui.chkExcludeNodePolicy->isChecked() & ui.chkNodePolicy->isChecked());
    /*
       //disable all other stuff!

Modified: vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui
===================================================================
--- vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui	2008-07-02 17:02:17 UTC (rev 2828)
+++ vidalia/branches/exit-country/src/vidalia/config/networkoutpage.ui	2008-07-02 21:00:30 UTC (rev 2829)
@@ -5,174 +5,127 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>571</width>
-    <height>507</height>
+    <width>618</width>
+    <height>515</height>
    </rect>
   </property>
   <property name="contextMenuPolicy" >
    <enum>Qt::NoContextMenu</enum>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
+  <layout class="QVBoxLayout" >
+   <item>
     <widget class="QCheckBox" name="chkNodePolicy" >
      <property name="text" >
-      <string>Enable Vidalia Node Policy Management (Will reduce your anonymity)</string>
+      <string>Enable Vidalia Relay Policy Management (Will reduce your anonymity and change your Tor Configuration)</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
+   <item>
     <widget class="QCheckBox" name="chkExitNodePolicy" >
      <property name="text" >
-      <string>Enable Strict Exit Node Management (Will change your exit node configuration)</string>
+      <string>Enable Strict Exit Relay Management (Changes 'ExitNodes' settings)</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
+   <item>
     <widget class="QGroupBox" name="grpExitNodeSettings" >
      <property name="title" >
-      <string>Exit Node Selection Policy</string>
+      <string>Exit Relay Selection Policy</string>
      </property>
-     <widget class="QLabel" name="label_2" >
-      <property name="geometry" >
-       <rect>
-        <x>20</x>
-        <y>50</y>
-        <width>71</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Exit Nodes</string>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="cmboExitNodesbyCountry" >
-      <property name="geometry" >
-       <rect>
-        <x>160</x>
-        <y>110</y>
-        <width>171</width>
-        <height>29</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pButtonApplyCountry" >
-      <property name="geometry" >
-       <rect>
-        <x>360</x>
-        <y>110</y>
-        <width>141</width>
-        <height>27</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Set Exits by Country</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_3" >
-      <property name="geometry" >
-       <rect>
-        <x>90</x>
-        <y>120</y>
-        <width>54</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Country</string>
-      </property>
-     </widget>
-     <widget class="QListWidget" name="listWidgetExitNodes" >
-      <property name="geometry" >
-       <rect>
-        <x>110</x>
-        <y>30</y>
-        <width>431</width>
-        <height>75</height>
-       </rect>
-      </property>
-     </widget>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Exit Relays</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QListWidget" name="listWidgetExitNodes" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Country</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QComboBox" name="cmboExitNodesbyCountry" />
+      </item>
+      <item row="1" column="3" >
+       <widget class="QPushButton" name="pButtonApplyCountry" >
+        <property name="text" >
+         <string>Set Exits by Country</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="3" column="0" >
+   <item>
     <widget class="QCheckBox" name="chkExcludeNodePolicy" >
      <property name="text" >
-      <string>Enable Exclude Node Management (Will change your invalid node configuration)</string>
+      <string>Enable Exclude Relay Management (Changes  'InvalidNodes' settings)</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item>
     <widget class="QGroupBox" name="grpExcludeNodeSettings" >
      <property name="title" >
-      <string>GroupBox</string>
+      <string>Exclude Relay Selection Policy</string>
      </property>
-     <widget class="QListWidget" name="listWidgetExcludedNodes" >
-      <property name="geometry" >
-       <rect>
-        <x>110</x>
-        <y>20</y>
-        <width>431</width>
-        <height>75</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>50</y>
-        <width>90</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Excluded Nodes</string>
-      </property>
-     </widget>
-     <widget class="QListWidget" name="listWidgetExcludedCountries" >
-      <property name="geometry" >
-       <rect>
-        <x>150</x>
-        <y>100</y>
-        <width>181</width>
-        <height>75</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pButtonApplyExcludedCountry" >
-      <property name="geometry" >
-       <rect>
-        <x>350</x>
-        <y>130</y>
-        <width>174</width>
-        <height>27</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Set Exclude Nodes by Country</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_4" >
-      <property name="geometry" >
-       <rect>
-        <x>80</x>
-        <y>130</y>
-        <width>54</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text" >
-       <string>Countries</string>
-      </property>
-     </widget>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Excluded Relays</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" colspan="2" >
+       <widget class="QListWidget" name="listWidgetExcludedNodes" />
+      </item>
+      <item row="1" column="0" colspan="2" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Countries</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QListWidget" name="listWidgetExcludedCountries" />
+      </item>
+      <item row="1" column="3" >
+       <widget class="QPushButton" name="pButtonApplyExcludedCountry" >
+        <property name="text" >
+         <string>Set Exclude Nodes by Country</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="5" column="0" >
+   <item>
     <widget class="QCheckBox" name="chkCloseAllActiveCircuits" >
      <property name="text" >
       <string>Close All Active Circuits</string>
      </property>
     </widget>
    </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>

Modified: vidalia/branches/exit-country/src/vidalia/network/netviewer.cpp
===================================================================
--- vidalia/branches/exit-country/src/vidalia/network/netviewer.cpp	2008-07-02 17:02:17 UTC (rev 2828)
+++ vidalia/branches/exit-country/src/vidalia/network/netviewer.cpp	2008-07-02 21:00:30 UTC (rev 2829)
@@ -81,10 +81,10 @@
   /* Set up the timers used to group together GeoIP requests for new
    * descriptors arriving within MIN_RESOLVE_QUEUE_DELAY milliseconds, but no
    * more than MAX_RESOLVE_QUEUE_DELAY milliseconds of each other. */
-  _minResolveQueueTimer.setSingleShot(true);
-  connect(&_minResolveQueueTimer, SIGNAL(timeout()), this, SLOT(resolve()));
-  _maxResolveQueueTimer.setSingleShot(true);
-  connect(&_maxResolveQueueTimer, SIGNAL(timeout()), this, SLOT(resolve()));
+  //_minResolveQueueTimer.setSingleShot(true);
+  //connect(&_minResolveQueueTimer, SIGNAL(timeout()), this, SLOT(resolve()));
+  //_maxResolveQueueTimer.setSingleShot(true);
+  //connect(&_maxResolveQueueTimer, SIGNAL(timeout()), this, SLOT(resolve()));
 
   /* Connect the necessary slots and signals */
   connect(ui.actionHelp, SIGNAL(triggered()), this, SLOT(help()));

Prev by Author: [vidalia-svn] r2843: small bugfix to copy not only the onion address but the whol (vidalia/branches/hidden-services/src/vidalia/config)
Next by Author: [vidalia-svn] r2845: Added 'common' country names to pull down menus. In English (in vidalia/branches/exit-country/src/vidalia: config res)
Previous by thread: [vidalia-svn] r2828: Commit from The Tor Translation Portal by user DJHasis. 528 (vidalia/trunk/src/vidalia/i18n/fi)
Next by thread: [vidalia-svn] r2830: If we're building with CMake 2.6, then force CMake 2.4 compa (vidalia/trunk)
Index(es):
- Author
- Thread