[libconfig-model-tkui-perl] 01/05: New upstream version 1.365
dod at debian.org
dod at debian.org
Mon Nov 20 12:32:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
dod pushed a commit to annotated tag debian/1.365-1
in repository libconfig-model-tkui-perl.
commit be36665dff5b686c0b8e082ecb3dda947e16b9e4
Author: Dominique Dumont <dod at debian.org>
Date: Mon Nov 20 13:14:57 2017 +0100
New upstream version 1.365
---
Build.PL | 2 +-
Changes | 5 +++++
META.json | 6 +++---
META.yml | 4 ++--
lib/Config/Model/Tk/AnyViewer.pm | 2 +-
lib/Config/Model/Tk/CheckListEditor.pm | 2 +-
lib/Config/Model/Tk/CheckListViewer.pm | 2 +-
lib/Config/Model/Tk/HashEditor.pm | 2 +-
lib/Config/Model/Tk/HashViewer.pm | 2 +-
lib/Config/Model/Tk/LeafEditor.pm | 2 +-
lib/Config/Model/Tk/LeafViewer.pm | 2 +-
lib/Config/Model/Tk/ListEditor.pm | 2 +-
lib/Config/Model/Tk/ListViewer.pm | 2 +-
lib/Config/Model/Tk/NodeEditor.pm | 24 ++++++++++++++++--------
lib/Config/Model/Tk/NodeViewer.pm | 2 +-
lib/Config/Model/Tk/NoteEditor.pm | 2 +-
lib/Config/Model/Tk/Wizard.pm | 2 +-
lib/Config/Model/TkUI.pm | 8 ++++++--
t/lib/Config/Model/models/Master.pl | 1 +
19 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/Build.PL b/Build.PL
index 34e47f1..9e752db 100644
--- a/Build.PL
+++ b/Build.PL
@@ -51,7 +51,7 @@ my $build = Module::Build->new
},
'requires' => {
'Carp' => '0',
- 'Config::Model' => '2.095',
+ 'Config::Model' => '2.114',
'Config::Model::ObjTreeScanner' => '0',
'File::HomeDir' => '0',
'Log::Log4perl' => '1.11',
diff --git a/Changes b/Changes
index ed5dc71..a7d5e4b 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,8 @@
+1.365 2017-11-19
+
+ * display node gist in tree widget (req Config::Model 2.114)
+ * fix font issue when elements pop in node editor
+
1.364 2017-08-23
* fix font loading in TkUI (also gh #12)
diff --git a/META.json b/META.json
index dfb86f6..c632308 100644
--- a/META.json
+++ b/META.json
@@ -32,7 +32,7 @@
"runtime" : {
"requires" : {
"Carp" : "0",
- "Config::Model" : "2.095",
+ "Config::Model" : "2.114",
"Config::Model::ObjTreeScanner" : "0",
"File::HomeDir" : "0",
"Log::Log4perl" : "1.11",
@@ -89,7 +89,7 @@
"web" : "https://github.com/dod38fr/config-model-tk-ui"
}
},
- "version" : "1.364",
- "x_serialization_backend" : "JSON::XS version 3.03"
+ "version" : "1.365",
+ "x_serialization_backend" : "JSON::XS version 3.04"
}
diff --git a/META.yml b/META.yml
index a2cf4e8..ea5ea14 100644
--- a/META.yml
+++ b/META.yml
@@ -19,7 +19,7 @@ meta-spec:
name: Config-Model-TkUI
requires:
Carp: '0'
- Config::Model: '2.095'
+ Config::Model: '2.114'
Config::Model::ObjTreeScanner: '0'
File::HomeDir: '0'
Log::Log4perl: '1.11'
@@ -56,5 +56,5 @@ resources:
bugtracker: https://github.com/dod38fr/config-model-tk-ui/issues
homepage: https://github.com/dod38fr/config-model/wiki
repository: git://github.com/dod38fr/config-model-tk-ui.git
-version: '1.364'
+version: '1.365'
x_serialization_backend: 'YAML::Tiny version 1.70'
diff --git a/lib/Config/Model/Tk/AnyViewer.pm b/lib/Config/Model/Tk/AnyViewer.pm
index 25b87af..35be7cf 100644
--- a/lib/Config/Model/Tk/AnyViewer.pm
+++ b/lib/Config/Model/Tk/AnyViewer.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::AnyViewer;
-$Config::Model::Tk::AnyViewer::VERSION = '1.364';
+$Config::Model::Tk::AnyViewer::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/CheckListEditor.pm b/lib/Config/Model/Tk/CheckListEditor.pm
index 1853457..c8a5314 100644
--- a/lib/Config/Model/Tk/CheckListEditor.pm
+++ b/lib/Config/Model/Tk/CheckListEditor.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::CheckListEditor;
-$Config::Model::Tk::CheckListEditor::VERSION = '1.364';
+$Config::Model::Tk::CheckListEditor::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/CheckListViewer.pm b/lib/Config/Model/Tk/CheckListViewer.pm
index 2cf262d..55616bc 100644
--- a/lib/Config/Model/Tk/CheckListViewer.pm
+++ b/lib/Config/Model/Tk/CheckListViewer.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::CheckListViewer;
-$Config::Model::Tk::CheckListViewer::VERSION = '1.364';
+$Config::Model::Tk::CheckListViewer::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/HashEditor.pm b/lib/Config/Model/Tk/HashEditor.pm
index 8724cc8..3b07fb5 100644
--- a/lib/Config/Model/Tk/HashEditor.pm
+++ b/lib/Config/Model/Tk/HashEditor.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::HashEditor;
-$Config::Model::Tk::HashEditor::VERSION = '1.364';
+$Config::Model::Tk::HashEditor::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/HashViewer.pm b/lib/Config/Model/Tk/HashViewer.pm
index e8ca00e..b0adf29 100644
--- a/lib/Config/Model/Tk/HashViewer.pm
+++ b/lib/Config/Model/Tk/HashViewer.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::HashViewer;
-$Config::Model::Tk::HashViewer::VERSION = '1.364';
+$Config::Model::Tk::HashViewer::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/LeafEditor.pm b/lib/Config/Model/Tk/LeafEditor.pm
index b3ce8c4..96f84e6 100644
--- a/lib/Config/Model/Tk/LeafEditor.pm
+++ b/lib/Config/Model/Tk/LeafEditor.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::LeafEditor;
-$Config::Model::Tk::LeafEditor::VERSION = '1.364';
+$Config::Model::Tk::LeafEditor::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/LeafViewer.pm b/lib/Config/Model/Tk/LeafViewer.pm
index 0f08458..b2b61a1 100644
--- a/lib/Config/Model/Tk/LeafViewer.pm
+++ b/lib/Config/Model/Tk/LeafViewer.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::LeafViewer;
-$Config::Model::Tk::LeafViewer::VERSION = '1.364';
+$Config::Model::Tk::LeafViewer::VERSION = '1.365';
use strict;
use warnings;
use 5.10.1;
diff --git a/lib/Config/Model/Tk/ListEditor.pm b/lib/Config/Model/Tk/ListEditor.pm
index 0afadbd..f496302 100644
--- a/lib/Config/Model/Tk/ListEditor.pm
+++ b/lib/Config/Model/Tk/ListEditor.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::ListEditor;
-$Config::Model::Tk::ListEditor::VERSION = '1.364';
+$Config::Model::Tk::ListEditor::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/ListViewer.pm b/lib/Config/Model/Tk/ListViewer.pm
index 8b26137..a76a068 100644
--- a/lib/Config/Model/Tk/ListViewer.pm
+++ b/lib/Config/Model/Tk/ListViewer.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::ListViewer;
-$Config::Model::Tk::ListViewer::VERSION = '1.364';
+$Config::Model::Tk::ListViewer::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/NodeEditor.pm b/lib/Config/Model/Tk/NodeEditor.pm
index e9d7aa8..fa51d78 100644
--- a/lib/Config/Model/Tk/NodeEditor.pm
+++ b/lib/Config/Model/Tk/NodeEditor.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::NodeEditor;
-$Config::Model::Tk::NodeEditor::VERSION = '1.364';
+$Config::Model::Tk::NodeEditor::VERSION = '1.365';
use strict;
use warnings;
use Carp;
@@ -44,7 +44,7 @@ sub Populate {
|| die "NodeViewer: no -item, got ", keys %$args;
$cw->{path} = delete $args->{-path};
$cw->{store_cb} = delete $args->{-store_cb} || die __PACKAGE__, "no -store_cb";
- my $cme_font = delete $args->{-font};
+ my $cme_font = $cw->{my_font} = delete $args->{-font};
$cw->add_header( Edit => $node )->pack(@fx);
@@ -78,8 +78,12 @@ sub Populate {
$cw->ConfigSpecs(-font => [['SELF','DESCENDANTS'], 'font','Font', $cme_font ],);
- # don't call directly SUPER::Populate as it's LeafViewer's populate
+ # don't call directly SUPER::Populate as it's NodeViewer's populate
$cw->Tk::Frame::Populate($args);
+
+ # TODO: above is a hack. The required methods of NodeViewer and
+ # AnyViewer should be moved into a role. Question: how can roles
+ # be done with Tk ??
}
sub reload {
@@ -97,6 +101,7 @@ sub fill_pane {
my %values;
my %modified;
my $prev_elt;
+ my $font = $cw->{my_font}; #cget('-font');
foreach my $c ( $node->get_element_name() ) {
if ( delete $is_elt_drawn{$c} ) {
@@ -113,7 +118,7 @@ sub fill_pane {
$f->pack( -side => 'top', @fx, @after );
$cw->{elt_widgets}{$c} = $f;
- my $label = $f->Label( -text => $c, -width => 22, -anchor => 'w' );
+ my $label = $f->Label( -text => $c, -font => $font, -width => 22, -anchor => 'w' );
$label->pack(qw/-side left -fill x -anchor w/);
my $help = $node->get_help_as_text( summary => $c ) || $node->get_help_as_text( description => $c );
@@ -137,7 +142,7 @@ sub fill_pane {
}
if ( $v_type =~ /boolean/ ) {
- my $e = $f->Checkbutton( -variable => \$v, -command => $store_sub )
+ my $e = $f->Checkbutton( -variable => \$v, -font => $font, -command => $store_sub )
->pack(qw/-side left -anchor w/);
next;
}
@@ -147,6 +152,7 @@ sub fill_pane {
require Tk::BrowseEntry;
my $e = $f->BrowseEntry(
-variable => \$v,
+ -font => $font,
-browsecmd => $store_sub,
-choices => \@choices
)->pack( qw/-side left -anchor w/, @fxe1 );
@@ -163,7 +169,7 @@ sub fill_pane {
};
my $edb = $f->Button(
-text => '...',
- -font => [ -size => 6 ],
+ -font => $font,
-command => $edit_sub
);
$edb->pack( -anchor => 'w' );
@@ -186,10 +192,12 @@ sub add_accept_entry {
my $f = $cw->Frame( -relief => 'groove', -borderwidth => 1 );
$f->pack( -side => 'top', @fx );
+ my $font = $cw->{my_font}; #cget('-font');
+
my $accepted = '';
- $f->Label( -text => 'accept : /' . join( '/, /', @rexp ) . '/' )->pack;
+ $f->Label( -text => 'accept : /' . join( '/, /', @rexp ) . '/', -font => $font )->pack;
- my $e = $f->Entry( -textvariable => \$accepted )->pack( qw/-side left -anchor w/, @fxe1 );
+ my $e = $f->Entry( -textvariable => \$accepted, -font => $font)->pack( qw/-side left -anchor w/, @fxe1 );
my $sub = sub {
return unless $accepted;
my $ok = 0;
diff --git a/lib/Config/Model/Tk/NodeViewer.pm b/lib/Config/Model/Tk/NodeViewer.pm
index c4201bb..c6a46f2 100644
--- a/lib/Config/Model/Tk/NodeViewer.pm
+++ b/lib/Config/Model/Tk/NodeViewer.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::NodeViewer;
-$Config::Model::Tk::NodeViewer::VERSION = '1.364';
+$Config::Model::Tk::NodeViewer::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/NoteEditor.pm b/lib/Config/Model/Tk/NoteEditor.pm
index 052cf1e..6e57f3e 100644
--- a/lib/Config/Model/Tk/NoteEditor.pm
+++ b/lib/Config/Model/Tk/NoteEditor.pm
@@ -8,7 +8,7 @@
# The GNU Lesser General Public License, Version 2.1, February 1999
#
package Config::Model::Tk::NoteEditor;
-$Config::Model::Tk::NoteEditor::VERSION = '1.364';
+$Config::Model::Tk::NoteEditor::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/Tk/Wizard.pm b/lib/Config/Model/Tk/Wizard.pm
index 0eb4a2e..b8a095f 100644
--- a/lib/Config/Model/Tk/Wizard.pm
+++ b/lib/Config/Model/Tk/Wizard.pm
@@ -9,7 +9,7 @@
#
package Config::Model::Tk::Wizard;
-$Config::Model::Tk::Wizard::VERSION = '1.364';
+$Config::Model::Tk::Wizard::VERSION = '1.365';
use strict;
use warnings;
use Carp;
diff --git a/lib/Config/Model/TkUI.pm b/lib/Config/Model/TkUI.pm
index 7946fc3..c1a11c9 100644
--- a/lib/Config/Model/TkUI.pm
+++ b/lib/Config/Model/TkUI.pm
@@ -10,7 +10,7 @@
# copyright at the end of the file in the pod section
package Config::Model::TkUI;
-$Config::Model::TkUI::VERSION = '1.364';
+$Config::Model::TkUI::VERSION = '1.365';
use 5.10.1;
use strict;
use warnings;
@@ -39,7 +39,7 @@ use Tk::FontDialog;
use Tk::Pod;
use Tk::Pod::Text; # for findpod
-use Config::Model 2.095; # Node::get_help_as_text
+use Config::Model 2.114; # Node::gist
use Config::Model::Tk::LeafEditor;
use Config::Model::Tk::CheckListEditor;
@@ -898,6 +898,10 @@ sub disp_hash {
$tkt->setmode( $newpath => $eltmode );
}
+ # update the node gist
+ my $gist = $elt_type =~ /node/ ? $elt->fetch_with_id($idx)->fetch_gist : '';
+ $tkt->itemCreate( $newpath, 2, -text => $gist );
+
my $elt_loc = $node_loc;
$elt_loc .= ' ' if $elt_loc;
diff --git a/t/lib/Config/Model/models/Master.pl b/t/lib/Config/Model/models/Master.pl
index 4c3c7ce..3b0cb15 100644
--- a/t/lib/Config/Model/models/Master.pl
+++ b/t/lib/Config/Model/models/Master.pl
@@ -56,6 +56,7 @@ use utf8;
[
name => 'SlaveZ',
+ gist => 'Z:{Z} DX:{DX}',
element => [
[qw/Z/] => {
type => 'leaf',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-tkui-perl.git
More information about the Pkg-perl-cvs-commits
mailing list