From: Angus Leeming <leeming@lyx.org>
Date: Tue, 4 May 2004 18:39:41 +0000 (+0000)
Subject: Squash bug 1590 by removing "error" from the list of dialog identifiers.
X-Git-Tag: 1.6.10~15239
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a5e44ab543bd29f357d46ca7355a55dc37ff8844;p=features.git

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 662eb59323..865f34b24a 100644
--- 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 e78b0ae72d..9831a4c235 100644
--- 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 6522f7b8dd..27e60e0a34 100644
--- 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 24189d6a9d..43f3cb4176 100644
--- 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 a85859a7d3..300ae2d173 100644
--- 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 e2b4a1360f..c8898920d7 100644
--- 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));