r76975 - in /trunk/libconfig-model-tkui-perl: ./ debian/ lib/Config/Model/ lib/Config/Model/Tk/ t/

carnil at users.alioth.debian.org carnil at users.alioth.debian.org
Sat Jul 2 21:48:56 UTC 2011


Author: carnil
Date: Sat Jul  2 21:48:54 2011
New Revision: 76975

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76975
Log:
* New upstream release
* debian/copyright:
  - Update copyright years for debian/* packaging
  - Fix typo Debian ystems -> Debian systems. 

Modified:
    trunk/libconfig-model-tkui-perl/ChangeLog
    trunk/libconfig-model-tkui-perl/META.yml
    trunk/libconfig-model-tkui-perl/debian/changelog
    trunk/libconfig-model-tkui-perl/debian/copyright
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm
    trunk/libconfig-model-tkui-perl/t/big_model.pm

Modified: trunk/libconfig-model-tkui-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/ChangeLog?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/ChangeLog (original)
+++ trunk/libconfig-model-tkui-perl/ChangeLog Sat Jul  2 21:48:54 2011
@@ -1,3 +1,10 @@
+2011-05-17  Dominique Dumont  <domi.dumont at free.fr> 1.325
+
+    * TkUI.pm: disable double-click because it trigger
+      editor when double clicking outside of Hlist
+    * NodeEditor.pm: respect order of element when 
+      completing the pane widget after warp
+
 2011-05-17  Dominique Dumont  <domi.dumont at free.fr> 1.324
 
    * Depends on Config::Model 1.244

Modified: trunk/libconfig-model-tkui-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/META.yml?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/META.yml (original)
+++ trunk/libconfig-model-tkui-perl/META.yml Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 configure_requires:
   Module::Build: 0.3601
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.110930'
+generated_by: 'Dist::Zilla version 4.200008, CPAN::Meta::Converter version 2.110930'
 license: lgpl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -26,4 +26,4 @@
   Tk: 0
   Tk::DirSelect: 0
   Tk::Tree: 0
-version: 1.324
+version: 1.325

Modified: trunk/libconfig-model-tkui-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/debian/changelog?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/debian/changelog (original)
+++ trunk/libconfig-model-tkui-perl/debian/changelog Sat Jul  2 21:48:54 2011
@@ -1,3 +1,12 @@
+libconfig-model-tkui-perl (1.325-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/copyright:
+    - Update copyright years for debian/* packaging
+    - Fix typo Debian ystems -> Debian systems. 
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 02 Jul 2011 23:47:58 +0200
+
 libconfig-model-tkui-perl (1.324-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/libconfig-model-tkui-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/debian/copyright?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/debian/copyright (original)
+++ trunk/libconfig-model-tkui-perl/debian/copyright Sat Jul  2 21:48:54 2011
@@ -18,7 +18,7 @@
 Copyright: 2008-2011, Dominique Dumont <domi.dumont at free.fr>
            2010, Jonathan Yu <jawnsy at cpan.org>
            2010, gregor herrmann <gregoa at debian.org>
-           2010, Salvatore Bonaccorso <carnil at debian.org>
+           2010-2011, Salvatore Bonaccorso <carnil at debian.org>
 License: LGPL-2.1+
 
 
@@ -28,6 +28,6 @@
  Free Software Foundation; either version 2.1 of the License, or (at
  your option) any later version.
  . 
- On Debian ystems, the complete text of version 2.1 of the GNU Lesser
+ On Debian systems, the complete text of version 2.1 of the GNU Lesser
  Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
 

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm Sat Jul  2 21:48:54 2011
@@ -27,7 +27,7 @@
 
 package Config::Model::Tk::AnyViewer ;
 BEGIN {
-  $Config::Model::Tk::AnyViewer::VERSION = '1.324';
+  $Config::Model::Tk::AnyViewer::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::CheckListEditor ;
 BEGIN {
-  $Config::Model::Tk::CheckListEditor::VERSION = '1.324';
+  $Config::Model::Tk::CheckListEditor::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::CheckListViewer ;
 BEGIN {
-  $Config::Model::Tk::CheckListViewer::VERSION = '1.324';
+  $Config::Model::Tk::CheckListViewer::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::HashEditor;
 BEGIN {
-  $Config::Model::Tk::HashEditor::VERSION = '1.324';
+  $Config::Model::Tk::HashEditor::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::HashViewer ;
 BEGIN {
-  $Config::Model::Tk::HashViewer::VERSION = '1.324';
+  $Config::Model::Tk::HashViewer::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::LeafEditor ;
 BEGIN {
-  $Config::Model::Tk::LeafEditor::VERSION = '1.324';
+  $Config::Model::Tk::LeafEditor::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::LeafViewer ;
 BEGIN {
-  $Config::Model::Tk::LeafViewer::VERSION = '1.324';
+  $Config::Model::Tk::LeafViewer::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::ListEditor ;
 BEGIN {
-  $Config::Model::Tk::ListEditor::VERSION = '1.324';
+  $Config::Model::Tk::ListEditor::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::ListViewer ;
 BEGIN {
-  $Config::Model::Tk::ListViewer::VERSION = '1.324';
+  $Config::Model::Tk::ListViewer::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::NodeEditor ;
 BEGIN {
-  $Config::Model::Tk::NodeEditor::VERSION = '1.324';
+  $Config::Model::Tk::NodeEditor::VERSION = '1.325';
 }
 
 use strict;
@@ -86,22 +86,25 @@
 
     my $exp = $cw->parent->parent->parent->parent->get_experience ;
 
-    my %old_elt = map { ($_ => 1) } keys %{$cw->{elt_widgets}|| {} } ;
+    my %is_elt_drawn = map { ($_ => 1) } keys %{$cw->{elt_widgets}|| {} } ;
 
     my %values;
     my %modified ;
-    my $old_f ;
+    my $prev_elt ;
 
     foreach my $c ($node->get_element_name(for => $exp)) {
-	next if delete $old_elt{$c} ;
+	if (delete $is_elt_drawn{$c}) { 
+	    $prev_elt = $c ;
+	    next;
+	} ; 
 
 	my $type = $node->element_type($c) ;
 	my $elt_path = $cw->{path}.'.'.$c ;
 
-	my @after = $old_f ? ( -after => $old_f ) : () ;
-	my $f = $elt_pane->Frame(-relief=> 'groove', -borderwidth => 1)
-	  ->pack(-side =>'top', at fx, at after) ;
-	$old_f = $f ;
+	my @after = defined $prev_elt ? ( -after => $cw->{elt_widgets}{$prev_elt} ) : () ;
+        $prev_elt = $c ;
+	my $f = $elt_pane->Frame(-relief=> 'groove', -borderwidth => 1);
+	$f ->pack(-side =>'top', at fx, at after) ;
 
 	$cw->{elt_widgets}{$c} = $f ;
 	my $label = $f -> Label(-text => $c,-width=> 22, -anchor => 'w') ;
@@ -162,7 +165,7 @@
     }
 
     # destroy leftover widgets (may occur with warp mechanism)
-    map {my $w = delete $cw->{elt_widgets}{$_};$w->destroy } keys %old_elt ;
+    map {my $w = delete $cw->{elt_widgets}{$_};$w->destroy } keys %is_elt_drawn ;
 }
 
 sub get_info {

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::NodeViewer ;
 BEGIN {
-  $Config::Model::Tk::NodeViewer::VERSION = '1.324';
+  $Config::Model::Tk::NodeViewer::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm Sat Jul  2 21:48:54 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::NoteEditor ;
 BEGIN {
-  $Config::Model::Tk::NoteEditor::VERSION = '1.324';
+  $Config::Model::Tk::NoteEditor::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm Sat Jul  2 21:48:54 2011
@@ -10,7 +10,7 @@
 
 package Config::Model::Tk::Wizard ;
 BEGIN {
-  $Config::Model::Tk::Wizard::VERSION = '1.324';
+  $Config::Model::Tk::Wizard::VERSION = '1.325';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm Sat Jul  2 21:48:54 2011
@@ -11,7 +11,7 @@
 
 package Config::Model::TkUI ;
 BEGIN {
-  $Config::Model::TkUI::VERSION = '1.324';
+  $Config::Model::TkUI::VERSION = '1.325';
 }
 
 use strict;
@@ -230,7 +230,8 @@
     my $b3_sub = sub{my $item = $tree->nearest($tree->pointery - $tree->rooty) ;
 		     $cw->on_select($item)} ;
     $cw->bind('<Button-3>', $b3_sub) ;
-    $cw->bind('<Double-Button-1>', $b3_sub) ;
+    # pb: rapid click outside the hlist will trigger $b3_sub
+    #$cw->bind('<Double-Button-1>', $b3_sub) ;
 
     # bind button2 to get cut buffer content and try to store cut buffer content
     my $b2_sub = sub{my $item = $tree->nearest($tree->pointery - $tree->rooty) ;
@@ -412,7 +413,7 @@
        eval { $cw->{root}->instance->write_back(@wb_args); } ;
        if ($@) {
          $cw -> Dialog ( -title => 'Save error',
-                         -text  => $@->as_string,
+                         -text  => ref($@) ? $@->as_string : $@ ,
                        )
             -> Show ;
        }

Modified: trunk/libconfig-model-tkui-perl/t/big_model.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/t/big_model.pm?rev=76975&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/t/big_model.pm (original)
+++ trunk/libconfig-model-tkui-perl/t/big_model.pm Sat Jul  2 21:48:54 2011
@@ -113,7 +113,7 @@
 
     [
         name              => 'Master',
-        experience        => [ [qw/tree_macro warp/] => 'advanced' ],
+        experience        => [ [qw/warp/] => 'advanced' ],
         class_description => "
 
 =head1 coucou
@@ -145,6 +145,29 @@
             },
         ],
         element => [
+            tree_macro => {
+                type       => 'leaf',
+                value_type => 'enum',
+                choice     => [qw/XY XZ mXY/],
+                help       => {
+                    XY  => 'XY help',
+                    XZ  => 'XZ help',
+                    mXY => 'mXY help',
+                }
+            },
+            pop_in_out => {
+                type       => 'leaf',
+                level => 'hidden',
+                value_type => 'uniline',
+                default    => 'yada yada',
+                warp => {  
+                    follow            => '! tree_macro',
+                    rules             => [
+                        XZ => { level => 'normal' },
+                    ],
+                },
+            },
+
             std_id => {
                 type       => 'hash',
                 index_type => 'string',
@@ -210,16 +233,6 @@
                     type       => 'leaf',
                     value_type => 'enum',
                     choice     => [qw/A B C/],
-                }
-            },
-            tree_macro => {
-                type       => 'leaf',
-                value_type => 'enum',
-                choice     => [qw/XY XZ mXY/],
-                help       => {
-                    XY  => 'XY help',
-                    XZ  => 'XZ help',
-                    mXY => 'mXY help',
                 }
             },
             warp => {




More information about the Pkg-perl-cvs-commits mailing list