From ed8a36e6c93fa2b3c98d126d2f9134663e306dc3 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 4 Sep 2011 17:57:00 +0000
Subject: Moved menu definitions to a seperate ini file.

---
 base/ini/menu.ini | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 base/ini/ui.ini   | 121 ------------------------------------------------------
 2 files changed, 120 insertions(+), 121 deletions(-)
 create mode 100644 base/ini/menu.ini

diff --git a/base/ini/menu.ini b/base/ini/menu.ini
new file mode 100644
index 0000000..5370a32
--- /dev/null
+++ b/base/ini/menu.ini
@@ -0,0 +1,120 @@
+;
+; menu.ini
+; client menu definitions
+;
+
+;
+; main menu
+; ------------------------------------------------------------------
+
+[menu]
+label=main
+
+[label]
+text=Project::OSiRiON
+
+[button]
+text=New Game
+command=connect
+
+[button]
+text=Multiplayer
+command=connect osirion.org
+
+[button]
+text=Options
+command=menu options
+
+[button]
+text=Quit
+command=quit
+;
+; game menu
+; ------------------------------------------------------------------
+
+[menu] 
+label=game
+
+[label]
+text=Project::OSiRiON
+
+[button]
+text=Options
+command=menu options
+
+[button]
+text=Disconnect
+command=disconnect
+
+[button]
+text=Quit
+command=quit
+
+[button]
+text=Close menu
+command=menu hide
+
+;
+; join menu
+; ------------------------------------------------------------------
+
+[menu]
+label=join
+
+[label]
+text=Project::OSiRiON
+
+[button]
+text=Join
+; note: we use comma as command seperator in .ini files.
+command=join, menu hide
+
+[button]
+text=Disconnect
+command=disconnect
+
+[button]
+text=Main menu
+command=menu game
+
+;
+; options menu
+; ------------------------------------------------------------------
+
+[menu]
+label=options
+background=bitmaps/banner
+
+[label]
+text=Options
+
+[button]
+text=Toggle fullscreen
+command=toggle r_fullscreen
+align=left
+
+[button]
+text=Toggle grid
+command=toggle r_grid
+align=left
+
+[button]
+text=Toggle keypress
+command=toggle draw_keypress
+align=left
+
+[button]
+text=Toggle stats
+command=toggle draw_stats
+align=left
+
+[button]
+text=Toggle wireframe
+command=toggle r_wireframe
+align=left
+
+[button]
+text=Return
+text=Close menu
+align=center
+command=menu default
diff --git a/base/ini/ui.ini b/base/ini/ui.ini
index ed37a8b..4a5aa1b 100644
--- a/base/ini/ui.ini
+++ b/base/ini/ui.ini
@@ -44,124 +44,3 @@ fancy=0 1 0
 warning=1 1 0
 ; error text color
 error=1 0 0
-
-;
-; main menu
-; ------------------------------------------------------------------
-
-[menu]
-label=main
-; background bitmap
-background=bitmaps/banner
-
-[label]
-text=Main Menu
-
-[button]
-text=New Game
-command=connect
-
-[button]
-text=Multiplayer
-command=connect osirion.org
-
-[button]
-text=Options
-command=menu options
-
-[button]
-text=Quit
-command=quit
-
-;
-; options menu
-; ------------------------------------------------------------------
-
-[menu]
-label=options
-background=bitmaps/banner
-
-[label]
-text=Options
-
-[button]
-text=Toggle fullscreen
-command=toggle r_fullscreen
-align=left
-
-[button]
-text=Toggle grid
-command=toggle r_grid
-align=left
-
-[button]
-text=Toggle keypress
-command=toggle draw_keypress
-align=left
-
-[button]
-text=Toggle stats
-command=toggle draw_stats
-align=left
-
-[button]
-text=Toggle wireframe
-command=toggle r_wireframe
-align=left
-
-[button]
-text=Return
-command=menu previous
-align=center
-
-;
-; game menu
-; ------------------------------------------------------------------
-
-[menu] 
-label=game
-background=bitmaps/banner
-
-[label]
-text=Main Menu
-
-[button]
-text=Options
-command=menu options
-
-[button]
-text=Disconnect
-command=disconnect
-
-[button]
-text=Quit
-command=quit
-
-[button]
-text=Return
-command=menu hide
-
-;
-; join menu
-; ------------------------------------------------------------------
-
-[menu]
-label=join
-background=bitmaps/banner
-
-[label]
-text=Project::OSiRiON
-
-[button]
-text=Join
-; note: we use comma as command seperator in .ini files.
-command=join, menu hide
-
-[button]
-text=Disconnect
-command=disconnect
-
-[button]
-text=Main menu
-command=menu game
-
-- 
cgit v1.2.3