Changeset 10031 in orxonox.OLD

Timestamp:

Dec 6, 2006, 6:55:34 PM (17 years ago)

Author:

hejja

Message:

Quest-Dialog mit Weissem Bild gecodet

Location:

branches/gui/src/world_entities/questGUI

Files:

• quest_gui.cc (modified) (8 diffs)
• quest_gui.h (modified) (2 diffs)

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

@@ -19 +19 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-
+#include "debug.h"
 #include "quest_gui.h"
 
@@ -57 +57 @@
   this->toList(OM_GROUP_00);
   
+  this->mainMenuBox = NULL;
+  
+  this->questBox = NULL;
+
+  this->currentlyOpened = NULL;
+  
 
   if( root != NULL)
@@ -86 +92 @@
    LoadParam(root, "quest-description", this, QuestGUI, setQuestDescription)
        .describe("sets the description of a quest");
-
-   this->mainMenuBox = NULL;
-
-   this->levelsBox = NULL;
-   
-   this->levelsBox = NULL;
-
-   this->currentlyOpened = NULL;
 }
 
@@ -101 +99 @@
  */
 void QuestGUI::guiInit()
-{
-
+{  
   if (mainMenuBox == NULL)
   {
@@ -112 +109 @@
       startButton->select();
 
-      OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("MultiPlayer");
+      OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("Bla Bla");
       //networkButton->released.connect(this, &QuestGUI::showMultiPlayer);
       this->mainMenuBox->pack(networkButton);
 
-      OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Options");
+      OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Blobb");
       //optionsButton->released.connect(this, &QuestGUI::showOptionsMenu);
       this->mainMenuBox->pack(optionsButton);
 
 
-      OrxGui::GLGuiButton* quitButton = new OrxGui::GLGuiPushButton("Quit");
+      OrxGui::GLGuiButton* quitButton = new OrxGui::GLGuiPushButton("Quit Menu");
       this->mainMenuBox->pack(quitButton);
       quitButton->released.connect(this, &QuestGUI::quitMenu);
@@ -150 +147 @@
     
     OrxGui::GLGuiBox* labelBox = new OrxGui::GLGuiBox();
+    
+    OrxGui::GLGuiText* questTxt = new OrxGui::GLGuiText();
+    questTxt->setText(this->questDescription);
+    labelBox->pack(questTxt);
 
     OrxGui::GLGuiImage* image = new OrxGui::GLGuiImage();
@@ -165 +166 @@
 }
 
+void QuestGUI::quitMenu()
+{
+  delete this->mainMenuBox;
+  this->mainMenuBox = NULL;
+}
+
 void QuestGUI::showSecondLevelElement(OrxGui::GLGuiBox* element)
 {
@@ -178 +185 @@
 }
 
-void QuestGUI::quitMenu()
-{
-  delete this->mainMenuBox;
-  this->mainMenuBox = NULL;
-}
 
 

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

@@ -29 +29 @@
    
    void quitMenu();
-   virtual bool stop();
 
 
@@ -40 +39 @@
     std::string             questDescription;
     OrxGui::GLGuiBox*       mainMenuBox;
-    OrxGui::GLGuiBox*       levelsBox;
+    
     OrxGui::GLGuiBox*       questBox;