From e36779755ebff282927b32d4b09525a92f0fde8c Mon Sep 17 00:00:00 2001 From: Tommaso Cucinotta Date: Sun, 5 May 2013 14:05:50 +0100 Subject: [PATCH] Automatic horiz/vert switch of layout when docking Advanced F&R pane top-bottom/left-right (copying 49c2450f). --- src/frontends/qt4/FindAndReplace.cpp | 13 + src/frontends/qt4/FindAndReplace.h | 4 + src/frontends/qt4/ui/FindAndReplaceUi.ui | 409 ++++++++++++----------- 3 files changed, 228 insertions(+), 198 deletions(-) diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp index f31f59a54c..19c0bacf12 100644 --- a/src/frontends/qt4/FindAndReplace.cpp +++ b/src/frontends/qt4/FindAndReplace.cpp @@ -65,6 +65,16 @@ FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view) } +void FindAndReplaceWidget::dockLocationChanged(Qt::DockWidgetArea area) +{ + if (area == Qt::RightDockWidgetArea || area == Qt::LeftDockWidgetArea) { + dynamicLayout_->setDirection(QBoxLayout::TopToBottom); + } else { + dynamicLayout_->setDirection(QBoxLayout::LeftToRight); + } +} + + bool FindAndReplaceWidget::eventFilter(QObject * obj, QEvent * event) { if (event->type() != QEvent::KeyPress @@ -555,6 +565,9 @@ FindAndReplace::FindAndReplace(GuiView & parent, widget_ = new FindAndReplaceWidget(parent); setWidget(widget_); setFocusProxy(widget_); + + connect(this, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)), + widget_, SLOT(dockLocationChanged(Qt::DockWidgetArea))); } diff --git a/src/frontends/qt4/FindAndReplace.h b/src/frontends/qt4/FindAndReplace.h index 9b69e2658b..d1a6a38e8b 100644 --- a/src/frontends/qt4/FindAndReplace.h +++ b/src/frontends/qt4/FindAndReplace.h @@ -39,6 +39,10 @@ public: bool initialiseParams(std::string const & params); void updateGUI(); +public Q_SLOTS: + /// + void dockLocationChanged(Qt::DockWidgetArea area); + private: /// GuiView & view_; diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui index f2b2f662e0..7a5cbaffff 100644 --- a/src/frontends/qt4/ui/FindAndReplaceUi.ui +++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui @@ -1,246 +1,259 @@ - + + FindAndReplaceUi - - + + 0 0 - 279 - 300 + 276 + 291 - + + + 0 + 0 + + + TabWidget - + 0 - - + + Sear&ch - - - - - &Find: - - - find_work_area_ - - - - - - - - 0 - 0 - - - + + + + + + + &Find: + + + find_work_area_ + + + + + + + + 0 + 0 + + + + + - - - - Replace &with: - - - replace_work_area_ - - + + + + + + Replace &with: + + + replace_work_area_ + + + + + + + + 0 + 0 + + + + + - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Perform a case-sensitive search - - - Case &sensitive - - - - - - - true - - - - 100 - 32 - - - - Find next occurrence [Enter] - - - Find &Next - - - true - - - - - - - true - - - Restrict search to whole words only - - - W&hole words - - - - - - - true - - - - 100 - 32 - - - - Replace and find next occurrence [Enter] - - - &Replace - - - - - - - Shift+Enter search backwards directly - - - Search &backwards - - - - - - - true - - - - 100 - 32 - - - - Replace all occurences at once - - - Replace &All - - + + + + + + + 0 + 0 + + + + Perform a case-sensitive search + + + Case &sensitive + + + + + + + true + + + + 100 + 32 + + + + Find next occurrence [Enter] + + + Find &Next + + + true + + + + + + + true + + + Restrict search to whole words only + + + W&hole words + + + + + + + true + + + + 100 + 32 + + + + Replace and find next occurrence [Enter] + + + &Replace + + + + + + + Shift+Enter search backwards directly + + + Search &backwards + + + + + + + true + + + + 100 + 32 + + + + Replace all occurences at once + + + Replace &All + + + + - - + + S&ettings - - - - + + + + true - - - 0 - 0 - - - + The scope to which the search horizon is restricted - + false - + Sco&pe - + false - + - - + + true - + Current &document - + true - - + + true - - + + 0 0 - + Current document and all related documents belonging to the same master document - + &Master document - - + + true - + All open documents - + &Open documents - - + + true - + All ma&nuals @@ -248,48 +261,48 @@ - - - + + + true - + If unchecked, the search will be limited to occurrences of the selected text and paragraph style - + Ignore &format - + true - - - + + + Keep the case of the replacement's first letter as in each matching text first letter - + &Preserve first case on replace - - - + + + false - + &Expand macros - - - + + + Qt::Vertical - + 105 2 -- 2.39.2