Fix:gui_sdl:Renamed to gui_cegui

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1142 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/configure.in b/navit/configure.in
index 8c21717..a65c50e 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -554,8 +554,8 @@ navit/graphics/qt_qpainter/Makefile
 navit/gui/Makefile
 navit/gui/gtk/Makefile
 navit/gui/internal/Makefile
-navit/gui/sdl/Makefile
-navit/gui/sdl/datafiles/Makefile
+navit/gui/cegui/Makefile
+navit/gui/cegui/datafiles/Makefile
 navit/osd/Makefile
 navit/osd/core/Makefile
 navit/speech/Makefile

diff --git a/navit/navit/gui/Makefile.am b/navit/navit/gui/Makefile.am
index 1f368df..7b28087 100644 (file)
--- a/navit/navit/gui/Makefile.am
+++ b/navit/navit/gui/Makefile.am
@@ -3,6 +3,6 @@ if GUI_GTK
   SUBDIRS += gtk
 endif
 if GUI_SDL
-  SUBDIRS += sdl
+  SUBDIRS += cegui
 endif
 

diff --git a/navit/navit/gui/cegui/Makefile.am b/navit/navit/gui/cegui/Makefile.am
new file mode 100644 (file)
index 0000000..479413f
--- /dev/null
+++ b/navit/navit/gui/cegui/Makefile.am
@@ -0,0 +1,6 @@
+include $(top_srcdir)/Makefile.inc
+SUBDIRS=datafiles
+AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=gui_cegui
+modulegui_LTLIBRARIES = libgui_cegui.la
+libgui_cegui_la_SOURCES = gui_sdl_window.cpp sdl_events.cpp gui_sdl.h sdl_events.h wmcontrol.c wmcontrol.h cegui_keyboard.cpp cegui_keyboard.h
+libgui_cegui_la_LIBADD = @SDL_LIBS@ @CEGUI_LIBS@ @OPENGL_LIBS@ @GLC_LIBS@

diff --git a/navit/navit/gui/sdl/cegui_keyboard.cpp b/navit/navit/gui/cegui/cegui_keyboard.cpp
similarity index 100%
rename from navit/navit/gui/sdl/cegui_keyboard.cpp
rename to navit/navit/gui/cegui/cegui_keyboard.cpp

diff --git a/navit/navit/gui/sdl/cegui_keyboard.h b/navit/navit/gui/cegui/cegui_keyboard.h
similarity index 100%
rename from navit/navit/gui/sdl/cegui_keyboard.h
rename to navit/navit/gui/cegui/cegui_keyboard.h

diff --git a/navit/navit/gui/sdl/datafiles/Makefile.am b/navit/navit/gui/cegui/datafiles/Makefile.am
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/Makefile.am
rename to navit/navit/gui/cegui/datafiles/Makefile.am

diff --git a/navit/navit/gui/sdl/datafiles/fonts/DejaVuSans-10.font b/navit/navit/gui/cegui/datafiles/fonts/DejaVuSans-10.font
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/fonts/DejaVuSans-10.font
rename to navit/navit/gui/cegui/datafiles/fonts/DejaVuSans-10.font

diff --git a/navit/navit/gui/sdl/datafiles/fonts/DejaVuSans-12.font b/navit/navit/gui/cegui/datafiles/fonts/DejaVuSans-12.font
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/fonts/DejaVuSans-12.font
rename to navit/navit/gui/cegui/datafiles/fonts/DejaVuSans-12.font

diff --git a/navit/navit/gui/sdl/datafiles/fonts/DejaVuSans-14.font b/navit/navit/gui/cegui/datafiles/fonts/DejaVuSans-14.font
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/fonts/DejaVuSans-14.font
rename to navit/navit/gui/cegui/datafiles/fonts/DejaVuSans-14.font

diff --git a/navit/navit/gui/sdl/datafiles/fonts/DejaVuSans.ttf b/navit/navit/gui/cegui/datafiles/fonts/DejaVuSans.ttf
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/fonts/DejaVuSans.ttf
rename to navit/navit/gui/cegui/datafiles/fonts/DejaVuSans.ttf

diff --git a/navit/navit/gui/sdl/datafiles/fonts/Font.xsd b/navit/navit/gui/cegui/datafiles/fonts/Font.xsd
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/fonts/Font.xsd
rename to navit/navit/gui/cegui/datafiles/fonts/Font.xsd

diff --git a/navit/navit/gui/sdl/datafiles/imagesets/Imageset.xsd b/navit/navit/gui/cegui/datafiles/imagesets/Imageset.xsd
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/imagesets/Imageset.xsd
rename to navit/navit/gui/cegui/datafiles/imagesets/Imageset.xsd

diff --git a/navit/navit/gui/sdl/datafiles/imagesets/Mineque-Black.imageset b/navit/navit/gui/cegui/datafiles/imagesets/Mineque-Black.imageset
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/imagesets/Mineque-Black.imageset
rename to navit/navit/gui/cegui/datafiles/imagesets/Mineque-Black.imageset

diff --git a/navit/navit/gui/sdl/datafiles/imagesets/TaharezLook.imageset b/navit/navit/gui/cegui/datafiles/imagesets/TaharezLook.imageset
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/imagesets/TaharezLook.imageset
rename to navit/navit/gui/cegui/datafiles/imagesets/TaharezLook.imageset

diff --git a/navit/navit/gui/sdl/datafiles/imagesets/TaharezLook.tga b/navit/navit/gui/cegui/datafiles/imagesets/TaharezLook.tga
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/imagesets/TaharezLook.tga
rename to navit/navit/gui/cegui/datafiles/imagesets/TaharezLook.tga

diff --git a/navit/navit/gui/sdl/datafiles/imagesets/navit-skin-black-imageset.tga b/navit/navit/gui/cegui/datafiles/imagesets/navit-skin-black-imageset.tga
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/imagesets/navit-skin-black-imageset.tga
rename to navit/navit/gui/cegui/datafiles/imagesets/navit-skin-black-imageset.tga

diff --git a/navit/navit/gui/sdl/datafiles/layouts/GUILayout.xsd b/navit/navit/gui/cegui/datafiles/layouts/GUILayout.xsd
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/layouts/GUILayout.xsd
rename to navit/navit/gui/cegui/datafiles/layouts/GUILayout.xsd

diff --git a/navit/navit/gui/sdl/datafiles/layouts/Mineque.layout b/navit/navit/gui/cegui/datafiles/layouts/Mineque.layout
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/layouts/Mineque.layout
rename to navit/navit/gui/cegui/datafiles/layouts/Mineque.layout

diff --git a/navit/navit/gui/sdl/datafiles/layouts/TaharezLook.layout b/navit/navit/gui/cegui/datafiles/layouts/TaharezLook.layout
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/layouts/TaharezLook.layout
rename to navit/navit/gui/cegui/datafiles/layouts/TaharezLook.layout

diff --git a/navit/navit/gui/sdl/datafiles/looknfeel/Falagard.xsd b/navit/navit/gui/cegui/datafiles/looknfeel/Falagard.xsd
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/looknfeel/Falagard.xsd
rename to navit/navit/gui/cegui/datafiles/looknfeel/Falagard.xsd

diff --git a/navit/navit/gui/sdl/datafiles/looknfeel/Mineque.looknfeel b/navit/navit/gui/cegui/datafiles/looknfeel/Mineque.looknfeel
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/looknfeel/Mineque.looknfeel
rename to navit/navit/gui/cegui/datafiles/looknfeel/Mineque.looknfeel

diff --git a/navit/navit/gui/sdl/datafiles/looknfeel/TaharezLook.looknfeel b/navit/navit/gui/cegui/datafiles/looknfeel/TaharezLook.looknfeel
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/looknfeel/TaharezLook.looknfeel
rename to navit/navit/gui/cegui/datafiles/looknfeel/TaharezLook.looknfeel

diff --git a/navit/navit/gui/sdl/datafiles/schemes/GUIScheme.xsd b/navit/navit/gui/cegui/datafiles/schemes/GUIScheme.xsd
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/schemes/GUIScheme.xsd
rename to navit/navit/gui/cegui/datafiles/schemes/GUIScheme.xsd

diff --git a/navit/navit/gui/sdl/datafiles/schemes/Mineque.scheme b/navit/navit/gui/cegui/datafiles/schemes/Mineque.scheme
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/schemes/Mineque.scheme
rename to navit/navit/gui/cegui/datafiles/schemes/Mineque.scheme

diff --git a/navit/navit/gui/sdl/datafiles/schemes/TaharezLook.scheme b/navit/navit/gui/cegui/datafiles/schemes/TaharezLook.scheme
similarity index 100%
rename from navit/navit/gui/sdl/datafiles/schemes/TaharezLook.scheme
rename to navit/navit/gui/cegui/datafiles/schemes/TaharezLook.scheme

diff --git a/navit/navit/gui/sdl/gui_sdl.h b/navit/navit/gui/cegui/gui_sdl.h
similarity index 100%
rename from navit/navit/gui/sdl/gui_sdl.h
rename to navit/navit/gui/cegui/gui_sdl.h

diff --git a/navit/navit/gui/sdl/gui_sdl_window.cpp b/navit/navit/gui/cegui/gui_sdl_window.cpp
similarity index 99%
rename from navit/navit/gui/sdl/gui_sdl_window.cpp
rename to navit/navit/gui/cegui/gui_sdl_window.cpp
index 96306a2..68949ae 100644 (file)
--- a/navit/navit/gui/sdl/gui_sdl_window.cpp
+++ b/navit/navit/gui/cegui/gui_sdl_window.cpp
@@ -918,5 +918,5 @@ void
 plugin_init(void)
 {
        dbg(1,"registering sdl plugin\n");
-       plugin_register_gui_type("sdl", gui_sdl_new);
+       plugin_register_gui_type("cegui", gui_sdl_new);
 }

diff --git a/navit/navit/gui/sdl/sdl_events.cpp b/navit/navit/gui/cegui/sdl_events.cpp
similarity index 100%
rename from navit/navit/gui/sdl/sdl_events.cpp
rename to navit/navit/gui/cegui/sdl_events.cpp

diff --git a/navit/navit/gui/sdl/sdl_events.h b/navit/navit/gui/cegui/sdl_events.h
similarity index 100%
rename from navit/navit/gui/sdl/sdl_events.h
rename to navit/navit/gui/cegui/sdl_events.h

diff --git a/navit/navit/gui/sdl/wmcontrol.c b/navit/navit/gui/cegui/wmcontrol.c
similarity index 100%
rename from navit/navit/gui/sdl/wmcontrol.c
rename to navit/navit/gui/cegui/wmcontrol.c

diff --git a/navit/navit/gui/sdl/wmcontrol.h b/navit/navit/gui/cegui/wmcontrol.h
similarity index 100%
rename from navit/navit/gui/sdl/wmcontrol.h
rename to navit/navit/gui/cegui/wmcontrol.h

diff --git a/navit/navit/gui/sdl/Makefile.am b/navit/navit/gui/sdl/Makefile.am
deleted file mode 100644 (file)
index f5777f2..0000000
--- a/navit/navit/gui/sdl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.inc
-SUBDIRS=datafiles
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @CEGUI_CFLAGS@ @GLC_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=gui_sdl
-modulegui_LTLIBRARIES = libgui_sdl.la
-libgui_sdl_la_SOURCES = gui_sdl_window.cpp sdl_events.cpp gui_sdl.h sdl_events.h wmcontrol.c wmcontrol.h cegui_keyboard.cpp cegui_keyboard.h
-libgui_sdl_la_LIBADD = @SDL_LIBS@ @CEGUI_LIBS@ @OPENGL_LIBS@ @GLC_LIBS@