Changeset 7988 in orxonox.OLD

Timestamp:

May 30, 2006, 6:42:08 PM (18 years ago)

Author:

bensch

Message:

gui: \fixed a bug when clicking a Widget

Location:

branches/gui/src

Files:

• lib/gui/gl_gui/glgui_widget.cc (modified) (4 diffs)
• lib/gui/gl_gui/glgui_widget.h (modified) (3 diffs)
• story_entities/simple_game_menu.cc (modified) (1 diff)

branches/gui/src/lib/gui/gl_gui/glgui_widget.cc

@@ -70 +70 @@
     this->_frontMat.setDiffuse(1.0, 0.0, 0.0);
     this->_borderSize = 1.0;
-
-    this->widgetSignals.resize(SignalCount, SignalConnector());
   }
 
@@ -123 +121 @@
   {
     assert (!this->_pushed);
-    this->widgetSignals[Signal_click]("none");
     this->_pushed = true;
 
@@ -133 +130 @@
     if (this->_pushed)
     {
-      this->widgetSignals[Signal_release]("none");
-
       this->releasing(pos);
       this->_pushed = false;
@@ -182 +177 @@
 
 
-  /**
-   * @brief connects a Signal to the Gui-Elements' Event.
-   * @param sinalType the Type of Signal to set. @see GLGuiSignalType
-   * @param signal the name of the Signal
-   */
-  void GLGuiWidget::connectSignal(SignalType signalType, BaseObject* object, const Executor* signal)
-  {
-    if (signalType >= this->widgetSignals.size())
-      return;
-
-    //    if (this->widgetSignals[signalType] != NULL)
-    //      PRINTF(2)("Already connected a Signal to '%s::%s' type %s... overwriting\n", this->getClassName(), this->getName(), "TEST");
-
-    this->widgetSignals[signalType] = SignalConnector(object, signal);
-  }
-
-  /**
-   * @brief removes a Signal from a Gui-ELements' Event
-   * @param signalType the type of Signal to remove.
-   */
-  void GLGuiWidget::disconnectSignal(SignalType signalType)
-  {
-    if (signalType >= this->widgetSignals.size())
-      return;
-
-    this->widgetSignals[signalType] = SignalConnector();
-  }
-
-
   void GLGuiWidget::show()
   {

branches/gui/src/lib/gui/gl_gui/glgui_widget.h

@@ -24 +24 @@
 namespace OrxGui
 {
-  typedef enum
-  {
-    Signal_click     = 0,
-    Signal_release,
-    Signal_rollOn,
-    Signal_rollOff,
-    Signal_open,
-    Signal_close,
-    Signal_destroy,
-
-    SignalCount,
-  } SignalType;
-
 
   class GLGuiCursor;
@@ -55 +42 @@
     void show();
     void hide();
-
-    /// INTERCONNECTIVITY
-    void connectSignal(SignalType signalType, BaseObject* obj, const Executor* signal);
-    void disconnectSignal(SignalType signalType);
 
 
@@ -152 +135 @@
     float                          _borderSize;
 
-    /// SIGNALS
-    std::vector<SignalConnector>   widgetSignals;
-
     /// EVENTS
     bool                           _focusable;        //!< If this widget can receive focus.

branches/gui/src/story_entities/simple_game_menu.cc

@@ -89 +89 @@
   dnpb->show();
   dnpb->setAbsCoor2D(350, 50);
-  dnpb->connectSignal(OrxGui::Signal_release, this, createExecutor<SimpleGameMenu>(&SimpleGameMenu::execURL));
+
 
   OrxGui::GLGuiPushButton* rdnpb = new OrxGui::GLGuiPushButton("Quit ORXONOX!!");
   rdnpb->show();
   rdnpb->setAbsCoor2D(200, 180);
-  rdnpb->connectSignal(OrxGui::Signal_release, this, SLOT(SimpleGameMenu, quitMenu));
+  rdnpb->connect(SIGNAL(rdnpb, released), this, SLOT(SimpleGameMenu, quitMenu));
 
   OrxGui::GLGuiInputLine* input = new OrxGui::GLGuiInputLine();