Fixed the labels transparency

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@421 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/gui/sdl/datafiles/layouts/Mineque.layout b/navit/src/gui/sdl/datafiles/layouts/Mineque.layout
index 6740dd2..4b05fb1 100644 (file)
--- a/navit/src/gui/sdl/datafiles/layouts/Mineque.layout
+++ b/navit/src/gui/sdl/datafiles/layouts/Mineque.layout
@@ -13,9 +13,9 @@
                        <Property Name="UnifiedAreaRect" Value="{{0,1},{0,550},{0,660},{0,600}}" />\r
                        <Property Name="ZOrderChangeEnabled" value="False" />\r
                </Window>\r
-               <Window Type="TaharezLook/StaticText" Name="Navit/Routing/Tips" >\r
+               <Window Type="NavitGrey/StaticText" Name="Navit/Routing/Tips" >\r
                        <Property Name="Font" Value="DejaVuSans-14" />\r
-                       <Property Name="Visible" Value="False" />\r
+                       <Property Name="Visible" Value="True" />\r
                        <Property Name="HorzFormatting" Value="WordWrapCentred" />\r
                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />\r
                        <Property Name="UnifiedAreaRect" Value="{{0,60},{0,565},{0,600},{0,598}}" />\r
@@ -41,18 +41,36 @@
                        <Property Name="ZOrderChangeEnabled" value="False" />\r
                </Window>\r
 \r
-               <Window Type="TaharezLook/StaticText" Name="OSD/SpeedoMeter" >\r
+               <Window Type="NavitGrey/StaticText" Name="OSD/SpeedoMeterLabel" >\r
+                       <Property Name="Font" Value="DejaVuSans-12" />\r
+                       <Property Name="Text" Value="Speed" />\r
+                       <Property Name="HorzFormatting" Value="WordWrapCentred" />\r
+                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,100},{0,800},{0,128}}" />\r
+               </Window>\r
+               <Window Type="NavitGrey/StaticText" Name="OSD/SpeedoMeter" >\r
                        <Property Name="Font" Value="DejaVuSans-14" />\r
                        <Property Name="HorzFormatting" Value="WordWrapCentred" />\r
-                       <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />\r
-                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,100},{0,800},{0,130}}" />\r
+                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,120},{0,800},{0,150}}" />\r
                </Window>\r
-               <Window Type="TaharezLook/StaticText" Name="OSD/Altimeter" >\r
+               <Window Type="NavitGrey/StaticText" Name="OSD/AltimeterLabel" >\r
+                       <Property Name="Font" Value="DejaVuSans-12" />\r
+                       <Property Name="Text" Value="Alt." />\r
+                       <Property Name="HorzFormatting" Value="WordWrapCentred" />\r
+                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,148},{0,800},{0,176}}" />\r
+               </Window>\r
+               <Window Type="NavitGrey/StaticText" Name="OSD/Altimeter" >\r
                        <Property Name="Font" Value="DejaVuSans-14" />\r
                        <Property Name="HorzFormatting" Value="WordWrapCentred" />\r
-                       <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />\r
-                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,132},{0,800},{0,162}}" />\r
+                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,164},{0,800},{0,194}}" />\r
                </Window>\r
+               <Window Type="NavitGrey/StaticText" Name="OSD/Satellites" >\r
+                       <Property Name="Font" Value="DejaVuSans-12" />\r
+                       <Property Name="HorzFormatting" Value="WordWrapCentred" />\r
+                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,196},{0,800},{0,226}}" />\r
+               </Window>\r
+\r
+\r
+\r
                <Window Type="TaharezLook/LargeVerticalScrollbar" Name="OSD/Scrollbar1" >\r
                        <Property Name="PageSize" Value="0" />\r
                        <Property Name="OverlapSize" Value="0" />\r
@@ -60,13 +78,7 @@
                        <Property Name="ScrollPosition" Value="0" />\r
                        <Property Name="UnifiedMaxSize" Value="{{0.03,0},{1,0}}" />\r
                        <Property Name="UnifiedMinSize" Value="{{0.01,0},{0.1,0}}" />\r
-                       <Property Name="UnifiedAreaRect" Value="{{0,750},{0,200},{0,770},{0,350}}" />\r
-               </Window>\r
-               <Window Type="TaharezLook/StaticText" Name="OSD/Satellites" >\r
-                       <Property Name="Font" Value="DejaVuSans-12" />\r
-                       <Property Name="HorzFormatting" Value="WordWrapCentred" />\r
-                       <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />\r
-                       <Property Name="UnifiedAreaRect" Value="{{0,670},{0,164},{0,800},{0,194}}" />\r
+                       <Property Name="UnifiedAreaRect" Value="{{0,770},{0,300},{0,790},{0,450}}" />\r
                </Window>\r
 \r
        \r

diff --git a/navit/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel b/navit/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel
index f8e1483..dc64960 100755 (executable)
--- a/navit/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel
+++ b/navit/src/gui/sdl/datafiles/looknfeel/Mineque.looknfeel
@@ -154,7 +154,6 @@
                    </Layer>
            </StateImagery>
     </WidgetLook>
-    
 
     <WidgetLook name="NavitGrey/ViewModeSwitchButton">
            <PropertyDefinition name="NormalImage" initialValue="" redrawOnWrite="true" />
@@ -1279,6 +1278,7 @@
            </StateImagery>
     </WidgetLook>
 
+    <!-- this widget needs cleanup -->
     <WidgetLook name="NavitGrey/StaticText">
            <PropertyDefinition name="FrameColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" />
            <PropertyDefinition name="BackgroundColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" />
@@ -1442,17 +1442,17 @@
            <StateImagery name="Disabled" />
            <StateImagery name="EnabledFrame">
                    <Layer>
-                           <Section look="TaharezLook/StaticShared" section="frame" />
+                           <Section look="NavitGrey/StaticShared" section="frame" />
                    </Layer>
            </StateImagery>
            <StateImagery name="DisabledFrame">
                    <Layer>
-                           <Section look="TaharezLook/StaticShared" section="frame" />
+                           <Section look="NavitGrey/StaticShared" section="frame" />
                    </Layer>
            </StateImagery>
            <StateImagery name="WithFrameEnabledBackground">
                    <Layer>
-                           <Section look="TaharezLook/StaticShared" section="background" />
+                           <Section look="NavitGrey/StaticShared" section="background" />
                    </Layer>
            </StateImagery>
            <StateImagery name="WithFrameDisabledBackground">

diff --git a/navit/src/gui/sdl/datafiles/schemes/Mineque.scheme b/navit/src/gui/sdl/datafiles/schemes/Mineque.scheme
index edab828..3410189 100755 (executable)
--- a/navit/src/gui/sdl/datafiles/schemes/Mineque.scheme
+++ b/navit/src/gui/sdl/datafiles/schemes/Mineque.scheme
@@ -7,7 +7,7 @@
        <WindowRendererSet Filename="CEGUIFalagardWRBase" />
 
        <FalagardMapping WindowType="NavitGrey/StaticImage"      TargetType="DefaultWindow"  Renderer="Falagard/StaticImage"       LookNFeel="NavitGrey/StaticImage" />
-       <FalagardMapping WindowType="NavitGrey/StaticText"      TargetType="DefaultWindow"  Renderer="Falagard/StaticImage"       LookNFeel="NavitGrey/StaticText" />
+       <FalagardMapping WindowType="NavitGrey/StaticText"      TargetType="DefaultWindow"  Renderer="Falagard/StaticText"       LookNFeel="NavitGrey/StaticText" />
 
        <FalagardMapping WindowType="NavitGrey/ZoomInButton"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="NavitGrey/ZoomInButton" />
        <FalagardMapping WindowType="NavitGrey/ZoomOutButton"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="NavitGrey/ZoomOutButton" />