Changeset 10167 in orxonox.OLD

Timestamp:

Jan 3, 2007, 4:38:00 PM (17 years ago)

Author:

hejja

Message:

Borders done

Location:

branches/gui/src/world_entities/questGUI

Files:

• quest.cc (modified) (3 diffs)
• quest.h (modified) (2 diffs)
• quest_gui.cc (modified) (6 diffs)
• quest_gui.h (modified) (1 diff)

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

@@ -51 +51 @@
 {
   this->registerObject(this, Quest::_objectList);
+  
+  this->Status = false;
 
   if( root != NULL)
@@ -72 +74 @@
  * @param root: root xml tag for this element
  */
+ 
 void Quest::loadParams(const TiXmlElement* root)
 {
@@ -89 +92 @@
 }
 
+void Quest::setQuestActive()
+{
+  this->Status = true;
+}
+
+void Quest::setQuestInactive()
+{
+  this->Status = false;
+}
+
+const bool Quest::getQuestStatus()
+{
+  return this->Status;
+}

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

@@ -19 +19 @@
 
    virtual void loadParams(const TiXmlElement* root = NULL);
-
-   /** @param questName sets the name of this quest */
+   
    inline void setQuestName(const std::string& questName)                { this->questName = questName; }
    inline const std::string& getQuestName()                              { return this->questName; }
@@ -33 +32 @@
    inline void setRewardPicture(const std::string& rewardPicture)        { this->rewardPicture  = rewardPicture; }
    inline const std::string& getRewardPicture()                          { return this->rewardPicture; }
+   void setQuestActive();
+   void setQuestInactive();
+   const bool getQuestStatus();
+   
 
    
   private:
+    bool                    Status;
     std::string             questName;
     std::string             questDescription;

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

@@ -64 +64 @@
 {
   this->registerObject(this, QuestGUI::_objectList);
-
+  
   this->toList(OM_GROUP_00);
   
@@ -116 +116 @@
       questImage->loadImageFromFile(this->myQuest->getQuestPicture());
       questImage->show();
-      //questImage->setBorderBottom(20);
       headerBox->pack(questImage);
       
@@ -125 +124 @@
         outlineBox->pack(questDifficulty);
       }
+      headerBox->setBorderBottom(40);
       headerBox->pack(outlineBox);
-      headerBox->setBorderBottom(100);
-      
     }
     
@@ -135 +133 @@
       questTxt->setText(this->myQuest->getQuestDescription());
       labelBox->pack(questTxt);
-      labelBox->setBorderBottom(100);
-      labelBox->setBorderTop(100);
+      labelBox->setBorderBottom(40);
     }
     
@@ -147 +144 @@
       rewardImage->show();
       rewardBox->pack(rewardImage);
-      //rewardImage->setBorderBottom(50);
     
       OrxGui::GLGuiMultiLineText* rewardTxt = new OrxGui::GLGuiMultiLineText();
       rewardTxt->setText(this->myQuest->getRewardDescription());
+      rewardBox->setBorderBottom(40);
       rewardBox->pack(rewardTxt);
-      rewardBox->setBorderBottom(100);
-      
     }
     
     OrxGui::GLGuiBox* answerBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
     {
-      OrxGui::GLGuiButton* acceptButton = new OrxGui::GLGuiPushButton("Accept");
-      acceptButton->released.connect(this, &QuestGUI::accept);
-      answerBox->pack(acceptButton);
-      acceptButton->select();
+      OrxGui::GLGuiBox* acceptBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
+      {
+        OrxGui::GLGuiButton* acceptButton = new OrxGui::GLGuiPushButton("Accept");
+        acceptButton->released.connect(this, &QuestGUI::accept);
+        acceptBox->setBorderRight(70);
+        acceptBox->pack(acceptButton);
+      }
       
-      OrxGui::GLGuiButton* refuseButton = new OrxGui::GLGuiPushButton("Refuse");
-      refuseButton->released.connect(this, &QuestGUI::refuse);
-      answerBox->pack(refuseButton);
-    }
-    
+      OrxGui::GLGuiBox* refuseBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
+      {
+        OrxGui::GLGuiButton* refuseButton = new OrxGui::GLGuiPushButton("Refuse");
+        refuseButton->released.connect(this, &QuestGUI::refuse);
+        refuseBox->setBorderLeft(0);
+        refuseBox->pack(refuseButton);
+      }
+      answerBox->pack(acceptBox);
+      answerBox->pack(refuseBox);
+    }
     this->questBox->pack(headerBox);
     this->questBox->pack(labelBox);
@@ -195 +198 @@
 void QuestGUI::accept()
 {
+  this->myQuest->setQuestActive();
   this->bKillGui = true;
-  
 }
 

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

@@ -38 +38 @@
     OrxGui::GLGuiImage*     rewardImage;
     OrxGui::GLGuiBox*       answerBox;
+    OrxGui::GLGuiBox*       acceptBox;
+    OrxGui::GLGuiBox*       refuseBox;
 
     OrxSound::SoundSource*  selectorSource;