+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
#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);
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;
///
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
+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
#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));
#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
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();
+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
#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
// 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));
-}
#include "XFormsView.h"
#include "GUIRunTime.h"
#include "debug.h"
+#include "graphics/GraphicsImageXPM.h"
#include FORMS_H_LOCATION
}
+// 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();
+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.
#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)
{
// 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));
-}
#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
}
+
+// 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();
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 \
+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]:
#include "GraphicsImage.h"
#include "GraphicsParams.h"
#include "insets/insetgraphics.h"
-#include "frontends/Dialogs.h"
+#include "frontends/GUIRunTime.h"
namespace grfx {
static bool start = true;
if (start) {
start = false;
- Dialogs::initialiseGraphics();
+ GUIRunTime::initialiseGraphics();
}
// Now return the cache