Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2595 in orxonox.OLD for orxonox/trunk/gui


Ignore:
Timestamp:
Oct 19, 2004, 1:30:24 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk/gui: Generalized plugins (returning Widget* now). Enumerator for isOption added

Location:
orxonox/trunk/gui
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/gui/orxonox_gui.cc

    r2588 r2595  
    6363
    6464  banner = new OrxonoxGuiBanner();
    65   windowBox->fill (banner->getEventBox());
     65  windowBox->fill (banner->getWidget());
    6666 
    6767  Box* optionBox = new Box ('v');
    … …  
    7070
    7171  video = new OrxonoxGuiVideo ();
    72   avBox->fill (video->getFrame ());
     72  avBox->fill (video->getWidget ());
    7373  audio = new OrxonoxGuiAudio ();
    74   avBox->fill (audio->getFrame ());
     74  avBox->fill (audio->getWidget ());
    7575     
    7676  optionBox->fill (avBox);
    7777   
    7878  exec = new OrxonoxGuiExec (orxonoxGUI);
    79   optionBox->fill (exec->getFrame ());
     79  optionBox->fill (exec->getWidget ());
    8080
    8181  flags = new OrxonoxGuiFlags (orxonoxGUI);
    8282
    8383
    84   optionBox->fill (flags->getFrame ());
     84  optionBox->fill (flags->getWidget ());
    8585  windowBox->fill (optionBox);
    8686 

  • orxonox/trunk/gui/orxonox_gui.h

    r2588 r2595  
    4343  virtual void init(void);
    4444  int is_option; //!< with this Paramenter one can set the IsOption type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option
    45 
     45  enum option { containerType = -2, boxType = -1, nothingType = 0, boolType = 1, intType = 2}; //!< defines is_option states
    4646  void connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *));
    4747  void connectSignal (char* event, gint (*signal)(GtkWidget*, Widget *));

  • orxonox/trunk/gui/orxonox_gui_audio.cc

    r2588 r2595  
    5555   \return Returns the Audio-frame
    5656*/
    57 Frame* OrxonoxGuiAudio::getFrame ()
     57Widget* OrxonoxGuiAudio::getWidget ()
    5858{
    5959  return audioFrame;

  • orxonox/trunk/gui/orxonox_gui_audio.h

    r2588 r2595  
    2222  ~OrxonoxGuiAudio ();
    2323 
    24   Frame* getFrame ();
     24  Widget* getWidget ();
    2525};
    2626#endif /* _ORXONOX_GUI_AUDIO_H */

  • orxonox/trunk/gui/orxonox_gui_banner.cc

    r2588 r2595  
    6262          logoWindow->connectSignal("delete_event", this, LogoWindowClose);
    6363          logoEventBox = new EventBox();
     64          logoBox = new Box('v');
     65          logoLabel = new Label("OrxOnoX");
    6466          logoImage = new Image("banner.xpm");
    6567          logoEventBox->fill(logoImage);
     68
     69          logoBox->fill(logoLabel);
     70          logoBox->fill(logoEventBox);
    6671          logoEventBox->connectSignal("button_press_event",this,LogoWindowClose);
    6772
    68           logoWindow->fill (logoEventBox);
     73          logoWindow->fill (logoBox);
    6974         
    7075        }
    … …  
    9095   \return The EventBox, that holds the Banner.
    9196*/
    92 EventBox* OrxonoxGuiBanner::getEventBox ()
     97Widget* OrxonoxGuiBanner::getWidget ()
    9398{
    9499  return bannerEventBox;

  • orxonox/trunk/gui/orxonox_gui_banner.h

    r2588 r2595  
    1414{
    1515 private:
     16  // the banner Frame
    1617  Frame* bannerFrame;
    1718  Box* bannerBox;
    … …  
    1920  Image* bannerImage;
    2021  Label* bannerLabel;
     22
     23  // the logo Window
    2124  Window* logoWindow;
    2225  int logoWindowIsOpen;
    2326  EventBox* logoEventBox;
     27  Box* logoBox;
    2428  Image* logoImage;
     29  Label* logoLabel;
    2530
    2631 public:
    … …  
    3035  void logoWindowNew();
    3136  void logoWindowClose();
    32   EventBox* getEventBox ();
     37  Widget* getWidget ();
    3338};
    3439

  • orxonox/trunk/gui/orxonox_gui_exec.cc

    r2588 r2595  
    6262   \return Returns the Exec-frame
    6363*/
    64 Frame* OrxonoxGuiExec::getFrame ()
     64Widget* OrxonoxGuiExec::getWidget ()
    6565{
    6666  return execFrame;

  • orxonox/trunk/gui/orxonox_gui_exec.h

    r2588 r2595  
    2828  ~OrxonoxGuiExec ();
    2929 
    30   Frame* getFrame ();
     30  Widget* getWidget ();
    3131 
    3232  void setFilename (char* filename);

  • orxonox/trunk/gui/orxonox_gui_flags.cc

    r2588 r2595  
    5050   \returns Frame that holds the Flagtext.
    5151*/
    52 Frame* OrxonoxGuiFlags::getFrame ()
     52Widget* OrxonoxGuiFlags::getWidget ()
    5353{
    5454  return flagsFrame;

  • orxonox/trunk/gui/orxonox_gui_flags.h

    r2588 r2595  
    2626  void OrxonoxGuiFlags::FlagsText(Widget* widget);
    2727 
    28   Frame* getFrame ();
     28  Widget* getWidget ();
    2929};
    3030#endif /* _ORXONOX_GUI_FLAGS_H */

  • orxonox/trunk/gui/orxonox_gui_video.cc

    r2588 r2595  
    4747   \return Returns the Video-frame
    4848*/
    49 Frame* OrxonoxGuiVideo::getFrame ()
     49Widget* OrxonoxGuiVideo::getWidget ()
    5050{
    5151  return videoFrame;

  • orxonox/trunk/gui/orxonox_gui_video.h

    r2588 r2595  
    2020  ~OrxonoxGuiVideo ();
    2121 
    22   Frame* getFrame ();
     22  Widget* getWidget ();
    2323};
    2424#endif /* _ORXONOX_GUI_VIDEO_H */

  • orxonox/trunk/gui/rc

    r2050 r2595  
    122122widget_class "GtkWindow" style "window"
    123123widget_class "GtkFrame" style "window"
     124widget_class "Gtk*EventBox" style "window"
    124125widget_class "GtkDialog" style "window"
    125126widget_class "GtkFileSelection" style "window"
Note: See TracChangeset for help on using the changeset viewer.