Some fixes for the buttons of the Document and Preferences dialog:

http://bugzilla.lyx.org/show_bug.cgi?id=5295
- set the bc status to INITIAL when the dialog is initialized, and
- enable the restore button in the Document dialog.

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 8d9a37c574fcf37b5151c50bf324a2822b08172a..0ad171b5aaf72f3d2e4f8a4181c1fa6fae88ca57 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -2167,6 +2167,8 @@ void GuiDocument::paramsToDialog()
 
        pdfSupportModule->optionsLE->setText(
                toqstr(pdf.quoted_options));
+       
+       bc().restore();
 }
 
 

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 8aa728af9a8ae193fb4caea1d332b1783637c027..406305df610b15d99413ccbae8315cc41d26e76e 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2597,7 +2597,9 @@ bool GuiPreferences::initialiseParams(string const &)
        movers_ = theMovers();
        colors_.clear();
        update_screen_font_ = false;
+       
        updateRc(rc_);
+       bc().restore();
 
        return true;
 }

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 521ccd2e6f1b1ecad3a042f863d3cc5aa2f1f06a..adeb400ef4c2458ba43ed1ec2eb46a54480586fe 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1999,7 +1999,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
                                inset->dispatch(view()->cursor(), fr);
                        } else if (name == "paragraph") {
                                lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
-                       } else if (name == "prefs") {
+                       } else if (name == "prefs" || name == "document") {
                                updateDialog(name, string());
                        }
                        break;