commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue forms/src/GFParser.py forms/src/GFObjects/...


From: Jason Cater
Subject: gnue forms/src/GFParser.py forms/src/GFObjects/...
Date: Fri, 06 Jun 2003 20:52:37 -0400

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jason Cater <address@hidden>    03/06/06 20:52:37

Modified files:
        forms/src      : GFParser.py 
        forms/src/GFObjects: GFLayout.py 
        common/src/datasources: GDataSource.py 
        common/src/logic: GTrigger.py 

Log message:
        added Label support to Parser elements so i18n and better descriptions 
will appear in designer's property editor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFParser.py.diff?tr1=1.108&tr2=1.109&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFLayout.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/datasources/GDataSource.py.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/logic/GTrigger.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: gnue/common/src/datasources/GDataSource.py
diff -c gnue/common/src/datasources/GDataSource.py:1.62 
gnue/common/src/datasources/GDataSource.py:1.63
*** gnue/common/src/datasources/GDataSource.py:1.62     Sat Apr  5 00:37:14 2003
--- gnue/common/src/datasources/GDataSource.py  Fri Jun  6 20:52:37 2003
***************
*** 576,579 ****
      self._datasourceDictionary={}
      self._toplevelParent = self._type
      
!     
--- 576,579 ----
      self._datasourceDictionary={}
      self._toplevelParent = self._type
      
! 
Index: gnue/common/src/logic/GTrigger.py
diff -c gnue/common/src/logic/GTrigger.py:1.33 
gnue/common/src/logic/GTrigger.py:1.34
*** gnue/common/src/logic/GTrigger.py:1.33      Wed Apr 30 18:30:26 2003
--- gnue/common/src/logic/GTrigger.py   Fri Jun  6 20:52:37 2003
***************
*** 345,356 ****
              'type': {
                 'Typecast': GTypecast.uppername },
              'src': {
                 'References': 'trigger.name',
                 'Typecast': GTypecast.name },
              'language': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                    'python': {} },
                 'Default': 'python' } },
           'MixedContent': 1,
           'KeepWhitespace': 1,
--- 345,357 ----
              'type': {
                 'Typecast': GTypecast.uppername },
              'src': {
+                'Label': _('Source Trigger'),
                 'References': 'trigger.name',
                 'Typecast': GTypecast.name },
              'language': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                    'python': {'Label': 'Python Script'} },
                 'Default': 'python' } },
           'MixedContent': 1,
           'KeepWhitespace': 1,
Index: gnue/forms/src/GFObjects/GFLayout.py
diff -c gnue/forms/src/GFObjects/GFLayout.py:1.5 
gnue/forms/src/GFObjects/GFLayout.py:1.6
*** gnue/forms/src/GFObjects/GFLayout.py:1.5    Mon Feb 17 02:32:53 2003
--- gnue/forms/src/GFObjects/GFLayout.py        Fri Jun  6 20:52:37 2003
***************
*** 40,45 ****
--- 40,46 ----
      GFObj.__init__(self, parent, "GFLayout")
      self._inits =[self.initialize]
      self._pageList = []
+     self.tabbed = 'none'
  
    def _buildObject(self):
  
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.108 gnue/forms/src/GFParser.py:1.109
*** gnue/forms/src/GFParser.py:1.108    Fri Jun  6 19:00:08 2003
--- gnue/forms/src/GFParser.py  Fri Jun  6 20:52:37 2003
***************
*** 87,96 ****
--- 87,98 ----
              'title': {
                 'Typecast': GTypecast.text,
                 'Default': 'Untitled Form',
+                'Label': _('Title'),
                 'Description': 'The title of the form.' },
              'readonly': {
                 'Typecast': GTypecast.boolean,
                 'Default': 0,
+                'Label': _('Read Only'),
                 'Description': 'If set to {Y}, then no modifications to data '
                                'by the end user will be allowed. The form will 
'
                                'become a query-only form.' },
***************
*** 101,107 ****
              'style': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'dialog': {} },
                 'Default': '',
                 'Description': ''  }, },
           'ParentTags': None,
--- 103,110 ----
              'style': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'normal': {'Label': _('Normal')},
!                   'dialog': {'Label': _('Dialog')} },
                 'Default': '',
                 'Description': ''  }, },
           'ParentTags': None,
***************
*** 125,136 ****
           'Attributes': {
             'tabbed': {
               'Typecast': GTypecast.name,
               'ValueSet': {
!                 'left': {},
!                 'right': {},
!                 'bottom': {},
!                 'top': {} },
!            'Default': "",
             'Description': 'Informs the UI subsystem to display a form\'s 
pages as '
                          'notebook tabs. Allowed values are {left}, '
                          '{right}, {bottom}, {top}.  If the UI driver in use 
does not support the chosen tab position (or tabs at all,) then the UI driver 
may choose another tab position.' } } } ,
--- 128,141 ----
           'Attributes': {
             'tabbed': {
               'Typecast': GTypecast.name,
+              'Label': _('Tab Location'),
               'ValueSet': {
!                 'none':   {'Label': _('No tabs')},
!                 'left':   {'Label': _('Left tab')},
!                 'right':  {'Label': _('Right tab')},
!                 'bottom': {'Label': _('Botton tab')},
!                 'top':    {'Label': _('Top tab')} },
!            'Default': "none",
             'Description': 'Informs the UI subsystem to display a form\'s 
pages as '
                          'notebook tabs. Allowed values are {left}, '
                          '{right}, {bottom}, {top}.  If the UI driver in use 
does not support the chosen tab position (or tabs at all,) then the UI driver 
may choose another tab position.' } } } ,
***************
*** 156,162 ****
              'style': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                    'normal': {},
  ## TODO ##         'popup': {},
                     },
                 'Default': 'normal',
--- 161,167 ----
              'style': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                    'normal': {'Label': _('Normal')},
  ## TODO ##         'popup': {},
                     },
                 'Default': 'normal',
***************
*** 187,192 ****
--- 192,198 ----
                                'a grid entry system.'},
              'rowSpacer': {
                 'Typecast': GTypecast.whole,
+                'Label': _('Row Spacer'),
                 'Description': 'Adjusts the vertical gap of this number of 
rows '
                                'between duplicated widgets. Serves the same '
                                'purpose as some of the gap attributes on '
***************
*** 202,212 ****
--- 208,220 ----
              'restrictDelete':{
                 'Typecast': GTypecast.boolean,
                 'Default': 0,
+                'Label': _('Restrict Deletes'),
                 'Description': 'If set then the user will be unable to request 
'
                                 'that a record be deleted via the user 
interface.' },
              'restrictInsert':{
                 'Typecast': GTypecast.boolean,
                 'Default': 0,
+                'Label': _('Restrict Inserts'),
                 'Description': 'If set then the user will be unable to request 
'
                                'that new records be inserted into the block.' 
},
              'datasource': {
***************
*** 232,240 ****
              'alignment': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'left': {},
!                   'right': {},
!                   'center': {} },
                 'Default': "left",
                 'Description': 'The justification of the label. Can be one of '
                                'the following: {left}, {right}, or {center}. '
--- 240,248 ----
              'alignment': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'left': {'Label': _('Left')},
!                   'right': {'Label': _('Right')},
!                   'center': {'Label': _('Centered')} },
                 'Default': "left",
                 'Description': 'The justification of the label. Can be one of '
                                'the following: {left}, {right}, or {center}. '
***************
*** 249,254 ****
--- 257,263 ----
                 'Description': 'Overrides the rows setting defined at the 
block level. ' },
              'rowSpacer': {
                 'Typecast': GTypecast.whole,
+                'Label': _('Row Spacer'),
                 'Description': 'Overriders the rowSpace setting defined at the 
block level.' } },
  ##            'x': {
  ##               'Required': 1,
***************
*** 274,279 ****
--- 283,289 ----
                                'master/detail setups as well as triggers.' },
              'field': {
                 'Typecast': GTypecast.name,
+                'Label': _('Field (Database)'),
                 'Description': 'The name of the field in the datasource to '
                                'which this widget is tied.' },
              'max_length': {
***************
*** 287,292 ****
--- 297,303 ----
                 'Default': 0 },
              'readonly': {
                 'Typecast': GTypecast.boolean,
+                'Label': _('Read Only'),
                 'Description': 'It defined the user will be unable to alter '
                                'the contents of this entry. Triggers can still 
'
                                'alter the value.',
***************
*** 299,325 ****
              'case': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'mixed': {},
!                   'upper': {},
!                   'lower': {} },
                 'Default': 'mixed',
                 'Description': 'TODO'  },
              'typecast': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'text': {},
!                   'number': {},
!                   'date': {} },
                 'Default': 'text',
                 'Description': 'The type of data the entry widget will accept. 
'
                                'Possible values are {text}, {number}, 
{date}.'},
              'formatmask': {
                 'Typecast': GTypecast.text,
                 'Description': 'TODO' },
              'inputmask': {
                 'Typecast': GTypecast.text,
                 'Description': 'TODO' },
              'displaymask': {
                 'Typecast': GTypecast.text,
                 'Description': 'TODO' },
              'value': {
--- 310,340 ----
              'case': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'mixed': {'Label': _('Mixed case (no conversion)')},
!                   'upper': {'Label': _('Convert to upper case')},
!                   'lower': {'Label': _('Convert to lower case')} },
                 'Default': 'mixed',
                 'Description': 'TODO'  },
              'typecast': {
                 'Typecast': GTypecast.name,
+                'Label': _('Data Type'),
                 'ValueSet': {
!                   'text': {'Label': _('Text')},
!                   'number': {'Label': _('Numeric')},
!                   'date': {'Label': _('Date/Time')} },
                 'Default': 'text',
                 'Description': 'The type of data the entry widget will accept. 
'
                                'Possible values are {text}, {number}, 
{date}.'},
              'formatmask': {
                 'Typecast': GTypecast.text,
+                'Label': _('Format Mask'),
                 'Description': 'TODO' },
              'inputmask': {
                 'Typecast': GTypecast.text,
+                'Label': _('Input Mask'),
                 'Description': 'TODO' },
              'displaymask': {
+                'Label': _('Display Mask'),
                 'Typecast': GTypecast.text,
                 'Description': 'TODO' },
              'value': {
***************
*** 342,397 ****
  ##                              'only store it\'s 2 character abrievation.' },
              'fk_source': {
                 'References': 'datasource.name',
                 'Typecast': GTypecast.name,
                 'Description': 'TODO' },
              'fk_key': {
                 'Typecast': GTypecast.name,
                 'Description': 'TODO' },
              'fk_description': {
                 'Typecast': GTypecast.name,
                 'Description': 'TODO' },
              'fk_refresh': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'startup': {},
!                   'change': {},
!                   'commit': {} },
                 'Default': 'startup',
                 'Description': 'TODO' },
              'default': {
                 'Typecast': GTypecast.text,
                 'Description': 'The default value for any new records created. 
'
                                'If the field is visible the user can override '
                                'the value.' },
              'queryDefault':{
                 'Typecast': GTypecast.text,
                 'Description': 'The form will be populated with this value '
                                'automatically when a query is requested. If '
                                'the field is visible the user can still '
                                'override the value.' },
              'sloppyQuery': {
                 'Typecast': GTypecast.text,
                 'Description': 'When set, whatever value the user enters for '
                                'the query mask is rewritten with % between '
                                'each character. Thus {example} would be '
                                'queried as {%e%x%a%m%p%l%e%}' },
              'ignoreCaseOnQuery': {
                 'Typecast': GTypecast.boolean,
                 'Default': 0,
                 'Description': 'If defined the entry widget ignores the case '
                                'of the information entered into the query 
mask.' },
              'editOnNull': {
                 'Description': 'Only allow this object to be edited if it '
                                'is currently empty.',
                 'Typecast': GTypecast.boolean,
                 'Default': 0,
                 'Description': 'TODO' },
              'ltrim': {
                 'Description': 'Trim extraneous space at '
                                'beginning of user input.',
                 'Typecast': GTypecast.boolean,
                 'Default': 0 },
              'rtrim': {
                 'Description': 'Trim extraneous space at end '
                                'of user input.',
                 'Typecast': GTypecast.boolean,
--- 357,423 ----
  ##                              'only store it\'s 2 character abrievation.' },
              'fk_source': {
                 'References': 'datasource.name',
+                'Label': _('F/K Datasource'),
                 'Typecast': GTypecast.name,
                 'Description': 'TODO' },
              'fk_key': {
+                'Label': _('F/K Bound Field'),
                 'Typecast': GTypecast.name,
                 'Description': 'TODO' },
              'fk_description': {
                 'Typecast': GTypecast.name,
+                'Label': _('F/K Description Field'),
                 'Description': 'TODO' },
              'fk_refresh': {
                 'Typecast': GTypecast.name,
+                'Label': _('F/K Refresh Method'),
                 'ValueSet': {
!                   'startup': {'Label': _('Only refresh on form startup')},
!                   'change': {'Label': _('Refresh on field modification')},
!                   'commit': {'Label': _('Refresh after record is committed')} 
},
                 'Default': 'startup',
                 'Description': 'TODO' },
              'default': {
                 'Typecast': GTypecast.text,
+                'Label': _('Default (New Record)'),
                 'Description': 'The default value for any new records created. 
'
                                'If the field is visible the user can override '
                                'the value.' },
              'queryDefault':{
                 'Typecast': GTypecast.text,
+                'Label': _('Default (Query)'),
                 'Description': 'The form will be populated with this value '
                                'automatically when a query is requested. If '
                                'the field is visible the user can still '
                                'override the value.' },
              'sloppyQuery': {
                 'Typecast': GTypecast.text,
+                'Label': _('Sloppy Queries?'),
                 'Description': 'When set, whatever value the user enters for '
                                'the query mask is rewritten with % between '
                                'each character. Thus {example} would be '
                                'queried as {%e%x%a%m%p%l%e%}' },
              'ignoreCaseOnQuery': {
                 'Typecast': GTypecast.boolean,
+                'Label': _('Ignore Case on Queries?'),
                 'Default': 0,
                 'Description': 'If defined the entry widget ignores the case '
                                'of the information entered into the query 
mask.' },
              'editOnNull': {
                 'Description': 'Only allow this object to be edited if it '
                                'is currently empty.',
+                'Label': _('Edit Only When Null?'),
                 'Typecast': GTypecast.boolean,
                 'Default': 0,
                 'Description': 'TODO' },
              'ltrim': {
+                'Label': _('Trim spaces (left)?'),
                 'Description': 'Trim extraneous space at '
                                'beginning of user input.',
                 'Typecast': GTypecast.boolean,
                 'Default': 0 },
              'rtrim': {
+                'Label': _('Trim spaces (right)?'),
                 'Description': 'Trim extraneous space at end '
                                'of user input.',
                 'Typecast': GTypecast.boolean,
***************
*** 410,420 ****
--- 436,448 ----
                 'Description': 'The unique ID of the entry.' },
              'field': {
                 'Typecast': GTypecast.name,
+                'Label': _('Field Name'),
                 'References': 'field.name',
                 'Required': 1,
                 'Description': 'The name of the field that this ties to.' },
              'block': {
                 'Typecast': GTypecast.name,
+                'Label': _('Block Name'),
                 'Required': 1,
                 'References': 'block.name',
                 'Description': 'The name of the block that this ties to.' },
***************
*** 427,438 ****
--- 455,468 ----
  ##               'Description': 'The width of the entry in text columns.' },
              'focusorder': {
                 'Typecast': GTypecast.whole,
+                'Label': _('Focus Order'),
                 'Description': 'TODO'},
              'rows': {
                 'Typecast': GTypecast.whole,
                 'Description': 'TODO'},
              'rowSpacer': {
                 'Typecast': GTypecast.whole,
+                'Label': _('Row Spacer'),
                 'Description': 'TODO' },
              'navigable': {
                 'Typecast': GTypecast.boolean,
***************
*** 450,460 ****
              'style': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'default': {},
!                   'password': {},
!                   'dropdown': {},
!                   'checkbox': {},
!                   'label': {} },
                 'Default': 'default',
                 'Description': 'The style of entry widget requested. Currently 
'
                                'either {text}, {label}, {checkbox}, or 
{dropdown}. To '
--- 480,490 ----
              'style': {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'default': {'Label': _('Default')},
!                   'password': {'Label': _('Password/Hidden')},
!                   'dropdown': {'Label': _('Dropdown/Combo box')},
!                   'checkbox': {'Label': _('Checkbox')},
!                   'label': {'Label': _('Label (non-editable)')} },
                 'Default': 'default',
                 'Description': 'The style of entry widget requested. Currently 
'
                                'either {text}, {label}, {checkbox}, or 
{dropdown}. To '
***************
*** 557,564 ****
              'type':        {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'URL': {},
!                   'PIL': {} },
                 'Default': "URL",
                 'Description': 'TODO' },
              'focusorder': {
--- 587,594 ----
              'type':        {
                 'Typecast': GTypecast.name,
                 'ValueSet': {
!                   'URL': {'Label': _('Field contains the URL of the image')},
!                   'PIL': {'Label': _('Field contains a PIL encoding of the 
image')} },
                 'Default': "URL",
                 'Description': 'TODO' },
              'focusorder': {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]