Squash bug 1590 by removing "error" from the list of dialog identifiers.

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

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 662eb5932344c654cf52df55df2b8ab5b33a3a37..865f34b24a9a8e1f5917181e130371ab8b3605ef 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-04  Angus Leeming  <leeming@lyx.org>
+
+       * Dialogs.C: Remove "error" dialog identifier.
+
 2004-04-28  Angus Leeming  <leeming@lyx.org>
 
        * GToolbar.[Ch]: rewrite code to derive from a single Toolbar or

diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C
index e78b0ae72d2e8d406df84887ee5640d1bfcc6acf..9831a4c23584dd91b3e3435ba5ad60629374b26a 100644 (file)
--- a/src/frontends/gtk/Dialogs.C
+++ b/src/frontends/gtk/Dialogs.C
@@ -131,7 +131,7 @@ FormMathsBitmap * createFormBitmap(Dialog & parent, string const & title,
 
 char const * const dialognames[] = {
 "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "document", "error", "errorlist" , "ert", "external", "file",
+"citation", "document", "errorlist" , "ert", "external", "file",
 "findreplace", "float", "graphics", "include", "index", "label", "log",
 "mathpanel", "mathaccents", "matharrows", "mathoperators", "mathrelations",
 "mathgreek", "mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
@@ -192,14 +192,14 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setController(new ControlBox(*dialog));
                dialog->setView(new FormBox(*dialog));
                dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
-       } else if (name == "character") {
-               dialog->setController(new ControlCharacter(*dialog));
-               dialog->setView(new FormCharacter(*dialog));
-               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "changes") {
                dialog->setController(new ControlChanges(*dialog));
                dialog->setView(new FormChanges(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
+       } else if (name == "character") {
+               dialog->setController(new ControlCharacter(*dialog));
+               dialog->setView(new FormCharacter(*dialog));
+               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "citation") {
                dialog->setController(new ControlCitation(*dialog));
                dialog->setView(new FormCitation(*dialog));

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 6522f7b8dde4ada00a29aa7c6c045c706113cae5..27e60e0a342d155a0a22fa2940bfe24b80929238 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-04  Angus Leeming  <leeming@lyx.org>
+
+       * Dialogs.C: Remove "error" dialog identifier.
+
 2004-05-02  Angus Leeming  <leeming@lyx.org>
 
        * QLImage.[Ch]: store and use QImage rather than QPixmap. Saves

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 24189d6a9dccd3d91c766559b4a2e77d8ed91cb9..43f3cb4176cd217e56ffc7388cdb6b68bf864679 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -100,7 +100,7 @@ namespace {
 
 char const * const dialognames[] = {
 "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "document", "error", "errorlist", "ert", "external", "file",
+"citation", "document", "errorlist", "ert", "external", "file",
 "findreplace", "float", "graphics", "include", "index", "label", "log",
 "mathpanel", "mathdelimiter", "mathmatrix", "note", "paragraph", "preamble",
 "prefs", "print", "ref", "sendto", "spellchecker","tabular", "tabularcreate",

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index a85859a7d3b25908bab22059c2fdfd62e6ebc37f..300ae2d1736fd115a34a2caa67a54a3fabaa6cc2 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,8 +1,12 @@
+2004-05-04  Angus Leeming  <leeming@lyx.org>
+
+       * Dialogs.C: Remove "error" dialog identifier.
+
 2004-05-04  Angus Leeming  <leeming@lyx.org>
 
        This is a resurrection of John Levon's June 2002 code.
 
-       * xscreen.C (expose): do the 'right thing' and ouput an XEvent
+       * xscreen.C (expose): do the 'right thing' and output an XEvent
        request to expose the work area.
 
        * XWorkArea.C (updateGeometry, paint): split the old redraw function

diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index e2b4a1360f5ffa6106ab19c6f7b62b5ad86cfd6a..c8898920d7f804430a54dc509fa2ac9ca47288d6 100644 (file)
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -127,7 +127,7 @@ FormMathsBitmap * createFormBitmap(Dialog & parent, string const & title,
 
 char const * const dialognames[] = {
 "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "document", "error", "errorlist" , "ert", "external", "file",
+"citation", "document", "errorlist" , "ert", "external", "file",
 "findreplace", "float", "graphics", "include", "index", "label", "log",
 "mathpanel", "mathaccents", "matharrows", "mathoperators", "mathrelations",
 "mathgreek", "mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
@@ -191,14 +191,14 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setController(new ControlBranch(*dialog));
                dialog->setView(new FormBranch(*dialog));
                dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
-       } else if (name == "character") {
-               dialog->setController(new ControlCharacter(*dialog));
-               dialog->setView(new FormCharacter(*dialog));
-               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "changes") {
                dialog->setController(new ControlChanges(*dialog));
                dialog->setView(new FormChanges(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
+       } else if (name == "character") {
+               dialog->setController(new ControlCharacter(*dialog));
+               dialog->setView(new FormCharacter(*dialog));
+               dialog->bc().bp(new OkApplyCancelReadOnlyPolicy);
        } else if (name == "citation") {
                dialog->setController(new ControlCitation(*dialog));
                dialog->setView(new FormCitation(*dialog));