[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3269 - in trunk/pingus: data/data data/images/core/menu sr
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3269 - in trunk/pingus: data/data data/images/core/menu src src/screen |
Date: |
Mon, 1 Oct 2007 06:24:20 +0200 |
Author: grumbel
Date: 2007-10-01 06:24:14 +0200 (Mon, 01 Oct 2007)
New Revision: 3269
Added:
trunk/pingus/data/images/core/menu/optionmenu.png
Modified:
trunk/pingus/data/data/core.res
trunk/pingus/src/global_event.cpp
trunk/pingus/src/option_menu.cpp
trunk/pingus/src/screen/screen_manager.cpp
trunk/pingus/src/screen/screen_manager.hpp
Log:
- some more look&feel testing of option menu
Modified: trunk/pingus/data/data/core.res
===================================================================
--- trunk/pingus/data/data/core.res 2007-10-01 00:55:05 UTC (rev 3268)
+++ trunk/pingus/data/data/core.res 2007-10-01 04:24:14 UTC (rev 3269)
@@ -347,6 +347,10 @@
(image-file "../images/core/menu/filedialog.png"))
(sprite
+ (name "optionmenu")
+ (image-file "../images/core/menu/optionmenu.png"))
+
+ (sprite
(name "folder")
(image-file "../images/core/menu/folder.png"))
Added: trunk/pingus/data/images/core/menu/optionmenu.png
===================================================================
(Binary files differ)
Property changes on: trunk/pingus/data/images/core/menu/optionmenu.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: trunk/pingus/src/global_event.cpp
===================================================================
--- trunk/pingus/src/global_event.cpp 2007-10-01 00:55:05 UTC (rev 3268)
+++ trunk/pingus/src/global_event.cpp 2007-10-01 04:24:14 UTC (rev 3269)
@@ -62,8 +62,8 @@
case SDLK_F5:
- //if
(!dynamic_cast<OptionMenu*>(&(ScreenManager::instance()->get_current_screen())))
- ScreenManager::instance()->push_screen(new OptionMenu(), true);
+ if
(!dynamic_cast<OptionMenu*>(ScreenManager::instance()->get_screen()))
+ ScreenManager::instance()->push_screen(new OptionMenu(), true);
break;
case SDLK_F12:
Modified: trunk/pingus/src/option_menu.cpp
===================================================================
--- trunk/pingus/src/option_menu.cpp 2007-10-01 00:55:05 UTC (rev 3268)
+++ trunk/pingus/src/option_menu.cpp 2007-10-01 04:24:14 UTC (rev 3269)
@@ -26,7 +26,7 @@
OptionMenu::OptionMenu()
{
- background = Resource::load_sprite("core/menu/filedialog");
+ background = Resource::load_sprite("core/menu/optionmenu");
ok_button = Resource::load_sprite("core/start/ok");
}
@@ -67,7 +67,7 @@
strs.push_back(OptionEntry("Frame Skip:", "<5>"));
strs.push_back(OptionEntry("Software Cursor:", "[X]"));
- int y = 130;
+ int y = 145;
for(std::vector<OptionEntry>::iterator i = strs.begin(); i != strs.end();
++i)
{
gc.print_left(Fonts::chalk_normal, 120, y += 32, i->left);
@@ -75,13 +75,14 @@
}
std::vector<OptionEntry> strs2;
- strs2.push_back(OptionEntry("Scroll Mode:", "<drag&drop>"));
strs2.push_back(OptionEntry("Language:", "<German>"));
strs2.push_back(OptionEntry("Master Volume:",
"[||||||||||||||||||||||||||||||]"));
strs2.push_back(OptionEntry("Sound Volume:",
"[||||||||||||||||||||||||||||||]"));
strs2.push_back(OptionEntry("Music Volume:",
"[||||||||||||||||||||||||||||||]"));
+ strs2.push_back(OptionEntry("Scroll Mode:", "<drag&drop>"));
+ strs2.push_back(OptionEntry("Mouse Grab:", "[X]"));
- y = 130;
+ y = 145;
for(std::vector<OptionEntry>::iterator i = strs2.begin(); i != strs2.end();
++i)
{
gc.print_left(Fonts::chalk_normal, gc.get_width()/2 + 32, y += 32,
i->left);
@@ -92,7 +93,8 @@
gc.print_center(Fonts::chalk_normal, gc.get_width()/2 + 225 + 30,
gc.get_height()/2 + 125 - 20, _("Close"));
gc.draw(ok_button, gc.get_width()/2 + 225, gc.get_height()/2 + 125);
- gc.print_center(Fonts::chalk_normal, gc.get_width()/2, gc.get_height()/2 +
180, "Reset to Defaults [ ]");
+ gc.print_center(Fonts::chalk_normal, gc.get_width()/2, gc.get_height()/2 +
160, "Reset to Defaults [ ]");
+ gc.print_left(Fonts::chalk_normal, gc.get_width()/2 - 280, gc.get_height()/2
+ 160, "Save [ ]");
}
void
Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2007-10-01 00:55:05 UTC (rev
3268)
+++ trunk/pingus/src/screen/screen_manager.cpp 2007-10-01 04:24:14 UTC (rev
3269)
@@ -299,7 +299,12 @@
Display::set_video_mode(size.width, size.height);
get_current_screen()->resize(size);
+}
+Screen*
+ScreenManager::get_screen()
+{
+ return get_current_screen().get();
}
void
Modified: trunk/pingus/src/screen/screen_manager.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.hpp 2007-10-01 00:55:05 UTC (rev
3268)
+++ trunk/pingus/src/screen/screen_manager.hpp 2007-10-01 04:24:14 UTC (rev
3269)
@@ -77,6 +77,9 @@
/** @return a pointer to the current Screen */
ScreenPtr& get_current_screen();
+ /** @return a pointer to the current Screen */
+ Screen* get_screen();
+
private:
void real_clear();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3269 - in trunk/pingus: data/data data/images/core/menu src src/screen,
grumbel at BerliOS <=