From bc4b4e4576bcb04b891f0e3b27a9c319e41222f6 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 15 Mar 2014 19:54:23 +0100 Subject: [PATCH] Menu windows in CEGUI --- interface/imagesets/button1.imageset | 11 +- interface/imagesets/button2.imageset | 2 + interface/layouts/mainmenu.layout | 104 ++++++++------- interface/layouts/multiplayer.layout | 42 +++--- interface/layouts/startgame.layout | 132 +++++++++--------- interface/looknfeel/colobot.looknfeel | 185 ++++++++++++++++++++++++++ interface/schemes/colobot.scheme | 4 +- 7 files changed, 345 insertions(+), 135 deletions(-) diff --git a/interface/imagesets/button1.imageset b/interface/imagesets/button1.imageset index 720cdf18..32590bd0 100644 --- a/interface/imagesets/button1.imageset +++ b/interface/imagesets/button1.imageset @@ -32,7 +32,16 @@ - + + + + + + + + + + diff --git a/interface/imagesets/button2.imageset b/interface/imagesets/button2.imageset index 4d054154..7ff54dad 100644 --- a/interface/imagesets/button2.imageset +++ b/interface/imagesets/button2.imageset @@ -40,4 +40,6 @@ + + diff --git a/interface/layouts/mainmenu.layout b/interface/layouts/mainmenu.layout index 1bffa9ba..23a026e1 100644 --- a/interface/layouts/mainmenu.layout +++ b/interface/layouts/mainmenu.layout @@ -1,61 +1,65 @@ - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/interface/layouts/multiplayer.layout b/interface/layouts/multiplayer.layout index 3e763d5a..2908e46f 100644 --- a/interface/layouts/multiplayer.layout +++ b/interface/layouts/multiplayer.layout @@ -1,28 +1,32 @@ - - - - - - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + - + diff --git a/interface/layouts/startgame.layout b/interface/layouts/startgame.layout index 447231dc..01583da6 100644 --- a/interface/layouts/startgame.layout +++ b/interface/layouts/startgame.layout @@ -1,77 +1,81 @@ - - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/interface/looknfeel/colobot.looknfeel b/interface/looknfeel/colobot.looknfeel index 1ec6dd85..41b9fba8 100644 --- a/interface/looknfeel/colobot.looknfeel +++ b/interface/looknfeel/colobot.looknfeel @@ -587,4 +587,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/interface/schemes/colobot.scheme b/interface/schemes/colobot.scheme index 8b19a804..13e64152 100644 --- a/interface/schemes/colobot.scheme +++ b/interface/schemes/colobot.scheme @@ -8,7 +8,7 @@ - + @@ -17,4 +17,6 @@ + +