Fixed overlapping of both Find Advanced and Spellchecker Dockwidgets (addressing...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38133 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index f0b73d753227e8b6175df3c70cc00f1e948a9774..104ec0ccf0a77ef068eebfe919e9180c253cec01 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -60,7 +60,7 @@ static void ApplyParams(Buffer &buf, BufferParams const & bp) {
 
 
 FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
-       :       view_(view)
+       : QTabWidget(&view), view_(view)
 {
        setupUi(this);
        find_work_area_->setGuiView(view_);

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index 3497ad97c30eed28e9eec1013e9c599b1bb48eaa..a7147ce56215cc83ff0cebcf0356cf658568e127 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -81,7 +81,7 @@ struct SpellcheckerWidget::Private
 
 
 SpellcheckerWidget::SpellcheckerWidget(GuiView * gv, QWidget * parent)
-       : QWidget(parent), d(new Private(this))
+       : QTabWidget(parent), d(new Private(this))
 {
        d->ui.setupUi(this);
        d->gv_ = gv;

diff --git a/src/frontends/qt4/GuiSpellchecker.h b/src/frontends/qt4/GuiSpellchecker.h
index 5679b8c7ff59572f1358909091e9bc609a80dda2..9a42ba687b0fa38f9ab4085da6ee8884188c8446 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.h
+++ b/src/frontends/qt4/GuiSpellchecker.h
@@ -25,7 +25,7 @@ class docstring_list;
 
 namespace frontend {
 
-class SpellcheckerWidget : public QWidget
+class SpellcheckerWidget : public QTabWidget
 {
        Q_OBJECT
 

diff --git a/src/frontends/qt4/ui/SpellcheckerUi.ui b/src/frontends/qt4/ui/SpellcheckerUi.ui
index f22eb0875410300b2d9e9172d5088e753527fc96..9d7a7700c376010e2e4b5da1f2a5a286f5b21791 100644 (file)
--- a/src/frontends/qt4/ui/SpellcheckerUi.ui
+++ b/src/frontends/qt4/ui/SpellcheckerUi.ui
@@ -10,6 +10,12 @@
     <height>342</height>
    </rect>
   </property>
+  <property name="minimumSize" >
+    <size>
+      <width>200</width>
+      <height>260</height>
+    </size>
+  </property>
   <property name="windowTitle">
    <string>Spell Checker</string>
   </property>
@@ -29,9 +35,9 @@
      <item>
       <widget class="QComboBox" name="languageCO">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
+        <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+         <horstretch>100</horstretch>
+         <verstretch>32</verstretch>
         </sizepolicy>
        </property>
        <property name="toolTip">