r37085 - lyx-devel/trunk/src/frontends/qt4

[vfr]

Author: vfr
Date: Mon Jan  3 21:04:03 2011
New Revision: 37085
URL: http://www.lyx.org/trac/changeset/37085

Log:
Fix bug 7137: Main WA disappears on wrap-around dialog.

Modified:
   lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp

Modified: lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp        Mon Jan  3 
19:50:37 2011        (r37084)
+++ lyx-devel/trunk/src/frontends/qt4/FindAndReplace.cpp        Mon Jan  3 
21:04:03 2011        (r37085)
@@ -315,6 +315,7 @@
 
 void FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt)
 {
+       view_.setBusy(true);
        int wrap_answer = -1;
        ostringstream oss;
        oss << opt;
@@ -349,6 +350,7 @@
                LYXERR(Debug::FIND, "dispatched");
                if (bv->cursor().result().dispatched()) {
                        // New match found and selected (old selection replaced 
if needed)
+                       view_.setBusy(false);
                        return;
                }
 
@@ -359,9 +361,11 @@
                        if (wrap_answer != -1)
                                break;
                        docstring q = getQuestionString(opt);
+                       view_.setBusy(false);
                        wrap_answer = frontend::Alert::prompt(
                                _("Wrap search?"), q,
                                0, 1, _("&Yes"), _("&No"));
+                       view_.setBusy(true);
                        if (wrap_answer == 1)
                                break;
                }
@@ -389,6 +393,7 @@
        if (cur_orig.pos() > cur_orig.lastpos())
                cur_orig.pos() = cur_orig.lastpos();
        bv->cursor().setCursor(cur_orig);
+       view_.setBusy(false);
 }
 
 
@@ -462,9 +467,7 @@
        FindAndReplaceOptions opt(searchString, casesensitive, matchword,
                                  !backwards, expandmacros, ignoreformat,
                                  regexp, replaceString, keep_case, scope);
-       view_.setBusy(true);
        findAndReplaceScope(opt);
-       view_.setBusy(false);
 }