Changeset 6387 for code/branches/presentation2/data/gui

Timestamp:

Dec 21, 2009, 1:18:36 PM (15 years ago)

Author:

rgrieder

Message:

Found some non empty new lines.

Location:

code/branches/presentation2/data/gui

Files:

• layouts/PickupInventory.layout (modified) (1 diff)
• scripts/GUITools.lua (modified) (1 diff)
• scripts/InitialiseGUI.lua (modified) (2 diffs)
• scripts/KeyBindMenu.lua (modified) (6 diffs)
• scripts/PickupInventory.lua (modified) (3 diffs)
• scripts/QuestGUI.lua (modified) (1 diff)

code/branches/presentation2/data/gui/layouts/PickupInventory.layout

@@ -15 +15 @@
             <Property Name="TabPanePosition" Value="Bottom" />
             <Property Name="UnifiedAreaRect" Value="{{0,10},{0,30},{1,-10},{1,-10}}" />
-            
+
             <Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
                 <Property Name="Text" Value="Equipment" />

code/branches/presentation2/data/gui/scripts/GUITools.lua

@@ -14 +14 @@
 function getMinTextSize(window)
     local size = {}
-    
+
     local lookAndFeel = CEGUI.WidgetLookManager:getSingleton():getWidgetLook(window:getLookNFeel())
     local height = window:getFont():getLineSpacing() + window:getUnclippedPixelRect():getHeight() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getHeight()
     local width =  window:getFont():getTextExtent(window:getText()) + window:getUnclippedPixelRect():getWidth() - lookAndFeel:getNamedArea("WithFrameTextRenderArea"):getArea():getPixelRect(window):getWidth()
-    
+
     table.insert(size, height)
     table.insert(size, width)

code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua

@@ -81 +81 @@
         hideCursor()
     end
-    
+
     if find( activeSheets, filename ) ~= nil then
         table.remove( activeSheets, find( activeSheets, filename ) )
@@ -96 +96 @@
     bHidePrevious[filename]=hidePrevious
     cursorVisibility[filename] = bCursorVisible
-    
+
     if hidePrevious == true then
         for i=1,nrOfActiveSheets-1 do

code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua

@@ -70 +70 @@
     sampleWindow = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/SampleWindow")
     sampleWindow:setText("SampleText")
-    
+
     local size = getMinTextSize(sampleWindow)
     lineHeight = size[1]
-    
+
     commandWidth = 0
     for k,v in pairs(commandList) do
@@ -86 +86 @@
     size = getMinTextSize(sampleWindow)
     addWidth = size[2]
-    
+
     sampleWindow:setText("X")
     size = getMinTextSize(sampleWindow)
@@ -92 +92 @@
 
     spaceWidth = math.floor(1/14*commandWidth)
-    
+
     buttonWidth = 145
 
@@ -166 +166 @@
 
     line:setWidth(CEGUI.UDim(0, offset+clearWidth))
-    
+
     return line
 end
@@ -178 +178 @@
         window:addChildWindow(line)
     end
-    
+
     pane = tolua.cast(window, "CEGUI::ScrollablePane")
     pane:setVerticalStepSize(getScrollingStepSize(window))
@@ -216 +216 @@
     local commandNr = tonumber(match())
     local buttonNr = tonumber(match())
- 
+
     orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
 

code/branches/presentation2/data/gui/scripts/PickupInventory.lua

@@ -20 +20 @@
     local equipCount = orxonox.PickupInventory:getEquipmentCount()
     local usableCount = orxonox.PickupInventory:getUsableCount()
-    
+
     if equipCount ~= self.lastEquipmentCount_ or usableCount ~= self.lastUsableCount_ then
         self:updateTabs()
@@ -39 +39 @@
     local t = name:sub(25, 27)
     local i = name:sub(29)
-    
+
     if t == "equ" then
-        
+
     end
-    
+
     if t == "use" then
         if self.currentUsableID_ >= 0 then
@@ -60 +60 @@
     orxonox.PickupInventory:getSingleton():clearInventory(winMgr, eqWin, usWin)
     orxonox.PickupInventory:getSingleton():updateTabs(winMgr, eqWin, usWin)
-    
+
     self.currentUsableID_ = orxonox.PickupInventory:getCurrentUsableIndex()
     self.lastEquipmentCount_ = orxonox.PickupInventory:getEquipmentCount()

code/branches/presentation2/data/gui/scripts/QuestGUI.lua

@@ -15 +15 @@
 
     local questManager = orxonox.QuestManager:getInstance()
-      
+
     local questsList = winMgr:getWindow("orxonox/QuestGUI/QuestsList")