Get rid of Dialogs::showMathPanel.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 486e403a02058972074460cfa3d21bc2e8a1ab62..db1698728e2fb0e8919a2a907e1402d68a082887 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-17  Angus Leeming  <leeming@lyx.org>
+
+       * lyxfunc.C (dispatch): s/showMathPanel/show("mathpanel")/
+
 2003-06-17  Angus Leeming  <leeming@lyx.org>
 
        * lfuns.h:

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index ffad45d1ac6855f854bcd95d111883822573fd0c..fd02f185ac31603c7152f828cc8e76112b56a2a2 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-17  Angus Leeming  <leeming@lyx.org>
+
+       * Dialogs.h: (showMathPanel):
+       * guiapi.[Ch] (gui_ShowMathPanel):  removed.
+
 2003-06-06  Alfredo Braunstein  <abraunst@libero.it>
 
        * Dialogs.[Ch] (visible): added.

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 60e0fef371eceda33fe269aec1786c8f678868c4..af8f12a09088aaf9d203e6b7ca59070beac4cc77 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -74,8 +74,6 @@ public:
        void showDocument();
        /// show all forked child processes
        void showForks();
-       /// display the top-level maths panel
-       void showMathPanel();
        ///
        void showPreamble();
        ///

diff --git a/src/frontends/guiapi.C b/src/frontends/guiapi.C
index 824eca21e3a60a6f128c2da6812ca7bed50aaf24..1265a84b2f8ff02f2de74eb9bb5032afea933831 100644 (file)
--- a/src/frontends/guiapi.C
+++ b/src/frontends/guiapi.C
@@ -33,12 +33,6 @@ void gui_ShowForks(Dialogs & d)
 }
 
 
-void gui_ShowMathPanel(Dialogs & d)
-{
-       d.showMathPanel();
-}
-
-
 void gui_ShowPreamble(Dialogs & d)
 {
        d.showPreamble();

diff --git a/src/frontends/guiapi.h b/src/frontends/guiapi.h
index f98d61125dd13ac5c964e47a18962d274b3ee4a1..b34910b47230d2ac51a65b019b8964b69026e9a5 100644 (file)
--- a/src/frontends/guiapi.h
+++ b/src/frontends/guiapi.h
@@ -23,7 +23,6 @@ void gui_show_dialog(Dialogs *, char const * name, char const * data);
 
 void gui_ShowDocument(Dialogs &);
 void gui_ShowForks(Dialogs &);
-void gui_ShowMathPanel(Dialogs &);
 void gui_ShowPreamble(Dialogs &);
 void gui_ShowPreferences(Dialogs &);
 void gui_ShowPrint(Dialogs &);

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 02cf579eeeb802b4ff001611cc440620e8573030..02efbce62d41a51531ee5ac5f2a203b2ffac9f61 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-17  Angus Leeming  <leeming@lyx.org>
+
+       * Dialogs.C: rename math panel identifier as "mathpanel".
+       * Dialogs2.C (showMathPanel): removed.
+
 2003-06-17  Angus Leeming  <leeming@lyx.org>
 
        * Dialogs.C:

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 41703b023a31b6a04ad541c79904f7f08a3d076f..e8d5d767f727abf63a11d4ea000069643334fc03 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -83,7 +83,7 @@ namespace {
 char const * const dialognames[] = { "about", "bibitem", "bibtex", "changes",
 "character", "citation", "error", "errorlist", "ert", "external", "file",
 "float", "graphics", "include", "index", "label", "log",
-"math", "mathdelimiter", "mathmatrix",
+"mathpanel", "mathdelimiter", "mathmatrix",
 "minipage", "paragraph", "ref", "tabular", "tabularcreate",
 
 #ifdef HAVE_LIBAIKSAURUS
@@ -195,7 +195,7 @@ Dialog * Dialogs::build(string const & name)
                dialog->setController(new ControlLog(*dialog));
                dialog->setView(new QLog(*dialog));
                dialog->bc().bp(new OkCancelPolicy);
-       } else if (name == "math") {
+       } else if (name == "mathpanel") {
                dialog->setController(new ControlMath(*dialog));
                dialog->setView(new QMath(*dialog));
                dialog->bc().bp(new IgnorantPolicy);

diff --git a/src/frontends/qt2/Dialogs2.C b/src/frontends/qt2/Dialogs2.C
index 807c68a9bf8889c34685513a7e868e9f42ee5d32..4edb6a1bf3d28d2e66b6f4a01d4804584bd4f155 100644 (file)
--- a/src/frontends/qt2/Dialogs2.C
+++ b/src/frontends/qt2/Dialogs2.C
@@ -118,13 +118,6 @@ void Dialogs::showForks()
 {}
 
 
-void Dialogs::showMathPanel()
-{
-       static DialogPtr mathdialog(build("math"));
-       mathdialog->show(string());
-}
-
-
 void Dialogs::showPreamble()
 {
        pimpl_->document.controller().show();

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index ad7cfbca2033ad40a0fb233c2f88390b6d4f902a..708ea80fd9c9590cb02b5962737ac978b8aaa7d3 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-17  Angus Leeming  <leeming@lyx.org>
+
+       * Dialogs.C: rename math panel identifier as "mathpanel".
+       * Dialogs2.C (showMathPanel): removed.
+
 2003-06-17  Angus Leeming  <leeming@lyx.org>
 
        * Dialogs.C:

diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index d21216d0417a53caaaa93ca19eaf687d8aea19bc..6eed624908014cf96ec23e128a34966239f8470a 100644 (file)
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -110,7 +110,7 @@ FormMathsBitmap * createFormBitmap(Dialog & parent, string const & title,
 
 char const * const dialognames[] = { "about", "bibitem", "bibtex", "changes",
 "character", "citation", "error", "errorlist" , "ert", "external", "file",
-"float", "graphics", "include", "index", "label", "log", "math",
+"float", "graphics", "include", "index", "label", "log", "mathpanel",
 "mathaccents", "matharrows", "mathoperators", "mathrelations", "mathgreek",
 "mathmisc", "mathdots", "mathbigoperators", "mathamsmisc",
 "mathamsarrows", "mathamsrelations", "mathamsnegatedrelations", "mathamsoperators",
@@ -224,7 +224,7 @@ Dialog * Dialogs::build(string const & name)
                dialog->setView(new FormLog(*dialog));
                dialog->bc().bp(new OkCancelPolicy);
 
-       } else if (name == "math") {
+       } else if (name == "mathpanel") {
                dialog->setController(new ControlMath(*dialog));
                dialog->setView(new FormMathsPanel(*dialog));
                dialog->bc().bp(new IgnorantPolicy);

diff --git a/src/frontends/xforms/Dialogs2.C b/src/frontends/xforms/Dialogs2.C
index 1c9a733b7f3a21f0ad7fe472397cb8bf8386a083..0aeab5f7713703e559b40062b5235650255e7531 100644 (file)
--- a/src/frontends/xforms/Dialogs2.C
+++ b/src/frontends/xforms/Dialogs2.C
@@ -13,7 +13,6 @@
 #include <config.h>
 
 #include "Dialogs.h"
-#include "Dialog.h"
 #include "controllers/GUI.h"
 #include "ButtonController.h"
 
@@ -135,13 +134,6 @@ void Dialogs::showForks()
 }
 
 
-void Dialogs::showMathPanel()
-{
-       static DialogPtr mathdialog(build("math"));
-       mathdialog->show(string());
-}
-
-
 void Dialogs::showPreamble()
 {
        pimpl_->preamble.controller().show();

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index c97fa8bc82911e17ebf420c7b5a502ef4c86089e..75577bce9e1bdbcbbfcbc0f27cb770c52f778da9 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1405,7 +1405,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                break;
 
        case LFUN_MATH_PANEL:
-               owner->getDialogs().showMathPanel();
+               owner->getDialogs().show("mathpanel");
                break;
 
        case LFUN_DIALOG_SHOW:

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 48b93ec128b6bbec19c4d82735f4bdb49bd64a95..8708e5b181acd7454d59c9ffbe476298b4656404 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-17  Angus Leeming  <leeming@lyx.org>
+
+       * formulabase.C (lfunMouseRelease): s/showMathPanel/show("mathpanel")/
+
 2003-06-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * formulabase.C (mathDispatchCreation): fix call to cutSelection

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index ae0d51d0f432e9aa050dcc2838410c3a38c188d9..5884d0679b16776b861e30027c23c6f782206d48 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -227,7 +227,7 @@ dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
                if (mathcursor->dispatch(cmd) == UNDISPATCHED) {
                        // launch math panel for right mouse button
                        lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
-                       bv->owner()->getDialogs().showMathPanel();
+                       bv->owner()->getDialogs().show("mathpanel");
                }
                return DISPATCHED;
        }