[Orxonox-commit 1234] r5952 - in code/branches/menu: . data/gui/schemes

[cmueri at orxonox.net]

Author: cmueri
Date: 2009-10-14 14:50:04 +0200 (Wed, 14 Oct 2009)
New Revision: 5952

Modified:
   code/branches/menu/
   code/branches/menu/data/gui/schemes/OrxonoxGUIScheme.scheme
   code/branches/menu/data/gui/schemes/TaharezLookWidgetAliases.scheme
Log:
reapplying changes made to trunk (5951)



Property changes on: code/branches/menu
___________________________________________________________________
Modified: svn:mergeinfo
   - /code/branches/core5:5768-5928
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/resource2:3372-5694
code/branches/buildsystem:1874-2276,2278-2400
code/branches/buildsystem2:2506-2658
code/branches/buildsystem3:2662-2708
code/branches/ceguilua:1802-1808
code/branches/core3:1572-1739
code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
code/branches/gametypes:2826-3031
code/branches/gcc43:1580
code/branches/gui:1635-1723,2795-2894
code/branches/input:1629-1636
code/branches/lodfinal:2372-2411
code/branches/map:2801-3086,3089
code/branches/miniprojects:2754-2824
code/branches/netp2:2835-2988
code/branches/netp3:2988-3082
code/branches/netp6:3214-3302
code/branches/network:2356
code/branches/network64:2210-2355
code/branches/objecthierarchy:1911-2085,2100,2110-2169
code/branches/objecthierarchy2:2171-2479
code/branches/overlay:2117-2385
code/branches/particles:2829-3085
code/branches/pch:3113-3194
code/branches/physics:1912-2055,2107-2439
code/branches/physics_merge:2436-2457
code/branches/pickups:1926-2086,2127,2827-2915
code/branches/pickups2:2107-2497,2915-3071
code/branches/presentation:2369-2652,2654-2660
code/branches/questsystem:1894-2088
code/branches/questsystem2:2107-2259
code/branches/questsystem5:2776-2905
code/branches/resource:3327-3366
code/branches/script_trigger:1295-1953,1955
code/branches/sound:2829-3010
code/branches/weapon:1925-2094
code/branches/weapon2:2107-2488
code/branches/weapons:2897-3051
code/branches/weaponsystem:2742-2890
   + /code/branches/core5:5768-5928
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/resource2:3372-5694
/code/trunk:5951
code/branches/buildsystem:1874-2276,2278-2400
code/branches/buildsystem2:2506-2658
code/branches/buildsystem3:2662-2708
code/branches/ceguilua:1802-1808
code/branches/core3:1572-1739
code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
code/branches/gametypes:2826-3031
code/branches/gcc43:1580
code/branches/gui:1635-1723,2795-2894
code/branches/input:1629-1636
code/branches/lodfinal:2372-2411
code/branches/map:2801-3086,3089
code/branches/miniprojects:2754-2824
code/branches/netp2:2835-2988
code/branches/netp3:2988-3082
code/branches/netp6:3214-3302
code/branches/network:2356
code/branches/network64:2210-2355
code/branches/objecthierarchy:1911-2085,2100,2110-2169
code/branches/objecthierarchy2:2171-2479
code/branches/overlay:2117-2385
code/branches/particles:2829-3085
code/branches/pch:3113-3194
code/branches/physics:1912-2055,2107-2439
code/branches/physics_merge:2436-2457
code/branches/pickups:1926-2086,2127,2827-2915
code/branches/pickups2:2107-2497,2915-3071
code/branches/presentation:2369-2652,2654-2660
code/branches/questsystem:1894-2088
code/branches/questsystem2:2107-2259
code/branches/questsystem5:2776-2905
code/branches/resource:3327-3366
code/branches/script_trigger:1295-1953,1955
code/branches/sound:2829-3010
code/branches/weapon:1925-2094
code/branches/weapon2:2107-2488
code/branches/weapons:2897-3051
code/branches/weaponsystem:2742-2890

Modified: code/branches/menu/data/gui/schemes/OrxonoxGUIScheme.scheme
===================================================================
--- code/branches/menu/data/gui/schemes/OrxonoxGUIScheme.scheme	2009-10-14 12:41:28 UTC (rev 5951)
+++ code/branches/menu/data/gui/schemes/OrxonoxGUIScheme.scheme	2009-10-14 12:50:04 UTC (rev 5952)
@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <GUIScheme Name="OrxonoxGUI">
-    <Imageset Name="MainMenuBackground" Filename="MainMenuBackground.imageset" ResourceGroup="General"/>
+    <Imageset Name="MainMenuBackground" Filename="MainMenuBackground.imageset"/>
 </GUIScheme>

Modified: code/branches/menu/data/gui/schemes/TaharezLookWidgetAliases.scheme
===================================================================
--- code/branches/menu/data/gui/schemes/TaharezLookWidgetAliases.scheme	2009-10-14 12:41:28 UTC (rev 5951)
+++ code/branches/menu/data/gui/schemes/TaharezLookWidgetAliases.scheme	2009-10-14 12:50:04 UTC (rev 5952)
@@ -25,7 +25,7 @@
 	<WindowAlias Alias="Taharez StaticImage" Target="TaharezLook/StaticImage" />
 	<WindowAlias Alias="Taharez StaticText" Target="TaharezLook/StaticText" />
 	<WindowAlias Alias="Taharez Tab Button" Target="TaharezLook/TabButton" />
-	<WindowAlias Alias="Taharez Tab Pane" Target="TaharezLook/TabPane" />
+	<WindowAlias Alias="Taharez Tab Pane" Target="TaharezLook/TabContentPane" />
 	<WindowAlias Alias="Taharez Tab Control" Target="TaharezLook/TabControl" />
 	<WindowAlias Alias="Taharez Titlebar" Target="TaharezLook/Titlebar" />
 	<WindowAlias Alias="Taharez VertScrollbar" Target="TaharezLook/LargeVerticalScrollbar" />