Changeset 8479 in orxonox.OLD

Timestamp:

Jun 15, 2006, 4:55:00 PM (18 years ago)

Author:

bensch

Message:

gui: enter-event handled in inputLine

Location:

branches/gui/src

Files:

• lib/graphics/text_engine/text.cc (modified) (1 diff)
• lib/graphics/text_engine/text.h (modified) (1 diff)
• lib/gui/gl/glgui_inputline.cc (modified) (4 diffs)
• lib/gui/gl/glgui_inputline.h (modified) (3 diffs)
• story_entities/simple_game_menu.cc (modified) (1 diff)

branches/gui/src/lib/graphics/text_engine/text.cc

@@ -159 +159 @@
 }
 
+
+/**
+ * @brief clears the Text Line (empies it).
+ */
+void Text::clear()
+{
+  text.clear();
+  this->setupTextWidth();
+}
 
 /**

branches/gui/src/lib/graphics/text_engine/text.h

@@ -40 +40 @@
     const std::string& operator<<(const std::string& appendText);
     void removeCharacters(unsigned int chars);
+    void clear();
 
     /// SETUP

branches/gui/src/lib/gui/gl/glgui_inputline.cc

@@ -48 +48 @@
     this->setFocusable(true);
 
+    this->_clearOnEnter = false;
     this->_text.setParent2D(this);
     this->_text.setRelCoor2D(4,4);
@@ -100 +101 @@
   }
 
+  void GLGuiInputLine::clear()
+  {
+    this->_text.clear();
+    this->changedText();
+  }
+
   /**
    * @brief If the Text has been changed this function is called.
@@ -124 +131 @@
   }
 
+  /**
+   * @brief handles the EnterPush-Event.
+   *
+   * Emmits th EnterPushed Signal with the current Line,
+   * and if _clearOnEnter is pushed clears the Line.
+   */
+  void GLGuiInputLine::pushEnter()
+  {
+    emit(this->enterPushed(this->_text.getText()));
+    if (this->_clearOnEnter)
+      this->clear();
+  }
+
 
   /**
@@ -140 +160 @@
         this->pressedKeyName = SDLK_BACKSPACE;
         this->removeCharacters(1);
+        return true;
+      }
+      else if(event.type == SDLK_RETURN || event.type == SDLK_KP_ENTER)
+      {
+        this->pushEnter();
         return true;
       }

branches/gui/src/lib/gui/gl/glgui_inputline.h

@@ -38 +38 @@
     void appendCharacter(char character);
     void removeCharacters(unsigned int chars);
+    void clear();
+
+    void clearOnEnter(bool clear = true) { this->_clearOnEnter = clear; };
 
     virtual void removedFocus();
@@ -47 +50 @@
 
     DeclareSignal1(textChanged, const std::string&);
+    DeclareSignal1(enterPushed, const std::string&);
 
   protected:
@@ -57 +61 @@
   private:
     void init();
+    void pushEnter();
     void changedText();
+
 
   private:
     Text                    _text;            //!< The Text to display inside of the InputLine.
+    bool                    _clearOnEnter;    //!< Clear on Enter
 
     Uint16                  pressedKey;       //!< the pressed key that will be repeated.

branches/gui/src/story_entities/simple_game_menu.cc

@@ -100 +100 @@
     box->pack(rdnpb);
 
-    OrxGui::GLGuiPushButton* fullscreen = new OrxGui::GLGuiPushButton("Fullscreen");
-    fullscreen->connect(SIGNAL(fullscreen, released), GraphicsEngine::getInstance(), SLOT(GraphicsEngine, toggleFullscreen));
+    OrxGui::GLGuiCheckButton* fullscreen = new OrxGui::GLGuiCheckButton("Fullscreen");
+    fullscreen->connect(SIGNAL(fullscreen, toggled), GraphicsEngine::getInstance(), SLOT(GraphicsEngine, setFullscreen));
 
     box->pack(fullscreen);