Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl/lib/Etk
Modified Files:
FillPolicy.pm ToggleButton.pm Tree.pm Widget.pm Window.pm
Log Message:
- more work on new API
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/FillPolicy.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- FillPolicy.pm 7 Jun 2006 11:58:33 -0000 1.1
+++ FillPolicy.pm 20 Jul 2006 17:27:04 -0000 1.2
@@ -1,6 +1,11 @@
package Etk::FillPolicy;
use strict;
require Etk;
+require Exporter;
+our @ISA=qw/Exporter/;
+
+our @EXPORT = qw/None HFill VFill HExpand VExpand/;
+
use constant
{
None => 1 << 0,
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/ToggleButton.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ToggleButton.pm 7 Jun 2006 11:58:34 -0000 1.1
+++ ToggleButton.pm 20 Jul 2006 17:27:04 -0000 1.2
@@ -23,6 +23,7 @@
{
my $self = shift;
Etk::etk_toggle_button_toggle($self->{WIDGET});
+ return $self;
}
sub ActiveSet
@@ -30,6 +31,7 @@
my $self = shift;
my $active = shift;
Etk::etk_toggle_button_active_set($self->{WIDGET}, $active);
+ return $self;
}
sub ActiveGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Tree.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Tree.pm 18 Jul 2006 22:14:34 -0000 1.3
+++ Tree.pm 20 Jul 2006 17:27:04 -0000 1.4
@@ -2,7 +2,10 @@
use strict;
use vars qw(@ISA);
require Etk::Widget;
[EMAIL PROTECTED] = ("Etk::Widget");
+require Exporter;
[EMAIL PROTECTED] = ("Etk::Widget", "Exporter");
+
+our @EXPORT = qw/ModeList ModeTree FromFile FromEdje cols/;
use Etk::Tree::Col;
use Etk::Tree::Row;
@@ -19,7 +22,9 @@
use constant
{
ModeList => 0,
- ModeTree => 1
+ ModeTree => 1,
+ FromFile => 0,
+ FromEdje => 1
};
sub new
@@ -225,12 +230,29 @@
my $self = shift;
my ($title, $model, $width) = @_;
+ my $data;
my $model_widget;
+
+ if (ref $model eq "ARRAY") {
+ $data = $model->[1];
+ $model = $model->[0];
+ }
+
if ($model eq "Text") {
$model_widget = Etk::Tree::Model::Text->new($self);
} elsif ($model eq "ProgressBar") {
$model_widget = Etk::Tree::Model::ProgressBar->new($self);
- } # etc...
+ } elsif ($model eq "IconText") {
+ $model_widget = Etk::Tree::Model::IconText->new($self, $data);
+ } elsif ($model eq "Image") {
+ $model_widget = Etk::Tree::Model::Image->new($self, $data);
+ } elsif ($model eq "Double") {
+ $model_widget = Etk::Tree::Model::Double->new($self);
+ } elsif ($model eq "Checkbox") {
+ $model_widget = Etk::Tree::Model::Checkbox->new($self);
+ } elsif ($model eq "Int") {
+ $model_widget = Etk::Tree::Model::Int->new($self);
+ }
my $widget = Etk::Tree::Col->new($self, $title, $model_widget, $width);
$widget->{MODEL} = $model;
@@ -263,6 +285,25 @@
} elsif ($col->{MODEL} eq "ProgressBar") {
my $prog = shift @data;
$row->FieldProgressBarSet($col, $prog->[0], $prog->[1]);
+ } elsif ($col->{MODEL} eq "IconText") {
+ my $d = shift @data;
+ if (@$d == 3) {
+ $row->FieldIconEdjeTextSet($col, $d->[0], $d->[1],
$d->[2]);
+ } else {
+ $row->FieldIconFileTextSet($col, $d->[0], $d->[1]);
+ }
+ } elsif ($col->{MODEL} eq "Image") {
+ my $path = shift @data;
+ $row->FieldImageFileSet($col, $path);
+ } elsif ($col->{MODEL} eq "Double") {
+ my $value = shift @data;
+ $row->FieldDoubleSet($col, $value);
+ } elsif ($col->{MODEL} eq "Checkbox") {
+ my $checked = shift @data;
+ $row->FieldCheckboxSet($col, $checked);
+ } elsif ($col->{MODEL} eq "Int") {
+ my $value = shift @data;
+ $row->FieldIntSet($col, $value);
}
}
return $row;
@@ -276,6 +317,12 @@
$self->AddRow(@$_);
}
return $self;
+}
+
+sub cols
+{
+ my $self = shift;
+ return $self->{COLS};
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Widget.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Widget.pm 18 Jul 2006 22:14:34 -0000 1.8
+++ Widget.pm 20 Jul 2006 17:27:04 -0000 1.9
@@ -110,6 +110,7 @@
{
my $self = shift;
Etk::etk_widget_size_recalc_queue($self->{WIDGET});
+ return $self;
}
sub RedrawQueue
@@ -124,6 +125,7 @@
my $width = shift;
my $height = shift;
Etk::etk_widget_size_request_set($self->{WIDGET}, $width, $height);
+ return $self;
}
sub SizeAllocate
@@ -131,6 +133,7 @@
my $self = shift;
my $geometry = shift; # hashref
Etk::etk_widget_size_allocate($self->{WIDGET}, $geometry);
+ return $self;
}
sub Enter
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Window.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Window.pm 1 Jul 2006 20:20:22 -0000 1.3
+++ Window.pm 20 Jul 2006 17:27:04 -0000 1.4
@@ -30,6 +30,7 @@
my $self = shift;
my $title = shift;
Etk::etk_window_title_set($self->{WIDGET}, $title);
+ return $self;
}
sub TitleGet
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
