[vidalia-svn] r1691: Add a status icon and text to the top of the main window. (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-03-29 21:54:30 -0400 (Thu, 29 Mar 2007)
New Revision: 1691

Modified:
   trunk/
   trunk/src/gui/mainwindow.ui
Log:
 r1765@adrastea:  edmanm | 2007-03-29 21:49:15 -0400
 Add a status icon and text to the top of the main window.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r1765] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/gui/mainwindow.ui
===================================================================
--- trunk/src/gui/mainwindow.ui	2007-03-30 01:28:14 UTC (rev 1690)
+++ trunk/src/gui/mainwindow.ui	2007-03-30 01:54:30 UTC (rev 1691)
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>425</width>
-    <height>325</height>
+    <height>395</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -20,13 +20,13 @@
   <property name="minimumSize" >
    <size>
     <width>425</width>
-    <height>325</height>
+    <height>395</height>
    </size>
   </property>
   <property name="maximumSize" >
    <size>
     <width>425</width>
-    <height>325</height>
+    <height>395</height>
    </size>
   </property>
   <property name="windowTitle" >
@@ -44,6 +44,56 @@
      <number>6</number>
     </property>
     <item>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="lblTorStatusImg" >
+        <property name="pixmap" >
+         <pixmap>:/images/48x48/tor-off.png</pixmap>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="lblTorStatus" >
+        <property name="text" >
+         <string>Tor is not running</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </item>
+    <item>
      <widget class="QGroupBox" name="grpShortcuts" >
       <property name="geometry" >
        <rect>
@@ -53,6 +103,12 @@
         <height>245</height>
        </rect>
       </property>
+      <property name="minimumSize" >
+       <size>
+        <width>381</width>
+        <height>245</height>
+       </size>
+      </property>
       <property name="title" >
        <string>Vidalia Shortcuts</string>
       </property>
@@ -302,6 +358,19 @@
        </item>
      </layout>
     </item>
+    <item>
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" >
+       <size>
+        <width>20</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar" >