[vidalia-svn] r3972: Tabs not movable on OSX, but movable anywhere else. Toolbar (vidalia/branches/extension-api/src/vidalia)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-07-22 19:28:58 -0400 (Wed, 22 Jul 2009)
New Revision: 3972

Modified:
   vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
   vidalia/branches/extension-api/src/vidalia/MainWindow.ui
Log:
Tabs not movable on OSX, but movable anywhere else. Toolbar text shown everywhere else but Mac as well.

Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-22 23:22:14 UTC (rev 3971)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-22 23:28:58 UTC (rev 3972)
@@ -176,6 +176,10 @@
   /* Populate the tab bar with plugins */
   populateTabs(_pluginManager->plugins());
 
+#if defined(Q_OS_MAC)
+  ui.tabMainPanel->setMovable(false);
+#endif
+
   /* When a tab changes, update the statusbar to give that tab control of it. */
   connect(ui.tabMainPanel, SIGNAL(currentChanged(int)),
           this, SLOT(updateStatusControl(int)));
@@ -465,6 +469,9 @@
 void
 MainWindow::connectToolBarActions()
 {
+#if defined(Q_OS_MAC)
+  ui.toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
+#endif
   connect(ui.startStopAct32, SIGNAL(triggered()), this, SLOT(start()));
   connect(ui.newIdentityAct32, SIGNAL(triggered()), this, SLOT(newIdentity()));
   connect(ui.configAct32, SIGNAL(triggered()), this, SLOT(showConfigDialog()));

Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.ui	2009-07-22 23:22:14 UTC (rev 3971)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.ui	2009-07-22 23:28:58 UTC (rev 3972)
@@ -49,7 +49,7 @@
        <bool>false</bool>
       </property>
       <property name="movable">
-       <bool>false</bool>
+       <bool>true</bool>
       </property>
      </widget>
     </item>
@@ -70,7 +70,7 @@
     <enum>Qt::NoContextMenu</enum>
    </property>
    <property name="toolButtonStyle">
-    <enum>Qt::ToolButtonIconOnly</enum>
+    <enum>Qt::ToolButtonTextUnderIcon</enum>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>