Changeset 7639 for code/branches/releasetodo
- Timestamp:
- Nov 11, 2010, 12:30:38 PM (14 years ago)
- Location:
- code/branches/releasetodo
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/releasetodo/data/gui/layouts/SingleplayerMenu.layout
r7626 r7639 20 20 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" /> 21 21 </Window> 22 <Window Type="MenuWidgets/RadioButton" Name="orxonox/SingleplayerShowRestrictedButton" > 23 <Property Name="Text" Value="show only restricted" /> 24 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 25 <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.87,0},{0.5,0},{.97,0}}" /> 26 <Event Name="SelectStateChanged" Function="SingleplayerMenu.SingleplayerShowRestrictedButton_clicked"/> 27 </Window> 28 <Window Type="MenuWidgets/RadioButton" Name="orxonox/SingleplayerShowAllButton" > 22 <Window Type="MenuWidgets/Checkbox" Name="orxonox/SingleplayerShowAllCheckbox" > 29 23 <Property Name="Text" Value="show all" /> 30 24 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 31 <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.87,0},{0.8 5,0},{.97,0}}" />32 <Event Name=" SelectStateChanged" Function="SingleplayerMenu.SingleplayerShowAllButton_clicked"/>25 <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.87,0},{0.8,0},{.97,0}}" /> 26 <Event Name="CheckStateChanged" Function="SingleplayerMenu.SingleplayerShowAll_clicked"/> 33 27 </Window> 34 28 </Window> -
code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua
r7627 r7639 8 8 9 9 function P.onLoad() 10 local window = winMgr:getWindow("orxonox/SingleplayerShow RestrictedButton")11 local button = tolua.cast(window,"CEGUI:: RadioButton")12 button:setSelected( true)10 local window = winMgr:getWindow("orxonox/SingleplayerShowAllCheckbox") 11 local button = tolua.cast(window,"CEGUI::Checkbox") 12 button:setSelected(false) 13 13 P.createLevelList() 14 14 end … … 64 64 end 65 65 66 function P.SingleplayerShowRestrictedButton_clicked(e) 67 P.showAll = false 68 P.createLevelList() 69 end 70 71 function P.SingleplayerShowAllButton_clicked(e) 72 P.showAll = true 73 P.createLevelList() 66 function P.SingleplayerShowAll_clicked(e) 67 local checkbox = tolua.cast(winMgr:getWindow("orxonox/SingleplayerShowAllCheckbox"), "CEGUI::Checkbox") 68 local show = checkbox:isSelected() 69 if show ~= P.showAll then 70 P.showAll = show 71 P.createLevelList() 72 end 74 73 end 75 74 -
code/branches/releasetodo/src/orxonox/LevelInfo.cc
r7638 r7639 120 120 if(!this->validateTag(tag)) 121 121 { 122 COUT(2) << "Bad tag '" << tag << "' in " << this->getXMLFilename() << ". Ignoring..." << std::endl;122 COUT(2) << "Bad LevelInfo tag '" << tag << "' in " << this->getXMLFilename() << ". Ignoring..." << std::endl; 123 123 return false; 124 124 } 125 bool success = this->tags_.insert( std::string(tag)).second;125 bool success = this->tags_.insert(*LevelInfoItem::possibleTags_s.find(tag)).second; 126 126 if(update && success) 127 127 this->tagsUpdated();
Note: See TracChangeset
for help on using the changeset viewer.