Changeset 7149 in orxonox.OLD

Timestamp:

Feb 16, 2006, 12:51:42 AM (18 years ago)

Author:

bensch

Message:

qt_gui:more gui work

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

• Makefile.am (modified) (1 diff)
• gui_saveable.cc (modified) (1 diff)
• gui_saveable.h (modified) (3 diffs)
• qt_gui.cc (modified) (1 diff)
• qt_gui.h (modified) (1 diff)

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

@@ -14 +14 @@
 libORXqtgui_a_SOURCES = \
                 gui_saveable.cc \
+                \
                 qt_gui.cc
 
-noinst_HEADERS=
+noinst_HEADERS= \
+                gui_saveable.h \
+                \
+                qt_gui.h
 
 EXTRA_DIST =

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

@@ -40 +40 @@
 
 
-GuiGroup::GuiGroup(const std::string& name)
+GuiGroup::GuiGroup(const char* groupName)
 {
-
+  this->setName(groupName);
 }
 

branches/qt_gui/src/lib/gui/qt_gui/gui_saveable.h

@@ -10 +10 @@
 #include "multi_type.h"
 #include <list>
-#include <string>
 
 // FORWARD DECLARATION
@@ -16 +15 @@
 
 //! A class for ...
-class GuiSaveable : virtual public BaseObject {
+class GuiSaveable : virtual public BaseObject
+{
 
- public:
+public:
+
 
 protected:
@@ -27 +28 @@
   virtual const MultiType& save() = 0;
 
- private:
-   MultiType       value;
+protected:
+  MultiType       value;
 };
 
 
-class GuiGroup
+
+class GuiGroup : virtual public BaseObject
 {
-  public:
-    GuiGroup(const std::string& name);
-    ~GuiGroup();
+public:
+  GuiGroup(const char* name);
+  ~GuiGroup();
 
-  private:
+  void addSaveable(GuiSaveable* saveable);
 
+private:
+  std::list<GuiSaveable*>     saveables;
 };
 

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h

@@ -8 +8 @@
 
 #include "base_object.h"
+#include "gui_saveable.h"
+#include <list>
+
+// grouping
+#include <qgroupbox.h>
+#include <qprogressbar.h>
+#include <qlabel.h>
+
+// events
 #include <qpushbutton.h>
+
+// options
 #include <qcheckbox.h>
 #include <qslider.h>
+#include <qlineedit.h>
 
 
+class QtGuiWidget : virtual public BaseObject
+{
+  public:
+};
+
+
+class QtGuiContainer
+{
+public:
+  virtual bool pack(QtGuiWidget* widget) = 0;
+
+protected:
+  QtGuiContainer();
+  ~QtGuiContainer();
+
+private:
+
+};
+
+
+class QtGuiBox : public QtGuiContainer
+{
+public:
+  typedef enum Orientation
+  {
+    horizontal,
+    vertical
+  };
+
+public:
+  QtGuiBox(Orientation orientation);
+  ~QtGuiBox();
+
+  virtual bool pack(QtGuiWidget* widget);
+
+private:
+  std::list<QtGuiWidget*>   children;
+
+};
+
+class QtGuiGroupBox : public QtGuiContainer, public GuiGroup
+{
+public:
+  QtGuiGroupBox(const char* groupName);
+  ~QtGuiGroupBox();
+
+  virtual bool pack(QtGuiWidget* widget);
+
+private:
+  QtGuiWidget*              child;
+};
+
+
+class QtGuiCheckBox : public QtGuiWidget, public GuiSaveable
+{
+public:
+  QtGuiCheckBox(const char* name, bool defaultValue = false);
+  ~QtGuiCheckBox();
+
+  //slot
+
+private:
+
+};