[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.12,1.13 editor.cxx,1.46,1.47 object_manager.cxx,1.42,1.43 panel_icons.cxx,1.7,1.8 property_window.cxx,1.14,1.15 thumb_cache.cxx,1.11,1.12

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv23041/src/editor

Modified Files:
        action_window.cxx editor.cxx object_manager.cxx 
        panel_icons.cxx property_window.cxx thumb_cache.cxx 
Log Message:
finished the menu background

Index: action_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/action_window.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- action_window.cxx   28 Nov 2002 20:09:54 -0000      1.12
+++ action_window.cxx   28 Mar 2003 12:06:32 -0000      1.13
@@ -77,7 +77,7 @@
 void
 ActionWindow::show ()
 {
-  std::cout << "show" << std::endl;
+  //std::cout << "show" << std::endl;
   read_data ();
   window->show (true);
 }
@@ -85,14 +85,14 @@
 void
 ActionWindow::hide ()
 {
-  std::cout << "hide" << std::endl;
+  //std::cout << "hide" << std::endl;
   window->show (false);
 }
 
 void 
 ActionWindow::ok_clicked ()
 {
-  std::cout << "OK Clicked" << std::endl;
+  //std::cout << "OK Clicked" << std::endl;
   write_data ();
   hide ();
 }
@@ -100,7 +100,7 @@
 void
 ActionWindow::cancel_clicked ()
 {
-  std::cout << "Cancel Clicked" << std::endl;
+  //std::cout << "Cancel Clicked" << std::endl;
   hide ();
 }
 
@@ -123,7 +123,7 @@
 void
 ActionWindow::read_data ()
 {
-  std::cout << "Reading data" << std::endl;
+  //std::cout << "Reading data" << std::endl;
   for (unsigned int i = 0; i <  default_actions.size(); ++i)
     {
       std::vector<ActionData>::iterator act = std::find_if (actions->begin (), 
actions->end (),
@@ -144,7 +144,7 @@
 void
 ActionWindow::write_data ()
 {
-  std::cout << "Writing data" << std::endl;
+  //std::cout << "Writing data" << std::endl;
 
   for (unsigned int i = 0; i < default_actions.size(); ++i)  
     {

Index: editor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- editor.cxx  19 Feb 2003 09:50:36 -0000      1.46
+++ editor.cxx  28 Mar 2003 12:06:32 -0000      1.47
@@ -152,7 +152,6 @@
   // FIXME: This should be moved to the object manager
   if (tmp_selection != selection->get_objects())
     {
-      std::cout << "Exit: Selection changed" << std::endl;
       tmp_selection = selection->get_objects();
 
       // FIXME: dirty hack, should only be called if the selection changed

Index: object_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- object_manager.cxx  4 Mar 2003 12:53:47 -0000       1.42
+++ object_manager.cxx  28 Mar 2003 12:06:32 -0000      1.43
@@ -143,7 +143,7 @@
 
   std::stable_sort(editor_objs.begin (), editor_objs.end (), 
EditorObj_z_pos_sorter);
 
-  std::cout << "Reading props" << std::endl;
+  //std::cout << "Reading props" << std::endl;
   description = plf->get_description();
   levelname   = plf->get_levelname();
   level_time  = plf->get_time();

Index: panel_icons.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel_icons.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- panel_icons.cxx     18 Feb 2003 10:30:31 -0000      1.7
+++ panel_icons.cxx     28 Mar 2003 12:06:32 -0000      1.8
@@ -65,7 +65,7 @@
 
 PanelIconDelete::PanelIconDelete()
 {
-  tooltip = _("Delete marked objects");
+  tooltip = _("Delete marked objects (delete");
   sur = PingusResource::load_surface("editor/delete", "core");
 }
 
@@ -197,7 +197,7 @@
 
 PanelIconHelp::PanelIconHelp ()
 {
-  tooltip = _("Display Help Screen");
+  tooltip = _("Display Help Screen (F1)");
   sur = PingusResource::load_surface("editor/help", "core");
 }
 

Index: property_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_window.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- property_window.cxx 30 Nov 2002 17:11:55 -0000      1.14
+++ property_window.cxx 28 Mar 2003 12:06:32 -0000      1.15
@@ -54,7 +54,7 @@
 {
   if (current_frame)
     { // Clean up the old frame
-      std::cout << "PropertyWindow::update_frame: cleanup" << std::endl;
+      //std::cout << "PropertyWindow::update_frame: cleanup" << std::endl;
       get_client_area ()->remove_child (current_frame);
       delete current_frame;
       current_frame = 0;
@@ -64,7 +64,7 @@
     { // current object provides a GUI
       set_title(current_frame->get_title ());
       label.show (false);
-      std::cout << "Got GUI" << std::endl;
+      //std::cout << "Got GUI" << std::endl;
       set_client_size (current_frame->get_width () + 1, 
                        current_frame->get_height () + 40);
       close_button.set_position(110, current_frame->get_height () +  10);
@@ -73,7 +73,7 @@
     {
       label.show (true);
       set_title("Property Dialog");
-      std::cout << "No GUI" << std::endl;
+      //std::cout << "No GUI" << std::endl;
       set_client_size (200, 50);
       close_button.set_position(110, 20);
     }

Index: thumb_cache.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/thumb_cache.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- thumb_cache.cxx     14 Oct 2002 11:15:15 -0000      1.11
+++ thumb_cache.cxx     28 Mar 2003 12:06:32 -0000      1.12
@@ -51,7 +51,8 @@
 {
   CL_Surface sur = PingusResource::load_surface (res_ident, datafile);
 
-  pout << "ThumbCache: Loading: " << res_ident << " (" << datafile << ")"  << 
std::endl;
+  if (maintainer_mode)
+    pout << "ThumbCache: Loading: " << res_ident << " (" << datafile << ")"  
<< std::endl;
   
   // Add object to cache
   return ThumbCache::cache (sur, res_ident, datafile);
@@ -129,8 +130,9 @@
       && sur.get_provider ()->get_width () < 50)
     {
       // If the image is smaller than the thumbnail, there is no need to cache 
it
-      pout << "ThumbCache: image too small for cache: " << res_ident << 
std::endl;
-      std::cout << "ThumbCache: image too small for cache: " << res_ident << 
std::endl;
+      if (maintainer_mode)
+        pout << "ThumbCache: image too small for cache: " << res_ident << 
std::endl;
+      
       return sur;
     }
     
@@ -144,8 +146,9 @@
 
   unsigned int timestamp = PingusResource::get_mtime (res_ident, datafile);
 
-  pout << "ThumbCache: Writing cache file: " << filename 
-       << " timestamp: " << timestamp << std::endl;
+  if (maintainer_mode)
+    pout << "ThumbCache: Writing cache file: " << filename 
+         << " timestamp: " << timestamp << std::endl;
   
   try 
     {