gnue designer/src/ToolDock.py designer/src/form...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/16 16:21:26

Modified files:
        designer/src   : ToolDock.py 
        designer/src/forms: PropertyEditor.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
        reports        : setup.py 
        samples/tutorials/schema: librarian.gsd 

Log message:
        * Patches by btami for win32 support
        * More work on sample schema

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/ToolDock.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/PropertyEditor.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/setup.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/samples/tutorials/schema/librarian.gsd.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/designer/src/ToolDock.py
diff -c gnue/designer/src/ToolDock.py:1.2 gnue/designer/src/ToolDock.py:1.3
*** gnue/designer/src/ToolDock.py:1.2   Sat Nov 30 18:00:35 2002
--- gnue/designer/src/ToolDock.py       Mon Dec 16 16:21:26 2002
***************
*** 63,72 ****
  class MultiTooledPane(wxNotebook, ToolDock):
    def __init__(self, parent, instance):
      wxNotebook.__init__(self, parent, -1, style=wxCLIP_CHILDREN)
!     self.SetPadding(wxSize(0,0))
      ToolDock.__init__(self, parent, instance)
      font = self.GetFont()
!     font.SetPointSize(font.GetPointSize()-2)
      self.SetFont(font)
  
    def AddTool(self, title, baseclass, rootObject, instance):
--- 63,73 ----
  class MultiTooledPane(wxNotebook, ToolDock):
    def __init__(self, parent, instance):
      wxNotebook.__init__(self, parent, -1, style=wxCLIP_CHILDREN)
!     self.SetPadding(wxSize(4,4))
      ToolDock.__init__(self, parent, instance)
      font = self.GetFont()
!     font.SetWeight(wxBOLD)
! ##    font.SetPointSize(font.GetPointSize()-2)
      self.SetFont(font)
  
    def AddTool(self, title, baseclass, rootObject, instance):
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.53 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.54
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.53   Tue Dec 10 
18:44:49 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Mon Dec 16 
16:21:26 2002
***************
*** 56,61 ****
--- 56,64 ----
  
      # TODO: blah.... historical reasons
      self._instance = self.instance
+     
+     # TODO: this needs to go away... requires toolbar to be on main frame
+     self.frame = self.instance
  
      self._app = self.instance._app
      self.widgets = {}
Index: gnue/designer/src/forms/PropertyEditor.py
diff -c gnue/designer/src/forms/PropertyEditor.py:1.3 
gnue/designer/src/forms/PropertyEditor.py:1.4
*** gnue/designer/src/forms/PropertyEditor.py:1.3       Thu Dec 12 09:42:10 2002
--- gnue/designer/src/forms/PropertyEditor.py   Mon Dec 16 16:21:26 2002
***************
*** 33,39 ****
  from gnue.common import GDebug, GTypecast
  from gnue.designer.PropertyEditor import PropertyEditor as BasePropertyEditor
  from gnue.designer.PropertyEditor import InspectorPanel as BaseInspectorPanel
! from ToolPanel import *
  
  class PropertyEditor (BasePropertyEditor):
    def reset(self):
--- 33,39 ----
  from gnue.common import GDebug, GTypecast
  from gnue.designer.PropertyEditor import PropertyEditor as BasePropertyEditor
  from gnue.designer.PropertyEditor import InspectorPanel as BaseInspectorPanel
! from gnue.designer.ToolPanel import *
  
  class PropertyEditor (BasePropertyEditor):
    def reset(self):
Index: gnue/reports/setup.py
diff -c gnue/reports/setup.py:1.18 gnue/reports/setup.py:1.19
*** gnue/reports/setup.py:1.18  Fri Dec 13 04:24:04 2002
--- gnue/reports/setup.py       Mon Dec 16 16:21:26 2002
***************
*** 251,257 ****
                     "gnue.reports.adapters.filters.Labels.labels.formatters",
                     "gnue.reports.adapters.filters.SimpleTabulation",
                     "gnue.reports.adapters.filters.SimpleTabulation.tabulator",
!                    "gnue.reports.adapters.filters.SimpleTabulation.tabulator",
                     "gnue.reports.adapters.filters.MailMerge",
                     "gnue.reports.adapters.filters.MailMerge._merge",
                     "gnue.reports.adapters.filters.MailMerge.merge_latex",
--- 251,257 ----
                     "gnue.reports.adapters.filters.Labels.labels.formatters",
                     "gnue.reports.adapters.filters.SimpleTabulation",
                     "gnue.reports.adapters.filters.SimpleTabulation.tabulator",
!                    
"gnue.reports.adapters.filters.SimpleTabulation.tabulator.formatters",
                     "gnue.reports.adapters.filters.MailMerge",
                     "gnue.reports.adapters.filters.MailMerge._merge",
                     "gnue.reports.adapters.filters.MailMerge.merge_latex",
Index: gnue/samples/tutorials/schema/librarian.gsd
diff -c gnue/samples/tutorials/schema/librarian.gsd:1.1 
gnue/samples/tutorials/schema/librarian.gsd:1.2
*** gnue/samples/tutorials/schema/librarian.gsd:1.1     Wed Dec 11 01:45:25 2002
--- gnue/samples/tutorials/schema/librarian.gsd Mon Dec 16 16:21:26 2002
***************
*** 58,65 ****
          <index name="idx_titles_title" >
            <indexfield name="title"/>
          </index>
!         <index name="idx_titles_dewey" >
!           <indexfield name="dewey_reference"/>
          </index>
        </indexes>
      </table>
--- 58,65 ----
          <index name="idx_titles_title" >
            <indexfield name="title"/>
          </index>
!         <index name="idx_titles_call_number" >
!           <indexfield name="call_number_reference"/>
          </index>
        </indexes>
      </table>
***************
*** 133,159 ****
          </constraint>
        </constraints>
      </table>
    </tables>
  </schema>
- 
- Patrons
-   id
-   join_date
-   first_name
-   middle_name
-   last_name
-   address_1
-   address_2
-   address_3
-   city
-   province
-   postal_code
-   country
- 
- Fees
-   id
-   description
-   recurring
-   initial_fee
-   recurring_fee
-   max_fee
--- 133,168 ----
          </constraint>
        </constraints>
      </table>
+ 
+     <!--
+       *********************************
+          Patrons
+       *********************************
+     -->
+ 
+     <table name="patrons">
+       <fields>
+         <field name="id" type="key" defaultwith="serial" nullable="N"/>
+         <field name="first_name" type="string" length="20"/>
+         <field name="last_name" type="string" length="20"/>
+         <field name="address_1" type="string" length="40"/>
+         <field name="address_2" type="string" length="40"/>
+         <field name="address_3" type="string" length="40"/>
+         <field name="city" type="string" length="25"/>
+         <field name="state" type="string" length="2"/>
+         <field name="postal_code" type="string" length="10"/>
+         <field name="country" type="string" length="3"/>
+         <field name="identification_type" type="key"/>
+         <field name="identification_no" type="string" length="20"/>
+       </fields>
+       <primarykey name="pk_sections_id">
+         <pkfield name="id"/>
+       </primarykey>
+       <constraints>
+         <constraint type="unique" name="uq_sections_description">
+           <constraintfield name="description"/>
+         </constraint>
+       </constraints>
+     </table>
    </tables>
  </schema>