Changeset 10164 in orxonox.OLD for branches

Timestamp:

Jan 3, 2007, 2:56:10 PM (18 years ago)

Author:

hejja

Message:

border made

Location:

branches/gui/src

Files:

• lib/gui/gl/Makefile.am (modified) (2 diffs)
• lib/gui/gl/glgui_container.cc (modified) (1 diff)
• lib/gui/gl/glgui_multiline_text.cc (copied) (copied from branches/gui/src/lib/gui/gl/glgui_text.cc) (16 diffs)
• lib/gui/gl/glgui_multiline_text.h (copied) (copied from branches/gui/src/lib/gui/gl/glgui_text.h) (5 diffs)
• lib/gui/gl/glgui_widget.cc (modified) (2 diffs)
• world_entities/elements/glgui_energywidget.cc (modified) (1 diff)
• world_entities/questGUI/quest.cc (modified) (1 diff)
• world_entities/questGUI/quest_gui.cc (modified) (6 diffs)
• world_entities/questGUI/quest_gui.h (modified) (1 diff)

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

@@ -25 +25 @@
                 glgui_frame.cc \
                 glgui_text.cc \
+                glgui_multiline_text.cc \
                 glgui_inputline.cc \
                 glgui_textfield.cc \
@@ -53 +54 @@
                 glgui_frame.h \
                 glgui_text.h \
+                glgui_multiline_text.h \
                 glgui_inputline.h \
                 glgui_textfield.h \

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

@@ -43 +43 @@
     this->registerObject(this, GLGuiContainer::_objectList);
 
-    this->setBackgroundTexture("gui_container_background.png");
+//    this->setBackgroundTexture("gui_container_background.png");
 
   }

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

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
 
-#include "glgui_text.h"
+#include "glgui_multiline_text.h"
 
 #include "text.h"
@@ -22 +22 @@
 namespace OrxGui
 {
-  ObjectListDefinition(GLGuiText);
+  ObjectListDefinition(GLGuiMultiLineText);
   /**
    * standard constructor
   */
-  GLGuiText::GLGuiText ()
+  GLGuiMultiLineText::GLGuiMultiLineText ()
   {
     this->init();
@@ -36 +36 @@
    * standard deconstructor
   */
-  GLGuiText::~GLGuiText()
+  GLGuiMultiLineText::~GLGuiMultiLineText()
   {}
 
@@ -42 +42 @@
    * initializes the GUI-element
    */
-  void GLGuiText::init()
+  void GLGuiMultiLineText::init()
   {
-    this->registerObject(this, GLGuiText::_objectList);
+    this->registerObject(this, GLGuiMultiLineText::_objectList);
 
     this->_text.setParent2D(this);
@@ -61 +61 @@
   * @param text The new Text.
    */
-  void GLGuiText::setText(const std::string& text)
+  void GLGuiMultiLineText::setText(const std::string& text)
   {
     this->_text.setText(text);
@@ -71 +71 @@
    * @param appendText the Text to append
    */
-  void GLGuiText::append(const std::string& appendText)
+  void GLGuiMultiLineText::append(const std::string& appendText)
   {
     this->_text.append(appendText);
@@ -82 +82 @@
    * @param character the Character to append.
    */
-  void GLGuiText::appendCharacter(char character)
+  void GLGuiMultiLineText::appendCharacter(char character)
   {
     this->_text.appendCharacter(character);
@@ -93 +93 @@
    * @param chars The count of characters to remove
    */
-  void GLGuiText::removeCharacters(unsigned int chars)
+  void GLGuiMultiLineText::removeCharacters(unsigned int chars)
   {
     this->_text.removeCharacters(chars);
@@ -99 +99 @@
   }
 
-  void GLGuiText::clear()
+  void GLGuiMultiLineText::clear()
   {
     this->_text.clear();
@@ -111 +111 @@
   * This Function also emits the Signal textChanged.
    */
-  void GLGuiText::changedText()
+  void GLGuiMultiLineText::changedText()
   {
     this->resize();
@@ -118 +118 @@
   }
 
-  void GLGuiText::setTextSize(float size)
+  void GLGuiMultiLineText::setTextSize(float size)
   {
     this->_text.setSize(size);
@@ -124 +124 @@
   }
 
-  void GLGuiText::setFont(const Font& font)
+  void GLGuiMultiLineText::setFont(const Font& font)
   {
     GLGuiWidget::setFont(font);
@@ -130 +130 @@
   }
 
-  void GLGuiText::setChangedTextColor(const Color& color)
+  void GLGuiMultiLineText::setChangedTextColor(const Color& color)
   {
     this->_changedTextColor = color;
@@ -138 +138 @@
    * @brief Resizes the Widget to the new Size-constraints.
    */
-  void GLGuiText::resize()
+  void GLGuiMultiLineText::resize()
   {
     this->_text.setRelCoor2D(borderLeft(), borderTop());
@@ -148 +148 @@
   }
 
-  void GLGuiText::updateFrontColor()
+  void GLGuiMultiLineText::updateFrontColor()
   {
     this->_text.setColor(foregroundColor());
   }
 
-  void GLGuiText::hiding()
+  void GLGuiMultiLineText::hiding()
   {
     this->_text.setVisibility(false);
   }
 
-  void GLGuiText::showing()
+  void GLGuiMultiLineText::showing()
   {
     this->_text.setVisibility(true);
@@ -166 +166 @@
 
   /**
-   * draws the GLGuiText
+   * draws the GLGuiMultiLineText
    */
-  void GLGuiText::draw() const
+  void GLGuiMultiLineText::draw() const
   {
     this->beginDraw();

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

@@ -1 +1 @@
 /*!
- * @file glgui_text.h
+ * @file glgui_multiline_text.h
  * The gl_TEXT widget of th openglGUI
  *
  */
 
-#ifndef _GLGUI_TEXT_H
-#define _GLGUI_TEXT_H
+#ifndef _GLGUI_MULTILINE_TEXT_H
+#define _GLGUI_MULTILINE_TEXT_H
 
 #include "glgui_widget.h"
-#include "limited_width_text.h"
+#include "multi_line_text.h"
 // FORWARD DECLARATION
 namespace OrxGui
@@ -18 +18 @@
    *
    */
-  class GLGuiText : public GLGuiWidget
+  class GLGuiMultiLineText : public GLGuiWidget
   {
-    ObjectListDeclaration(GLGuiText);
+    ObjectListDeclaration(GLGuiMultiLineText);
   public:
-    GLGuiText();
-    virtual ~GLGuiText();
+    GLGuiMultiLineText();
+    virtual ~GLGuiMultiLineText();
 
     void setText(const std::string& text);
@@ -36 +36 @@
 
     void setLineWidth(float lineWidth) { this->_text.setLineWidth(lineWidth); };
-    void setDotsPosition(LimitedWidthText::DotsPosition dotsPosition) { this->_text.setDotsPosition(dotsPosition); };
+//    void setDotsPosition(LimitedWidthText::DotsPosition dotsPosition) { this->_text.setDotsPosition(dotsPosition); };
 
     const std::string& text() const { return _text.text(); };
@@ -57 +57 @@
 
   private:
-    LimitedWidthText    _text;
+    MultiLineText       _text;
 
     Color               _changedTextColor;
@@ -63 +63 @@
 }
 
-#endif /* _GLGUI_TEXT_H */
+#endif /* _GLGUI_MULTILINE_TEXT_H */

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

@@ -112 +112 @@
 
 
-    this->setBackgroundColor(Color(.51, .3, .3, .5));
-    this->setBackgroundColor(Color(.3, .5, .3, 1), OrxGui::Selected);
+    this->setBackgroundColor(Color(.51, .3, .3, 0));
+    this->setBackgroundColor(Color(.51, .3, .3, 0), OrxGui::Selected);
     this->_style[0]._background.setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     this->_style[1]._background.setBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -127 +127 @@
 
     this->setBorderLeft(15);
-    this->setBackgroundTexture("gui_element_background.png");
+    //this->setBackgroundTexture("gui_element_background.png");
 
     this->switchState(_state);

branches/gui/src/world_entities/elements/glgui_energywidget.cc

@@ -37 +37 @@
     this->_valueText.setChangedTextColor(Color::white);
 
-    //this->setBackgroundTexture("maps/gui_element_background_2.png");
+    this->setBackgroundTexture("maps/gui_element_background_2.png");
     this->setBackgroundColor(Color(.5,.5,.5,1));
 

branches/gui/src/world_entities/questGUI/quest.cc

@@ -37 +37 @@
 #include "glgui.h"
 #include "menu/glgui_imagebutton.h"
-#include "glgui_text.h"
+#include "glgui_multiline_text.h"
 #include <glgui_image.h>
 

branches/gui/src/world_entities/questGUI/quest_gui.cc

@@ -43 +43 @@
 #include "glgui.h"
 #include "menu/glgui_imagebutton.h"
-#include "glgui_text.h"
+#include "glgui_multiline_text.h"
 #include <glgui_image.h>
 
@@ -70 +70 @@
   
   this->bKillGui = false;
+  
+  this->background = "/pictures/map.jpg";
 
   this->myQuest = new Quest(root);
@@ -114 +116 @@
       questImage->loadImageFromFile(this->myQuest->getQuestPicture());
       questImage->show();
-      questImage->setBorderBottom(20);
+      //questImage->setBorderBottom(20);
       headerBox->pack(questImage);
-      headerBox->setBorderBottom(20);
       
       OrxGui::GLGuiBox* outlineBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
       {
-        OrxGui::GLGuiText* questDifficulty = new OrxGui::GLGuiText();
+        OrxGui::GLGuiMultiLineText* questDifficulty = new OrxGui::GLGuiMultiLineText();
         questDifficulty->setText(this->myQuest->getQuestDifficulty());
         outlineBox->pack(questDifficulty);
       }
       headerBox->pack(outlineBox);
-      headerBox->setBorderBottom(75);
+      headerBox->setBorderBottom(100);
       
     }
@@ -131 +132 @@
     OrxGui::GLGuiBox* labelBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
     { 
-      OrxGui::GLGuiText* questTxt = new OrxGui::GLGuiText();
+      OrxGui::GLGuiMultiLineText* questTxt = new OrxGui::GLGuiMultiLineText();
       questTxt->setText(this->myQuest->getQuestDescription());
       labelBox->pack(questTxt);
-      labelBox->setBorderBottom(75);
+      labelBox->setBorderBottom(100);
+      labelBox->setBorderTop(100);
     }
     
@@ -145 +147 @@
       rewardImage->show();
       rewardBox->pack(rewardImage);
-      rewardImage->setBorderBottom(50);
-    
-      OrxGui::GLGuiText* rewardTxt = new OrxGui::GLGuiText();
+      //rewardImage->setBorderBottom(50);
+    
+      OrxGui::GLGuiMultiLineText* rewardTxt = new OrxGui::GLGuiMultiLineText();
       rewardTxt->setText(this->myQuest->getRewardDescription());
       rewardBox->pack(rewardTxt);
-      rewardBox->setBorderBottom(75);
+      rewardBox->setBorderBottom(100);
       
     }
@@ -172 +174 @@
     this->questBox->showAll();
     
-    this->questBox->setAbsCoor2D(300, 40);
+    this->questBox->setAbsCoor2D(300, 200);
     OrxGui::GLGuiHandler::getInstance()->activate();
     OrxGui::GLGuiHandler::getInstance()->activateCursor();

branches/gui/src/world_entities/questGUI/quest_gui.h

@@ -28 +28 @@
     Quest*                  myQuest;
     bool                    bKillGui;
+    std::string             background;
     
     OrxGui::GLGuiBox*       headerBox;