Changeset 2969

Timestamp:

08/15/08 11:42:17 (3 months ago)

Author:

borkdomenik

Message:

Two new features:
* Display the number of HiddenServices? actually running on the MainWindow?(thanks to phobos for this idea!!)
* Added some Tooltipps for the new features.

Location:

vidalia/branches/hidden-services/src/vidalia

Files:

• config/configdialog.cpp (modified) (2 diffs)
• config/configdialog.h (modified) (3 diffs)
• config/servicepage.ui (modified) (7 diffs)
• mainwindow.cpp (modified) (4 diffs)
• mainwindow.h (modified) (1 diff)

vidalia/branches/hidden-services/src/vidalia/config/configdialog.cpp

@@ -52 +52 @@
   ui.setupUi(this);
 
+  /* A reference to the parnet widget */
+  //_parent = (MainWIndow)parent;
   /* Override the QDialogButtonBox button text so we can use our own
    * translations. */
@@ -223 +225 @@
     appliedChanges = true;
   }
-  if (appliedChanges)
+  if (appliedChanges) {
     saveConf();
+  }
+  emit saved();
   close();
 }

vidalia/branches/hidden-services/src/vidalia/config/configdialog.h

@@ -21 +21 @@
 #include <QFileDialog>
 #include <vidaliawindow.h>
+//#include <mainwindow.h>
 
 #include "generalpage.h"
@@ -71 +72 @@
   void help();
 
+public:
+
+signals:
+  /** Emitted when the user closes the ConfigDialog in order to update the 
+   * number of Hidden Services that are running on the MainWindow */
+  void saved();
+
 private:
   /** Loads the current configuration settings */
@@ -78 +86 @@
   /** Adds a new action to the toolbar. */
   void addAction(QAction *action, const char *slot = 0);
+  /** A reference to the parent widget*/
+  //MainWindow* _parent;
 
   /** Qt Designer generated object */

vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui

@@ -107 +107 @@
             </size>
            </property>
+           <property name="toolTip" >
+            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A listing of all configured Services.&lt;/p>&lt;/body>&lt;/html></string>
+           </property>
            <property name="selectionMode" >
             <enum>QAbstractItemView::SingleSelection</enum>
@@ -298 +304 @@
           <item row="0" column="0" >
            <widget class="QCheckBox" name="checkBox_basic" >
+            <property name="toolTip" >
+             <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the basic authorization mode is more scalable but less secure.&lt;/p>&lt;/body>&lt;/html></string>
+            </property>
             <property name="text" >
              <string>basic configuration</string>
@@ -305 +317 @@
           <item row="0" column="1" >
            <widget class="QCheckBox" name="checkBox_stealth" >
+            <property name="toolTip" >
+             <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the stealth authorization mode is more secure but less scalable.&lt;/p>&lt;/body>&lt;/html></string>
+            </property>
             <property name="text" >
              <string>stealth configuration</string>
@@ -325 +343 @@
                 <height>16777215</height>
                </size>
+              </property>
+              <property name="toolTip" >
+               <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A listing of all ClientAuthorizationData configured with Vidalia.&lt;/p>&lt;/body>&lt;/html></string>
               </property>
               <property name="selectionMode" >
@@ -449 +473 @@
          </item>
          <item row="1" column="0" >
-          <widget class="QLineEdit" name="authLineAccess" />
+          <widget class="QLineEdit" name="authLineAccess" >
+           <property name="toolTip" >
+            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">only entries in the format: &amp;lt;onion-address&amp;gt; &amp;lt;descriptor-cookie&amp;gt; allowed.&lt;/p>&lt;/body>&lt;/html></string>
+           </property>
+          </widget>
          </item>
          <item row="1" column="1" >
-          <widget class="QLineEdit" name="commentLineAccess" />
+          <widget class="QLineEdit" name="commentLineAccess" >
+           <property name="toolTip" >
+            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Give an optional comment or identification for each entry.&lt;/p>&lt;/body>&lt;/html></string>
+           </property>
+          </widget>
          </item>
         </layout>
@@ -466 +504 @@
             </sizepolicy>
            </property>
+           <property name="toolTip" >
+            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">A listing of all ServiceAuthorizationData stored with Vidalia.&lt;/p>&lt;/body>&lt;/html></string>
+           </property>
            <property name="selectionMode" >
             <enum>QAbstractItemView::SingleSelection</enum>
@@ -487 +531 @@
           <widget class="QToolButton" name="addServiceAuthBtn" >
            <property name="toolTip" >
-            <string>Add new service with authorization data</string>
+            <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Add new service with authorization data&lt;/p>&lt;/body>&lt;/html></string>
            </property>
            <property name="text" >

vidalia/branches/hidden-services/src/vidalia/mainwindow.cpp

@@ -787 +787 @@
     }
   }
+  ui.lblTorStatus->setText(ui.lblTorStatus->text().append("\n""0 Hidden Services running."));
 }
 
@@ -1022 +1023 @@
   updateTorStatus(CircuitEstablished);
   startBrowser();
+  updateHidServStatus();
 }
 
@@ -1096 +1098 @@
 {
   _configDialog->showWindow(page);
+  connect(_configDialog, SIGNAL(saved()), this, SLOT(updateHidServStatus()));
 }
 
@@ -1169 +1172 @@
 }
 
-
+/** Called to display the number of Hidden Services actually running */
+void
+MainWindow::updateHidServStatus()
+{
+  QString statustext; 
+  QString conf = _torControl->getHiddenServiceConf("hiddenserviceoptions");
+  QStringList strList = conf.split("250 HiddenServiceDir");
+  int amount = strList.size()-1;
+  QString lblText = ui.lblTorStatus->text();
+  if(lblText.contains("\n")) {
+    QStringList lblList = lblText.split("\n");
+    statustext = lblList.first();
+  } else {
+    statustext = ui.lblTorStatus->text();
+  }
+  ui.lblTorStatus->setText(statustext.append("\n"+
+   QString::number(amount)+" Hidden Service(s) running."));
+}  
+

vidalia/branches/hidden-services/src/vidalia/mainwindow.h

@@ -104 +104 @@
   /** Called when the proxy server fails to start */
   void onProxyFailed(QString errmsg);
+  /** Called to display the number of Hidden Services actually running */
+  void updateHidServStatus();
   
 private: