[Pingus-CVS] r3504 - trunk/pingus/src

[grumbel at BerliOS]

Author: grumbel
Date: 2007-11-09 09:50:20 +0100 (Fri, 09 Nov 2007)
New Revision: 3504

Modified:
   trunk/pingus/src/config_manager.cpp
   trunk/pingus/src/config_manager.hpp
   trunk/pingus/src/option_menu.cpp
Log:
- hooked up ConfigManager to OptionMenu, some debug std::cout added

Modified: trunk/pingus/src/config_manager.cpp
===================================================================
--- trunk/pingus/src/config_manager.cpp 2007-11-09 08:38:26 UTC (rev 3503)
+++ trunk/pingus/src/config_manager.cpp 2007-11-09 08:50:20 UTC (rev 3504)
@@ -23,11 +23,25 @@
 **  02111-1307, USA.
 */
 
+#include <iostream>
+#include "globals.hpp"
 #include "config_manager.hpp"
 
+ConfigManager config_manager;
+
+ConfigManager::ConfigManager()
+{
+}
+
+ConfigManager::~ConfigManager()
+{
+}
+
 void
 ConfigManager::set_master_volume(int v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_master_volume: " << v << std::endl;
 }
 
 int
@@ -39,6 +53,8 @@
 void
 ConfigManager::set_sound_volume(int v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_sound_volume: " << v << std::endl;
 }
 
 int
@@ -50,6 +66,8 @@
 void
 ConfigManager::set_music_volume(int v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_music_volume: " << v << std::endl;
 }
 
 int
@@ -61,6 +79,8 @@
 void
 ConfigManager::set_resolution(const Size& size)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_resolution: " << size.width << "x" << 
size.height << std::endl;
 }
 
 Size
@@ -70,8 +90,10 @@
 }
 
 void
-ConfigManager::set_fullscreen(bool)
+ConfigManager::set_fullscreen(bool v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_fullscreen: " << v << std::endl;
 }
 
 bool
@@ -81,8 +103,10 @@
 }
 
 void
-ConfigManager::set_allow_resize(bool)
+ConfigManager::set_allow_resize(bool v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_allow_resize: " << v << std::endl;
 }
 
 bool
@@ -92,8 +116,10 @@
 }
 
 void
-ConfigManager::set_fast_mode(bool)
+ConfigManager::set_fast_mode(bool v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_fast_mode: " << v << std::endl;
 }
 
 bool
@@ -103,8 +129,10 @@
 }
 
 void
-ConfigManager::set_mouse_grab(bool)
+ConfigManager::set_mouse_grab(bool v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_mouse_grab: " << v << std::endl;
 }
 
 bool
@@ -114,8 +142,10 @@
 }
 
 void
-ConfigManager::set_print_fps(bool)
+ConfigManager::set_print_fps(bool v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_print_fps: " << v << std::endl;
 }
 
 bool
@@ -125,8 +155,10 @@
 }
 
 void
-ConfigManager::set_language(const std::string&)
+ConfigManager::set_language(const std::string& v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_language: '" << v << "'" << std::endl;
 }
 
 std::string
@@ -136,8 +168,10 @@
 }
 
 void
-ConfigManager::set_swcursor(bool)
+ConfigManager::set_swcursor(bool v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_swcursor: " << v << std::endl;
 }
 
 bool
@@ -147,8 +181,10 @@
 }
 
 void
-ConfigManager::set_autoscroll(bool)
+ConfigManager::set_autoscroll(bool v)
 {
+  if (maintainer_mode)
+    std::cout << "ConfigManager::set_autoscroll: " << v << std::endl;
 }
 
 bool

Modified: trunk/pingus/src/config_manager.hpp
===================================================================
--- trunk/pingus/src/config_manager.hpp 2007-11-09 08:38:26 UTC (rev 3503)
+++ trunk/pingus/src/config_manager.hpp 2007-11-09 08:50:20 UTC (rev 3504)
@@ -88,6 +88,8 @@
   ConfigManager& operator= (const ConfigManager&);
 };
 
+extern ConfigManager config_manager;
+
 #endif
 
 /* EOF */

Modified: trunk/pingus/src/option_menu.cpp
===================================================================
--- trunk/pingus/src/option_menu.cpp    2007-11-09 08:38:26 UTC (rev 3503)
+++ trunk/pingus/src/option_menu.cpp    2007-11-09 08:50:20 UTC (rev 3504)
@@ -19,6 +19,7 @@
 
 #include <set>
 #include <boost/bind.hpp>
+#include "config_manager.hpp"
 #include "globals.hpp"
 #include "gettext.h"
 #include "resource.hpp"
@@ -189,58 +190,55 @@
 void
 OptionMenu::on_swcursor_change(bool v)
 {
-  swcursor_enabled = v;
+  config_manager.set_swcursor(v);
 }
 
 void
 OptionMenu::on_fullscreen_change(bool v)
 {
-  fullscreen_enabled = v;
+  config_manager.set_fullscreen(v);
 }
 
 void
 OptionMenu::on_autoscrolling_change(bool v)
 {
-  auto_scrolling = v;
+  config_manager.set_autoscroll(v);
 }
 
 void
 OptionMenu::on_fastmode_change(bool v)
 {
+  config_manager.set_fast_mode(v);
 }
 
 void
 OptionMenu::on_mousegrab_change(bool v)
 {
-  // do stuff
+  config_manager.set_mouse_grab(v);
 }
 
 void
 OptionMenu::on_printfps_change(bool v)
 {
-  //fps_counter.toggle_display();
-  std::cout << "PrintFPS: " << print_fps << std::endl;
+  config_manager.set_print_fps(v);
 }
 
 void
 OptionMenu::on_master_volume_change(int v)
 {
-  if (maintainer_mode)
-    std::cout << "Master volume change: " << v << std::endl;
+  config_manager.set_master_volume(v);
 }
 
 void
 OptionMenu::on_sound_volume_change(int v)
 {
-  if (maintainer_mode)
-    std::cout << "Sound volume change: " << v << std::endl;
+  config_manager.set_sound_volume(v);
 }
 
 void
 OptionMenu::on_music_volume_change(int v)
 {
-  if (maintainer_mode)
-    std::cout << "Music volume change: " << v << std::endl;
+  config_manager.set_music_volume(v);
 }
 
 /* EOF */