[gnue] r8095 - in trunk/gnue-designer/src/reports: . Char Standard

[btami]

Author: btami
Date: 2005-11-11 12:27:31 -0600 (Fri, 11 Nov 2005)
New Revision: 8095

Added:
   trunk/gnue-designer/src/reports/Standard/LayoutEditor.py
Removed:
   trunk/gnue-designer/src/reports/LayoutEditor.py
Modified:
   trunk/gnue-designer/src/reports/Char/LayoutEditor.py
   trunk/gnue-designer/src/reports/Instance.py
   trunk/gnue-designer/src/reports/Standard/FilterSupport.py
Log:
more work on reports support

Modified: trunk/gnue-designer/src/reports/Char/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/reports/Char/LayoutEditor.py        2005-11-08 
10:46:18 UTC (rev 8094)
+++ trunk/gnue-designer/src/reports/Char/LayoutEditor.py        2005-11-11 
18:27:31 UTC (rev 8095)
@@ -73,7 +73,7 @@
   def onModifyObject (self, event):
     object = event.object
     handler = event.originator
-    modifications = event.modifications
+#    modifications = event.modifications
 
   def onDeleteObject (self, event):
     object = event.object

Modified: trunk/gnue-designer/src/reports/Instance.py
===================================================================
--- trunk/gnue-designer/src/reports/Instance.py 2005-11-08 10:46:18 UTC (rev 
8094)
+++ trunk/gnue-designer/src/reports/Instance.py 2005-11-11 18:27:31 UTC (rev 
8095)
@@ -82,6 +82,7 @@
       usingDefault = 1
 
     self.filter = filtersupport.FilterSupport(self, report)
+    print self.filter
     if usingDefault:
       self.filter.setNamespace(namespace)
 
@@ -112,6 +113,7 @@
       usingDefault = 1
 
     self.filter = filtersupport.FilterSupport(self, report)
+    print self.filter
 
     if usingDefault:
       self.filter.setNamespace(namespace)

Deleted: trunk/gnue-designer/src/reports/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/reports/LayoutEditor.py     2005-11-08 10:46:18 UTC 
(rev 8094)
+++ trunk/gnue-designer/src/reports/LayoutEditor.py     2005-11-11 18:27:31 UTC 
(rev 8095)
@@ -1,73 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2002-2005 Free Software Foundation
-#
-# FILE:
-# reports/LayoutEditor.py
-#
-# DESCRIPTION:
-# The visual editor for Designer
-#
-# NOTES:
-#
-
-from wxPython.wx import *
-from gnue.designer.base.ToolBase import ToolBase
-
-class LayoutEditor (ToolBase):
-
-  def init(self):
-    self.panelColor = self.GetBackgroundColour()
-    self._instance = self.instance
-    self.rootObject = instance.rootObject
-    self._app = instance._app
-    self.rootObject.walk(self.inventoryObject)
-
-    # EventAware provided by ToolBase
-    self.registerEventListeners({
-                       'ObjectSelected'      : self.onSetCurrentObject,
-                       'ObjectCreated'       : self.onCreateObject,
-                       'ObjectModified'      : self.onModifyObject,
-                       'ObjectDeleted'       : self.onDeleteObject,
-                      })
-
-
-  def inventoryObject(self, object):
-    pass
-
-  def onSetCurrentObject (self, event):
-    object = event.object
-    handler = event.originator
-
-  def onCreateObject (self, event):
-    object = event.object
-    handler = event.originator
-
-  def onModifyObject (self, event):
-    object = event.object
-    handler = event.originator
-    modifications = event.modifications
-
-  def onDeleteObject (self, event):
-    object = event.object
-    handler = event.originator
-
-
-
-

Modified: trunk/gnue-designer/src/reports/Standard/FilterSupport.py
===================================================================
--- trunk/gnue-designer/src/reports/Standard/FilterSupport.py   2005-11-08 
10:46:18 UTC (rev 8094)
+++ trunk/gnue-designer/src/reports/Standard/FilterSupport.py   2005-11-11 
18:27:31 UTC (rev 8095)
@@ -28,6 +28,7 @@
 
 from gnue.designer.reports.FilterSupport import FilterSupport as 
_BaseFilterSupport
 from GroupEditor import GroupEditor
+from LayoutEditor import LayoutEditor
 from Incubator import Incubator as _Incubator
 
 class FilterSupport(_BaseFilterSupport):
@@ -51,8 +52,11 @@
   def addTools(self):
     self.instance.addToolSeparator()
     self.instance.addTool('groupEditor',   _('Group Editor'), GroupEditor, 
'F5')
+    self.instance.addTool('visualEditor',   _('Layout Editor'), LayoutEditor,
+                      hotkey='F11', menuGroup=301)
 
 
+
   def onCreateObject(self, event):
     pass
 

Added: trunk/gnue-designer/src/reports/Standard/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/reports/Standard/LayoutEditor.py    2005-11-08 
10:46:18 UTC (rev 8094)
+++ trunk/gnue-designer/src/reports/Standard/LayoutEditor.py    2005-11-11 
18:27:31 UTC (rev 8095)
@@ -0,0 +1,85 @@
+#
+# This file is part of GNU Enterprise.
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or (at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2002-2005 Free Software Foundation
+#
+# FILE:
+# reports/LayoutEditor.py
+#
+# DESCRIPTION:
+# The visual editor for Designer
+#
+# NOTES:
+#
+
+from wxPython.wx import *
+from gnue.designer.base.ToolBase import ToolBase
+from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
+
+
+class LayoutEditor (ToolBase):
+
+  runtime_section = "ReportsLayoutEditor"
+  default_dock = 'right-0'
+  uses_feedback_bar = 1
+  uses_toolbar = 0 #1
+
+  def init(self):
+    self.backcolor = wxWHITE
+    self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
+    self.panelColor = self.GetBackgroundColour()
+    self._instance = self.instance
+    self.rootObject = self.instance.rootObject
+    self._app = self.instance._app
+    self.rootObject.walk(self.inventoryObject)
+
+    # EventAware provided by ToolBase
+    self.registerEventListeners({
+                       'ObjectSelected'      : self.onSetCurrentObject,
+                       'ObjectCreated'       : self.onCreateObject,
+                       'ObjectModified'      : self.onModifyObject,
+                       'ObjectDeleted'       : self.onDeleteObject,
+                      })
+
+    EVT_SIZE(self, self.onSize)
+
+
+  def inventoryObject(self, object):
+    pass
+
+  def onSetCurrentObject (self, event):
+    object = event.object
+    handler = event.originator
+
+  def onCreateObject (self, event):
+    object = event.object
+    handler = event.originator
+
+  def onModifyObject (self, event):
+    object = event.object
+    handler = event.originator
+    modifications = event.modifications
+
+  def onDeleteObject (self, event):
+    object = event.object
+    handler = event.originator
+
+  def onSize(self, event):
+    x,y = self.GetClientSizeTuple()
+    self.panel.SetSize((x-12,y-12))
+