Context Navigation

Changeset 4049 in orxonox.OLD for orxonox/branches/guiMerge/src/lib

Timestamp:

May 5, 2005, 12:19:31 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/guiMerge: minor

Location:

orxonox/branches/guiMerge/src/lib/gui/gui

Files:

r4048	r4049
16	16	using namespace std;
17	17
18		~~#include <stdlib.h>~~
19
20	18	#define ORXONOX_GUI_DEFAULT_CONFIG_FILE "~/.orxonox/orxonox.conf"
21	19

-                      r4047
+                      r4049
 #include "gui_audio.h"
+#include "gui_gtk.h"
 /**
    \brief Creates an Audio-Frame
 …
+{
   Frame* audioFrame;        //!< The Frame that holds the audio Options.
-  Box* audioBox;            //!< The Box that holds the audio Options.
-  CheckButton* enableSound; //!< A Ckeckbutton for enabling Sound.
-  Slider* musicVolume;      //!< A Slider for music volume.
-  Slider* effectsVolume;    //!< A Slider for effects volume.
   audioFrame = new Frame("Audio-Options:");
   audioFrame->setGroupName("audio");
+  {
+    Box* audioBox;            //!< The Box that holds the audio Options.
     audioBox = new Box('v');
+    {
+      CheckButton* enableSound; //!< A Ckeckbutton for enabling Sound.
+      Slider* musicVolume;      //!< A Slider for music volume.
+      Slider* effectsVolume;    //!< A Slider for effects volume.
       enableSound = new CheckButton("Disable Sound");

-                      r4048
+                      r4049
 class OrxonoxGuiAudio : public OrxonoxGuiElement
+{
- private:
-  Frame* audioFrame;        //!< The Frame that holds the audio Options.
-  Box* audioBox;            //!< The Box that holds the audio Options.
-  CheckButton* enableSound; //!< A Ckeckbutton for enabling Sound.
-  Slider* musicVolume;      //!< A Slider for music volume.
-  Slider* effectsVolume;    //!< A Slider for effects volume.
  public:
   OrxonoxGuiAudio(void);

-                      r4047
+                      r4049
 #include "gui_banner.h"
+#include "gui_gtk.h"
 #include "banner.xpm"
 #include "logo.xpm"
 …
   // the logo Window
   Window* logoWindow;       //!< The Window that holds the Orxonox-CrewLogo.
-  EventBox* logoEventBox;   //!< The EventBox that holds the Orxonox-CrewLogo. it has to be an eventbox, because Images can not receive clicks.
   Box* logoBox;             //!< The Box that holds the Orxonox-CrewLogo
   Image* logoImage;         //!< The Orxonox-CrewLogo-Image
 …
   logoWindow = new Window("Logo");
+  {
+  EventBox* logoEventBox;   //!< The EventBox that holds the Orxonox-CrewLogo. it has to be an eventbox, because Images can not receive clicks.
 #ifdef HAVE_GTK2
     bannerEventBox->connectSignal("button_press_event", logoWindow, Window::windowOpen);

r4048	r4049
8	8	#define _GUI_ELEMENT_H
9	9
10		#include "gui_gtk.h"
	10	class Widget;
11	11
12	12	//! A SuperClass for all the Different GuiElements

-                      r4047
+                      r4049
 #include "gui_exec.h"
 #include <string.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>

r4048	r4049
9	9	#include "gui.h"
10	10	#include "gui_element.h"
	11	#include "gui_gtk.h"
11	12
12	13	//! Class that creates the flags-Text.

r4048	r4049
8	8	#include "gui.h"
9	9	#include "gui_element.h"
	10	#include "gui_gtk.h"
10	11
11	12	//! Class that creates the Video-Options.

Note: See TracChangeset for help on using the changeset viewer.