[vidalia-svn] r3939: Fixed statusbar "squishing" issue. Annoying border persists (vidalia/branches/extension-api/src/vidalia)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-07-06 16:16:32 -0400 (Mon, 06 Jul 2009)
New Revision: 3939

Modified:
   vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
   vidalia/branches/extension-api/src/vidalia/MainWindow.ui
Log:
Fixed statusbar "squishing" issue. Annoying border persists around statusbar widget. Do we need smaller icons for the statusbar?


Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-06 18:09:06 UTC (rev 3938)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-06 20:16:32 UTC (rev 3939)
@@ -139,10 +139,6 @@
   _isVidaliaRunningTor = false;
   updateTorStatus(Stopped);
 
-  /* Make the layout flush with the window */
-  setContentsMargins(-12, -12, -12, 0);
-  ui.vboxLayout->setContentsMargins(-12, -12, -12, 0);
-
   /* Populate the tab bar with plugins */
   populateTabs(_pluginManager->plugins());
 
@@ -605,12 +601,13 @@
 {
   /* Create the status bar */
   _statusBar = new QStatusBar(this);
+  _statusBar->setMaximumHeight(20);
+  _statusBar->setMinimumHeight(20);
 
   /* Create the widget to be inserted in the statusbar */
   QWidget* statusWidget = new QWidget(_statusBar);
-  statusWidget->setMaximumHeight(32);
-  statusWidget->setMinimumHeight(32);
   QHBoxLayout* hLayout = new QHBoxLayout(statusWidget);
+  hLayout->setContentsMargins(0,0,0,0);
   QSpacerItem* hSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding);
 
   /* Progress bar */

Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.ui	2009-07-06 18:09:06 UTC (rev 3938)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.ui	2009-07-06 20:16:32 UTC (rev 3939)
@@ -27,32 +27,31 @@
    <enum>Qt::ToolButtonTextUnderIcon</enum>
   </property>
   <property name="documentMode">
-   <bool>false</bool>
+   <bool>true</bool>
   </property>
   <property name="unifiedTitleAndToolBarOnMac">
    <bool>true</bool>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
+    <property name="margin">
+     <number>0</number>
+    </property>
     <item row="0" column="0">
-     <layout class="QVBoxLayout" name="vboxLayout">
-      <property name="spacing">
-       <number>-1</number>
+     <widget class="QTabWidget" name="tabMainPanel">
+      <property name="usesScrollButtons">
+       <bool>false</bool>
       </property>
-      <property name="sizeConstraint">
-       <enum>QLayout::SetDefaultConstraint</enum>
+      <property name="documentMode">
+       <bool>true</bool>
       </property>
-      <item>
-       <widget class="QTabWidget" name="tabMainPanel">
-        <property name="usesScrollButtons">
-         <bool>true</bool>
-        </property>
-        <property name="documentMode">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
+      <property name="tabsClosable">
+       <bool>false</bool>
+      </property>
+      <property name="movable">
+       <bool>true</bool>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>