From ae2c74ff42f77e6c3a6e19cb7780a1762834ce58 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Wed, 14 May 2008 00:26:00 +0100 Subject: [PATCH] Tied gui into main lumiera build --- Makefile.am | 3 + configure.ac | 46 ++++++++++ {src/gui/icons => icons}/viewer-panel.png | Bin {src/gui/po => po}/ChangeLog | 0 {src/gui/po => po}/LINGUAS | 0 {src/gui/po => po}/POTFILES.in | 0 src/gui/Makefile.am | 83 +++++++++++++++--- .../{src => }/dialogs/preferences-dialog.cpp | 0 .../{src => }/dialogs/preferences-dialog.hpp | 0 src/gui/{src => }/dialogs/render.cpp | 0 src/gui/{src => }/dialogs/render.hpp | 0 src/gui/{src => }/gtk-lumiera.cpp | 0 src/gui/{src => }/gtk-lumiera.hpp | 0 src/gui/{src => }/lumiera_ui.rc | 0 src/gui/{src => }/model/project.cpp | 0 src/gui/{src => }/model/project.hpp | 0 src/gui/{src => }/output/displayer.cpp | 0 src/gui/{src => }/output/displayer.hpp | 0 src/gui/{src => }/output/gdkdisplayer.cpp | 0 src/gui/{src => }/output/gdkdisplayer.hpp | 0 src/gui/{src => }/output/xvdisplayer.cpp | 0 src/gui/{src => }/output/xvdisplayer.hpp | 0 src/gui/{src => }/panels/assets-panel.cpp | 0 src/gui/{src => }/panels/assets-panel.hpp | 0 src/gui/{src => }/panels/panel.cpp | 0 src/gui/{src => }/panels/panel.hpp | 0 src/gui/{src => }/panels/timeline-panel.cpp | 0 src/gui/{src => }/panels/timeline-panel.hpp | 0 src/gui/{src => }/panels/viewer-panel.cpp | 0 src/gui/{src => }/panels/viewer-panel.hpp | 0 src/gui/src/Makefile.am | 55 ------------ src/gui/{src => }/widgets/timeline-widget.cpp | 0 src/gui/{src => }/widgets/timeline-widget.hpp | 0 .../widgets/video-display-widget.cpp | 0 .../widgets/video-display-widget.hpp | 0 src/gui/{src => }/window-manager.cpp | 0 src/gui/{src => }/window-manager.hpp | 0 src/gui/{src => }/workspace/actions.cpp | 0 src/gui/{src => }/workspace/actions.hpp | 0 .../{src => }/workspace/workspace-window.cpp | 2 +- .../{src => }/workspace/workspace-window.hpp | 0 41 files changed, 121 insertions(+), 68 deletions(-) rename {src/gui/icons => icons}/viewer-panel.png (100%) rename {src/gui/po => po}/ChangeLog (100%) rename {src/gui/po => po}/LINGUAS (100%) rename {src/gui/po => po}/POTFILES.in (100%) rename src/gui/{src => }/dialogs/preferences-dialog.cpp (100%) rename src/gui/{src => }/dialogs/preferences-dialog.hpp (100%) rename src/gui/{src => }/dialogs/render.cpp (100%) rename src/gui/{src => }/dialogs/render.hpp (100%) rename src/gui/{src => }/gtk-lumiera.cpp (100%) rename src/gui/{src => }/gtk-lumiera.hpp (100%) rename src/gui/{src => }/lumiera_ui.rc (100%) rename src/gui/{src => }/model/project.cpp (100%) rename src/gui/{src => }/model/project.hpp (100%) rename src/gui/{src => }/output/displayer.cpp (100%) rename src/gui/{src => }/output/displayer.hpp (100%) rename src/gui/{src => }/output/gdkdisplayer.cpp (100%) rename src/gui/{src => }/output/gdkdisplayer.hpp (100%) rename src/gui/{src => }/output/xvdisplayer.cpp (100%) rename src/gui/{src => }/output/xvdisplayer.hpp (100%) rename src/gui/{src => }/panels/assets-panel.cpp (100%) rename src/gui/{src => }/panels/assets-panel.hpp (100%) rename src/gui/{src => }/panels/panel.cpp (100%) rename src/gui/{src => }/panels/panel.hpp (100%) rename src/gui/{src => }/panels/timeline-panel.cpp (100%) rename src/gui/{src => }/panels/timeline-panel.hpp (100%) rename src/gui/{src => }/panels/viewer-panel.cpp (100%) rename src/gui/{src => }/panels/viewer-panel.hpp (100%) delete mode 100644 src/gui/src/Makefile.am rename src/gui/{src => }/widgets/timeline-widget.cpp (100%) rename src/gui/{src => }/widgets/timeline-widget.hpp (100%) rename src/gui/{src => }/widgets/video-display-widget.cpp (100%) rename src/gui/{src => }/widgets/video-display-widget.hpp (100%) rename src/gui/{src => }/window-manager.cpp (100%) rename src/gui/{src => }/window-manager.hpp (100%) rename src/gui/{src => }/workspace/actions.cpp (100%) rename src/gui/{src => }/workspace/actions.hpp (100%) rename src/gui/{src => }/workspace/workspace-window.cpp (99%) rename src/gui/{src => }/workspace/workspace-window.hpp (100%) diff --git a/Makefile.am b/Makefile.am index 69cc34288..bf4c80872 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,6 +36,9 @@ include $(top_srcdir)/admin/Makefile.am include $(top_srcdir)/src/lib/Makefile.am #include $(top_srcdir)/src/backend/Makefile.am +# gui +include $(top_srcdir)/src/gui/Makefile.am + # plugins #include $(top_srcdir)/src... diff --git a/configure.ac b/configure.ac index 78d76c136..e179d8a24 100644 --- a/configure.ac +++ b/configure.ac @@ -75,5 +75,51 @@ AC_MSG_RESULT([NoBug build level: $nobug_level]) # END NoBug +############## Internatinalization +#GETTEXT_PACKAGE=gtk-lumiera +#AC_SUBST(GETTEXT_PACKAGE) +#AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) +#AM_GLIB_GNU_GETTEXT +#IT_PROG_INTLTOOL([0.35.0]) + +# END Internatinalization + + +############## X11 Dependancies +AC_PATH_X +AC_PATH_XTRA +# CFLAGS="$CFLAGS $X_CFLAGS" +LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" + +AC_CHECK_HEADERS([X11/Xlib.h X11/Xutil.h],[], + [AC_MSG_ERROR([Xlib.h or Xutil.h not found install xdevel])]) + +AC_CHECK_HEADERS([sys/ipc.h sys/shm.h],, + [AC_MSG_ERROR([Required header not found. Please check that it is installed])] +) +AC_CHECK_HEADERS([X11/extensions/Xvlib.h X11/extensions/XShm.h],, + [AC_MSG_ERROR([Required xvideo (Xv) extension to X not found. Please check that it is installed.])], + [#include ] +) + +AC_CHECK_LIB(Xext, XInitExtension, , + [AC_MSG_ERROR([Could not link with libXext. Check that you have libXext installed])], -lX11 +) +AC_CHECK_LIB(Xv, XvQueryAdaptors, , + [AC_MSG_ERROR([Could not link with libXv. Check that you have libXv installed])] +) + +# END X11 Dependancies + + +############## Gtk Dependancies +PKG_CHECK_MODULES(GTK_LUMIERA, [gtkmm-2.4 >= 2.8 gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0]) + +AC_SUBST(GTK_LUMIERA_CFLAGS) +AC_SUBST(GTK_LUMIERA_LIBS) + +# END Gtk Dependancies + + AC_CONFIG_FILES(Makefile) AC_OUTPUT diff --git a/src/gui/icons/viewer-panel.png b/icons/viewer-panel.png similarity index 100% rename from src/gui/icons/viewer-panel.png rename to icons/viewer-panel.png diff --git a/src/gui/po/ChangeLog b/po/ChangeLog similarity index 100% rename from src/gui/po/ChangeLog rename to po/ChangeLog diff --git a/src/gui/po/LINGUAS b/po/LINGUAS similarity index 100% rename from src/gui/po/LINGUAS rename to po/LINGUAS diff --git a/src/gui/po/POTFILES.in b/po/POTFILES.in similarity index 100% rename from src/gui/po/POTFILES.in rename to po/POTFILES.in diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 50af375e8..818c2f582 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -1,17 +1,76 @@ -## Process this file with automake to produce Makefile.in +# Copyright (C) Lumiera.org +# 2007, Joel Holdsworth +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -SUBDIRS = src po +lumigui_srcdir = $(top_srcdir)/src/gui +#noinst_LIBRARIES += liblumigui.a -gtk_lumieradocdir = ${prefix}/doc/gtk-lumiera -gtk_lumieradoc_DATA = +#lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror +#lumigui_CPPFLAGS = -I$(top_srcdir)/src/ -EXTRA_DIST = $(gtk_lumieradoc_DATA) +INCLUDES = \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + $(GTK_LUMIERA_CFLAGS) -# Copy all the spec files. Of cource, only one is actually used. -dist-hook: - for specfile in *.spec; do \ - if test -f $$specfile; then \ - cp -p $$specfile $(distdir); \ - fi \ - done +AM_CFLAGS =\ + -Wall\ + -g +bin_PROGRAMS += lumigui + +lumigui_SOURCES = \ + $(lumigui_srcdir)/gtk-lumiera.cpp \ + $(lumigui_srcdir)/gtk-lumiera.hpp \ + $(lumigui_srcdir)/window-manager.cpp \ + $(lumigui_srcdir)/window-manager.hpp \ + $(lumigui_srcdir)/workspace/actions.cpp \ + $(lumigui_srcdir)/workspace/actions.hpp \ + $(lumigui_srcdir)/workspace/workspace-window.cpp \ + $(lumigui_srcdir)/workspace/workspace-window.hpp \ + $(lumigui_srcdir)/dialogs/render.cpp \ + $(lumigui_srcdir)/dialogs/render.hpp \ + $(lumigui_srcdir)/dialogs/preferences-dialog.cpp \ + $(lumigui_srcdir)/dialogs/preferences-dialog.hpp \ + $(lumigui_srcdir)/panels/panel.cpp \ + $(lumigui_srcdir)/panels/panel.hpp \ + $(lumigui_srcdir)/panels/timeline-panel.cpp \ + $(lumigui_srcdir)/panels/timeline-panel.hpp \ + $(lumigui_srcdir)/panels/viewer-panel.cpp \ + $(lumigui_srcdir)/panels/viewer-panel.hpp \ + $(lumigui_srcdir)/panels/assets-panel.cpp \ + $(lumigui_srcdir)/panels/asset-panels.hpp \ + $(lumigui_srcdir)/widgets/video-display-widget.cpp \ + $(lumigui_srcdir)/widgets/video-display-widget.hpp \ + $(lumigui_srcdir)/widgets/timeline-widget.cpp \ + $(lumigui_srcdir)/widgets/timeline-widget.hpp \ + $(lumigui_srcdir)/model/project.cpp \ + $(lumigui_srcdir)/model/project.hpp \ + $(lumigui_srcdir)/output/displayer.cpp \ + $(lumigui_srcdir)/output/displayer.hpp \ + $(lumigui_srcdir)/output/gdkdisplayer.cpp \ + $(lumigui_srcdir)/output/gdkdisplayer.hpp \ + $(lumigui_srcdir)/output/xvdisplayer.cpp \ + $(lumigui_srcdir)/output/xvdisplayer.hpp + +lumigui_LDFLAGS = +lumigui_LDADD = $(GTK_LUMIERA_LIBS) + +themesdir = $(datadir)/themes +themes_DATA = $(lumigui_srcdir)/lumiera_ui.rc + +EXTRA_DIST += $(themes_DATA) diff --git a/src/gui/src/dialogs/preferences-dialog.cpp b/src/gui/dialogs/preferences-dialog.cpp similarity index 100% rename from src/gui/src/dialogs/preferences-dialog.cpp rename to src/gui/dialogs/preferences-dialog.cpp diff --git a/src/gui/src/dialogs/preferences-dialog.hpp b/src/gui/dialogs/preferences-dialog.hpp similarity index 100% rename from src/gui/src/dialogs/preferences-dialog.hpp rename to src/gui/dialogs/preferences-dialog.hpp diff --git a/src/gui/src/dialogs/render.cpp b/src/gui/dialogs/render.cpp similarity index 100% rename from src/gui/src/dialogs/render.cpp rename to src/gui/dialogs/render.cpp diff --git a/src/gui/src/dialogs/render.hpp b/src/gui/dialogs/render.hpp similarity index 100% rename from src/gui/src/dialogs/render.hpp rename to src/gui/dialogs/render.hpp diff --git a/src/gui/src/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp similarity index 100% rename from src/gui/src/gtk-lumiera.cpp rename to src/gui/gtk-lumiera.cpp diff --git a/src/gui/src/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp similarity index 100% rename from src/gui/src/gtk-lumiera.hpp rename to src/gui/gtk-lumiera.hpp diff --git a/src/gui/src/lumiera_ui.rc b/src/gui/lumiera_ui.rc similarity index 100% rename from src/gui/src/lumiera_ui.rc rename to src/gui/lumiera_ui.rc diff --git a/src/gui/src/model/project.cpp b/src/gui/model/project.cpp similarity index 100% rename from src/gui/src/model/project.cpp rename to src/gui/model/project.cpp diff --git a/src/gui/src/model/project.hpp b/src/gui/model/project.hpp similarity index 100% rename from src/gui/src/model/project.hpp rename to src/gui/model/project.hpp diff --git a/src/gui/src/output/displayer.cpp b/src/gui/output/displayer.cpp similarity index 100% rename from src/gui/src/output/displayer.cpp rename to src/gui/output/displayer.cpp diff --git a/src/gui/src/output/displayer.hpp b/src/gui/output/displayer.hpp similarity index 100% rename from src/gui/src/output/displayer.hpp rename to src/gui/output/displayer.hpp diff --git a/src/gui/src/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp similarity index 100% rename from src/gui/src/output/gdkdisplayer.cpp rename to src/gui/output/gdkdisplayer.cpp diff --git a/src/gui/src/output/gdkdisplayer.hpp b/src/gui/output/gdkdisplayer.hpp similarity index 100% rename from src/gui/src/output/gdkdisplayer.hpp rename to src/gui/output/gdkdisplayer.hpp diff --git a/src/gui/src/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp similarity index 100% rename from src/gui/src/output/xvdisplayer.cpp rename to src/gui/output/xvdisplayer.cpp diff --git a/src/gui/src/output/xvdisplayer.hpp b/src/gui/output/xvdisplayer.hpp similarity index 100% rename from src/gui/src/output/xvdisplayer.hpp rename to src/gui/output/xvdisplayer.hpp diff --git a/src/gui/src/panels/assets-panel.cpp b/src/gui/panels/assets-panel.cpp similarity index 100% rename from src/gui/src/panels/assets-panel.cpp rename to src/gui/panels/assets-panel.cpp diff --git a/src/gui/src/panels/assets-panel.hpp b/src/gui/panels/assets-panel.hpp similarity index 100% rename from src/gui/src/panels/assets-panel.hpp rename to src/gui/panels/assets-panel.hpp diff --git a/src/gui/src/panels/panel.cpp b/src/gui/panels/panel.cpp similarity index 100% rename from src/gui/src/panels/panel.cpp rename to src/gui/panels/panel.cpp diff --git a/src/gui/src/panels/panel.hpp b/src/gui/panels/panel.hpp similarity index 100% rename from src/gui/src/panels/panel.hpp rename to src/gui/panels/panel.hpp diff --git a/src/gui/src/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp similarity index 100% rename from src/gui/src/panels/timeline-panel.cpp rename to src/gui/panels/timeline-panel.cpp diff --git a/src/gui/src/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp similarity index 100% rename from src/gui/src/panels/timeline-panel.hpp rename to src/gui/panels/timeline-panel.hpp diff --git a/src/gui/src/panels/viewer-panel.cpp b/src/gui/panels/viewer-panel.cpp similarity index 100% rename from src/gui/src/panels/viewer-panel.cpp rename to src/gui/panels/viewer-panel.cpp diff --git a/src/gui/src/panels/viewer-panel.hpp b/src/gui/panels/viewer-panel.hpp similarity index 100% rename from src/gui/src/panels/viewer-panel.hpp rename to src/gui/panels/viewer-panel.hpp diff --git a/src/gui/src/Makefile.am b/src/gui/src/Makefile.am deleted file mode 100644 index 455dcdd60..000000000 --- a/src/gui/src/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## Process this file with automake to produce Makefile.in - -INCLUDES = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - $(GTK_LUMIERA_CFLAGS) - -AM_CFLAGS =\ - -Wall\ - -g - -bin_PROGRAMS = gtk-lumiera - -gtk_lumiera_SOURCES = \ - gtk-lumiera.cpp \ - gtk-lumiera.hpp \ - window-manager.cpp \ - window-manager.hpp \ - workspace/actions.cpp \ - workspace/actions.hpp \ - workspace/workspace-window.cpp \ - workspace/workspace-window.hpp \ - dialogs/render.cpp \ - dialogs/render.hpp \ - dialogs/preferences-dialog.cpp \ - dialogs/preferences-dialog.hpp \ - panels/panel.cpp \ - panels/panel.hpp \ - panels/timeline-panel.cpp \ - panels/timeline-panel.hpp \ - panels/viewer-panel.cpp \ - panels/viewer-panel.hpp \ - panels/assets-panel.cpp \ - panels/asset-panels.hpp \ - widgets/video-display-widget.cpp \ - widgets/video-display-widget.hpp \ - widgets/timeline-widget.cpp \ - widgets/timeline-widget.hpp \ - model/project.cpp \ - model/project.hpp \ - output/displayer.cpp \ - output/displayer.hpp \ - output/gdkdisplayer.cpp \ - output/gdkdisplayer.hpp \ - output/xvdisplayer.cpp \ - output/xvdisplayer.hpp - -gtk_lumiera_LDFLAGS = - -gtk_lumiera_LDADD = $(GTK_LUMIERA_LIBS) - -EXTRA_DIST = - - diff --git a/src/gui/src/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp similarity index 100% rename from src/gui/src/widgets/timeline-widget.cpp rename to src/gui/widgets/timeline-widget.cpp diff --git a/src/gui/src/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp similarity index 100% rename from src/gui/src/widgets/timeline-widget.hpp rename to src/gui/widgets/timeline-widget.hpp diff --git a/src/gui/src/widgets/video-display-widget.cpp b/src/gui/widgets/video-display-widget.cpp similarity index 100% rename from src/gui/src/widgets/video-display-widget.cpp rename to src/gui/widgets/video-display-widget.cpp diff --git a/src/gui/src/widgets/video-display-widget.hpp b/src/gui/widgets/video-display-widget.hpp similarity index 100% rename from src/gui/src/widgets/video-display-widget.hpp rename to src/gui/widgets/video-display-widget.hpp diff --git a/src/gui/src/window-manager.cpp b/src/gui/window-manager.cpp similarity index 100% rename from src/gui/src/window-manager.cpp rename to src/gui/window-manager.cpp diff --git a/src/gui/src/window-manager.hpp b/src/gui/window-manager.hpp similarity index 100% rename from src/gui/src/window-manager.hpp rename to src/gui/window-manager.hpp diff --git a/src/gui/src/workspace/actions.cpp b/src/gui/workspace/actions.cpp similarity index 100% rename from src/gui/src/workspace/actions.cpp rename to src/gui/workspace/actions.cpp diff --git a/src/gui/src/workspace/actions.hpp b/src/gui/workspace/actions.hpp similarity index 100% rename from src/gui/src/workspace/actions.hpp rename to src/gui/workspace/actions.hpp diff --git a/src/gui/src/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp similarity index 99% rename from src/gui/src/workspace/workspace-window.cpp rename to src/gui/workspace/workspace-window.cpp index 66d74e905..c203c7584 100644 --- a/src/gui/src/workspace/workspace-window.cpp +++ b/src/gui/workspace/workspace-window.cpp @@ -32,7 +32,7 @@ #include #include -#include "gtk-lumiera.hpp" +#include "../gtk-lumiera.hpp" #include "workspace-window.hpp" using namespace Gtk; diff --git a/src/gui/src/workspace/workspace-window.hpp b/src/gui/workspace/workspace-window.hpp similarity index 100% rename from src/gui/src/workspace/workspace-window.hpp rename to src/gui/workspace/workspace-window.hpp