Changeset 6595 for code/branches/gamestates2/src/modules
- Timestamp:
- Mar 22, 2010, 2:47:10 PM (15 years ago)
- Location:
- code/branches/gamestates2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gamestates2
- Property svn:mergeinfo changed
/code/branches/gamestate merged: 6441-6442,6459,6537,6544-6546,6548,6564,6566-6567,6569,6571-6572
- Property svn:mergeinfo changed
-
code/branches/gamestates2/src/modules/questsystem/QuestGUI.cc
r6417 r6595 109 109 110 110 //! Create root window. 111 this->rootWindow_ = this->windowManager_->createWindow(" TaharezLook/ScrollablePane", "QuestGUI/Quests");111 this->rootWindow_ = this->windowManager_->createWindow("MenuWidgets/ScrollablePane", "QuestGUI/Quests"); 112 112 this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, 0),CEGUI::UDim(1, 0))); 113 113 … … 161 161 Get a CEGUI Window to use. 162 162 Windows that are no longer used are collected with giveWindow, and are given out again with getWindow, so save some time recreating new windows everytime. 163 The retreived window is of type " TaharezLook/TabButton".164 @return 165 Returns a CEGUI Window of type " TaharezLook/TabButton".163 The retreived window is of type "MenuWidgets/TabButton". 164 @return 165 Returns a CEGUI Window of type "MenuWidgets/TabButton". 166 166 */ 167 167 CEGUI::Window* QuestGUI::getWindow(void) … … 177 177 std::ostringstream stream; 178 178 stream << "QuestGUI/Quests/EmptyWindows/" << this->windows_.size()+1; 179 return this->windowManager_->createWindow(" TaharezLook/TabButton", stream.str());179 return this->windowManager_->createWindow("MenuWidgets/TabButton", stream.str()); 180 180 } 181 181 -
code/branches/gamestates2/src/modules/questsystem/QuestGUINode.cc
r6502 r6595 160 160 stream << this->window_->getName() << "/Details"; 161 161 const QuestDescription* description = this->item_->getDescription(); 162 this->details_ = this->gui_->getWindowManager()->createWindow(" TaharezLook/FrameWindow", stream.str());162 this->details_ = this->gui_->getWindowManager()->createWindow("MenuWidgets/FrameWindow", stream.str()); 163 163 this->details_->setSize(CEGUI::UVector2(CEGUI::UDim(0.7f, 0),CEGUI::UDim(0.7f, 0))); 164 164 this->details_->setPosition(CEGUI::UVector2(CEGUI::UDim(0.1f, 0),CEGUI::UDim(0.1f, 0))); … … 171 171 //! Create a ScrollablePane. 172 172 stream << "/Scrollable"; 173 CEGUI::Window* window = this->gui_->getWindowManager()->createWindow(" TaharezLook/ScrollablePane", stream.str());173 CEGUI::Window* window = this->gui_->getWindowManager()->createWindow("MenuWidgets/ScrollablePane", stream.str()); 174 174 window->setSize(CEGUI::UVector2(CEGUI::UDim(1.0, -2*QuestGUINode::BORDER_WIDTH),CEGUI::UDim(1.0, -QuestGUINode::TITLE_HEIGHT))); 175 175 window->setPosition(CEGUI::UVector2(CEGUI::UDim(0, (float)QuestGUINode::BORDER_WIDTH),CEGUI::UDim(0, (float)QuestGUINode::TITLE_HEIGHT))); … … 185 185 stream.str(""); 186 186 stream << this->details_->getName() << "/Status"; 187 CEGUI::Window* statusWindow = this->gui_->getWindowManager()->createWindow(" TaharezLook/StaticText", stream.str());187 CEGUI::Window* statusWindow = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str()); 188 188 window->addChildWindow(statusWindow); 189 189 std::string status; … … 214 214 stream << this->details_->getName() << "/Description"; 215 215 stream << "/Title"; 216 CEGUI::Window* descriptionWindowTitle = this->gui_->getWindowManager()->createWindow(" TaharezLook/StaticText", stream.str());216 CEGUI::Window* descriptionWindowTitle = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str()); 217 217 window->addChildWindow(descriptionWindowTitle); 218 218 descriptionWindowTitle->setProperty("HorzFormatting", "HorzCentred"); … … 227 227 stream.str(""); 228 228 stream << this->details_->getName() << "/Description"; 229 CEGUI::Window* descriptionWindow = this->gui_->getWindowManager()->createWindow(" TaharezLook/StaticText", stream.str());229 CEGUI::Window* descriptionWindow = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str()); 230 230 window->addChildWindow(descriptionWindow); 231 231 descriptionWindow->setProperty("HorzFormatting", "WordWrapLeftAligned"); … … 250 250 stream.str(""); 251 251 stream << this->details_->getName() << "/Hints/Title"; 252 CEGUI::Window* hintsTitle = this->gui_->getWindowManager()->createWindow(" TaharezLook/StaticText", stream.str());252 CEGUI::Window* hintsTitle = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str()); 253 253 window->addChildWindow(hintsTitle); 254 254 hintsTitle->setProperty("HorzFormatting", "HorzCentred");
Note: See TracChangeset
for help on using the changeset viewer.