Changeset 5696

Timestamp:

Aug 30, 2009, 2:29:06 AM (15 years ago)

Author:

rgrieder

Message:

Merged media_stripped branch back to data trunk.
PLEASE update your DATA_DIRECTORY!

Location:

data/trunk

Files:

• . (modified) (1 prop)
• backToPNG (deleted)
• defaultConfig (deleted)
• gui/configs (deleted)
• gui/layouts (deleted)
• gui/looknfeel/TaharezLook.looknfeel (modified) (2 diffs)
• gui/schemes (deleted)
• gui/scripts (deleted)
• levels (deleted)
• materials/textures/OrxonoxBlack.tga (modified) (previous)
• models/satellitedish.mesh (modified) (previous)
• overlay (deleted)
• particle (deleted)
• resources.cfg (deleted)
• resources.oxr (copied) (copied from data/branches/media_stripped/resources.oxr)
• tcl (deleted)
• tcl8.4 (deleted)
• tcl8.5 (deleted)

data/trunk/gui/looknfeel/TaharezLook.looknfeel

@@ -1045 +1045 @@
         <NamedArea name="ProgressArea">
             <Area>
-                <Dim type="LeftEdge" ><ImageDim imageset="TaharezLook" image="ProgressBarLeft" dimension="Width" /></Dim>
+                <Dim type="LeftEdge" >
+                    <ImageDim imageset="TaharezLook" image="ProgressBarLeft" dimension="Width">
+                        <DimOperator op="Divide">
+                            <AbsoluteDim value="2" />
+                        </DimOperator>
+                    </ImageDim>
+                </Dim>
                 <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
                 <Dim type="RightEdge" >
                     <UnifiedDim scale="1" type="RightEdge">
                         <DimOperator op="Subtract">
-                            <ImageDim imageset="TaharezLook" image="ProgressBarRight" dimension="Width" />
+                            <ImageDim imageset="TaharezLook" image="ProgressBarRight" dimension="Width">
+                                <DimOperator op="Divide">
+                                    <AbsoluteDim value="2" />
+                                </DimOperator>
+                            </ImageDim>
                         </DimOperator>
                     </UnifiedDim>
@@ -1068 +1078 @@
                 <Image type="RightEdge" imageset="TaharezLook" image="ProgressBarRight" />
                 <Image type="Background" imageset="TaharezLook" image="ProgressBarMiddle" />
+                <HorzFormat type="Tiled" />
             </FrameComponent>
         </ImagerySection>