From e352fa10cf1984e3aa1372bd65c45567b6dc990e Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Sun, 28 Feb 2010 08:25:59 +0000 Subject: [PATCH] Add special image for bind keys --- Src/gui/bind_keys_menu.cpp | 4 ++-- Src/gui/gui.cpp | 5 +++++ Src/gui/gui.hh | 1 + themes/default/bind_key_box.png | Bin 0 -> 2201 bytes 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 themes/default/bind_key_box.png diff --git a/Src/gui/bind_keys_menu.cpp b/Src/gui/bind_keys_menu.cpp index b080c72..17254f3 100644 --- a/Src/gui/bind_keys_menu.cpp +++ b/Src/gui/bind_keys_menu.cpp @@ -456,10 +456,10 @@ public: SDL_BlitSurface(Gui::gui->main_menu_bg, NULL, where, &dst); dst = (SDL_Rect){350,13,0,0}; - SDL_BlitSurface(Gui::gui->disc_info, NULL, where, &dst); + SDL_BlitSurface(Gui::gui->bind_key_box, NULL, where, &dst); this->menu->draw(where, 50, 70, 300, 400); - this->help->draw(where, 354, 24, 264, 210); + this->help->draw(where, 358, 28, 264, 210); } protected: diff --git a/Src/gui/gui.cpp b/Src/gui/gui.cpp index 83ada5f..b9ca203 100644 --- a/Src/gui/gui.cpp +++ b/Src/gui/gui.cpp @@ -87,6 +87,7 @@ Gui::Gui() this->default_font = NULL; this->dialogue_bg = NULL; this->network_info = NULL; + this->bind_key_box = NULL; this->small_font = NULL; this->n_views = 0; @@ -155,6 +156,7 @@ Gui::~Gui() SDL_FreeSurface(this->bg_submenu_right); SDL_FreeSurface(this->background); SDL_FreeSurface(this->main_menu_bg); + SDL_FreeSurface(this->bind_key_box); SDL_FreeSurface(this->infobox); SDL_FreeSurface(this->dialogue_bg); SDL_FreeSurface(this->disc_info); @@ -188,6 +190,7 @@ bool Gui::setTheme(const char *path) this->dialogue_bg = this->loadThemeImage(path, "dialogue_box.png"); this->disc_info = this->loadThemeImage(path, "disc_info.png"); this->network_info = this->loadThemeImage(path, "network_info.png"); + this->bind_key_box = this->loadThemeImage(path, "bind_key_box.png"); this->highlighted_key = this->loadThemeImage(path, "highlighted_key.png"); this->selected_key = this->loadThemeImage(path, "selected_key.png"); @@ -203,6 +206,7 @@ bool Gui::setTheme(const char *path) !this->selected_key || !this->highlighted_key || !this->status_bar_bg || + !this->bind_key_box || !this->network_info || !this->default_font || !this->small_font) @@ -222,6 +226,7 @@ bool Gui::setTheme(const char *path) SDL_FreeSurface(this->network_message_box); SDL_FreeSurface(this->selected_key); SDL_FreeSurface(this->keyboard); + SDL_FreeSurface(this->bind_key_box); SDL_FreeSurface(this->highlighted_key); SDL_FreeSurface(this->status_bar_bg); diff --git a/Src/gui/gui.hh b/Src/gui/gui.hh index cfcbcbd..84a8aca 100644 --- a/Src/gui/gui.hh +++ b/Src/gui/gui.hh @@ -88,6 +88,7 @@ public: SDL_Surface *main_menu_bg; SDL_Surface *status_bar_bg; SDL_Surface *infobox; + SDL_Surface *bind_key_box; SDL_Surface *network_message_box; SDL_Surface *keyboard; SDL_Surface *dialogue_bg; diff --git a/themes/default/bind_key_box.png b/themes/default/bind_key_box.png new file mode 100644 index 0000000000000000000000000000000000000000..dac041ddc41d29116a3ffe39db1cf95e086501aa GIT binary patch literal 2201 zcmeAS@N?(olHy`uVBq!ia0y~yU=#r2GaPI{5!r9w9f1^Mage(c!@6@aFM%AkByV>Y zhW{YAVDIwDKoQOYkH}&M25w;xW@MN(M*=9wUgGKN%6^lFmy1K}|I-W+ppayVYeb22 zer|4RUI~M9QEFmIYKlU6W=V#EyQgnJcq5-UP}>(z7srr_TW{}f^b5(9Ireb6arQ&8 zXbG zd%8`E;S9Lmu5#P+o?4{urb$mqC#~Id_h&^^{gDfvY)iJ9MXN~q8qG{mJIQ-p*6&W* zq;$_|lXIrLJ@>p=bi%b;Z?39b_7scp{_*VDBpdzPbIa4M6xMFNIotEu*0z!{-4}z9^8@k`?Rdecm5l$B~{Viu4lbuj?v-vl>7R5TmIXI zkms`9g#ldRH-jdv-1S^(D^t+XWXqGXpIf=#r%pO)C20ALXUVN?I$i8MJ=UILtFQmN z&Z=_PnE$qzgiiVD>vf-XeM*gXXG}BLu9gZ)DLOchD3u=<^Ip6GvO`1PfB;=9dR zjK50vdVF`h&hU3vsLD(O_63cdN+)+%GVu0@dmcN(n31r?!zhW*fmzvglJ+wOlMl{` zY!1%%IXN!OXkcJs;^0tFXlP)7QXoE%2N6cdGBJS_p~xa@g3Br>AT$l6k%Pq@@USE+ zw8+wgh=9QoYlFodlqEMd$uzLViFu`U4?)@z*_l*8m-x3ewzbYV_|RqhXehf`(g*7qhdew)4e)`Z7l z3Z9=#PF5Q;uM)F)`<3688ED@8Nq5Z56;8fg#rc&f$Th|Gf3tcyNa@U(!&R>i+SX9?z_$ueR1NSvYs@+~oS;?A&ibyXNoPoxHB#;a(r3${Rb~ z_iInM>wMKyTTr57s{7iCD|{#Bb=>JT7TmEyY|@?8(*3uhXUIj*`t2!pR$8xTU`ME#U7%exfohdG4vH4-eA5-l