[vidalia-svn] r3521: Compromise on the Tor version thing. (vidalia/trunk/src/vidalia/about)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-02-15 10:47:19 -0500 (Sun, 15 Feb 2009)
New Revision: 3521

Modified:
   vidalia/trunk/src/vidalia/about/aboutdialog.cpp
   vidalia/trunk/src/vidalia/about/aboutdialog.ui
Log:

Compromise on the Tor version thing.


Modified: vidalia/trunk/src/vidalia/about/aboutdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.cpp	2009-02-14 06:04:35 UTC (rev 3520)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.cpp	2009-02-15 15:47:19 UTC (rev 3521)
@@ -37,6 +37,17 @@
   /* Get Vidalia's version number */
   ui.lblVidaliaVersion->setText(QString("Vidalia %1").arg(Vidalia::version()));
 
+  /* Get Tor's version number or hide it if Tor isn't running */
+  if (Vidalia::torControl()->isConnected()) {
+    QString version = Vidalia::torControl()->getTorVersionString();
+    if (! version.isEmpty())
+      ui.lblTorVersion->setText(QString("Tor %1").arg(version));
+    else
+      ui.lblTorVersion->setVisible(false);
+  } else {
+    ui.lblTorVersion->setVisible(false);
+  }
+
   /* Get Qt's version number */
   ui.lblQtVersion->setText(QString("Qt %1").arg(QT_VERSION_STR));
 

Modified: vidalia/trunk/src/vidalia/about/aboutdialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/about/aboutdialog.ui	2009-02-14 06:04:35 UTC (rev 3520)
+++ vidalia/trunk/src/vidalia/about/aboutdialog.ui	2009-02-15 15:47:19 UTC (rev 3521)
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>192</width>
-    <height>220</height>
+    <width>215</width>
+    <height>271</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -68,6 +68,16 @@
     </widget>
    </item>
    <item>
+    <widget class="QLabel" name="lblTorVersion" >
+     <property name="text" >
+      <string>Tor 0.2.0.32</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QLabel" name="lblQtVersion" >
      <property name="font" >
       <font>