[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.11,1.12 editor.cxx,1.39,1.40 editor.hxx,1.21,1.22 editor_event.cxx,1.40,1.41 editorobj.cxx,1.5,1.6 editorobj.hxx,1.17,1.18 editorobj_group.hxx,1.12,1.13 panel_icons.cxx,1.5,1.6 property_frame.hxx,1.6,1.7 property_window.cxx,1.10,1.11 property_window.hxx,1.8,1.9 start_pos.hxx,1.8,1.9 weather_obj.hxx,1.10,1.11

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv16949/editor

Modified Files:
        action_window.cxx editor.cxx editor.hxx editor_event.cxx 
        editorobj.cxx editorobj.hxx editorobj_group.hxx 
        panel_icons.cxx property_frame.hxx property_window.cxx 
        property_window.hxx start_pos.hxx weather_obj.hxx 
Log Message:
- fixed GUI dialogs


Index: action_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/action_window.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- action_window.cxx   2 Nov 2002 19:03:40 -0000       1.11
+++ action_window.cxx   28 Nov 2002 20:09:54 -0000      1.12
@@ -36,6 +36,9 @@
  [    ok     ]  [  cancel  ]
 ****************************/
 
+// FIXME: [+][-] buttons are missing, need an own widget, anybody
+// FIXME: wants to write that?
+
 using namespace Actions;
 
 namespace EditorNS {

Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- editor.cxx  5 Nov 2002 03:02:48 -0000       1.39
+++ editor.cxx  28 Nov 2002 20:09:54 -0000      1.40
@@ -144,13 +144,15 @@
 void
 Editor::update (const GameDelta&)
 {
+  // Check if the current selection is different then the last one and
+  // update the property window if necesarry
   // 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
+      // FIXME: dirty hack, should only be called if the selection changed
       if (selection->size() == 1)
        {
          EditorObj* obj = selection->get_current_obj();

Index: editor.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.hxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- editor.hxx  5 Nov 2002 03:02:48 -0000       1.21
+++ editor.hxx  28 Nov 2002 20:09:54 -0000      1.22
@@ -127,6 +127,8 @@
 
   void on_startup ();
   void on_shutdown ();
+
+  EditorNS::PropertyWindow* get_property_window () { return property_window; }
   
 private:
   Editor (const Editor&);

Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- editor_event.cxx    16 Oct 2002 00:25:27 -0000      1.40
+++ editor_event.cxx    28 Nov 2002 20:09:54 -0000      1.41
@@ -101,7 +101,7 @@
 void
 EditorEvent::on_button_press(CL_InputDevice *device, const CL_Key& key)
 {
-  std::cout << "EditorEvent::on_button_press: " << is_enabled << std::endl;
+  //std::cout << "EditorEvent::on_button_press: " << is_enabled << std::endl;
 
   if (!accept_input ())
     return;
@@ -356,7 +356,7 @@
 void
 EditorEvent::on_button_release(CL_InputDevice *device, const CL_Key &key)
 {
-  std::cout << "EditorEvent::on_button_release: " << is_enabled << std::endl;
+  //std::cout << "EditorEvent::on_button_release: " << is_enabled << std::endl;
 
   if (!accept_input ())
     return;

Index: editorobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- editorobj.cxx       11 Sep 2002 12:45:58 -0000      1.5
+++ editorobj.cxx       28 Nov 2002 20:09:54 -0000      1.6
@@ -35,10 +35,4 @@
   return "EditorObj::status_line(): Not implemented";
 }
 
-EditorNS::PropertyFrame*
-EditorObj::get_gui_dialog (EditorNS::Editor*)
-{
-  return 0;
-}
-
 /* EOF */

Index: editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- editorobj.hxx       28 Sep 2002 11:52:23 -0000      1.17
+++ editorobj.hxx       28 Nov 2002 20:09:54 -0000      1.18
@@ -118,7 +118,7 @@
       responsible for deleting the object after usage. The
       CL_Component* should/must be a CL_Frame so that it can get
       embedded in the properties window */
-  virtual EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent);
+  virtual EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent) 
=0;
   
 protected:
   EditorObj (const EditorObj&) { }

Index: editorobj_group.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- editorobj_group.hxx 28 Sep 2002 11:52:23 -0000      1.12
+++ editorobj_group.hxx 28 Nov 2002 20:09:54 -0000      1.13
@@ -57,6 +57,7 @@
 
   unsigned int size () { return objs.size (); }
   
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
 private:
   EditorObjGroup (const EditorObjGroup&);
   EditorObjGroup& operator= (const EditorObjGroup&);

Index: panel_icons.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel_icons.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- panel_icons.cxx     11 Sep 2002 12:45:58 -0000      1.5
+++ panel_icons.cxx     28 Nov 2002 20:09:54 -0000      1.6
@@ -89,7 +89,7 @@
 
 PanelIconLevelProperties::PanelIconLevelProperties()
 {
-  tooltip = _("Edit Object Properties");
+  tooltip = _("Edit Level Properties");
   sur = PingusResource::load_surface("editor/edit", "core");  
 }
 
@@ -101,7 +101,7 @@
 
 PanelIconObjectProperties::PanelIconObjectProperties()
 {
-  tooltip = _("Edit Level Properties");
+  tooltip = _("Edit Object Properties");
   sur = PingusResource::load_surface("editor/preferences", "core");
 }
 

Index: property_frame.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_frame.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- property_frame.hxx  27 Sep 2002 11:26:45 -0000      1.6
+++ property_frame.hxx  28 Nov 2002 20:09:54 -0000      1.7
@@ -27,6 +27,7 @@
 
 namespace EditorNS {
 
+/** FIXME: Document Me */
 class PropertyFrame : public CL_Frame
 {
 public:

Index: property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- property_window.cxx 11 Sep 2002 12:45:58 -0000      1.10
+++ property_window.cxx 28 Nov 2002 20:09:54 -0000      1.11
@@ -40,7 +40,8 @@
 PropertyWindow::update_frame (EditorObj* obj)
 {
   if (current_frame)
-    {
+    { // Clean up the old frame
+      std::cout << "PropertyWindow::update_frame: cleanup" << std::endl;
       get_client_area ()->remove_child (current_frame);
       delete current_frame;
       current_frame = 0;

Index: property_window.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- property_window.hxx 27 Sep 2002 11:26:45 -0000      1.8
+++ property_window.hxx 28 Nov 2002 20:09:54 -0000      1.9
@@ -34,13 +34,20 @@
 class PropertyWindow : public CL_Window
 {
 private:
+  /** Pointer to the editor (FIXME: its actually a singleton, not really 
needed) */
   Editor* editor;
+  
+  /** Pointer to the frame of the current object */
   CL_Component* current_frame;
+
+  /** The empty frame that is shown when no object is selected */
   CL_Label label;
       
 public:
   PropertyWindow (Editor* parent);
 
+  /** Called once from the editor when the selection changed or if a
+      update() is called. */
   void update_frame (EditorObj*);
       
 private:

Index: start_pos.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/start_pos.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- start_pos.hxx       28 Sep 2002 11:52:24 -0000      1.8
+++ start_pos.hxx       28 Nov 2002 20:09:54 -0000      1.9
@@ -33,7 +33,8 @@
 
   virtual void write_xml(std::ostream& xml);
   virtual EditorObj* duplicate();
-  
+
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   StartPos (const StartPos&);
   StartPos& operator= (const StartPos&);

Index: weather_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/weather_obj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- weather_obj.hxx     28 Sep 2002 11:52:24 -0000      1.10
+++ weather_obj.hxx     28 Nov 2002 20:09:54 -0000      1.11
@@ -34,13 +34,14 @@
   WeatherObj (const std::string& type_);
   virtual ~WeatherObj();
 
-  virtual void drag ();
-  virtual void drop ();
-
-  virtual void draw (EditorNS::EditorView * view);
-  virtual void write_xml(std::ostream& xml);
-  virtual EditorObj* duplicate();
+  void drag ();
+  void drop ();
   
+  void draw (EditorNS::EditorView * view);
+  void write_xml(std::ostream& xml);
+  EditorObj* duplicate();
+
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
 private:
   WeatherObj (const WeatherObj&);
   WeatherObj& operator= (const WeatherObj&);