[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1688: Let's give this mainwindow layout a try. (Reminder: none of (in trunk: . src/gui)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r1688: Let's give this mainwindow layout a try. (Reminder: none of (in trunk: . src/gui)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Thu, 29 Mar 2007 18:18:06 -0400 (EDT)
Delivered-to: archiver@seul.org
Delivered-to: vidalia-svn-outgoing@seul.org
Delivered-to: vidalia-svn@seul.org
Delivery-date: Thu, 29 Mar 2007 18:08:10 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2007-03-29 18:18:06 -0400 (Thu, 29 Mar 2007)
New Revision: 1688

Modified:
   trunk/
   trunk/src/gui/mainwindow.ui
Log:
 r1759@adrastea:  edmanm | 2007-03-29 18:10:23 -0400
 Let's give this mainwindow layout a try. (Reminder: none of the buttons 
 do anything yet.)



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

Modified: trunk/src/gui/mainwindow.ui
===================================================================
--- trunk/src/gui/mainwindow.ui	2007-03-20 02:35:57 UTC (rev 1687)
+++ trunk/src/gui/mainwindow.ui	2007-03-29 22:18:06 UTC (rev 1688)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>560</width>
-    <height>225</height>
+    <width>425</width>
+    <height>325</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -19,14 +19,14 @@
   </property>
   <property name="minimumSize" >
    <size>
-    <width>560</width>
-    <height>225</height>
+    <width>425</width>
+    <height>325</height>
    </size>
   </property>
   <property name="maximumSize" >
    <size>
-    <width>560</width>
-    <height>225</height>
+    <width>425</width>
+    <height>325</height>
    </size>
   </property>
   <property name="windowTitle" >
@@ -36,188 +36,240 @@
    <iconset resource="res/vidalia_common.qrc" >:/images/128x128/tor-logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <widget class="QWidget" name="verticalLayout" >
-    <property name="geometry" >
-     <rect>
-      <x>410</x>
-      <y>30</y>
-      <width>141</width>
-      <height>160</height>
-     </rect>
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>20</number>
     </property>
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <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>
-       </property>
-       <property name="pixmap" >
-        <pixmap>:/images/16x16/format-justify-fill.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="VClickLabel" name="lblSettings" >
-       <property name="text" >
-        <string>Settings</string>
-       </property>
-       <property name="pixmap" >
-        <pixmap>:/images/16x16/preferences-system.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="VClickLabel" name="lblHelpBrowser" >
-       <property name="text" >
-        <string>Help</string>
-       </property>
-       <property name="pixmap" >
-        <pixmap>:/images/16x16/help-browser.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="VClickLabel" name="lblAboutVidalia" >
-       <property name="text" >
-        <string>About</string>
-       </property>
-       <property name="pixmap" >
-        <pixmap>:/images/16x16/tor-logo.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="VClickLabel" name="lblAboutVidalia" >
-       <property name="text" >
-        <string>Exit</string>
-       </property>
-       <property name="pixmap" >
-        <pixmap>:/images/16x16/emblem-unreadable.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QCheckBox" name="chkShowOnStartup" >
-    <property name="geometry" >
-     <rect>
-      <x>20</x>
-      <y>170</y>
-      <width>341</width>
-      <height>21</height>
-     </rect>
+    <property name="spacing" >
+     <number>6</number>
     </property>
-    <property name="text" >
-     <string>Show this window on startup</string>
-    </property>
-   </widget>
-   <widget class="QGroupBox" name="grpShortcuts" >
-    <property name="geometry" >
-     <rect>
-      <x>20</x>
-      <y>10</y>
-      <width>381</width>
-      <height>151</height>
-     </rect>
-    </property>
-    <property name="title" >
-     <string>Vidalia Shortcuts</string>
-    </property>
-    <widget class="QWidget" name="gridLayout" >
-     <property name="geometry" >
-      <rect>
-       <x>19</x>
-       <y>29</y>
-       <width>351</width>
-       <height>111</height>
-      </rect>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>0</number>
+    <item>
+     <widget class="QGroupBox" name="grpShortcuts" >
+      <property name="geometry" >
+       <rect>
+        <x>20</x>
+        <y>10</y>
+        <width>381</width>
+        <height>245</height>
+       </rect>
       </property>
-      <property name="spacing" >
-       <number>6</number>
+      <property name="title" >
+       <string>Vidalia Shortcuts</string>
       </property>
-      <item row="0" column="1" >
-       <widget class="VClickLabel" native="1" name="lblSetupRelaying" >
-        <property name="text" >
-         <string>Setup Relaying</string>
+      <widget class="QWidget" name="gridLayout" >
+       <property name="geometry" >
+        <rect>
+         <x>19</x>
+         <y>29</y>
+         <width>351</width>
+         <height>250</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" >
+        <property name="margin" >
+         <number>0</number>
         </property>
-        <property name="pixmap" >
-         <pixmap>:/images/48x48/network-server.png</pixmap>
+        <property name="spacing" >
+         <number>6</number>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="VClickLabel" native="1" name="lblStartStopTor" >
-        <property name="text" >
-         <string>Start Tor</string>
+        <item row="0" column="1" >
+         <widget class="VClickLabel" native="1" name="lblSetupRelaying" >
+          <property name="text" >
+           <string>Setup Relaying</string>
+          </property>
+          <property name="pixmap" >
+           <pixmap>:/images/48x48/network-server.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0" >
+         <widget class="VClickLabel" native="1" name="lblStartStopTor" >
+          <property name="text" >
+           <string>Start Tor</string>
+          </property>
+          <property name="pixmap" >
+           <pixmap>:/images/48x48/tor-on.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" >
+         <widget class="VClickLabel" native="1" name="lblViewNetwork" >
+          <property name="text" >
+           <string>View the Network</string>
+          </property>
+          <property name="pixmap" >
+           <pixmap>:/images/48x48/applications-internet.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1" >
+         <widget class="VClickLabel" native="1" name="lblNewIdentity" >
+          <property name="text" >
+           <string>Use a New Identity</string>
+          </property>
+          <property name="pixmap" >
+           <pixmap>:/images/48x48/system-users.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" colspan="2" >
+         <widget class="Line" name="line" >
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>  
+        </item>
+        <item row="3" column="0" >
+         <widget class="QWidget" name="leftVerticalLayout" >
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <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>
+             </property>
+             <property name="pixmap" >
+              <pixmap>:/images/16x16/format-justify-fill.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="VClickLabel" name="lblSettings" >
+             <property name="text" >
+              <string>Settings</string>
+             </property>
+             <property name="pixmap" >
+              <pixmap>:/images/16x16/preferences-system.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="3" column="1" >
+         <widget class="QWidget" name="rightVerticalLayout" >
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="VClickLabel" name="lblHelpBrowser" >
+             <property name="text" >
+              <string>Help</string>
+             </property>
+             <property name="pixmap" >
+              <pixmap>:/images/16x16/help-browser.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="VClickLabel" name="lblAboutVidalia" >
+             <property name="text" >
+              <string>About</string>
+             </property>
+             <property name="pixmap" >
+              <pixmap>:/images/16x16/tor-logo.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="VClickLabel" name="lblExit" >
+             <property name="text" >
+              <string>Exit</string>
+             </property>
+             <property name="pixmap" >
+              <pixmap>:/images/16x16/emblem-unreadable.png</pixmap>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer>
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" >
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" >
+      <property name="margin" >
+         <number>0</number>
         </property>
-        <property name="pixmap" >
-         <pixmap>:/images/48x48/tor-on.png</pixmap>
+      <property name="spacing" >
+         <number>6</number>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="VClickLabel" native="1" name="lblViewNetwork" >
-        <property name="text" >
-         <string>View the Network</string>
-        </property>
-        <property name="pixmap" >
-         <pixmap>:/images/48x48/applications-internet.png</pixmap>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="VClickLabel" native="1" name="lblNewIdentity" >
-        <property name="text" >
-         <string>Use a New Identity</string>
-        </property>
-        <property name="pixmap" >
-         <pixmap>:/images/48x48/system-users.png</pixmap>
-        </property>
-       </widget>
-      </item>
+       <item>
+         <widget class="QCheckBox" name="chkShowOnStartup" >
+          <property name="text" >
+           <string>Show this window on startup</string>
+          </property>
+         </widget>
+        </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>18</width>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btnHide" >
+         <property name="text" >
+          <string>Hide</string>
+         </property>
+        </widget>
+       </item>
      </layout>
-    </widget>
-   </widget>
+    </item>
+   </layout>
   </widget>
   <widget class="QMenuBar" name="menubar" >
    <property name="geometry" >
Prev by Author: [vidalia-svn] r1687: We gave up on the libjpeg stuff awhile ago. (in trunk: . pkg/osx)
Next by Author: [vidalia-svn] r1689: Add status tips for each button on the main window and try o (in trunk: . src/gui src/gui/res src/gui/res/48x48)
Previous by thread: [vidalia-svn] r1687: We gave up on the libjpeg stuff awhile ago. (in trunk: . pkg/osx)
Next by thread: [vidalia-svn] r1689: Add status tips for each button on the main window and try o (in trunk: . src/gui src/gui/res src/gui/res/48x48)
Index(es):
- Author
- Thread