Changeset 10164 in orxonox.OLD for branches/gui/src/world_entities

Timestamp:

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

Author:

hejja

Message:

border made

Location:

branches/gui/src/world_entities

Files:

• elements/glgui_energywidget.cc (modified) (1 diff)
• questGUI/quest.cc (modified) (1 diff)
• questGUI/quest_gui.cc (modified) (6 diffs)
• questGUI/quest_gui.h (modified) (1 diff)

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;