From 787002ec11bf41bba01b899c53a38830768fc260 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 25 Oct 2010 12:40:53 +0000 Subject: directory prefix is no required for ini files, merge ui.ini and menu.ini --- src/ui/ui.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/ui/ui.h') diff --git a/src/ui/ui.h b/src/ui/ui.h index c340eb8..c611a26 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -34,15 +34,6 @@ public: /// list meus void list_menus() const; - /// load menus from menu.ini - void load_menus(); - - /// load settings from ui.ini - void load_settings(); - - /// apply UI options to the render engine - void apply_render_options(); - /// make a window the active window void show_menu(const char *label); @@ -81,6 +72,9 @@ public: /// run a user interface frame void frame(); + /// load settings from ui.ini + void load_settings(); + /* -- fonts ------------------------------------------------ */ /// default small font @@ -121,7 +115,7 @@ protected: /// handle key release events virtual bool on_keyrelease(const int key, const unsigned int modifier); -private: +private: void draw_pointer(); Palette *ui_palette; -- cgit v1.2.3