Changeset 7495 in orxonox.OLD

Timestamp:

May 3, 2006, 12:50:11 AM (18 years ago)

Author:

bensch

Message:

added GuiAudio

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

• Makefile.am (modified) (1 diff)
• gui_audio.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc) (3 diffs)
• gui_audio.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.h) (2 diffs)
• qt_gui.cc (modified) (2 diffs)

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

@@ -17 +17 @@
                 qt_gui.cc \
                 \
-                gui_video.cc
+                gui_video.cc \
+                gui_audio.cc
 
 noinst_HEADERS= \
                 qt_gui.h \
                 \
-                gui_video.h
+                gui_video.h \
+                gui_audio.h
 
 EXTRA_DIST =

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

@@ -25 +25 @@
 
 
-#include "gui_video.h"
+#include "gui_audio.h"
 
 #include <qlayout.h>
@@ -38 +38 @@
 {
   /**
-   *  Creates the Video-Option-Frame
+   *  Creates the Audio-Option-Frame
   */
-  GuiVideo::GuiVideo(QWidget* parent)
-  : Element("Video"), QGroupBox(parent)
+  GuiAudio::GuiAudio(QWidget* parent)
+  : Element("Audio"), QGroupBox(parent)
   {
     QGridLayout* layout = new QGridLayout(this);
 
     {
-      QCheckBox* fullscreen = new QCheckBox(QString("FullScreen"), this);
+      QCheckBox* fullscreen = new QCheckBox(QString("Enabled"), this);
       //fullscreen->setName();
       layout->addWidget(fullscreen, 0, 0);
 
-      QCheckBox* wireframe = new QCheckBox("Wireframe mode", this);
+      QCheckBox* wireframe = new QCheckBox("Test", this);
       layout->addWidget(wireframe, 1, 0);
 
-      QComboBox* resolution = new QComboBox("Resolution", this);
+      QComboBox* resolution = new QComboBox("SecondTest", this);
       layout->addWidget(resolution, 2, 0);
 
@@ -60 +60 @@
 
 
-
-/*    Frame* videoFrame;        //!< The Frame that holds the video options.
-
-    videoFrame = new Frame("Video-Options:");
-    videoFrame->setGroupName("video");
-    {
-      Box* videoBox;            //!< The Box that holds the video options.
-
-      videoBox = new Box('v');
-      {
-        CheckButton* fullscreen;  //!< CheckButton for fullscreen-mode
-        Menu* resolution;         //!< Menu for the resolution
-        CheckButton* wireframe;   //!< CheckButton for wireframe Mode.
-
-        fullscreen = new CheckButton(CONFIG_NAME_FULLSCREEN);
-        fullscreen->setFlagName("windowed", "q", 1);
-        fullscreen->setDescription("Starts orxonox in windowed mode");
-        fullscreen->saveability();
-        videoBox->fill(fullscreen);
-        resolution = new Menu(CONFIG_NAME_RESOLUTION);
-        getResolutions(resolution);
-        resolution->saveability();
-        resolution->setFlagName("resolution", "r", 0);
-        resolution->setDescription("Sets the resolution of orxonox");
-        videoBox->fill(resolution);
-        wireframe = new CheckButton(CONFIG_NAME_WIREFRAME);
-        wireframe->setFlagName("wireframe", "w", 0);
-        wireframe->setDescription("Starts orxonox in wireframe mode");
-        wireframe->saveability();
-        videoBox->fill(wireframe);
-
-        videoBox->fill(advancedWindowCreate());
-      }
-      videoFrame->fill(videoBox);
-    }
-    setMainWidget(videoFrame);*/
   }
 
   /**
-   *  Destructs the Video-stuff
+   *  Destructs the Audio-stuff
   */
-  GuiVideo::~GuiVideo()
+  GuiAudio::~GuiAudio()
   {
     // nothing to do here.
   }
 
-  /**
-   *  sets all resolutions to the menu
-   * @param menu the Menu to set The resolutions to.
-  */
-  void GuiVideo::getResolutions(std::vector<std::string>& 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(std::string(tmpChar));
-          x = modes[i]->w; y = modes[i]->h;
-        }
-      }
-    }
-    SDL_QuitSubSystem(SDL_INIT_VIDEO);
-    SDL_Quit();
-  }
 
 }

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

@@ -1 +1 @@
 /*!
-  \file gui_video.h
-  \brief File that holds the class that creates the Video-Options.
+  \file gui_audio.h
+  \brief File that holds the class that creates the Audio-Options.
 */
-#ifndef _GUI_VIDEO_H
-#define _GUI_VIDEO_H
+#ifndef _GUI_AUDIO_H
+#define _GUI_AUDIO_H
 
 #include "../gui_element.h"
@@ -13 +13 @@
 namespace OrxGui
 {
-  //! Class that creates the Video-Options.
-  class GuiVideo : public OrxGui::Element, public QGroupBox
+  //! Class that creates the Audio-Options.
+  class GuiAudio : public OrxGui::Element, public QGroupBox
   {
   public:
-    GuiVideo(QWidget* parent = NULL);
-    virtual ~GuiVideo();
+    GuiAudio(QWidget* parent = NULL);
+    virtual ~GuiAudio();
 
-  private:
-    void getResolutions(std::vector<std::string>& resolutionList);
   };
 }
 
-#endif /* _GUI_VIDEO_H */
+#endif /* _GUI_AUDIO_H */

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

@@ -26 +26 @@
 
 #include "gui_video.h"
+#include "gui_audio.h"
 
 namespace OrxGui
@@ -43 +44 @@
 
         toolBox->addItem(new GuiVideo(toolBox), "Video");
+        toolBox->addItem(new GuiAudio(toolBox), "Audio");
       }
       mainLayout->addWidget(toolBox,1,1);