Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 11792)
+++ /trunk/FACT++/Makefile.in	(revision 11793)
@@ -223,15 +223,22 @@
 dserver2_DEPENDENCIES = libTime.la libTools.la
 am__fact_SOURCES_DIST = gui/design.h gui/design.cc \
-	gui/DockWindow.moc.cc gui/MainWindow.moc.cc gui/DockWindow.cc \
-	gui/MainWindow.cc gui/CheckBoxDelegate.cc gui/HtmlDelegate.cc \
-	gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
+	gui/DockWindow.moc.cc gui/MainWindow.moc.cc \
+	gui/QCameraWidget.moc.cc gui/BasicGlCamera.moc.cc \
+	gui/DockWindow.cc gui/MainWindow.cc gui/QCameraWidget.cc \
+	gui/BasicGlCamera.cc gui/CheckBoxDelegate.cc \
+	gui/HtmlDelegate.cc gui/fact.cc gui/FactGui.cc \
+	src/HeadersFTM.cc
 am__objects_2 =
 @HAS_GUI_TRUE@am__objects_3 = gui/design.$(OBJEXT)
 @HAS_GUI_TRUE@am__objects_4 = gui/DockWindow.moc.$(OBJEXT) \
-@HAS_GUI_TRUE@	gui/MainWindow.moc.$(OBJEXT)
+@HAS_GUI_TRUE@	gui/MainWindow.moc.$(OBJEXT) \
+@HAS_GUI_TRUE@	gui/QCameraWidget.moc.$(OBJEXT) \
+@HAS_GUI_TRUE@	gui/BasicGlCamera.moc.$(OBJEXT)
 @HAS_GUI_TRUE@am__objects_5 = $(am__objects_2) $(am__objects_3) \
 @HAS_GUI_TRUE@	$(am__objects_4)
 @HAS_GUI_TRUE@am__objects_6 = gui/DockWindow.$(OBJEXT) \
-@HAS_GUI_TRUE@	gui/MainWindow.$(OBJEXT)
+@HAS_GUI_TRUE@	gui/MainWindow.$(OBJEXT) \
+@HAS_GUI_TRUE@	gui/QCameraWidget.$(OBJEXT) \
+@HAS_GUI_TRUE@	gui/BasicGlCamera.$(OBJEXT)
 am_fact_OBJECTS = $(am__objects_5) $(am__objects_6) \
 	gui/CheckBoxDelegate.$(OBJEXT) gui/HtmlDelegate.$(OBJEXT) \
@@ -892,5 +899,7 @@
 @HAS_GUI_TRUE@fact_QT_SOURCES = \
 @HAS_GUI_TRUE@	gui/DockWindow.cc \
-@HAS_GUI_TRUE@	gui/MainWindow.cc
+@HAS_GUI_TRUE@	gui/MainWindow.cc \
+@HAS_GUI_TRUE@	gui/QCameraWidget.cc \
+@HAS_GUI_TRUE@	gui/BasicGlCamera.cc
 
 @HAS_GUI_TRUE@fact_SRCADD = $(fact_DIALOGS:.ui=.h) $(fact_RESOURCES:.qrc=.cc) $(fact_QT_SOURCES:.cc=.moc.cc)
@@ -1237,7 +1246,15 @@
 gui/MainWindow.moc.$(OBJEXT): gui/$(am__dirstamp) \
 	gui/$(DEPDIR)/$(am__dirstamp)
+gui/QCameraWidget.moc.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
+gui/BasicGlCamera.moc.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
 gui/DockWindow.$(OBJEXT): gui/$(am__dirstamp) \
 	gui/$(DEPDIR)/$(am__dirstamp)
 gui/MainWindow.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
+gui/QCameraWidget.$(OBJEXT): gui/$(am__dirstamp) \
+	gui/$(DEPDIR)/$(am__dirstamp)
+gui/BasicGlCamera.$(OBJEXT): gui/$(am__dirstamp) \
 	gui/$(DEPDIR)/$(am__dirstamp)
 gui/CheckBoxDelegate.$(OBJEXT): gui/$(am__dirstamp) \
@@ -1398,4 +1415,6 @@
 	-rm -f dim/src/utilities.$(OBJEXT)
 	-rm -f dim/src/utilities.lo
+	-rm -f gui/BasicGlCamera.$(OBJEXT)
+	-rm -f gui/BasicGlCamera.moc.$(OBJEXT)
 	-rm -f gui/CheckBoxDelegate.$(OBJEXT)
 	-rm -f gui/DockWindow.$(OBJEXT)
@@ -1405,4 +1424,6 @@
 	-rm -f gui/MainWindow.$(OBJEXT)
 	-rm -f gui/MainWindow.moc.$(OBJEXT)
+	-rm -f gui/QCameraWidget.$(OBJEXT)
+	-rm -f gui/QCameraWidget.moc.$(OBJEXT)
 	-rm -f gui/RawEventsViewer/RawEventsViewer.$(OBJEXT)
 	-rm -f gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT)
@@ -1532,4 +1553,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-did.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@dim/src/did/$(DEPDIR)/did-dui_util.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/BasicGlCamera.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/BasicGlCamera.moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/CheckBoxDelegate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/DockWindow.Po@am__quote@
@@ -1539,4 +1562,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/MainWindow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/MainWindow.moc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/QCameraWidget.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/QCameraWidget.moc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/design.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gui/$(DEPDIR)/fact.Po@am__quote@