diff options
author | Stijn Buys <ingar@osirion.org> | 2010-10-25 12:40:53 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2010-10-25 12:40:53 +0000 |
commit | 787002ec11bf41bba01b899c53a38830768fc260 (patch) | |
tree | 5a4b4e60617b0167a9e32a3882342a85f0fde4ab /src/ui/ui.h | |
parent | 6a86e7f0f9e021498c1df44653a42643bd79dfbf (diff) |
directory prefix is no required for ini files, merge ui.ini and menu.ini
Diffstat (limited to 'src/ui/ui.h')
-rw-r--r-- | src/ui/ui.h | 14 |
1 files changed, 4 insertions, 10 deletions
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; |