Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 22, 2010, 2:47:10 PM (15 years ago)
Author:
rgrieder
Message:

Merged remaining revisions from gamestate to gamestates2.

Location:
code/branches/gamestates2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gamestates2

  • code/branches/gamestates2/src/modules/questsystem/QuestGUI.cc

    r6417 r6595  
    109109
    110110        //! Create root window.
    111         this->rootWindow_ = this->windowManager_->createWindow("TaharezLook/ScrollablePane", "QuestGUI/Quests");
     111        this->rootWindow_ = this->windowManager_->createWindow("MenuWidgets/ScrollablePane", "QuestGUI/Quests");
    112112        this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, 0),CEGUI::UDim(1, 0)));
    113113
     
    161161        Get a CEGUI Window to use.
    162162        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".
    166166    */
    167167    CEGUI::Window* QuestGUI::getWindow(void)
     
    177177        std::ostringstream stream;
    178178        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());
    180180    }
    181181
  • code/branches/gamestates2/src/modules/questsystem/QuestGUINode.cc

    r6502 r6595  
    160160            stream << this->window_->getName() << "/Details";
    161161            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());
    163163            this->details_->setSize(CEGUI::UVector2(CEGUI::UDim(0.7f, 0),CEGUI::UDim(0.7f, 0)));
    164164            this->details_->setPosition(CEGUI::UVector2(CEGUI::UDim(0.1f, 0),CEGUI::UDim(0.1f, 0)));
     
    171171            //! Create a ScrollablePane.
    172172            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());
    174174            window->setSize(CEGUI::UVector2(CEGUI::UDim(1.0, -2*QuestGUINode::BORDER_WIDTH),CEGUI::UDim(1.0, -QuestGUINode::TITLE_HEIGHT)));
    175175            window->setPosition(CEGUI::UVector2(CEGUI::UDim(0, (float)QuestGUINode::BORDER_WIDTH),CEGUI::UDim(0, (float)QuestGUINode::TITLE_HEIGHT)));
     
    185185                stream.str("");
    186186                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());
    188188                window->addChildWindow(statusWindow);
    189189                std::string status;
     
    214214            stream << this->details_->getName() << "/Description";
    215215            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());
    217217            window->addChildWindow(descriptionWindowTitle);
    218218            descriptionWindowTitle->setProperty("HorzFormatting", "HorzCentred");
     
    227227            stream.str("");
    228228            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());
    230230            window->addChildWindow(descriptionWindow);
    231231            descriptionWindow->setProperty("HorzFormatting", "WordWrapLeftAligned");
     
    250250                            stream.str("");
    251251                            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());
    253253                            window->addChildWindow(hintsTitle);
    254254                            hintsTitle->setProperty("HorzFormatting", "HorzCentred");
Note: See TracChangeset for help on using the changeset viewer.