[vidalia-svn] r1686: Call the new window a "Control Panel"; s/Setup a Server/Setu (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-03-18 23:59:25 -0400 (Sun, 18 Mar 2007)
New Revision: 1686

Modified:
   trunk/
   trunk/src/gui/mainwindow.ui
Log:
 r1755@adrastea:  edmanm | 2007-03-18 23:54:36 -0400
 Call the new window a "Control Panel"; s/Setup a Server/Setup Relaying/;
 convert the "Settings" button in my head from neurons to code (this group of
 buttons still needs a better place to live on the dialog).



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

Modified: trunk/src/gui/mainwindow.ui
===================================================================
--- trunk/src/gui/mainwindow.ui	2007-03-19 02:47:21 UTC (rev 1685)
+++ trunk/src/gui/mainwindow.ui	2007-03-19 03:59:25 UTC (rev 1686)
@@ -30,7 +30,7 @@
    </size>
   </property>
   <property name="windowTitle" >
-   <string>Vidalia</string>
+   <string>Vidalia Control Panel</string>
   </property>
   <property name="windowIcon" >
    <iconset resource="res/vidalia_common.qrc" >:/images/128x128/tor-logo.png</iconset>
@@ -42,7 +42,7 @@
       <x>410</x>
       <y>30</y>
       <width>141</width>
-      <height>151</height>
+      <height>160</height>
      </rect>
     </property>
     <layout class="QVBoxLayout" >
@@ -53,6 +53,16 @@
       <number>6</number>
      </property>
      <item>
+      <widget class="VClickLabel" name="lblBandwidthGraph" >
+       <property name="text" >
+        <string>Bandwidth Graph</string>
+       </property>
+       <property name="pixmap" >
+        <pixmap>:/images/16x16/utilities-system-monitor.png</pixmap>
+       </property>
+      </widget>
+     </item>
+     <item>
       <widget class="VClickLabel" name="lblMessageLog" >
        <property name="text" >
         <string>Message Log</string>
@@ -63,12 +73,12 @@
       </widget>
      </item>
      <item>
-      <widget class="VClickLabel" name="lblBandwidthGraph" >
+      <widget class="VClickLabel" name="lblSettings" >
        <property name="text" >
-        <string>Bandwidth Graph</string>
+        <string>Settings</string>
        </property>
        <property name="pixmap" >
-        <pixmap>:/images/16x16/utilities-system-monitor.png</pixmap>
+        <pixmap>:/images/16x16/preferences-system.png</pixmap>
        </property>
       </widget>
      </item>
@@ -166,9 +176,9 @@
        <number>6</number>
       </property>
       <item row="0" column="1" >
-       <widget class="VClickLabel" native="1" name="lblSetupServer" >
+       <widget class="VClickLabel" native="1" name="lblSetupRelaying" >
         <property name="text" >
-         <string>Setup a Server</string>
+         <string>Setup Relaying</string>
         </property>
         <property name="pixmap" >
          <pixmap>:/images/48x48/network-server.png</pixmap>