On 12/30/2011 04:26 PM, tomm...@lyx.org wrote:
Author: tommaso
Date: Fri Dec 30 22:26:51 2011
New Revision: 40549
URL: http://www.lyx.org/trac/changeset/40549
Log:
Moving the GUI consistency update to a more meaningful moment, i.e., when
Dialog::updateView() is called.
This will be fine for branch when you have a stable patch.
Richard
Modified:
lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp
lyx-devel/trunk/src/frontends/qt4/FindAndReplace.h
Modified: lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp Fri Dec 30
16:31:56 2011 (r40548)
+++ lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp Fri Dec 30
22:26:51 2011 (r40549)
@@ -67,11 +67,6 @@
bool FindAndReplaceWidget::eventFilter(QObject * obj, QEvent * event)
{
- bool replace_enabled = view_.documentBufferView()&&
!view_.documentBufferView()->buffer().isReadonly();
- replace_work_area_->setEnabled(replace_enabled);
- replacePB->setEnabled(replace_enabled);
- replaceallPB->setEnabled(replace_enabled);
-
if (event->type() != QEvent::KeyPress
|| (obj != find_work_area_&& obj != replace_work_area_))
return QWidget::eventFilter(obj, event);
@@ -530,6 +525,12 @@
}
+void FindAndReplace::updateView()
+{
+ widget_->updateGUI();
+}
+
+
FindAndReplace::FindAndReplace(GuiView& parent,
Qt::DockWidgetArea area, Qt::WindowFlags flags)
: DockView(parent, "findreplaceadv", qt_("Advanced Find and Replace"),
@@ -554,6 +555,16 @@
}
+void FindAndReplaceWidget::updateGUI()
+{
+ bool replace_enabled = view_.documentBufferView()
+ && !view_.documentBufferView()->buffer().isReadonly();
+ replace_work_area_->setEnabled(replace_enabled);
+ replacePB->setEnabled(replace_enabled);
+ replaceallPB->setEnabled(replace_enabled);
+}
+
+
Dialog * createGuiSearchAdv(GuiView& lv)
{
FindAndReplace * gui = new FindAndReplace(lv, Qt::RightDockWidgetArea);
Modified: lyx-devel/trunk/src/frontends/qt4/FindAndReplace.h
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FindAndReplace.h Fri Dec 30 16:31:56
2011 (r40548)
+++ lyx-devel/trunk/src/frontends/qt4/FindAndReplace.h Fri Dec 30 22:26:51
2011 (r40549)
@@ -39,6 +39,7 @@
public:
FindAndReplaceWidget(GuiView& view);
bool initialiseParams(std::string const& params);
+ void updateGUI();
private:
///
@@ -90,7 +91,7 @@
void selectAll();
/// update
- void updateView() {}
+ void updateView();
//virtual void update_contents() {}
protected:
