Changeset 7542 in orxonox.OLD

Timestamp:

May 5, 2006, 5:55:49 PM (18 years ago)

Author:

bensch

Message:

Stoeff

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

• Makefile.am (modified) (2 diffs)
• qt_gui.cc (modified) (2 diffs)

branches/qt_gui/src/lib/gui/qt_gui/Makefile.am

@@ -16 +16 @@
 libORXqtgui_a_SOURCES = \
                 qt_gui.cc \
+                qt_gui_moc.cc \
                 qt_gui_elements.cc \
+                qt_gui_elements_moc.cc \
                 \
                 gui_video.cc \
@@ -30 +32 @@
 EXTRA_DIST =
 
+
+
+%_moc.cc : %.h
+        @QT_MOC@ -o $@ $<
+
+clean-local:
+        rm *_moc.cc

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc

@@ -22 +22 @@
 #include <QtGui/QGridLayout>
 
-
+#include "qt_gui_elements.h"
 #include "gui_video.h"
 #include "gui_audio.h"
@@ -44 +44 @@
         toolBox->addItem(new GuiAudio(toolBox), "Audio");
       }
-      mainLayout->addWidget(toolBox,1,1);
+      mainLayout->addWidget(toolBox,1,1, 1, 3);
+
+
+      QPushButton* quit = new QPushButton("quit");
+      connect(quit, SIGNAL(released()), this, SLOT(quit()));
+
+      mainLayout->addWidget(quit, 2,3);
     }