From e28114779bd87979f083d9d0b96b9c345bd3bd82 Mon Sep 17 00:00:00 2001
From: Edwin Leuven <e.leuven@gmail.com>
Date: Fri, 25 Aug 2006 13:40:01 +0000
Subject: [PATCH] minimal effort implementation of:

* float widget as a .ui file
* floatplacement.[Ch] -> FloatPlacement.[Ch]



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14838 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/scons/scons_manifest.py           |  12 +-
 .../{floatplacement.C => FloatPlacement.C}    |  88 +++---------
 .../{floatplacement.h => FloatPlacement.h}    |  27 +---
 src/frontends/qt4/Makefile.dialogs            |   3 +-
 src/frontends/qt4/QDocument.C                 |   2 +-
 src/frontends/qt4/QDocumentDialog.C           |   2 +-
 src/frontends/qt4/QFloat.C                    |   4 +-
 src/frontends/qt4/QFloatDialog.C              |   7 +-
 src/frontends/qt4/ui/FloatPlacementUi.ui      | 125 ++++++++++++++++++
 src/frontends/qt4/ui/QFloatUi.ui              |   2 +-
 10 files changed, 168 insertions(+), 104 deletions(-)
 rename src/frontends/qt4/{floatplacement.C => FloatPlacement.C} (68%)
 rename src/frontends/qt4/{floatplacement.h => FloatPlacement.h} (62%)
 create mode 100644 src/frontends/qt4/ui/FloatPlacementUi.ui

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 0d3ed613be..146870181f 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -669,7 +669,7 @@ src_frontends_qt3_moc_files = Split('''
     BulletsModule.C
     emptytable.C
     FileDialog_private.C
-    floatplacement.C
+    FloatPlacement.C
     iconpalette.C
     lengthcombo.C
     panelstack.C
@@ -824,7 +824,7 @@ src_frontends_qt3_header_files = Split('''
     QtView.h
     checkedwidgets.h
     emptytable.h
-    floatplacement.h
+    FloatPlacement.h
     iconpalette.h
     lcolorcache.h
     lengthcombo.h
@@ -942,7 +942,7 @@ src_frontends_qt3_files = Split('''
     QtView.C
     checkedwidgets.C
     emptytable.C
-    floatplacement.C
+    FloatPlacement.C
     iconpalette.C
     lcolorcache.C
     lengthcombo.C
@@ -1039,7 +1039,7 @@ src_frontends_qt4_moc_files = Split('''
     BulletsModule.C
     emptytable.C
     FileDialog_private.C
-    floatplacement.C
+    FloatPlacement.C
     iconpalette.C
     lengthcombo.C
     InsertTableWidget.C
@@ -1204,7 +1204,7 @@ src_frontends_qt4_header_files = Split('''
     UrlView.h
     checkedwidgets.h
     emptytable.h
-    floatplacement.h
+    FloatPlacement.h
     iconpalette.h
     lengthcombo.h
     panelstack.h
@@ -1323,7 +1323,7 @@ src_frontends_qt4_files = Split('''
     UrlView.C
     checkedwidgets.C
     emptytable.C
-    floatplacement.C
+    FloatPlacement.C
     iconpalette.C
     lengthcombo.C
     lyx_gui.C
diff --git a/src/frontends/qt4/floatplacement.C b/src/frontends/qt4/FloatPlacement.C
similarity index 68%
rename from src/frontends/qt4/floatplacement.C
rename to src/frontends/qt4/FloatPlacement.C
index 762935a5b2..2e117478dd 100644
--- a/src/frontends/qt4/floatplacement.C
+++ b/src/frontends/qt4/FloatPlacement.C
@@ -11,70 +11,19 @@
 
 #include <config.h>
 
-#include "floatplacement.h"
+#include "FloatPlacement.h"
 #include "qt_helpers.h"
-//Added by qt3to4:
-#include <QVBoxLayout>
-#include <QHBoxLayout>
 
 #include "insets/insetfloat.h"
 #include "support/lstrings.h"
 
-#include <QCheckBox>
-#include <QLayout>
-#include <QGroupBox>
-
 using lyx::support::contains;
-
 using std::string;
 
-
-// FIXME: set disabled doesn't work properly
-// should be fixed now (jspitzm)
-FloatPlacement::FloatPlacement(QWidget * parent)
-	: QWidget(parent)
+FloatPlacement::FloatPlacement(QWidget *)
 {
-	QHBoxLayout * toplayout = new QHBoxLayout(this);
-	toplayout->setMargin(11);
-	toplayout->setSpacing(6);
-
-	layout = new QVBoxLayout(0);
-	layout->setMargin(0);
-	layout->setSpacing(6);
-
-	QGroupBox * options = new QGroupBox(qt_("Advanced Placement Options"), this);
-
-	defaultsCB = new QCheckBox(qt_("Use &default placement"), this);
-	topCB = new QCheckBox(qt_("&Top of page"), options);
-	bottomCB = new QCheckBox(qt_("&Bottom of page"), options);
-	pageCB = new QCheckBox(qt_("&Page of floats"), options);
-	herepossiblyCB = new QCheckBox(qt_("&Here if possible"), options);
-	heredefinitelyCB = new QCheckBox(qt_("Here definitely"), options);
-	ignoreCB = new QCheckBox(qt_("&Ignore LaTeX rules"), options);
-	spanCB = 0;
-	sidewaysCB = 0;
-
-	layout->addWidget(defaultsCB);
-
-	QVBoxLayout * optlay = new QVBoxLayout(options);
-	optlay->setMargin(10);
-	optlay->setSpacing(6);
-
-	optlay->addSpacing(6);
-	optlay->addWidget(topCB);
-	optlay->addWidget(bottomCB);
-	optlay->addWidget(pageCB);
-	optlay->addWidget(herepossiblyCB);
-	optlay->addWidget(heredefinitelyCB);
-	optlay->addWidget(ignoreCB);
+	setupUi(this);
 
-	layout->addWidget(options);
-
-	toplayout->addLayout(layout);
-
-	connect(defaultsCB, SIGNAL(toggled(bool)), options, SLOT(setDisabled(bool)));
-
-	connect(heredefinitelyCB, SIGNAL(clicked()), this, SLOT(heredefinitelyClicked()));
 	connect(topCB, SIGNAL(clicked()), this, SLOT(tbhpClicked()));
 	connect(bottomCB, SIGNAL(clicked()), this, SLOT(tbhpClicked()));
 	connect(pageCB, SIGNAL(clicked()), this, SLOT(tbhpClicked()));
@@ -88,26 +37,26 @@ FloatPlacement::FloatPlacement(QWidget * parent)
 	connect(herepossiblyCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot()));
 	connect(bottomCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot()));
 	connect(topCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot()));
+
+	spanCB->hide();
+	sidewaysCB->hide();
+}
+
+
+FloatPlacement::~FloatPlacement()
+{
 }
 
 
 void FloatPlacement::useWide()
 {
-	spanCB = new QCheckBox(qt_("&Span columns"), this);
-	layout->addWidget(spanCB);
-	setTabOrder(ignoreCB, spanCB);
-	connect(spanCB, SIGNAL(clicked()), this, SLOT(spanClicked()));
-	connect(spanCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot()));
+	spanCB->show();
 }
 
 
 void FloatPlacement::useSideways()
 {
-	sidewaysCB = new QCheckBox(qt_("&Rotate sideways"), this);
-	layout->addWidget(sidewaysCB);
-	setTabOrder(spanCB, sidewaysCB);
-	connect(sidewaysCB, SIGNAL(clicked()), this, SLOT(sidewaysClicked()));
-	connect(sidewaysCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot()));
+	sidewaysCB->show();
 }
 
 
@@ -226,7 +175,7 @@ void FloatPlacement::tbhpClicked()
 }
 
 
-void FloatPlacement::heredefinitelyClicked()
+void FloatPlacement::on_heredefinitelyCB_clicked()
 {
 	if (heredefinitelyCB->isChecked())
 		ignoreCB->setEnabled(false);
@@ -239,7 +188,7 @@ void FloatPlacement::heredefinitelyClicked()
 }
 
 
-void FloatPlacement::spanClicked()
+void FloatPlacement::on_spanCB_clicked()
 {
 	checkAllowed();
 
@@ -252,7 +201,7 @@ void FloatPlacement::spanClicked()
 }
 
 
-void FloatPlacement::sidewaysClicked()
+void FloatPlacement::on_sidewaysCB_clicked()
 {
 	checkAllowed();
 }
@@ -267,7 +216,7 @@ void FloatPlacement::checkAllowed()
 	ignore |= herepossiblyCB->isChecked();
 
 	// float or document dialog?
-	if (spanCB != 0) {
+	if (spanCB->isVisible()) {
 		bool const span(spanCB->isChecked());
 		bool const sideways(sidewaysCB->isChecked());
 		defaultsCB->setEnabled(!sideways);
@@ -288,4 +237,5 @@ void FloatPlacement::checkAllowed()
 	}
 }
 
-#include "floatplacement_moc.cpp"
+
+#include "FloatPlacement_moc.cpp"
diff --git a/src/frontends/qt4/floatplacement.h b/src/frontends/qt4/FloatPlacement.h
similarity index 62%
rename from src/frontends/qt4/floatplacement.h
rename to src/frontends/qt4/FloatPlacement.h
index 473397d0f8..e3ddc343d5 100644
--- a/src/frontends/qt4/floatplacement.h
+++ b/src/frontends/qt4/FloatPlacement.h
@@ -13,19 +13,18 @@
 #ifndef QT_FLOATPLACEMENT_H
 #define QT_FLOATPLACEMENT_H
 
+#include "ui/FloatPlacementUi.h"
 #include <QWidget>
 
 #include <string>
 
-class QCheckBox;
-class QVBoxLayout;
 class InsetFloatParams;
 
-class FloatPlacement : public QWidget {
+class FloatPlacement : public QWidget, public Ui::FloatPlacementUi {
 	Q_OBJECT
-
 public:
-	FloatPlacement(QWidget * parent=0);
+	FloatPlacement(QWidget * parent = 0);
+	~FloatPlacement();
 
 	void useWide();
 	void useSideways();
@@ -39,26 +38,14 @@ public:
 
 public Q_SLOTS:
 	void tbhpClicked();
-	void heredefinitelyClicked();
-	void spanClicked();
-	void sidewaysClicked();
 	void changedSlot();
+	void on_spanCB_clicked();
+	void on_heredefinitelyCB_clicked();
+	void on_sidewaysCB_clicked();
 
 Q_SIGNALS:
 	void changed();
 
-private:
-	QVBoxLayout * layout;
-
-	QCheckBox * defaultsCB;
-	QCheckBox * spanCB;
-	QCheckBox * sidewaysCB;
-	QCheckBox * ignoreCB;
-	QCheckBox * pageCB;
-	QCheckBox * heredefinitelyCB;
-	QCheckBox * herepossiblyCB;
-	QCheckBox * bottomCB;
-	QCheckBox * topCB;
 };
 
 #endif
diff --git a/src/frontends/qt4/Makefile.dialogs b/src/frontends/qt4/Makefile.dialogs
index b7b0076e8b..681416f551 100644
--- a/src/frontends/qt4/Makefile.dialogs
+++ b/src/frontends/qt4/Makefile.dialogs
@@ -4,6 +4,7 @@ UIFILES = \
 	BiblioUi.ui \
 	BranchesUi.ui \
 	BulletsUi.ui \
+	FloatPlacementUi.ui \
 	FontUi.ui \
 	TextLayoutUi.ui \
 	LanguageUi.ui \
@@ -76,7 +77,7 @@ MOCFILES = \
 	BulletsModule.C BulletsModule.h \
 	emptytable.C emptytable.h \
 	FileDialog_private.C FileDialog_private.h \
-	floatplacement.C floatplacement.h \
+	FloatPlacement.C FloatPlacement.h \
 	GuiView.C GuiView.h \
 	GuiWorkArea.C GuiWorkArea.h \
 	iconpalette.C iconpalette.h \
diff --git a/src/frontends/qt4/QDocument.C b/src/frontends/qt4/QDocument.C
index 3d60bf8d56..e357eee876 100644
--- a/src/frontends/qt4/QDocument.C
+++ b/src/frontends/qt4/QDocument.C
@@ -16,7 +16,7 @@
 #include "qt_helpers.h"
 
 #include "bufferparams.h"
-#include "floatplacement.h"
+#include "FloatPlacement.h"
 #include "gettext.h"
 #include "helper_funcs.h" // getSecond()
 #include "language.h"
diff --git a/src/frontends/qt4/QDocumentDialog.C b/src/frontends/qt4/QDocumentDialog.C
index 2fbe8417db..3c555a31fc 100644
--- a/src/frontends/qt4/QDocumentDialog.C
+++ b/src/frontends/qt4/QDocumentDialog.C
@@ -16,7 +16,7 @@
 
 #include <QCloseEvent>
 
-#include "floatplacement.h"
+#include "FloatPlacement.h"
 #include "lengthcombo.h"
 #include "validators.h"
 #include "panelstack.h"
diff --git a/src/frontends/qt4/QFloat.C b/src/frontends/qt4/QFloat.C
index c08f09400d..1d1ccfc581 100644
--- a/src/frontends/qt4/QFloat.C
+++ b/src/frontends/qt4/QFloat.C
@@ -13,13 +13,13 @@
 #include "QFloat.h"
 #include "QFloatDialog.h"
 #include "Qt2BC.h"
-#include "floatplacement.h"
+#include "FloatPlacement.h"
 
 #include "controllers/ControlFloat.h"
 
 #include "insets/insetfloat.h"
 
-#include <qpushbutton.h>
+#include <QPushButton>
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/qt4/QFloatDialog.C b/src/frontends/qt4/QFloatDialog.C
index 84c24f81fc..caa05f51a3 100644
--- a/src/frontends/qt4/QFloatDialog.C
+++ b/src/frontends/qt4/QFloatDialog.C
@@ -12,11 +12,12 @@
 
 #include "QFloatDialog.h"
 #include "QFloat.h"
-//Added by qt3to4:
+
 #include <QCloseEvent>
-#include "floatplacement.h"
+#include <QPushButton>
+
+#include "FloatPlacement.h"
 
-#include <qpushbutton.h>
 
 
 namespace lyx {
diff --git a/src/frontends/qt4/ui/FloatPlacementUi.ui b/src/frontends/qt4/ui/FloatPlacementUi.ui
new file mode 100644
index 0000000000..3b4950c820
--- /dev/null
+++ b/src/frontends/qt4/ui/FloatPlacementUi.ui
@@ -0,0 +1,125 @@
+<ui version="4.0" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>FloatPlacementUi</class>
+ <widget class="QWidget" name="FloatPlacementUi" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>211</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QCheckBox" name="defaultsCB" >
+     <property name="text" >
+      <string>Use &amp;default placement</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="options" >
+     <property name="title" >
+      <string>Advanced Placement Options</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="topCB" >
+        <property name="text" >
+         <string>&amp;Top of page</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QCheckBox" name="ignoreCB" >
+        <property name="text" >
+         <string>&amp;Ignore LaTeX rules</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QCheckBox" name="heredefinitelyCB" >
+        <property name="text" >
+         <string>Here de&amp;finitely</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QCheckBox" name="herepossiblyCB" >
+        <property name="text" >
+         <string>&amp;Here if possible</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="pageCB" >
+        <property name="text" >
+         <string>&amp;Page of floats</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="bottomCB" >
+        <property name="text" >
+         <string>&amp;Bottom of page</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="spanCB" >
+     <property name="text" >
+      <string>&amp;Span columns</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="sidewaysCB" >
+     <property name="text" >
+      <string>&amp;Rotate sideways</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>defaultsCB</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>options</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>51</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>201</x>
+     <y>47</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/frontends/qt4/ui/QFloatUi.ui b/src/frontends/qt4/ui/QFloatUi.ui
index 031ce11065..3abe39adf8 100644
--- a/src/frontends/qt4/ui/QFloatUi.ui
+++ b/src/frontends/qt4/ui/QFloatUi.ui
@@ -95,7 +95,7 @@
   <customwidget>
    <class>FloatPlacement</class>
    <extends></extends>
-   <header>floatplacement.h</header>
+   <header>FloatPlacement.h</header>
    <container>1</container>
    <pixmap></pixmap>
   </customwidget>
-- 
2.39.5