Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7140 in orxonox.OLD


Ignore:
Timestamp:
Feb 14, 2006, 5:39:01 PM (19 years ago)
Author:
bensch
Message:

orxonox/qt_gui: primar work

Location:
branches/qt_gui
Files:
1 added
3 edited
5 copied

Legend:

Unmodified
Added
Removed

  • branches/qt_gui/configure.ac

    r7127 r7140  
    640640                 src/lib/gui/gtk_gui/Makefile
    641641                 src/lib/gui/gl_gui/Makefile
     642                 src/lib/gui/qt_gui/Makefile
    642643                 src/lib/parser/Makefile
    643644                 src/lib/parser/tinyxml/Makefile

  • branches/qt_gui/src/defs/class_id.h

    r7123 r7140  
    312312  CL_GLGUI_BAR                  =    0x00000b30,
    313313
     314  // QT_GUI
     315  CL_GUI_SAVEABLE               =    0x00b10000,
     316  CL_QTGUI_BUTTON               =    0x00000ba0,
     317  CL_QTGUI_PUSHBUTTON           =    0x00000ba3,
     318  CL_QTGUI_CHECKBUTTON          =    0x00000ba4,
     319  CL_QTGUI_RADIOBUTTON          =    0x00000ba5,
     320  CL_QTGUI_CONTAINER            =    0x00b200a0,
     321  CL_QTGUI_BOX                  =    0x00000ba7,
     322  CL_QTGUI_FRAME                =    0x00000ba8,
     323  CL_QTGUI_WINDOW               =    0x00000ba9,
     324  CL_QTMENU_IMAGE_SCREEN        =    0x00000ba0,
     325  CL_QTGUI_BAR                  =    0x00000ba0,
     326
    314327  /// AUDIO stuff (range from 0x00000c00 to 0x00000cff)
    315328  CL_SOUND_BUFFER               =    0x00000c01,

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

    r5315 r7140  
    11SUBDIRS = gtk_gui \
    2           gl_gui
     2          gl_gui \
     3          qt_gui

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

    r7122 r7140  
    44AM_LDFLAGS =
    55
    6 noinst_LIBRARIES = libORXglgui.a
    7 
    8 libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX
     6noinst_LIBRARIES = libORXqtgui.a
    97
    108
    11 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
    12                         glgui_handler.cc \
    13                         glgui_mainwidget.cc \
    14                         glgui_widget.cc \
    15                         glgui_button.cc \
    16                         glgui_pushbutton.cc \
    17                         glgui_container.cc \
    18                         glgui_bar.cc \
    19                         glgui_box.cc \
    20                         glgui_frame.cc \
    21                         glgui_window.cc
     9libORXqtgui_a_CPPFLAGS = -DBUILD_ORXONOX
    2210
    2311
    24 noinst_HEADERS= glmenu/glmenu_imagescreen.h \
    25                 glgui.h \
    26                 glgui_handler.h \
    27                 glgui_mainwidget.h \
    28                 glgui_widget.h \
    29                 glgui_button.h \
    30                 glgui_pushbutton.h \
    31                 glgui_container.h \
    32                 glgui_bar.h \
    33                 glgui_box.h \
    34                 glgui_frame.h \
    35                 glgui_window.h
     12libORXqtgui_a_SOURCES = \
     13                gui_saveable.cc \
     14                qt_gui.cc
    3615
    37 
    38 
     16noinst_HEADERS=
    3917
    4018EXTRA_DIST =

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

    r7122 r7140  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
     12   main-programmer: Benjamin Grauer
    1313   co-programmer: ...
    1414*/
    … …  
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
    1717
    18 #include "proto_class.h"
     18#include "gui_saveable.h"
    1919
    2020using namespace std;
    … …  
    2323/**
    2424 * standard constructor
    25  * @todo this constructor is not jet implemented - do it
    2625*/
    27 ProtoClass::ProtoClass ()
     26GuiSaveable::GuiSaveable ()
    2827{
    29    this->setClassID(CL_PROTO_ID, "ProtoClass");
     28   this->setClassID(CL_GUI_SAVEABLE, "GuiSaveable");
    3029
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
    35 
    36       Advanced Topics:
    37       - if you want to let your object be managed via the ObjectManager make sure to read
    38         the object_manager.h header comments. You will use this most certanly only if you
    39         make many objects of your class, like a weapon bullet.
    40    */
    4130}
    4231
    … …  
    4534 * standard deconstructor
    4635*/
    47 ProtoClass::~ProtoClass ()
     36GuiSaveable::~GuiSaveable ()
    4837{
    4938  // delete what has to be deleted here

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

    r7122 r7140  
    11/*!
    2  * @file proto_class.h
     2 * @file gui_saveable.h
    33 * @brief Definition of ...
    44*/
    55
    6 #ifndef _PROTO_CLASS_H
    7 #define _PROTO_CLASS_H
     6#ifndef _GUI_SAVEABLE_H
     7#define _GUI_SAVEABLE_H
    88
    99#include "base_object.h"
     10#include "multi_type.h"
    1011
    1112// FORWARD DECLARATION
    1213
     14//! A class for ...
     15class GuiSaveable : virtual public BaseObject {
     16
     17 public:
     18   virtual void load(const MultiType& value) = 0;
     19   virtual const MultiType& save() = 0;
    1320
    1421
    15 //! A class for ...
    16 class ProtoClass : public BaseObject {
    17 
    18  public:
    19   ProtoClass();
    20   virtual ~ProtoClass();
    21 
     22protected:
     23  GuiSaveable();
     24  virtual ~GuiSaveable();
    2225
    2326 private:
    24 
     27   MultiType       value;
    2528};
    2629
    27 #endif /* _PROTO_CLASS_H */
     30#endif /* _GUI_SAVEABLE_H */

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

    r7122 r7140  
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
    1717
    18 #include "proto_class.h"
     18#include "qt_gui.h"
    1919
    2020using namespace std;
    2121
    22 
    23 /**
    24  * standard constructor
    25  * @todo this constructor is not jet implemented - do it
    26 */
    27 ProtoClass::ProtoClass ()
    28 {
    29    this->setClassID(CL_PROTO_ID, "ProtoClass");
    30 
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
    35 
    36       Advanced Topics:
    37       - if you want to let your object be managed via the ObjectManager make sure to read
    38         the object_manager.h header comments. You will use this most certanly only if you
    39         make many objects of your class, like a weapon bullet.
    40    */
    41 }
    42 
    43 
    44 /**
    45  * standard deconstructor
    46 */
    47 ProtoClass::~ProtoClass ()
    48 {
    49   // delete what has to be deleted here
    50 }

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

    r7122 r7140  
    11/*!
    2  * @file proto_class.h
     2 * @file qt_gui.h
    33 * @brief Definition of ...
    44*/
    55
    6 #ifndef _PROTO_CLASS_H
    7 #define _PROTO_CLASS_H
     6#ifndef __QT_GUI_H
     7#define __QT_GUI_H
    88
    99#include "base_object.h"
    10 
    11 // FORWARD DECLARATION
     10#include <QtGui/qpushbutton.h>
     11#include <QtGui/qcheckbox>
     12#include <QtGui/qslider>
    1213
    1314
    1415
    15 //! A class for ...
    16 class ProtoClass : public BaseObject {
    1716
    18  public:
    19   ProtoClass();
    20   virtual ~ProtoClass();
    21 
    22 
    23  private:
    24 
    25 };
    26 
    27 #endif /* _PROTO_CLASS_H */
     17#endif /* __QT_GUI_H */
Note: See TracChangeset for help on using the changeset viewer.