diff --git a/ChangeLog b/ChangeLog index d229849dda..fbec12ed42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2007-04-26 Michael Natterer + + * tools/pdbgen/pdb/pattern.pdb + * tools/pdbgen/pdb/gradients.pdb + * tools/pdbgen/pdb/brush_select.pdb + * tools/pdbgen/pdb/context.pdb + * tools/pdbgen/pdb/gradient.pdb + * tools/pdbgen/pdb/palette.pdb + * tools/pdbgen/pdb/procedural_db.pdb + * tools/pdbgen/pdb/brushes.pdb + * tools/pdbgen/pdb/palettes.pdb + * tools/pdbgen/pdb/drawable.pdb + * tools/pdbgen/pdb/brush.pdb + * tools/pdbgen/pdb/gradient_select.pdb: some argument cleanup: use + "=> 1" instead of "=> '1'" for setting argument flags, also made + argument property order consistent so flags come before "desc". + Doesn't affect generated code. + 2007-04-26 Sven Neumann * libgimp/gimp.c: document the image_types parameter (bug #326988). diff --git a/tools/pdbgen/pdb/brush.pdb b/tools/pdbgen/pdb/brush.pdb index 679301e77f..43d978d7b5 100644 --- a/tools/pdbgen/pdb/brush.pdb +++ b/tools/pdbgen/pdb/brush.pdb @@ -286,7 +286,7 @@ HELP ); @outargs = ( - { name => 'width', type => 'int32', void_ret => '1', + { name => 'width', type => 'int32', void_ret => 1, desc => 'The brush width' }, { name => 'height', type => 'int32', desc => 'The brush height' }, @@ -350,9 +350,8 @@ HELP ); @outargs = ( - { name => 'spacing', type => '0 <= int32 <= 1000', - desc => 'The brush spacing', - void_ret => 1 } + { name => 'spacing', type => '0 <= int32 <= 1000', void_ret => 1, + desc => 'The brush spacing' } ); %invoke = ( diff --git a/tools/pdbgen/pdb/brush_select.pdb b/tools/pdbgen/pdb/brush_select.pdb index 0d418c4929..1957b2724d 100644 --- a/tools/pdbgen/pdb/brush_select.pdb +++ b/tools/pdbgen/pdb/brush_select.pdb @@ -29,9 +29,8 @@ sub brushes_popup { made' }, { name => 'popup_title', type => 'string', desc => 'Title of the brush selection dialog' }, - { name => 'initial_brush', type => 'string', - desc => 'The name of the brush to set as the first selected', - null_ok => 1 }, + { name => 'initial_brush', type => 'string', null_ok => 1, + desc => 'The name of the brush to set as the first selected' }, { name => 'opacity', type => '0 <= float <= 100', desc => 'The initial opacity of the brush' }, { name => 'spacing', type => 'int32 <= 1000', diff --git a/tools/pdbgen/pdb/brushes.pdb b/tools/pdbgen/pdb/brushes.pdb index 52d7c8a4b8..24946a6e98 100644 --- a/tools/pdbgen/pdb/brushes.pdb +++ b/tools/pdbgen/pdb/brushes.pdb @@ -146,9 +146,8 @@ sub brushes_get_brush_data { &std_pdb_deprecated ('gimp-brush-get-pixels'); @inargs = ( - { name => 'name', type => 'string', - desc => 'The brush name ("" means current active brush)', - null_ok => '1' } + { name => 'name', type => 'string', null_ok => 1, + desc => 'The brush name ("" means current active brush)' } ); @outargs = ( diff --git a/tools/pdbgen/pdb/context.pdb b/tools/pdbgen/pdb/context.pdb index 681fff0ee4..3d463e4e89 100644 --- a/tools/pdbgen/pdb/context.pdb +++ b/tools/pdbgen/pdb/context.pdb @@ -148,8 +148,8 @@ HELP &pdb_misc; @outargs = ( - { name => 'foreground', type => 'color', - desc => 'The foreground color', void_ret => 1 } + { name => 'foreground', type => 'color', void_ret => 1, + desc => 'The foreground color' } ); %invoke = ( @@ -174,8 +174,8 @@ HELP &pdb_misc; @inargs = ( - { name => 'foreground', type => 'color', - desc => 'The foreground color', void_ret => 1 } + { name => 'foreground', type => 'color', void_ret => 1, + desc => 'The foreground color' } ); %invoke = ( @@ -200,8 +200,8 @@ HELP &pdb_misc; @outargs = ( - { name => 'background', type => 'color', - desc => 'The background color', void_ret => 1 } + { name => 'background', type => 'color', void_ret => 1, + desc => 'The background color' } ); %invoke = ( @@ -226,8 +226,8 @@ HELP &pdb_misc; @inargs = ( - { name => 'background', type => 'color', - desc => 'The background color', void_ret => 1 } + { name => 'background', type => 'color', void_ret => 1, + desc => 'The background color' } ); %invoke = ( diff --git a/tools/pdbgen/pdb/drawable.pdb b/tools/pdbgen/pdb/drawable.pdb index 315b495180..444338212c 100644 --- a/tools/pdbgen/pdb/drawable.pdb +++ b/tools/pdbgen/pdb/drawable.pdb @@ -547,8 +547,8 @@ HELP ); @outargs = ( - { name => 'offset_x', type => 'int32', - desc => "x offset of drawable", void_ret => 1 }, + { name => 'offset_x', type => 'int32', void_ret => 1, + desc => "x offset of drawable" }, { name => 'offset_y', type => 'int32', desc => "y offset of drawable" } ); diff --git a/tools/pdbgen/pdb/gradient.pdb b/tools/pdbgen/pdb/gradient.pdb index 30042030b3..7aa60fca5e 100644 --- a/tools/pdbgen/pdb/gradient.pdb +++ b/tools/pdbgen/pdb/gradient.pdb @@ -348,8 +348,8 @@ HELP ); @outargs = ( - { name => 'color', type => 'color', - desc => 'The return color', void_ret => 1 }, + { name => 'color', type => 'color', void_ret => 1, + desc => 'The return color' }, { name => 'opacity', type => 'float', desc => 'The opacity of the endpoint' } ); @@ -392,8 +392,8 @@ HELP ); @outargs = ( - { name => 'color', type => 'color', - desc => 'The return color', void_ret => 1 }, + { name => 'color', type => 'color', void_ret => 1, + desc => 'The return color' }, { name => 'opacity', type => 'float', desc => 'The opacity of the endpoint' } ); @@ -518,8 +518,8 @@ HELP ); @outargs = ( - { name => 'pos', type => 'float', - desc => 'The return position', void_ret => 1 } + { name => 'pos', type => 'float', void_ret => 1, + desc => 'The return position' } ); %invoke = ( @@ -559,8 +559,8 @@ HELP ); @outargs = ( - { name => 'pos', type => 'float', - desc => 'The return position', void_ret => 1 } + { name => 'pos', type => 'float', void_ret => 1, + desc => 'The return position' } ); %invoke = ( @@ -600,8 +600,8 @@ HELP ); @outargs = ( - { name => 'pos', type => 'float', - desc => 'The return position', void_ret => 1 } + { name => 'pos', type => 'float', void_ret => 1, + desc => 'The return position' } ); %invoke = ( @@ -647,8 +647,8 @@ HELP ); @outargs = ( - { name => 'final_pos', type => 'float', - desc => 'The return position', void_ret => 1 } + { name => 'final_pos', type => 'float', void_ret => 1, + desc => 'The return position' } ); %invoke = ( @@ -694,8 +694,8 @@ HELP ); @outargs = ( - { name => 'final_pos', type => 'float', - desc => 'The return position', void_ret => 1 } + { name => 'final_pos', type => 'float', void_ret => 1, + desc => 'The return position' } ); %invoke = ( @@ -741,8 +741,8 @@ HELP ); @outargs = ( - { name => 'final_pos', type => 'float', - desc => 'The return position', void_ret => 1 } + { name => 'final_pos', type => 'float', void_ret => 1, + desc => 'The return position' } ); %invoke = ( @@ -784,8 +784,8 @@ HELP @outargs = ( { name => 'blend_func', type => 'enum GimpGradientSegmentType', - desc => 'The blending function of the segment', - void_ret => 1 } + void_ret => 1, + desc => 'The blending function of the segment' } ); %invoke = ( @@ -826,8 +826,8 @@ HELP @outargs = ( { name => 'coloring_type', type => 'enum GimpGradientSegmentColor', - desc => 'The coloring type of the segment', - void_ret => 1 } + void_ret => 1, + desc => 'The coloring type of the segment' } ); %invoke = ( diff --git a/tools/pdbgen/pdb/gradient_select.pdb b/tools/pdbgen/pdb/gradient_select.pdb index 37c42cb7a7..c0801b91f5 100644 --- a/tools/pdbgen/pdb/gradient_select.pdb +++ b/tools/pdbgen/pdb/gradient_select.pdb @@ -29,12 +29,10 @@ sub gradients_popup { made' }, { name => 'popup_title', type => 'string', desc => 'Title of the gradient selection dialog' }, - { name => 'initial_gradient', type => 'string', - desc => 'The name of the gradient to set as the first selected', - null_ok => 1 }, - { name => 'sample_size', type => '1 <= int32 <= 10000', - desc => 'Size of the sample to return when the gradient is changed', - no_success => 1 } + { name => 'initial_gradient', type => 'string', null_ok => 1, + desc => 'The name of the gradient to set as the first selected' }, + { name => 'sample_size', type => '1 <= int32 <= 10000', no_success => 1, + desc => 'Size of the sample to return when the gradient is changed' } ); %invoke = ( diff --git a/tools/pdbgen/pdb/gradients.pdb b/tools/pdbgen/pdb/gradients.pdb index 0faf243e20..f87de9f00a 100644 --- a/tools/pdbgen/pdb/gradients.pdb +++ b/tools/pdbgen/pdb/gradients.pdb @@ -178,9 +178,8 @@ sub gradients_get_gradient_data { &std_pdb_deprecated ('gimp-gradient-get-uniform-samples'); @inargs = ( - { name => 'name', type => 'string', - desc => 'The gradient name ("" means current active gradient)', - null_ok => '1' }, + { name => 'name', type => 'string', null_ok => 1, + desc => 'The gradient name ("" means current active gradient)' }, { name => 'sample_size', type => '1 <= int32 <= 10000', desc => 'Size of the sample to return when the gradient is changed', no_success => 1 }, diff --git a/tools/pdbgen/pdb/palette.pdb b/tools/pdbgen/pdb/palette.pdb index 04cb27d148..f1de1658e9 100644 --- a/tools/pdbgen/pdb/palette.pdb +++ b/tools/pdbgen/pdb/palette.pdb @@ -209,7 +209,7 @@ HELP ); @outargs = ( - { name => 'num_colors', type => 'int32', void_ret => '1', + { name => 'num_colors', type => 'int32', void_ret => 1, desc => 'The number of colors in the palette' } ); @@ -307,14 +307,14 @@ HELP @inargs = ( { name => 'name', type => 'string', desc => 'The palette name' }, - { name => 'entry_name', type => 'string', null_ok => '1', + { name => 'entry_name', type => 'string', null_ok => 1, desc => 'The name of the entry' }, { name => 'color', type => 'color', desc => 'The new entry\'s color color' } ); @outargs = ( - { name => 'entry_num', type => 'int32', void_ret => '1', + { name => 'entry_num', type => 'int32', void_ret => 1, desc => 'The index of the added entry' } ); @@ -531,7 +531,7 @@ HELP desc => 'The palette name' }, { name => 'entry_num', type => 'int32', desc => 'The entry to retrieve' }, - { name => 'entry_name', type => 'string', null_ok => '1', + { name => 'entry_name', type => 'string', null_ok => 1, desc => 'The new name' } ); diff --git a/tools/pdbgen/pdb/palettes.pdb b/tools/pdbgen/pdb/palettes.pdb index 64c4ffd0d5..48f535c9ed 100644 --- a/tools/pdbgen/pdb/palettes.pdb +++ b/tools/pdbgen/pdb/palettes.pdb @@ -73,8 +73,8 @@ sub palettes_get_palette { &std_pdb_deprecated ('gimp-context-get-palette'); @outargs = ( - { name => 'name', type => 'string', - desc => 'The palette name', null_ok => '1' }, + { name => 'name', type => 'string', null_ok => 1, + desc => 'The palette name' }, { name => 'num_colors', type => 'int32', desc => 'The palette num_colors' } ); diff --git a/tools/pdbgen/pdb/pattern.pdb b/tools/pdbgen/pdb/pattern.pdb index dbcc572b97..cfbb9ed50a 100644 --- a/tools/pdbgen/pdb/pattern.pdb +++ b/tools/pdbgen/pdb/pattern.pdb @@ -33,7 +33,7 @@ HELP ); @outargs = ( - { name => 'width', type => 'int32', void_ret => '1', + { name => 'width', type => 'int32', void_ret => 1, desc => "The pattern width" }, { name => 'height', type => 'int32', desc => "The pattern height" }, @@ -79,7 +79,7 @@ HELP ); @outargs = ( - { name => 'width', type => 'int32', void_ret => '1', + { name => 'width', type => 'int32', void_ret => 1, desc => "The pattern width" }, { name => 'height', type => 'int32', desc => "The pattern height" }, diff --git a/tools/pdbgen/pdb/procedural_db.pdb b/tools/pdbgen/pdb/procedural_db.pdb index 693f62ce58..74644cf572 100644 --- a/tools/pdbgen/pdb/procedural_db.pdb +++ b/tools/pdbgen/pdb/procedural_db.pdb @@ -214,7 +214,8 @@ HELP @outargs = ( { name => 'arg_type', type => 'enum GimpPDBArgType (no GIMP_PDB_END)', - desc => "The type of argument", void_ret => 1 }, + void_ret => 1, + desc => "The type of argument" }, { name => 'arg_name', type => 'string', desc => 'The name of the argument' }, { name => 'arg_desc', type => 'string', @@ -281,7 +282,8 @@ HELP @outargs = ( { name => 'val_type', type => 'enum GimpPDBArgType (no GIMP_PDB_END)', - desc => "The type of return value", void_ret => 1 }, + void_ret => 1, + desc => "The type of return value" }, { name => 'val_name', type => 'string', desc => 'The name of the return value' }, { name => 'val_desc', type => 'string', @@ -343,9 +345,8 @@ HELP ); @outargs = ( - { name => 'data', type => 'int8array', - desc => 'A byte array containing data', wrap => 1, - void_ret => 1, + { name => 'data', type => 'int8array', wrap => 1, void_ret => 1, + desc => 'A byte array containing data', array => { name => 'bytes', type => '1 <= int32', desc => 'The number of bytes in the data' } } );