Changeset 7636 in orxonox.OLD

Timestamp:

May 17, 2006, 10:50:16 AM (18 years ago)

Author:

bensch

Message:

orxonox/qt_gui: more gui-elements

Location:

branches/qt_gui/src

Files:

• defs/globals.h (modified) (1 diff)
• lib/event/key_mapper.cc (modified) (2 diffs)
• lib/gui/Makefile.am (modified) (1 diff)
• lib/gui/qt_gui/Makefile.am (modified) (2 diffs)
• lib/gui/qt_gui/gui_audio.cc (modified) (1 diff)
• lib/gui/qt_gui/gui_control.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc) (1 diff)
• lib/gui/qt_gui/gui_control.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.h) (2 diffs)
• lib/gui/qt_gui/qt_gui.cc (modified) (2 diffs)

branches/qt_gui/src/defs/globals.h

@@ -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"

branches/qt_gui/src/lib/event/key_mapper.cc

@@ -138 +138 @@
 void KeyMapper::loadKeyBindings(IniParser* iniParser)
 {
-  if( !iniParser->getSection (CONFIG_SECTION_PLAYER "1"))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
+  if( !iniParser->getSection (CONFIG_SECTION_CONTROL))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_CONTROL "\n");
     return;
   }
@@ -158 +158 @@
 
   // PARSE MISC SECTION
-  if( !iniParser->getSection (CONFIG_SECTION_MISC_KEYS))
-  {
-    PRINTF(1)("Could not find key bindings" CONFIG_SECTION_MISC_KEYS "\n");
+//   if( !iniParser->getSection (CONFIG_SECTION_MISC_KEYS))
+//   {
+//     PRINTF(1)("Could not find key bindings" CONFIG_SECTION_MISC_KEYS "\n");
+//     return;
+//   }
+//
+//   iniParser->firstVar();
+//   while( iniParser->getCurrentName() != "" )
+//   {
+//     PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
+//     index = nameToIndex (iniParser->getCurrentValue());
+//     this->mapKeys(iniParser->getCurrentName(), index);
+//     iniParser->nextVar();
+//   }
+}
+
+void KeyMapper::loadKeyBindings()
+{
+  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_CONTROL))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_CONTROL "\n");
     return;
   }
-
-  iniParser->firstVar();
-  while( iniParser->getCurrentName() != "" )
-  {
-    PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
-    index = nameToIndex (iniParser->getCurrentValue());
-    this->mapKeys(iniParser->getCurrentName(), index);
-    iniParser->nextVar();
-  }
-}
-
-void KeyMapper::loadKeyBindings()
-{
-  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_PLAYER "1"))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
-    return;
-  }
   int* index;
 
-  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_PLAYER "1");
+  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_CONTROL);
   for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
   {
-    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, "").c_str());
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_CONTROL, *it, "").c_str());
     // map the name to an sdl index
-    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, ""));
+    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_CONTROL, *it, ""));
     // map the index to a internal name
-    this->mapKeys(*it, index);
-  }
-
-
-  // PARSE MISC SECTION
-  if( !Preferences::getInstance()->sectionExists (CONFIG_SECTION_MISC_KEYS))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_MISC_KEYS "\n");
-    return;
-  }
-
-  keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_MISC_KEYS);
-  for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
-  {
-    PRINTF(3)("MISC: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, "").c_str());
-    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, ""));
     this->mapKeys(*it, index);
   }

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

@@ -23 +23 @@
 SUBDIRS = \
         . \
-        gtk_gui \
         gl_gui \
         qt_gui
+
+#       gtk_gui

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

@@ -25 +25 @@
                 gui_audio.cc \
                 gui_general.cc \
-                gui_general_moc.cc
+                gui_general_moc.cc \
+                gui_control.cc \
+                gui_control_moc.cc
 
 
@@ -35 +37 @@
                 gui_video.h \
                 gui_audio.h \
-                gui_general.cc
+                gui_general.h \
+                gui_control.h
 
 

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

@@ -45 +45 @@
 
     {
-      QtGuiCheckBox* fullscreen = new QtGuiCheckBox(CONFIG_NAME_DISABLE_AUDIO, this, true);
-      layout->addWidget(fullscreen, 0, 0);
+      QtGuiCheckBox* disableAudio = new QtGuiCheckBox(CONFIG_NAME_DISABLE_AUDIO, this, false);
+      layout->addWidget(disableAudio, 0, 0);
 
 

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

@@ -25 +25 @@
 
 
-#include "gui_video.h"
+#include "gui_control.h"
 
 #include <QtGui/QLayout>
 #include "globals.h"
 #include "debug.h"
+#include "qt_gui_elements.h"
 
-#include "qt_gui_elements.h"
+#include "lib/event/key_mapper.h"
+#include "lib/event/key_names.h"
 
 namespace OrxGui
 {
   /**
-   *  Creates the Video-Option-Frame
+   *  Creates the Control-Option-Frame
   */
-  GuiVideo::GuiVideo(OrxGui::Gui* gui)
-  : Element(CONFIG_SECTION_VIDEO, gui), QGroupBox()
+  GuiControl::GuiControl(OrxGui::Gui* gui)
+      : Element(CONFIG_SECTION_CONTROL, gui), QGroupBox()
   {
     QGridLayout* layout = new QGridLayout(this);
 
     {
-      QtGuiCheckBox* fullscreen = new QtGuiCheckBox(CONFIG_NAME_FULLSCREEN, this, false);
-      //fullscreen->setName();
-      layout->addWidget(fullscreen, 0, 0);
-
-      QtGuiCheckBox* wireframe = new QtGuiCheckBox(CONFIG_NAME_WIREFRAME, this, false);
-      layout->addWidget(wireframe, 1, 0);
-
-      {
-        QComboBox* resolution = new QtGuiComboBox(CONFIG_NAME_RESOLUTION, this, "640x480");
-        layout->addWidget(resolution, 2, 0);
-        std::vector<QString> resolutions;
-        this->getResolutions(resolutions);
-        for (unsigned int i = 0; i < resolutions.size(); ++i)
-          resolution->addItem(resolutions[i]);
-      }
+      QLabel* keyLabel = new QLabel;
 
 
-      QGroupBox* advanced = new GuiAdvancedVideo(gui);
 
 
-      layout->addWidget(advanced, 0, 2, 4, 1);
+    }
 
-    }
+
   }
 
   /**
-   *  Destructs the Video-stuff
+   *  Destructs the Control-stuff
   */
-  GuiVideo::~GuiVideo()
+  GuiControl::~GuiControl()
   {
     // nothing to do here.
   }
 
-  /**
-   *  sets all resolutions to the menu
-   * @param menu the Menu to set The resolutions to.
-  */
-  void GuiVideo::getResolutions(std::vector<QString>& resolutionList)
-  {
-    SDL_Init(SDL_INIT_VIDEO);
-    SDL_Rect **modes;
-    int i;
-    int x = 0,y =0; // check for difference
-    char tmpChar[100];
-
-    /* Get available fullscreen/hardware modes */
-    modes=SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE);
-
-    /* Check is there are any modes available */
-    if(modes == (SDL_Rect **)0)
-    {
-      PRINTF(2)("No video-modes available!\n");
-      exit(-1);
-    }
-
-    /* Check if our resolution is restricted */
-    if(modes == (SDL_Rect **)-1)
-    {
-      PRINTF(2)("All resolutions available.\n");
-    }
-    else
-    {
-      /* Print valid modes */
-      PRINT(5)("Available Modes\n");
-      for(i = 0; modes[i] ;++i)
-      {
-        if (x != modes[i]->w || y != modes[i]->h)
-        {
-          PRINTF(5)("  %d x %d\n", modes[i]->w, modes[i]->h);
-          sprintf(tmpChar, "%dx%d", modes[i]->w, modes[i]->h);
-          resolutionList.push_back(QString(tmpChar));
-          x = modes[i]->w; y = modes[i]->h;
-        }
-      }
-    }
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
-    SDL_Quit();
-  }
-
-
-
-  GuiAdvancedVideo::GuiAdvancedVideo(OrxGui::Gui* gui)
-  : Element(CONFIG_SECTION_VIDEO_ADVANCED ,gui)
-  {
-    {
-      QGridLayout* advLayout = new QGridLayout(this);              //!< Advanced Layout
-      {
-        QtGuiCheckBox* shadows = new QtGuiCheckBox(CONFIG_NAME_SHADOWS, this, true);         //!< CheckBox for shadows
-        advLayout->addWidget(shadows, 0,0);
-        QtGuiCheckBox* fog = new QtGuiCheckBox(CONFIG_NAME_FOG, this, true);                 //!< CheckBox for fog.
-        advLayout->addWidget(fog, 1,0);
-        QtGuiCheckBox* reflections = new QtGuiCheckBox(CONFIG_NAME_REFLECTIONS, this, true);  //!< CheckBox for reflections
-        advLayout->addWidget(reflections, 2, 0);
-        QtGuiCheckBox* textures = new QtGuiCheckBox(CONFIG_NAME_TEXTURES, this, true);       //!< CheckBox for textures
-        advLayout->addWidget(textures, 3, 0);
-          /*
-        Menu* textureDetail;      //!< Menu for the Texture-Detail.
-        Label* modelDetailLabel;  //!< Label for model-detail.
-        Menu* modelDetail;        //!< model-detail.
-        CheckBox* particles;   //!< If the Particles should be enabled
-        Label* antiAliasingLabel; //!< Label for the anti-aliasing mode.
-        Menu* antiAliasing;       //!< Menu for the Antialiasing-mode.
-        Label* filterMethodLabel; //!< Label for filtering-Method.
-        Menu* filterMethod;       //!< Menu for filtering Method.
-        Button* closeButton;      //!< A Button to close the Advanced-settingsWindow.
-          */
-      }
-    }
-  }
-
-  GuiAdvancedVideo::~GuiAdvancedVideo()
-  {
-  }
-
 }

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

@@ -1 +1 @@
 /*!
-  \file gui_video.h
-  \brief File that holds the class that creates the Video-Options.
+  \file gui_control.h
+  \brief File that holds the class that creates the Control-Options.
 */
-#ifndef _GUI_VIDEO_H
-#define _GUI_VIDEO_H
+#ifndef _GUI_CONTROL_H
+#define _GUI_CONTROL_H
 
 #include "../gui_element.h"
@@ -10 +10 @@
 #include <string>
 #include <QtGui/QGroupBox>
+#include "../gui_saveable.h"
 
 namespace OrxGui
 {
-  //! Class that creates the Video-Options.
-  class GuiVideo : public OrxGui::Element, public QGroupBox
+  //! Class that creates the Control-Options.
+  class GuiControl : public OrxGui::Element, public QGroupBox
   {
   public:
-    GuiVideo(OrxGui::Gui* gui);
-    virtual ~GuiVideo();
+    GuiControl(OrxGui::Gui* gui);
+    virtual ~GuiControl();
 
   private:
-    void getResolutions(std::vector<QString>& resolutionList);
   };
 
-  class GuiAdvancedVideo : public OrxGui::Element, public QGroupBox
+  class GuiControlInput : public QGroupBox, public OrxGui::Saveable
   {
-    public:
-      GuiAdvancedVideo(OrxGui::Gui* gui);
-      virtual ~GuiAdvancedVideo();
+    Q_OBJECT
+    GuiControlInput(const std::string& name, SaveableGroup* group, const std::string& defaultValue);
+
+    public slots:
+
+    signals:
+      void optionChanged();
   };
+
 }
 
-#endif /* _GUI_VIDEO_H */
+#endif /* _GUI_CONTROL_H */

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

@@ -23 +23 @@
 
 #include "qt_gui_elements.h"
+#include "q_image_widget.h"
+
 #include "gui_video.h"
 #include "gui_audio.h"
+#include "gui_control.h"
 #include "gui_general.h"
+
 #include "banner.xpm"
-#include <QtGui/QPainter>
-#include "q_image_widget.h"
 
 namespace OrxGui
@@ -54 +56 @@
         toolBox->addItem(new GuiVideo(this), "Video");
         toolBox->addItem(new GuiAudio(this), "Audio");
+        toolBox->addItem(new GuiControl(this), "Control");
         toolBox->addItem(new GuiGeneral(this), "General");
       }