Changeset 10489 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2007, 12:38:10 AM (18 years ago)

Author:

patrick

Message:

nicer gui entries

Location:

trunk/src

Files:

• lib/gui/gl/glgui_container.cc (modified) (1 diff)
• lib/gui/gl/glgui_widget.cc (modified) (4 diffs)
• world_entities/questGUI/quest_gui.cc (modified) (8 diffs)

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

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

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

@@ -129 +129 @@
 
     this->setBorderLeft(15);
-    this->setBackgroundTexture("textures/gui/gui_element_background.png");
+//     this->setBackgroundTexture("textures/gui/gui_element_background.png");
 
     this->switchState(_state);
@@ -565 +565 @@
   }
 
-  
-  
-  
-  
-  
+
+
+
+
+
   /**
   * @brief sets the Background Texture to all States.
@@ -594 +594 @@
     }
   }
-  
-  
-  
-  
+
+
+
+
   /**
    * @brief sets the Background Texture.
@@ -943 +943 @@
   }
 
-  void GLGuiWidget::beginDraw() const 
-  { 
-    glPushMatrix(); 
+  void GLGuiWidget::beginDraw() const
+  {
+    glPushMatrix();
     glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
     glRotatef(this->getAbsDir2D(), 0, 0, 1);

trunk/src/world_entities/questGUI/quest_gui.cc

@@ -76 +76 @@
 
   this->bKillGui = false;
-  
+
   this->bActive = false;
 
@@ -118 +118 @@
     questBox->setBorderLeft(10);
     questBox->setBorderBottom(10);
-    this->questBox->setBackgroundTexture("maps/rand.png");
+    this->questBox->setBackgroundTexture("textures/gui/gui_quest_border.png");
     this->bKillGui = false;
 
     OrxGui::GLGuiBox* headerBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
     {
-      headerBox->setBackgroundTexture("maps/rand-unten.png");
+      headerBox->setBackgroundTexture("textures/gui/gui_quest_border_low.png");
       OrxGui::GLGuiImage* questImage = new OrxGui::GLGuiImage();
       questImage->setWidgetSize(100, 100);
@@ -131 +131 @@
 
       OrxGui::GLGuiBox* outlineBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
-      {      
+      {
         OrxGui::GLGuiMultiLineText* questDetails = new OrxGui::GLGuiMultiLineText();
         questDetails->setText(this->myQuest->getQuestDifficulty());
@@ -150 +150 @@
     OrxGui::GLGuiBox* labelBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
     {
-      labelBox->setBackgroundTexture("maps/rand-unten.png");
+      labelBox->setBackgroundTexture("textures/gui/gui_quest_border_low.png");
       OrxGui::GLGuiMultiLineText* questTxt = new OrxGui::GLGuiMultiLineText();
       questTxt->setText(this->myQuest->getQuestDescription());
       labelBox->pack(questTxt);
-      
+
       OrxGui::GLGuiImage* placeImage = new OrxGui::GLGuiImage();
       placeImage->setWidgetSize(85, 10);
@@ -160 +160 @@
       placeImage->show();
       labelBox->pack(placeImage);
-      
-      
+
+
       labelBox->setBorderTop(0);
       labelBox->setBorderRight(0);
@@ -171 +171 @@
     OrxGui::GLGuiBox* rewardBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
     {
-      rewardBox->setBackgroundTexture("maps/rand-unten.png");
+      rewardBox->setBackgroundTexture("textures/gui/gui_quest_border_low.png");
       OrxGui::GLGuiImage* rewardImage = new OrxGui::GLGuiImage();
       rewardImage->setWidgetSize(100, 100);
@@ -194 +194 @@
       placeImage->show();
       answerBox->pack(placeImage);
-      
+
       OrxGui::GLGuiBox* acceptBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
         //acceptBox->setBackgroundTexture("maps/accept.png");
-        acceptBox->setBackgroundTexture("maps/accept.png", OrxGui::Normal);
-        acceptBox->setBackgroundTexture("maps/acceptrout.png", OrxGui::Selected);
+        acceptBox->setBackgroundTexture("textures/gui/gui_quest_accept.jpg", OrxGui::Normal);
+        //acceptBox->setBackgroundTexture("maps/gui_quest_acceptrout.png", OrxGui::Selected);
         OrxGui::GLGuiButton* acceptButton = new OrxGui::GLGuiPushButton("        ");
         acceptButton->released.connect(this, &QuestGUI::accept);
@@ -209 +209 @@
       }
       answerBox->pack(acceptBox);
-      
+
       OrxGui::GLGuiImage* placeImage2 = new OrxGui::GLGuiImage();
       placeImage2->setWidgetSize(300, 10);
-      placeImage2->loadImageFromFile("maps/schwarz.png");
+      placeImage2->loadImageFromFile("textures/gui/gui_quest_black.png");
       placeImage2->show();
       answerBox->pack(placeImage2);
-      
+
       OrxGui::GLGuiBox* refuseBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
       {
-        refuseBox->setBackgroundTexture("maps/refuserout.png");
+        refuseBox->setBackgroundTexture("textures/gui/gui_quest_refuserout.gif");
         OrxGui::GLGuiButton* refuseButton = new OrxGui::GLGuiPushButton("        ");
         refuseButton->released.connect(this, &QuestGUI::refuse);