From 81d2d239c399fe864cb1d88d606065312f930e8b Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Mon, 1 Mar 2010 09:03:15 +0000
Subject: [PATCH] Document Settings: fix Float placement dialog. The float type
 is not needed here.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33602 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/FloatPlacement.cpp     |  2 +
 src/frontends/qt4/ui/FloatPlacementUi.ui | 52 ++++++++----------------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/src/frontends/qt4/FloatPlacement.cpp b/src/frontends/qt4/FloatPlacement.cpp
index c40b3b2ec7..3035d9ba70 100644
--- a/src/frontends/qt4/FloatPlacement.cpp
+++ b/src/frontends/qt4/FloatPlacement.cpp
@@ -44,6 +44,8 @@ FloatPlacement::FloatPlacement(bool show_options, QWidget * parent)
 	connect(spanCB, SIGNAL(clicked()), this, SLOT(changedSlot()));
 	connect(sidewaysCB, SIGNAL(clicked()), this, SLOT(changedSlot()));
 
+	floatTypeTitle->setVisible(show_options);
+	floatTypeCO->setVisible(show_options);
 	spanCB->setVisible(show_options);
 	sidewaysCB->setVisible(show_options);
 }
diff --git a/src/frontends/qt4/ui/FloatPlacementUi.ui b/src/frontends/qt4/ui/FloatPlacementUi.ui
index 8bc352b30a..a3cbd804ec 100644
--- a/src/frontends/qt4/ui/FloatPlacementUi.ui
+++ b/src/frontends/qt4/ui/FloatPlacementUi.ui
@@ -14,41 +14,36 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QSplitter" name="splitter">
+    <widget class="QLabel" name="floatTypeTitle">
+     <property name="text">
+      <string>Float Type:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2">
+    <widget class="QComboBox" name="floatTypeCO"/>
+   </item>
+   <item row="0" column="3">
+    <spacer name="floatTypeSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <widget class="QLabel" name="floatTypeTitle">
-      <property name="text">
-       <string>Float Type:</string>
-      </property>
-     </widget>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="floatTypeCO"/>
-   </item>
-   <item row="1" column="1">
-    <spacer name="spacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
+       <width>40</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="1" column="0" colspan="4">
     <widget class="QCheckBox" name="defaultsCB">
      <property name="text">
       <string>Use &amp;default placement</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="2" column="0" colspan="4">
     <widget class="QGroupBox" name="options">
      <property name="title">
       <string>Advanced Placement Options</string>
@@ -105,34 +100,21 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="2">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>12</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="0" colspan="2">
+   <item row="3" column="0" colspan="2">
     <widget class="QCheckBox" name="spanCB">
      <property name="text">
       <string>&amp;Span columns</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="4" column="0" colspan="2">
     <widget class="QCheckBox" name="sidewaysCB">
      <property name="text">
       <string>&amp;Rotate sideways</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="5" column="2" colspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>