[Orxonox-commit 6478] r11124 - code/branches/cegui0.8/data/gui/scripts
landauf at orxonox.net
landauf at orxonox.net
Sat Feb 20 18:28:29 CET 2016
Author: landauf
Date: 2016-02-20 18:28:28 +0100 (Sat, 20 Feb 2016)
New Revision: 11124
Modified:
code/branches/cegui0.8/data/gui/scripts/AudioMenu.lua
code/branches/cegui0.8/data/gui/scripts/DockingDialog.lua
code/branches/cegui0.8/data/gui/scripts/GameplayMenu.lua
code/branches/cegui0.8/data/gui/scripts/GraphicsMenu.lua
code/branches/cegui0.8/data/gui/scripts/HostMenu.lua
code/branches/cegui0.8/data/gui/scripts/MultiplayerMenu.lua
code/branches/cegui0.8/data/gui/scripts/PickupInventory.lua
code/branches/cegui0.8/data/gui/scripts/QuestGUI.lua
code/branches/cegui0.8/data/gui/scripts/ShipSelectionMenu.lua
code/branches/cegui0.8/data/gui/scripts/SingleplayerMenu.lua
code/branches/cegui0.8/data/gui/scripts/UndockingDialog.lua
Log:
fixed some more errors: use 0.8-notation for images
Modified: code/branches/cegui0.8/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/AudioMenu.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/AudioMenu.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -36,7 +36,7 @@
table.insert(themeList, "Metal")
for k,v in pairs(themeList) do
item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
CEGUI.toListbox(listboxwindow):addItem(item)
end
if orxonox.getConfig("MoodManager", "mood_") == "dnb" then
Modified: code/branches/cegui0.8/data/gui/scripts/DockingDialog.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/DockingDialog.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/DockingDialog.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -41,7 +41,7 @@
for k in pairs(P.docks) do
local item = CEGUI.createListboxTextItem("Dock " .. k)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
listbox:addItem(item)
if k == 1 then
listbox:setItemSelectState(item, true)
Modified: code/branches/cegui0.8/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/GameplayMenu.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/GameplayMenu.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -10,7 +10,7 @@
table.insert(themeList, "Theme 3")
for k,v in pairs(themeList) do
item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
CEGUI.toCombobox(dropdown):addItem(item)
end
end
Modified: code/branches/cegui0.8/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/GraphicsMenu.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/GraphicsMenu.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -38,7 +38,7 @@
for k,v in pairs(P.resolutionList) do
local item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
resolutionCombobox:addItem(item)
end
@@ -48,7 +48,7 @@
for k,v in pairs(P.schemeList) do
local item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
themeCombobox:addItem(item)
end
@@ -58,7 +58,7 @@
for k,v in pairs(P.fsaaList) do
local item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
fsaaCombobox:addItem(item)
end
@@ -68,7 +68,7 @@
for k,v in pairs(P.particleLodList) do
local item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
particleLodCombobox:addItem(item)
end
end
Modified: code/branches/cegui0.8/data/gui/scripts/HostMenu.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/HostMenu.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/HostMenu.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -72,7 +72,7 @@
--table.sort(levelList)
for k,v in pairs(P.levelList) do
local item = CEGUI.createListboxTextItem(v:getName())
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
listbox:addItem(item)
if v:getXMLFilename() == preselect then
listbox:setItemSelectState(item, true)
Modified: code/branches/cegui0.8/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/MultiplayerMenu.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/MultiplayerMenu.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -114,7 +114,7 @@
local item = CEGUI.createListboxTextItem("IP: " .. v[1] .. " Name: " .. v[2] .. " Players: " .. v[3])
item:setID(index)
index = index + 1
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
CEGUI.toListbox(listbox):addItem(item)
end
-- WAN Discovery
@@ -151,7 +151,7 @@
local item = CEGUI.createListboxTextItem("IP: " .. v[1] .. " Name: " .. v[2] .. " Players: " .. v[3])
item:setID(index)
index = index + 1
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
CEGUI.toListbox(listbox):addItem(item)
end
end
Modified: code/branches/cegui0.8/data/gui/scripts/PickupInventory.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/PickupInventory.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/PickupInventory.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -116,7 +116,7 @@
item:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, 0)))
local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
- image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
+ image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
image:setProperty("BackgroundEnabled", "set:False")
image:setProperty("FrameEnabled", "set:True")
image:setSize(CEGUI.UVector2(CEGUI.UDim(0, P.imageHeight), CEGUI.UDim(0, P.imageHeight)))
@@ -217,7 +217,7 @@
wrapper:addChildWindow(title)
local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
- image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
+ image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
image:setProperty("BackgroundEnabled", "set:False")
image:setProperty("FrameEnabled", "set:True")
image:setSize(CEGUI.UVector2(CEGUI.UDim(0, P.detailImageSize), CEGUI.UDim(0, P.detailImageSize)))
Modified: code/branches/cegui0.8/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/QuestGUI.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/QuestGUI.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -103,7 +103,7 @@
function P.insertQuest(list, quest)
if P.showActive == quest:isActive(P.player) then
local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
list:addItem(item)
table.insert(P.quests, quest)
return item
@@ -140,7 +140,7 @@
while i <= numQuests-1 do
local quest = P.questManager:getSubQuest(quest, P.player, i)
local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
list:addItem(item)
table.insert(P.subquests, quest)
i = i+1
Modified: code/branches/cegui0.8/data/gui/scripts/ShipSelectionMenu.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/ShipSelectionMenu.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/ShipSelectionMenu.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -33,7 +33,7 @@
--TODO: only add ship if is in the right filter tab
--if tag == nil or v:hasStartingShip(tag) then
local item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
listbox:addItem(item)
table.insert(tabIndexes, k)
--orxonox.GUIManager:setTooltipTextHelper(item, v:getDescription())
@@ -87,7 +87,7 @@
--local levelXMLFilename = selectedlevel:getXMLFilename()
--local imageName = selectedlevel:getScreenshot()
-- set the screenshot and the description for the selected level
- --levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
+ --levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
--levelDescription:setText(level:getDescription())
-- only enable config button for "gametype" levels
--if level:hasTag("gametype") then
Modified: code/branches/cegui0.8/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/SingleplayerMenu.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/SingleplayerMenu.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -86,7 +86,7 @@
-- only add level if it has desired tag
if tag == nil or v:hasTag(tag) then
local item = CEGUI.createListboxTextItem(v:getName())
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
listbox:addItem(item)
table.insert(tabIndexes, k)
if v:getXMLFilename() == preselect then
@@ -129,7 +129,7 @@
local levelXMLFilename = level:getXMLFilename()
local imageName = level:getScreenshot()
-- set the screenshot and the description for the selected level
- levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
+ levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
levelDescription:setText(level:getDescription())
-- only enable config button for "gametype" levels
if level:hasTag("gametype") then
Modified: code/branches/cegui0.8/data/gui/scripts/UndockingDialog.lua
===================================================================
--- code/branches/cegui0.8/data/gui/scripts/UndockingDialog.lua 2016-02-20 17:26:44 UTC (rev 11123)
+++ code/branches/cegui0.8/data/gui/scripts/UndockingDialog.lua 2016-02-20 17:28:28 UTC (rev 11124)
@@ -41,7 +41,7 @@
for k in pairs(P.docks) do
local item = CEGUI.createListboxTextItem("Dock " .. k)
- item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+ item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
listbox:addItem(item)
if k == 1 then
listbox:setItemSelectState(item, true)
More information about the Orxonox-commit
mailing list