Move Dialogs::redrawGUI to frontends/Dialogs.C from all those guis.

Move Dialogs::initialiseGraphics to GUIRunTime.
xforms works, qt2 and gnome not tested.

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

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 7807eaa48d2819cd29de21663cf60598e3482d17..23febc64bdbf7de3f65e3c9a72a11bfed25f986d 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-04  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * Dialogs.h:
+       * GUIRunTime.h (initialiseGraphics): moved to GUIRunTime.
+
 2002-03-02  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * Toolbar.[Ch] (setLayout): layout as string

diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index 4e6f32171c5efa4973e66858c76d3585ec80e3a3..da2e1a581c48d2a3d038ee84febc7ce936d79f2d 100644 (file)
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -23,6 +23,10 @@
 #include "Dialogs.h"
 #include "support/LAssert.h"
 
+// Signal enabling all visible dialogs to be redrawn if so desired.
+// E.g., when the GUI colours have been remapped.
+SigC::Signal0<void> Dialogs::redrawGUI;
+
 void Dialogs::add(DialogBase * ptr)
 {
        lyx::Assert(ptr);

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index b80704b97c460f3c11f8976baf0ba24536390d1e..50c3ccc02e93e2e7011cd24000a650ca168a77c3 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -63,11 +63,6 @@ public:
        Dialogs(LyXView *);
        //@}
 
-       /** Called bu the graphics cache to connect the approriate frontend
-        *  image loading routines to the LyX kernel.
-        */
-       static void initialiseGraphics();
-
        /** Redraw all visible dialogs because, for example, the GUI colours
            have been re-mapped. */
        static SigC::Signal0<void> redrawGUI;

diff --git a/src/frontends/GUIRunTime.h b/src/frontends/GUIRunTime.h
index 5bfc5c57cbded9e664f023b34999acb8c66b875a..72221fed67015a70ea52a149a003826c4174f2f7 100644 (file)
--- a/src/frontends/GUIRunTime.h
+++ b/src/frontends/GUIRunTime.h
@@ -39,6 +39,10 @@ public:
        ///
        static
        LyXView * createMainView(int w, int h);
+       /** Called bu the graphics cache to connect the approriate frontend
+        *  image loading routines to the LyX kernel.
+        */
+       static void initialiseGraphics();
 
 /* the following entries are X11 specific and should eventually go away */
        /// The display on which LyX is running

diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog
index 9cb655648d88e9b76a9934a0151b5de703a0a090..9eefafbb951950a7f1d2e0beb3f2ba6f89c02a3a 100644 (file)
--- a/src/frontends/gnome/ChangeLog
+++ b/src/frontends/gnome/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-04   Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * Dialogs.C (redrawGUI): removed to frontends/Dialogs.C
+
+       * GUIRunTime.C (initialiseGraphics): new static method
+
 2002-03-02  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * Makefile.am: get rid of LYX_LIBS 

diff --git a/src/frontends/gnome/Dialogs.C b/src/frontends/gnome/Dialogs.C
index 546171838588b4deb87b664492b14d3ba8d94019..d4792e2f9bfd731c914ccae8353ad637663b6571 100644 (file)
--- a/src/frontends/gnome/Dialogs.C
+++ b/src/frontends/gnome/Dialogs.C
@@ -64,10 +64,6 @@
 #include "FormMinipage.h"
 */
 
-// Signal enabling all visible dialogs to be redrawn if so desired.
-// E.g., when the GUI colours have been remapped.
-SigC::Signal0<void> Dialogs::redrawGUI;
-
 Dialogs::Dialogs(LyXView * lv)
 {
        add(new GUIUrl<FormUrl, gnomeBC>(*lv, *this));

diff --git a/src/frontends/gnome/GUIRunTime.C b/src/frontends/gnome/GUIRunTime.C
index 74738fb247d850650e3b38bc8a03e3ce7f732c86..b69ee4fa00a1df82333929d3585a3a7d900c2d46 100644 (file)
--- a/src/frontends/gnome/GUIRunTime.C
+++ b/src/frontends/gnome/GUIRunTime.C
@@ -21,6 +21,8 @@
 #include <gnome--/main.h>
 #include <glade/glade.h>
 
+#include "graphics/GraphicsImageXPM.h"
+
 using std::endl;
 
 // I keep these here so that it will be processed as early in
@@ -127,7 +129,20 @@ LyXView * GUIRunTime::createMainView(int w, int h)
        return new XFormsView(w, h);
 }
 
-       
+
+// Called bu the graphics cache to connect the approriate frontend
+// image loading routines to the LyX kernel.
+void GUIRunTime::initialiseGraphics()
+{
+       using namespace grfx;
+       using SigC::slot;
+    
+       // connect the image loader based on the XPM library
+       GImage::newImage.connect(slot(&GImageXPM::newImage));
+       GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
+}
+
+
 Display * GUIRunTime::x11Display()
 {
        return fl_get_display();

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index fe7cdc80ba55b7635762f2d3da37d8e786c855fc..fe156841e7cc3db723268011db323dbb2cf571a1 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-04   Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * Dialogs.C (redrawGUI): removed to frontends/Dialogs.C
+
+       * Dialogs.C:
+       * GUIRunTime.C (initialiseGraphics): moved to GUIRunTime.
+
 2002-03-02  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * Makefile.am: get rid of LYX_LIBS

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 80d667fe59f93b5cb7dc12effddb86d7e59d6e0b..401d460dc655e724105fa6a1cf59f458a3c0c483 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -80,14 +80,8 @@
 #include "xforms/FormShowFile.h"
 #include "xforms/FormTabular.h"
  
-#include "graphics/GraphicsImageXPM.h"
- 
 #include "GUI.h"
 
-// this makes no real sense for Qt2
-SigC::Signal0<void> Dialogs::redrawGUI;
-
-
 Dialogs::Dialogs(LyXView * lv)
 {
        // dialogs that have been converted to new scheme
@@ -129,16 +123,3 @@ Dialogs::Dialogs(LyXView * lv)
        // dialogs by a simple connection here.
        hideAll.connect(hideBufferDependent.slot());
 }
- 
- 
-// Called bu the graphics cache to connect the approriate frontend
-// image loading routines to the LyX kernel.
-void Dialogs::initialiseGraphics()
-{
-       using namespace grfx;
-       using SigC::slot;
-    
-       // connect the image loader based on the XPM library
-       GImage::newImage.connect(slot(&GImageXPM::newImage));
-       GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
-}

diff --git a/src/frontends/qt2/GUIRunTime.C b/src/frontends/qt2/GUIRunTime.C
index 4692ba0729d400f844e8b8bf1e47b33dbde4fa67..8aecae903dbedf30f09e8d4d97e6a569d543f764 100644 (file)
--- a/src/frontends/qt2/GUIRunTime.C
+++ b/src/frontends/qt2/GUIRunTime.C
@@ -19,6 +19,7 @@
 #include "XFormsView.h"
 #include "GUIRunTime.h"
 #include "debug.h"
+#include "graphics/GraphicsImageXPM.h"
 
 #include FORMS_H_LOCATION
 
@@ -90,6 +91,19 @@ LyXView * GUIRunTime::createMainView(int w, int h)
 }
 
  
+// Called bu the graphics cache to connect the approriate frontend
+// image loading routines to the LyX kernel.
+void GUIRunTime::initialiseGraphics()
+{
+       using namespace grfx;
+       using SigC::slot;
+    
+       // connect the image loader based on the XPM library
+       GImage::newImage.connect(slot(&GImageXPM::newImage));
+       GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
+}
+
+
 Display * GUIRunTime::x11Display()
 {
        //return p.device()->x11Display();

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 937017a021697b0d02588d27b2690db03d7732ff..9b8c17bdcf6607e79803e833c33e540a02d12a6e 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-04   Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * Dialogs.C (redrawGUI): removed to frontends/Dialogs.C
+
+       * Dialogs.C:
+       * GUIRunTime.C (initialiseGraphics): moved to GUIRunTime.
+
 2002-03-04   Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormDocument.C (build): add a std:: qualifier to remove_if.

diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index 724d978da7c803448ddd734a1d28957fa7c95e18..f44dddc7c2f6b7023bd6d7a11df2a0efb1496fd6 100644 (file)
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -81,12 +81,6 @@
 #include "FormPreferences.h"
 #include "FormTabular.h"
 
-#include "graphics/GraphicsImageXPM.h"
-//#include "xformsGraphicsImage.h"
-
-// Signal enabling all visible dialogs to be redrawn if so desired.
-// E.g., when the GUI colours have been remapped.
-SigC::Signal0<void> Dialogs::redrawGUI;
 
 Dialogs::Dialogs(LyXView * lv)
 {
@@ -130,18 +124,3 @@ Dialogs::Dialogs(LyXView * lv)
        // dialogs by a simple connection here.
        hideAll.connect(hideBufferDependent.slot());
 }
-
-// Called bu the graphics cache to connect the approriate frontend
-// image loading routines to the LyX kernel.
-void Dialogs::initialiseGraphics()
-{
-       using namespace grfx;
-       using SigC::slot;
-    
-       // connect the image loader based on the XPM library
-       GImage::newImage.connect(slot(&GImageXPM::newImage));
-       GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
-       // connect the image loader based on the xforms library
-//     GImage::newImage.connect(slot(&xformsGImage::newImage));
-//     GImage::loadableFormats.connect(slot(&xformsGImage::loadableFormats));
-}

diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C
index 423dd123063c57d55c64de96dfacdca05723ea46..05bba6edb7d90bb3360eb7d9666eeeacb9892b2c 100644 (file)
--- a/src/frontends/xforms/GUIRunTime.C
+++ b/src/frontends/xforms/GUIRunTime.C
@@ -19,6 +19,12 @@
 #include "XFormsView.h"
 #include "debug.h"
 
+//#if (FL_REVISION >= 89 && FL_FIXLEVEL >= 6)
+//#include "xformsGImage.h"
+//#else
+#include "graphics/GraphicsImageXPM.h"
+//#endif
+
 // I keep these here so that it will be processed as early in
 // the compilation process as possible.
 #if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
@@ -125,6 +131,26 @@ LyXView * GUIRunTime::createMainView(int w, int h)
 }
 
 
+
+// Called bu the graphics cache to connect the approriate frontend
+// image loading routines to the LyX kernel.
+void GUIRunTime::initialiseGraphics()
+{
+       using namespace grfx;
+       using SigC::slot;
+    
+//#if (FL_REVISION >= 89 && FL_FIXLEVEL >= 6)
+       // connect the image loader based on the xforms library
+//     GImage::newImage.connect(slot(&xformsGImage::newImage));
+//     GImage::loadableFormats.connect(slot(&xformsGImage::loadableFormats));
+//#else
+       // connect the image loader based on the XPM library
+       GImage::newImage.connect(slot(&GImageXPM::newImage));
+       GImage::loadableFormats.connect(slot(&GImageXPM::loadableFormats));
+//#endif
+}
+
+
 Display * GUIRunTime::x11Display()
 {
        return fl_get_display();

diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am
index 8c5d13f7e328f5fc2f3ee6fd0f29e065bad3f276..5466b1fd9158511b64c2afb23641d6552806d28d 100644 (file)
--- a/src/frontends/xforms/Makefile.am
+++ b/src/frontends/xforms/Makefile.am
@@ -201,6 +201,10 @@ libxforms_la_SOURCES = \
        xformsBC.C \
        xformsBC.h
 
+
+#      xformsGImage.C \
+#      xformsGImage.h
+
 # These still have to be added. Sooner or later. ARRae-20000411
 #      GUI_defaults.C \
 #      GUI_initialize.C \

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index a6de1db24366a5002f5182b6bcf65519bd780643..330516085806389be1b5b9bac40c3f4c86f05d25 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-04  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * GraphicsCache.C: change associated with move of initialiseGraphics
+       to GUIRuntime.
+
 2002-02-28  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * GraphicsParams.[Ch]:

diff --git a/src/graphics/GraphicsCache.C b/src/graphics/GraphicsCache.C
index 1380bf4adc3714598a794a0da8126cfeb70e478f..b478331033086f5b48e82136686ce20d0e76b293 100644 (file)
--- a/src/graphics/GraphicsCache.C
+++ b/src/graphics/GraphicsCache.C
@@ -18,7 +18,7 @@
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
 #include "insets/insetgraphics.h"
-#include "frontends/Dialogs.h"
+#include "frontends/GUIRunTime.h"
 
 
 namespace grfx {
@@ -28,7 +28,7 @@ GCache & GCache::get()
        static bool start = true;
        if (start) {
                start = false;
-               Dialogs::initialiseGraphics();
+               GUIRunTime::initialiseGraphics();
        }
 
        // Now return the cache