* gtk/lyx_gui.C:

        * qt3/lyx_gui.C:
        * qt3/Dialogs.C:
        * qt4/lyx_gui.C:
        * qt4/Dialogs.C: remove special handling of preamble dialog
        (which no longer exists)

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

diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index d775e8e15f915c40f89eaadee6e20a268a54e4f9..40d6676156231f316c29240b048e3e4b5088bcd7 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -187,10 +187,6 @@ FuncStatus lyx_gui::getStatus(FuncRequest const & ev)
 {
        FuncStatus flag;
        switch (ev.action) {
-       case LFUN_DIALOG_SHOW:
-               if (ev.argument == "preamble")
-                       flag.unknown(true);
-               break;
        case LFUN_TOOLTIPS_TOGGLE:
                flag.unknown(true);
                break;

diff --git a/src/frontends/qt3/Dialogs.C b/src/frontends/qt3/Dialogs.C
index 415f2b0f3f932c109f573a226c185b4204d2311a..bd273e23d4340148c1ec0c481607bd8088601846 100644 (file)
--- a/src/frontends/qt3/Dialogs.C
+++ b/src/frontends/qt3/Dialogs.C
@@ -105,7 +105,7 @@ char const * const dialognames[] = {
 "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
 "citation", "document", "errorlist", "ert", "external", "file",
 "findreplace", "float", "graphics", "include", "index", "label", "log", "view-source",
-"mathpanel", "mathdelimiter", "mathmatrix", "note", "paragraph", "preamble",
+"mathpanel", "mathdelimiter", "mathmatrix", "note", "paragraph",
 "prefs", "print", "ref", "sendto", "spellchecker","tabular", "tabularcreate",
 
 #ifdef HAVE_LIBAIKSAURUS
@@ -177,25 +177,10 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setController(new ControlCitation(*dialog));
                dialog->setView(new QCitation(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
-       } else if (name == "document" || name == "preamble") {
-
-               // This nastiness will exist only as long as xforms
-               // has a separate preamble dialog.
-
-               string const other = (name == "document") ?
-                       "preamble" : "document";
-
-               std::map<string, DialogPtr>::iterator it =
-                       dialogs_.find(other);
-
-               if (it != dialogs_.end())
-                       dialog = it->second;
-               else {
-                       dialog->setController(new ControlDocument(*dialog));
-                       dialog->setView(new QDocument(*dialog));
-                       dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
-               }
-
+       } else if (name == "document") {
+               dialog->setController(new ControlDocument(*dialog));
+               dialog->setView(new QDocument(*dialog));
+               dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "errorlist") {
                dialog->setController(new ControlErrorList(*dialog));
                dialog->setView(new QErrorList(*dialog));

diff --git a/src/frontends/qt3/lyx_gui.C b/src/frontends/qt3/lyx_gui.C
index 64c9b6b0c4497f4cb11fdceb669f4ab3f90ef682..70a2792e500dca503c0e15963cf98200db035c1a 100644 (file)
--- a/src/frontends/qt3/lyx_gui.C
+++ b/src/frontends/qt3/lyx_gui.C
@@ -303,10 +303,6 @@ FuncStatus getStatus(FuncRequest const & ev)
 {
        FuncStatus flag;
        switch (ev.action) {
-       case LFUN_DIALOG_SHOW:
-               if (ev.argument == "preamble")
-                       flag.unknown(true);
-               break;
        case LFUN_TOOLTIPS_TOGGLE:
                flag.unknown(true);
                break;

diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C
index 4ae2befb641bc12bf7af250a4112fcd988b66233..5606bc190f5d9f45b6dda9604047344ad8754f0e 100644 (file)
--- a/src/frontends/qt4/Dialogs.C
+++ b/src/frontends/qt4/Dialogs.C
@@ -101,7 +101,7 @@ char const * const dialognames[] = {
 "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
 "citation", "document", "errorlist", "ert", "external", "file",
 "findreplace", "float", "graphics", "include", "index", "label", "log", "view-source",
-"mathpanel", "mathdelimiter", "mathmatrix", "note", "paragraph", "preamble",
+"mathpanel", "mathdelimiter", "mathmatrix", "note", "paragraph",
 "prefs", "print", "ref", "sendto", "spellchecker","tabular", "tabularcreate",
 
 #ifdef HAVE_LIBAIKSAURUS
@@ -174,25 +174,10 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setController(ci);
                dialog->setView(new QCitationDialog(*dialog, ci));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
-       } else if (name == "document" || name == "preamble") {
-
-               // This nastiness will exist only as long as xforms
-               // has a separate preamble dialog.
-
-               string const other = (name == "document") ?
-                       "preamble" : "document";
-
-               std::map<string, DialogPtr>::iterator it =
-                       dialogs_.find(other);
-
-               if (it != dialogs_.end())
-                       dialog = it->second;
-               else {
-                       dialog->setController(new ControlDocument(*dialog));
-                       dialog->setView(new QDocument(*dialog));
-                       dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
-               }
-
+       } else if (name == "document") {
+               dialog->setController(new ControlDocument(*dialog));
+               dialog->setView(new QDocument(*dialog));
+               dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "errorlist") {
                dialog->setController(new ControlErrorList(*dialog));
                dialog->setView(new QErrorList(*dialog));

diff --git a/src/frontends/qt4/lyx_gui.C b/src/frontends/qt4/lyx_gui.C
index 7e572d765d30d51f04122413178d135f988cde86..3051dbe9d6428647cade3082d439686d0c7bbad2 100644 (file)
--- a/src/frontends/qt4/lyx_gui.C
+++ b/src/frontends/qt4/lyx_gui.C
@@ -275,10 +275,6 @@ FuncStatus getStatus(FuncRequest const & ev)
 {
        FuncStatus flag;
        switch (ev.action) {
-       case LFUN_DIALOG_SHOW:
-               if (ev.argument == "preamble")
-                       flag.unknown(true);
-               break;
        case LFUN_TOOLTIPS_TOGGLE:
                flag.unknown(true);
                break;