Changeset 7661 in orxonox.OLD for trunk/src/defs

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

Location:

trunk/src/defs

Files:

• class_id.h (modified) (1 diff)
• debug.h (modified) (1 diff)
• globals.h (modified) (6 diffs)

trunk/src/defs/class_id.h

@@ -322 +322 @@
   CL_GLGUI_BAR                  =    0x00000b30,
 
+  // QT_GUI
+  CL_GUI_SAVEABLE               =    0x00b10000,
+  CL_QTGUI_BUTTON               =    0x00000ba0,
+  CL_QTGUI_PUSHBUTTON           =    0x00000ba3,
+  CL_QTGUI_CHECKBUTTON          =    0x00000ba4,
+  CL_QTGUI_RADIOBUTTON          =    0x00000ba5,
+  CL_QTGUI_CONTAINER            =    0x00b200a0,
+  CL_QTGUI_BOX                  =    0x00000ba7,
+  CL_QTGUI_FRAME                =    0x00000ba8,
+  CL_QTGUI_WINDOW               =    0x00000ba9,
+  CL_QTMENU_IMAGE_SCREEN        =    0x00000ba0,
+  CL_QTGUI_BAR                  =    0x00000ba0,
+
   /// AUDIO stuff (range from 0x00000c00 to 0x00000cff)
   CL_SOUND_BUFFER               =    0x00000c01,

trunk/src/defs/debug.h

@@ -28 +28 @@
 #include "confincl.h"
 #ifndef NO_SHELL
- #include "shell_buffer.h"
+#include "lib/shell/shell_buffer.h"
 #endif /* NO_SHELL */
 

trunk/src/defs/globals.h

@@ -25 +25 @@
 #define   DEFAULT_CONFIG_FILE              "~/.orxonox/orxonox.conf"
 #define   DEFAULT_LOCK_FILE                "~/.orxonox/orxonox.lock"
-#define   DEFAULT_DATA_DIR                 DATADIR "/orxonox/"
+#define   DEFAULT_DATA_DIR                 ORX_DATADIR "/orxonox/"
 #define   DEFAULT_DATA_DIR_CHECKFILE       "data.oxd"
 
@@ -33 +33 @@
 //! Name of Section Misc in the config-File
 #define   CONFIG_SECTION_MISC              "misc"
-#define   CONFIG_SECTION_MISC_KEYS         "miscKeys"
-#define   CONFIG_SECTION_PLAYER            "player"
+#define   CONFIG_SECTION_CONTROL           "control"
 #define   CONFIG_SECTION_VIDEO             "video"
 #define   CONFIG_SECTION_VIDEO_ADVANCED    "video_advanced"
 #define   CONFIG_SECTION_AUDIO             "audio"
-#define   CONFIG_SECTION_EXEC              "exec"
-#define   CONFIG_SECTION_DATA              "data"
+#define   CONFIG_SECTION_GENERAL           "general"
 
 /*
@@ -54 +52 @@
 #define   CONFIG_NAME_FOG                  "Fog"
 #define   CONFIG_NAME_REFLECTIONS          "Reflections"
-#define   CONFIG_NAME_TEXTURES             "TEXTURES"
+#define   CONFIG_NAME_TEXTURES             "Textures"
 #define   CONFIG_NAME_TEXTURE_DETAIL       "Texture-Detail"
 #define   CONFIG_NAME_MODEL_DETAIL         "Model-Detail"
@@ -61 +59 @@
 #define   CONFIG_NAME_FILTER_METHOD        "Filtering-Method"
 
+#define   CONFIG_NAME_SOUNDCARD            "Soundcard"
 #define   CONFIG_NAME_DISABLE_AUDIO        "Disable-Audio"
 #define   CONFIG_NAME_AUDIO_CHANNELS       "Audio-Channels"
@@ -69 +68 @@
 #define   CONFIG_NAME_VERBOSE_MODE         "Verbose-Mode"
 #define   CONFIG_NAME_ALWAYS_SHOW_GUI      "Always-Show-The-Gui"
+#define   CONFIG_NAME_DEBUG_LEVEL          "Debug-Level"
+
 // evenets
 #define   CONFIG_NAME_PLAYER_FORWARD       "Forward"
@@ -80 +81 @@
 
 #define   CONFIG_NAME_PLAYER_FIRE          "Fire"
-#define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next"
-#define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Prev"
-#define   CONFIG_NAME_PLAYER_CHANGE_SHIP   "Change_Ship"
+#define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next-Weapon"
+#define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Previous-Weapon"
+#define   CONFIG_NAME_PLAYER_CHANGE_SHIP   "Change-Ship"
 
 #define   CONFIG_NAME_QUIT                 "Quit"