Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl/lib/Etk
Modified Files:
Alignment.pm Bin.pm Box.pm Button.pm CheckButton.pm
Clipboard.pm Colorpicker.pm Combobox.pm Container.pm Dialog.pm
Drag.pm Entry.pm Filechooser.pm FillPolicy.pm Frame.pm
Iconbox.pm Image.pm Label.pm Menu.pm MessageDialog.pm
Notebook.pm Object.pm Paned.pm PopupWindow.pm ProgressBar.pm
RadioButton.pm Range.pm ScrolledView.pm Selection.pm Stock.pm
Table.pm TextBlock.pm ToggleButton.pm Tooltips.pm
ToplevelWidget.pm Tree.pm Widget.pm Window.pm
Added Files:
Constants.pm
Log Message:
- back to stable again.
- new Constants for all consts
- Stock can export its constants too
- more simplifications in etk_test.pl
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Alignment.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Alignment.pm 16 Jun 2006 18:41:16 -0000 1.1
+++ Alignment.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -3,6 +3,7 @@
use vars qw(@ISA);
require Etk::Bin;
@ISA = ("Etk::Bin");
+
sub new
{
my $class = shift;
@@ -12,16 +13,29 @@
return $self;
}
+=item Set($xalign, $yalign, $xscale, $yscale)
+
+Set alignment info.
+
+=cut
+
sub Set
{
my $self = shift;
Etk::etk_alignment_set($self->{WIDGET}, shift, shift, shift, shift);
+ return $self;
}
+=item Get()
+
+Returns a list containing alignment info.
+xalign, yalign, xscale, yscale
+
+=cut
+
sub Get
{
my $self = shift;
- # returns xalign, yalign, xscale, yscale
return Etk::etk_alignment_get($self->{WIDGET});
}
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Bin.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Bin.pm 7 Jun 2006 11:58:33 -0000 1.1
+++ Bin.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -16,6 +16,7 @@
my $self = shift;
my $widget = shift;
Etk::etk_bin_child_set($self->{WIDGET}, $widget->{WIDGET});
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Box.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Box.pm 18 Jul 2006 22:14:34 -0000 1.3
+++ Box.pm 20 Jul 2006 23:16:22 -0000 1.4
@@ -10,6 +10,7 @@
{
my $class = shift;
my $self = $class->SUPER::new();
+ $self->{CHILDREN} = [];
bless($self, $class);
return $self;
}
@@ -18,16 +19,18 @@
{
my $self = shift;
my $child = shift;
+ # if there's no child, and this widget has a PARENT of type Box
+ # then PackStart is being called on a child object and needs to
+ # be handled by the Widget itself (effectively calling PackStart
+ # on the parent)
if (!$child && ref $self->{PARENT} && $self->{PARENT}->isa("Etk::Box")) {
$self->{PARENT}->PackStart($self, @_);
return $self;
}
- my $expand = 1;
- $expand = shift if(@_ > 0);
- my $fill = 1;
- $fill = shift if(@_ > 0);
- my $padding = 0;
- $padding = shift if(@_ > 0);
+ my ($expand, $fill, $padding) = @_;
+ $expand = 1 unless defined $expand;
+ $fill = 1 unless defined $fill;
+ $padding = 0 unless defined $padding;
Etk::etk_box_pack_start($self->{WIDGET}, $child->{WIDGET}, $expand,
$fill, $padding);
return $self;
@@ -37,12 +40,15 @@
{
my $self = shift;
my $child = shift;
- my $expand = 1;
- $expand = shift if(@_ > 0);
- my $fill = 1;
- $fill = shift if(@_ > 0);
- my $padding = 0;
- $padding = shift if(@_ > 0);
+ # similar to PackStart
+ if (!$child && ref $self->{PARENT} && $self->{PARENT}->isa("Etk::Box")) {
+ $self->{PARENT}->PackEnd($self, @_);
+ return $self;
+ }
+ my ($expand, $fill, $padding) = @_;
+ $expand = 1 unless defined $expand;
+ $fill = 1 unless defined $fill;
+ $padding = 0 unless defined $padding;
Etk::etk_box_pack_end($self->{WIDGET}, $child->{WIDGET}, $expand,
$fill, $padding);
}
@@ -57,6 +63,7 @@
my $pack_end = shift;
Etk::etk_box_child_packing_set($self->{WIDGET}, $child->{WIDGET}, $padding,
$expand, $fill, $pack_end);
+ return $self;
}
=item ChildPackingGet($child)
@@ -73,13 +80,13 @@
my $self = shift;
my $child = shift;
my $child_widget;
- if ($child + 0 eq $child) {
- $child_widget = $self->children()->[$child];
- } else {
+ if (ref $child) {
$child_widget = $child;
+ } else {
+ $child_widget = $self->children()->[$child];
}
if ($child_widget->isa("Etk::Widget")) {
- return Etk::etk_box_child_packing_get($self->{WIDGET},
$child_widget->{WIDGET});
+ return Etk::etk_box_child_packing_get($self->{WIDGET},
$child_widget->{WIDGET});
}
return undef;
}
@@ -89,6 +96,7 @@
my $self = shift;
my $spacing = shift;
Etk::etk_box_spacing_set($self->{WIDGET}, $spacing);
+ return $self;
}
sub SpacingGet
@@ -102,6 +110,7 @@
my $self = shift;
my $homogenous = shift;
Etk::etk_box_homogenous_set($self->{WIDGET}, $homogenous);
+ return $self;
}
sub HomogenousGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Button.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Button.pm 18 Jul 2006 22:14:34 -0000 1.4
+++ Button.pm 20 Jul 2006 23:16:22 -0000 1.5
@@ -9,15 +9,12 @@
{
my $class = shift;
my $self = $class->SUPER::new();
- if(@_ == 1)
- {
+ if(@_ == 1) {
my $thing = shift;
- $self->{WIDGET} = $thing + 0 eq $thing ?
- Etk::etk_button_new_from_stock($thing) :
- Etk::etk_button_new_with_label($thing);
- }
- else
- {
+ $self->{WIDGET} = $thing =~ /\D/ ?
+ Etk::etk_button_new_with_label($thing) :
+ Etk::etk_button_new_from_stock($thing);
+ } else {
$self->{WIDGET} = Etk::etk_button_new();
}
bless($self, $class);
@@ -28,18 +25,21 @@
{
my $self = shift;
Etk::etk_button_press($self->{WIDGET});
+ return $self;
}
sub Release
{
my $self = shift;
Etk::etk_button_release($self->{WIDGET});
+ return $self;
}
sub Click
{
my $self = shift;
Etk::etk_button_click($self->{WIDGET});
+ return $self;
}
sub LabelSet
@@ -47,6 +47,7 @@
my $self = shift;
my $label = shift;
Etk::etk_button_label_set($self->{WIDGET}, $label);
+ return $self;
}
sub LabelGet
@@ -89,6 +90,7 @@
my $self = shift;
my $stock_id = shift;
Etk::etk_button_set_from_stock($self->{WIDGET}, $stock_id);
+ return $self;
}
sub AlignmentSet
@@ -96,14 +98,18 @@
my $self = shift;
my $alignment = shift;
Etk::etk_button_alignment_set($self->{WIDGET}, $alignment);
+ return $self;
}
+=item AlignmentGet()
+
+Return $xalign, $yalign.
+
+=cut
+
sub AlignmentGet
{
my $self = shift;
- # RETURNS
- # xalign
- # yalign
return Etk::etk_button_alignment_get($self->{WIDGET});
}
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/CheckButton.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- CheckButton.pm 7 Jun 2006 11:58:33 -0000 1.1
+++ CheckButton.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -7,12 +7,9 @@
{
my $class = shift;
my $self = $class->SUPER::new();
- if(@_ == 1)
- {
+ if(@_ == 1) {
$self->{WIDGET} = Etk::etk_check_button_new_with_label(shift);
- }
- else
- {
+ } else {
$self->{WIDGET} = Etk::etk_check_button_new();
}
bless($self, $class);
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Clipboard.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Clipboard.pm 7 Jun 2006 11:58:33 -0000 1.1
+++ Clipboard.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -12,6 +12,7 @@
my $widget = shift;
my $text = shift;
Etk::etk_clipboard_text_set($widget->{WIDGET}, $text, length($text));
+ return $widget;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Colorpicker.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Colorpicker.pm 1 Jul 2006 20:20:22 -0000 1.2
+++ Colorpicker.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -23,6 +23,7 @@
my $self = shift;
my $mode = shift;
Etk::etk_colorpicker_mode_set($self->{WIDGET}, $mode);
+ return $self;
}
sub ColorSet
@@ -30,6 +31,7 @@
my $self = shift;
my $color = shift;
Etk::etk_colorpicker_current_color_set($self->{WIDGET}, $color);
+ return $self;
}
sub ColorGet
@@ -37,18 +39,5 @@
my $self = shift;
return Etk::etk_colorpicker_current_color_get($self->{WIDGET});
}
-
-package Etk::Colorpicker::Mode;
-
-use constant {
-
- H => 0,
- S => 1,
- V => 2,
- R => 3,
- G => 4,
- B => 5
-
-};
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Combobox.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Combobox.pm 18 Jul 2006 22:14:34 -0000 1.4
+++ Combobox.pm 20 Jul 2006 23:16:22 -0000 1.5
@@ -6,13 +6,6 @@
use Etk::Combobox::Item;
-use constant
-{
- ColumnTypeLabel => 0,
- ColumnTypeImage => 1,
- ColumnTypeOther => 2
-};
-
sub new
{
my $class = shift;
@@ -36,6 +29,7 @@
my $self = shift;
my $height = shift;
Etk::etk_combobox_height_set($self->{WIDGET}, $height);
+ return $self;
}
sub HeightGet
@@ -56,12 +50,14 @@
my $yalign = shift;
Etk::etk_combobox_column_add($self->{WIDGET}, $col_type, $size, $expand,
$hfill, $vfill, $xalign, $yalign);
+ return $self;
}
sub Build
{
my $self = shift;
Etk::etk_combobox_build($self->{WIDGET});
+ return $self;
}
sub ActiveItemSet
@@ -69,13 +65,14 @@
my $self = shift;
my $item = shift;
Etk::etk_combobox_active_item_set($self->{WIDGET}, $item->{WIDGET});
+ return $self;
}
sub ActiveItemGet
{
my $self = shift;
my $item = Etk::Combobox::Item->new();
- $item->{WIDGET} = Etk::etk_combobox_active_item_get($self->{WIDGET});
+ $item->{WIDGET} = Etk::etk_combobox_active_item_get($self->{WIDGET});
return $item;
}
@@ -96,12 +93,9 @@
for my $arg (@_)
{
- if($arg->isa("Etk::Widget"))
- {
+ if($arg->isa("Etk::Widget")) {
push @args, $arg->{WIDGET};
- }
- else
- {
+ } else {
push @args, $arg;
}
}
@@ -118,12 +112,9 @@
for my $arg (@_)
{
- if($arg->isa("Etk::Widget"))
- {
+ if($arg->isa("Etk::Widget")) {
push @args, $arg->{WIDGET};
- }
- else
- {
+ } else {
push @args, $arg;
}
}
@@ -142,12 +133,9 @@
for my $arg (@_)
{
- if($arg->isa("Etk::Widget"))
- {
+ if($arg->isa("Etk::Widget")) {
push @args, $arg->{WIDGET};
- }
- else
- {
+ } else {
push @args, $arg;
}
}
@@ -166,12 +154,9 @@
for my $arg (@_)
{
- if($arg->isa("Etk::Widget"))
- {
+ if($arg->isa("Etk::Widget")) {
push @args, $arg->{WIDGET};
- }
- else
- {
+ } else {
push @args, $arg;
}
}
@@ -186,12 +171,14 @@
my $self = shift;
my $item = shift;
Etk::etk_combobox_item_remove($self->{WIDGET}, $item->{WIDGET});
+ return $self;
}
sub Clear
{
my $self = shift;
Etk::etk_combobox_clear($self->{WIDGET});
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Container.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Container.pm 15 Jul 2006 19:19:05 -0000 1.3
+++ Container.pm 20 Jul 2006 23:16:22 -0000 1.4
@@ -15,10 +15,10 @@
sub Add
{
my $self = shift;
- # confess "usage: \$container->Add(\$widget)" unless @_ == 1;
my $widget = shift;
Etk::etk_container_add($self->{WIDGET}, $widget->{WIDGET});
push @{$self->{CHILDREN}}, $widget;
+ return $self;
}
sub Remove
@@ -29,6 +29,7 @@
my @children = @{$self->{CHILDREN}};
$self->{CHILDREN} = [];
push @{$self->{CHILDREN}}, grep { $_ != $widget } @children;
+ return $self;
}
sub BorderWidthSet
@@ -36,6 +37,7 @@
my $self = shift;
my $width = shift;
Etk::etk_container_border_width_set($self->{WIDGET}, $width);
+ return $self;
}
sub BorderWidthGet
@@ -72,6 +74,7 @@
my $yalign = shift;
Etk::etk_container_child_space_fill($child->{WIDGET}, $child_space,
$hfill, $vfill, $xalign, $yalign);
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Dialog.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Dialog.pm 7 Jun 2006 11:58:33 -0000 1.1
+++ Dialog.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -30,6 +30,7 @@
my $pack_at_end = shift;
Etk::etk_dialog_pack_in_main_area($self->{WIDGET}, $widget->{WIDGET},
$expand, $fill, $padding, $pack_at_end);
+ return $self;
}
sub PackWidgetInActionArea
@@ -42,6 +43,7 @@
my $pack_at_end = shift;
Etk::etk_dialog_pack_widget_in_action_area($self->{WIDGET},
$widget->{WIDGET}, $expand, $fill, $padding, $pack_at_end);
+ return $self;
}
sub PackButtonInActionArea
@@ -55,6 +57,7 @@
my $pack_at_end = shift;
Etk::etk_dialog_pack_button_in_action_area($self->{WIDGET},
$button->{WIDGET}, $response_id, $expand, $fill, $padding,
$pack_at_end);
+ return $self;
}
sub ButtonAdd
@@ -62,15 +65,12 @@
my $self = shift;
my $label = shift;
my $response_id = shift;
- Etk::etk_dialog_button_add($self->{WIDGET}, $label, $response_id);
-}
-
-sub ButtonAddFromStock
-{
- my $self = shift;
- my $stock_id = shift;
- my $response_id = shift;
- Etk::etk_dialog_button_add_from_stock($self->{WIDGET}, $stock_id,
$response_id);
+ if ($label =~ /\D/) {
+ Etk::etk_dialog_button_add($self->{WIDGET}, $label, $response_id);
+ } else {
+ Etk::etk_dialog_button_add_from_stock($self->{WIDGET}, $label,
$response_id);
+ }
+ return $self;
}
sub HasSeparatorSet
@@ -78,6 +78,7 @@
my $self = shift;
my $has_separator = shift;
Etk::etk_dialog_has_separator_set($self->{WIDGET}, $has_separator);
+ return $self;
}
sub HasSeparatorGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Drag.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Drag.pm 15 Jul 2006 19:19:05 -0000 1.3
+++ Drag.pm 20 Jul 2006 23:16:22 -0000 1.4
@@ -17,10 +17,10 @@
{
my $self = shift;
my @types = @_;
- if (@types > 0)
- {
+ if (@types > 0) {
Etk::etk_drag_types_set($self->{WIDGET}, @types);
}
+ return $self;
}
sub DataSet
@@ -28,12 +28,14 @@
my $self = shift;
my $data = shift;
Etk::etk_drag_data_set($self->{WIDGET}, $data);
+ return $self;
}
sub Begin
{
my $self = shift;
Etk::etk_drag_begin($self->{WIDGET});
+ return $self;
}
sub ParentWidgetSet
@@ -41,6 +43,7 @@
my $self = shift;
my $widget = shift;
Etk::etk_drag_parent_widget_set($self->{WIDGET}, $widget->{WIDGET});
+ return $self;
}
sub ParentWidgetGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Entry.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Entry.pm 7 Jun 2006 11:58:33 -0000 1.1
+++ Entry.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -17,6 +17,7 @@
my $self = shift;
my $text = shift;
Etk::etk_entry_text_set($self->{WIDGET}, $text);
+ return $self;
}
sub TextGet
@@ -30,6 +31,7 @@
my $self = shift;
my $on = shift;
return Etk::etk_entry_password_set($self->{WIDGET}, $on);
+ return $self;
}
sub PasswordGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Filechooser.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Filechooser.pm 1 Jul 2006 20:20:22 -0000 1.2
+++ Filechooser.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -18,6 +18,7 @@
my $select_multiple = shift;
Etk::etk_filechooser_widget_select_multiple_set($self->{WIDGET},
$select_multiple);
+ return $self;
}
sub SelectMultipleGet
@@ -31,6 +32,7 @@
my $self = shift;
my $show_hidden = shift;
Etk::etk_filechooser_widget_show_hidden_set($self->{WIDGET}, $show_hidden);
+ return $self;
}
sub ShowHiddenGet
@@ -44,6 +46,7 @@
my $self = shift;
my $folder = shift;
Etk::etk_filechooser_widget_current_folder_set($self->{WIDGET}, $folder);
+ return $self;
}
sub CurrentFolderGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/FillPolicy.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- FillPolicy.pm 20 Jul 2006 17:27:04 -0000 1.2
+++ FillPolicy.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -1,20 +1,7 @@
package Etk::FillPolicy;
-use strict;
-require Etk;
-require Exporter;
-our @ISA=qw/Exporter/;
-our @EXPORT = qw/None HFill VFill HExpand VExpand/;
+die "Etk::FillPolicy is deprecated. Use Etk::Constants instead.\n";
-use constant
-{
- None => 1 << 0,
- HFill => 1 << 1,
- VFill => 1 << 2,
- HExpand => 1 << 3,
- VExpand => 1 << 4
-};
-
-1;
+0;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Frame.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Frame.pm 7 Jun 2006 11:58:33 -0000 1.1
+++ Frame.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -18,6 +18,7 @@
my $self = shift;
my $label = shift;
Etk::etk_frame_label_set($self->{WIDGET}, $label);
+ return $self;
}
sub LabelGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Iconbox.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Iconbox.pm 18 Jul 2006 22:14:34 -0000 1.4
+++ Iconbox.pm 20 Jul 2006 23:16:22 -0000 1.5
@@ -21,6 +21,7 @@
my $self = shift;
my $model = shift;
Etk::etk_iconbox_current_model_set($self->{WIDGET}, $model->{WIDGET});
+ return $self;
}
sub CurrentModelGet
@@ -35,12 +36,14 @@
{
my $self = shift;
Etk::etk_iconbox_freeze($self->{WIDGET});
+ return $self;
}
sub Thaw
{
my $self = shift;
Etk::etk_iconbox_thaw($self->{WIDGET});
+ return $self;
}
sub Append
@@ -59,6 +62,7 @@
{
my $self = shift;
Etk::etk_iconbox_clear($self->{WIDGET});
+ return $self;
}
sub IconGetAtXY
@@ -80,12 +84,14 @@
{
my $self = shift;
Etk::etk_iconbox_select_all($self->{WIDGET});
+ return $self;
}
sub UnselectAll
{
my $self = shift;
Etk::etk_iconbox_unselect_all($self->{WIDGET});
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Image.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Image.pm 17 Jul 2006 23:26:17 -0000 1.3
+++ Image.pm 20 Jul 2006 23:16:22 -0000 1.4
@@ -34,6 +34,7 @@
my $self = shift;
my $filename = shift;
Etk::etk_image_set_from_file($self->{WIDGET}, $filename);
+ return $self;
}
sub FileGet
@@ -48,6 +49,7 @@
my $edje_filename = shift;
my $edje_group = shift;
Etk::etk_image_set_from_edje($self->{WIDGET}, $edje_filename, $edje_group);
+ return $self;
}
sub EdjeGet
@@ -65,12 +67,14 @@
my $stock_id = shift;
my $stock_size = shift;
Etk::etk_image_set_from_stock($self->{WIDGET}, $stock_id, $stock_size);
+ return $self;
}
sub StockGet
{
my $self = shift;
- Etk::etk_image_stock_get($self->{WIDGET}, shift, shift);
+ # returns stock_id, stock_size
+ return Etk::etk_image_stock_get($self->{WIDGET});
}
sub CopyFrom
@@ -78,6 +82,7 @@
my $self = shift;
my $src_image = shift;
Etk::etk_image_copy($self->{WIDGET}, $src_image->{WIDGET});
+ return $self;
}
sub SizeGet
@@ -91,6 +96,7 @@
my $self = shift;
my $keep_aspect = shift;
Etk::etk_image_keep_aspect_set($self->{WIDGET}, $keep_aspect);
+ return $self;
}
sub KeepAspectGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Label.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Label.pm 1 Jul 2006 20:20:22 -0000 1.2
+++ Label.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -18,6 +18,7 @@
my $self = shift;
my $text = shift;
Etk::etk_label_set($self->{WIDGET}, $text);
+ return $self;
}
sub Get
@@ -32,6 +33,7 @@
my $xalign = shift;
my $yalign = shift;
Etk::etk_label_alignment_set($self->{WIDGET}, $xalign, $yalign);
+ return $self;
}
sub AlignmentGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Menu.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Menu.pm 18 Jul 2006 22:14:34 -0000 1.2
+++ Menu.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -27,18 +27,21 @@
my $x = shift;
my $y = shift;
Etk::etk_menu_popup_at_xy($self->{WIDGET}, $x, $y);
+ return $self;
}
sub Popup
{
my $self = shift;
Etk::etk_menu_popup($self->{WIDGET});
+ return $self;
}
sub Popdown
{
my $self = shift;
Etk::etk_menu_popdown($self->{WIDGET});
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/MessageDialog.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- MessageDialog.pm 7 Jun 2006 11:58:34 -0000 1.1
+++ MessageDialog.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -4,21 +4,6 @@
require Etk::Dialog;
@ISA = ("Etk::Dialog");
-use constant
-{
- None = 0,
- Warning => 1,
- Question => 2,
- Error => 3,
-
- ButtonsNone => 0,
- ButtonsOk => 1,
- ButtonsClose => 2,
- ButtonsCancel => 3,
- ButtonsYesNo => 4,
- ButtonsOkCancel => 5
-};
-
sub new
{
my $class = shift;
@@ -26,8 +11,8 @@
my $message_type = shift;
my $buttons = shift;
my $text = shift;
- $self->{WIDGET} = Etk::etk_message_dialog_new($message_type, buttons,
- $test);
+ $self->{WIDGET} = Etk::etk_message_dialog_new($message_type, $buttons,
+ $text);
bless($self, $class);
return $self;
}
@@ -37,6 +22,7 @@
my $self = shift;
my $text = shift;
Etk::etk_message_dialog_text_set($self->{WIDGET}, $text);
+ return $self;
}
sub TextGet
@@ -50,6 +36,7 @@
my $self = shift;
my $type = shift;
Etk::etk_message_dialog_message_type_set($self->{WIDGET}, $type);
+ return $self;
}
sub MessageTypeGet
@@ -63,6 +50,7 @@
my $self = shift;
my $buttons = shift;
Etk::etk_message_dialog_buttons_set($self->{WIDGET}, $buttons);
+ return $self;
}
sub ButtonsGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Notebook.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Notebook.pm 1 Jul 2006 20:20:22 -0000 1.3
+++ Notebook.pm 20 Jul 2006 23:16:22 -0000 1.4
@@ -20,6 +20,7 @@
my $page_child = shift;
Etk::etk_notebook_page_prepend($self->{WIDGET}, $tab_label,
$page_child->{WIDGET});
+ return $self;
}
sub PageAppend
@@ -29,6 +30,7 @@
my $page_child = shift;
Etk::etk_notebook_page_append($self->{WIDGET}, $tab_label,
$page_child->{WIDGET});
+ return $self;
}
sub Insert
@@ -39,6 +41,7 @@
my $position = shift;
Etk::etk_notebook_page_insert($self->{WIDGET}, $tab_label,
$page_child->{WIDGET}, $position);
+ return $self;
}
sub Remove
@@ -46,6 +49,7 @@
my $self = shift;
my $page_num = shift;
Etk::etk_notebook_remove($self->{WIDGET}, $page_num);
+ return $self;
}
sub NumPagesGet
@@ -59,6 +63,7 @@
my $self = shift;
my $page = shift;
Etk::etk_notebook_current_page_set($self->{WIDGET}, $page);
+ return $self;
}
sub CurrentPageGet
{
@@ -77,12 +82,14 @@
{
my $self = shift;
Etk::etk_notebook_page_prev($self->{WIDGET});
+ return $self;
}
sub PageNext
{
my $self = shift;
Etk::etk_notebook_page_next($self->{WIDGET});
+ return $self;
}
sub PageTabLabelSet
@@ -92,6 +99,7 @@
my $tab_label = shift;
Etk::etk_notebook_page_tab_label_set($self->{WIDGET}, $page_num,
$tab_label);
+ return $self;
}
sub PageTabLabelGet
@@ -108,6 +116,7 @@
my $tab_widget = shift;
Etk::etk_notebook_page_tab_label_set($self->{WIDGET}, $page_num,
$tab_widget->{WIDGET});
+ return $self;
}
sub PageTabWidgetGet
@@ -127,6 +136,7 @@
my $child = shift;
Etk::etk_notebook_page_child_set($self->{WIDGET}, $page_num,
$child->{WIDET});
+ return $self;
}
sub PageChildGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Object.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Object.pm 18 Jul 2006 22:14:34 -0000 1.8
+++ Object.pm 20 Jul 2006 23:16:22 -0000 1.9
@@ -14,8 +14,7 @@
my $self = shift;
my $signal_name = shift;
my $callback = shift;
- my $data = undef;
- $data = shift if (@_ > 0);
+ my $data = shift;
Etk::etk_signal_connect($signal_name, $self, $callback, $data);
return $self;
}
@@ -25,8 +24,7 @@
my $self = shift;
my $signal_name = shift;
my $callback = shift;
- my $data = undef;
- $data = shift if (@_ > 0);
+ my $data = shift;
Etk::etk_signal_connect_after($signal_name, $self, $callback, $data);
return $self;
}
@@ -36,8 +34,7 @@
my $self = shift;
my $signal_name = shift;
my $callback = shift;
- my $data = undef;
- $data = shift if (@_ > 0);
+ my $data = shift;
Etk::etk_signal_connect_swapped($signal_name, $self, $callback, $data);
return $self;
}
@@ -70,6 +67,7 @@
my $callback = shift;
my $data = shift;
Etk::etk_object_notification_callback_add($self->{WIDGET}, $property_name,
$callback, $data);
+ return $self;
}
sub NotificationCallbackRemove
@@ -77,6 +75,7 @@
my $self = shift;
my $property_name = shift;
Etk::etk_object_notification_callback_remove($self->{WIDGET},
$property_name);
+ return $self;
}
sub Notify
@@ -84,6 +83,7 @@
my $self = shift;
my $property_name = shift;
Etk::etk_object_notify($self->{WIDGET}, $property_name);
+ return $self;
}
sub DataSet
@@ -92,6 +92,7 @@
my $key = shift;
my $data = shift;
Etk::etk_object_data_set($self->{WIDGET}, $key, $data);
+ return $self;
}
sub DataGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Paned.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Paned.pm 7 Jun 2006 11:58:34 -0000 1.1
+++ Paned.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -18,6 +18,7 @@
my $child = shift;
my $expand = shift;
Etk::etk_paned_child1_set($self->{WIDGET}, $child->{WIDGET}, $expand);
+ return $self;
}
sub Child2Set
@@ -26,6 +27,7 @@
my $child = shift;
my $expand = shift;
Etk::etk_paned_child2_set($self->{WIDGET}, $child->{WIDGET}, $expand);
+ return $self;
}
sub Child1Get
@@ -49,6 +51,7 @@
my $self = shift;
my $position = shift;
Etk::etk_paned_position_set($self->{WIDGET}, $position);
+ return $self;
}
sub PositionGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/PopupWindow.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- PopupWindow.pm 7 Jun 2006 11:58:34 -0000 1.1
+++ PopupWindow.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -46,6 +46,7 @@
{
my $self = shift;
Etk::etk_popup_window_focused_window_set($self->{WIDGET});
+ return $self;
}
sub FocusedWindowGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/ProgressBar.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ProgressBar.pm 18 Jul 2006 22:14:34 -0000 1.3
+++ ProgressBar.pm 20 Jul 2006 23:16:22 -0000 1.4
@@ -4,22 +4,13 @@
require Etk::Widget;
@ISA = ("Etk::Widget");
-use constant
-{
- LeftToRight => 0,
- RightToLeft => 1
-};
-
sub new
{
my $class = shift;
my $self = $class->SUPER::new();
- if(@_ == 1)
- {
+ if(@_ == 1) {
$self->{WIDGET} = Etk::etk_progress_bar_new_with_text(shift);
- }
- else
- {
+ } else {
$self->{WIDGET} = Etk::etk_progress_bar_new();
}
bless($self, $class);
@@ -31,6 +22,7 @@
my $self = shift;
my $label = shift;
Etk::etk_progress_bar_text_set($self->{WIDGET}, $label);
+ return $self;
}
sub TextGet
@@ -44,6 +36,7 @@
my $self = shift;
my $fraction = shift;
Etk::etk_progress_bar_fraction_set($self->{WIDGET}, $fraction);
+ return $self;
}
sub FractionGet
@@ -56,6 +49,7 @@
{
my $self = shift;
Etk::etk_progress_bar_pulse($self->{WIDGET});
+ return $self;
}
sub PulseStepSet
@@ -77,6 +71,7 @@
my $self = shift;
my $direction = shift;
Etk::etk_progress_bar_direction_set($self->{WIDGET}, $direction);
+ return $self;
}
sub DirectionGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/RadioButton.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- RadioButton.pm 28 Jun 2006 00:18:37 -0000 1.1
+++ RadioButton.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -9,37 +9,27 @@
my $self = $class->SUPER::new();
my $widget;
- if(@_ >= 1)
- {
+ if(@_ >= 1) {
my $data = shift;
- if (ref $data)
- {
+ if (ref $data) {
$self->{WIDGET} =
Etk::etk_radio_button_new_from_widget($data->{WIDGET});
$widget = $data;
- }
- else
- {
- if (@_)
- {
+ } else {
+ if (@_) {
my $data2 = shift;
$self->{WIDGET} =
Etk::etk_radio_button_new_with_label_from_widget(
$data, $data2->{WIDGET});
$widget = $data2;
- }
- else
- {
+ } else {
$self->{WIDGET} = Etk::etk_radio_button_new_with_label($data);
}
}
}
bless($self, $class);
- if ($widget)
- {
+ if ($widget) {
push @{$widget->{GROUP}}, $self;
$self->{GROUP} = $widget->{GROUP};
- }
- else
- {
+ } else {
push @{$self->{GROUP}}, $self;
}
return $self;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Range.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Range.pm 7 Jun 2006 11:58:34 -0000 1.1
+++ Range.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -17,6 +17,7 @@
my $self = shift;
my $value = shift;
Etk::etk_range_value_set($self->{WIDGET}, $value);
+ return $self;
}
sub ValueGet
@@ -31,12 +32,14 @@
my $lower = shift;
my $upper = shift;
Etk::etk_range_range_set($self->{WIDGET}, $lower, $upper);
+ return $self;
}
sub RangeGet
{
my $self = shift;
- Etk::etk_range_range_get($self->{WIDGET}, shift, shift);
+ # return lower, upper
+ return Etk::etk_range_range_get($self->{WIDGET});
}
sub IncrementsSet
@@ -45,12 +48,14 @@
my $step = shift;
my $page = shift;
Etk::etk_range_increments_set($self->{WIDGET}, $step, $page);
+ return $self;
}
sub IncrementstGet
{
my $self = shift;
- Etk::etk_range_increments_get($self->{WIDGET}, shift, shift);
+ #return step, page
+ return Etk::etk_range_increments_get($self->{WIDGET});
}
sub PageSizeSet
@@ -58,6 +63,7 @@
my $self = shift;
my $page_size = shift;
Etk::etk_range_page_size_set($self->{WIDGET}, $page_size);
+ return $self;
}
sub PageSizeGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/ScrolledView.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ScrolledView.pm 1 Jul 2006 20:20:22 -0000 1.2
+++ ScrolledView.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -4,12 +4,6 @@
require Etk::Widget;
@ISA = ("Etk::Widget");
-use constant {
- PolicyShow => 0,
- PolicyHide => 1,
- PolicyAuto => 2
-};
-
sub new
{
my $class = shift;
@@ -24,6 +18,7 @@
my $self = shift;
my $widget = shift;
Etk::etk_scrolled_view_add_with_viewport($self->{WIDGET},
$widget->{WIDGET});
+ return $self;
}
sub HScrollBarGet
@@ -53,6 +48,7 @@
my $hpolicy = shift;
my $vpolicy = shift;
Etk::etk_scrolled_view_policy_set($self->{WIDGET}, $hpolicy, $vpolicy);
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Selection.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Selection.pm 7 Jun 2006 11:58:34 -0000 1.1
+++ Selection.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -5,6 +5,7 @@
{
my $widget = shift;
Etk::etk_selection_text_request($widget->{WIDGET});
+ return $widget;
}
sub TextSet
@@ -12,6 +13,7 @@
my $widget = shift;
my $text = shift;
Etk::etk_selection_text_set($widget->{WIDGET}, $text, length($text));
+ return $widget;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Stock.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Stock.pm 18 Jun 2006 10:47:42 -0000 1.2
+++ Stock.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -1,6 +1,70 @@
package Etk::Stock;
use strict;
require Etk;
+require Exporter;
+
+our @ISA = qw/Exporter/;
+
+our %EXPORT_TAGS = (
+ size => [qw/SizeSmall SizeMedium SizeBig/],
+
+ stock => [
+ qw/
+ NoStock AddressBookNew AppointmentNew BookmarkNew ContactNew
+ DialogOk DialogCancel DialogYes DialogNo DialogClose DocumentNew
+ DocumentOpen DocumentPrint DocumentPrintPreview DocumentProperties
+ DocumentSaveAs DocumentSave EditClear EditCopy EditCut EditFind
+ EditPaste EditRedo EditUndo EditDelete EditFindReplace FolderNew
+ FormatIndentLess FormatIndentMore FormatJustifyCenter FormatJustifyFill
+ FormatJustifyLeft FormatJustifyRight FormatTextBold FormatTextItalic
+ FormatTextStrikethrough FormatTextUnderline GoBottom GoDown GoFirst
+ GoHome GoJump GoLast GoNext GoPrevious GoTop GoUp ListAdd ListRemove
+ MailMessageNew MailForward MailMarkJunk MailReplyAll MailReplySender
+ MailSendReceive MediaEject MediaPlaybackPause MediaPlaybackStart
+ MediaPlaybackStop MediaRecord MediaSeekBackward MediaSeekForward
+ MediaSkipBackward MediaSkipForward ProcessStop SystemLockScreen
+ SystemLogOut SystemSearch SystemShutdown TabNew ViewRefresh WindowNew
+ AccessoriesCalculator AccessoriesCharacterMap AccessoriesTextEditor
+ HelpBrowser InternetGroupChat InternetMail InternetNewsReader
+ InternetWebBrowser MultimediaVolumeControl OfficeCalendar
+ PreferencesDesktopAccessibility PreferencesDesktopAssistiveTechnology
+ PreferencesDesktopFont PreferencesDesktopKeyboardShortcuts
+ PreferencesDesktopLocale PreferencesDesktopRemoteDesktop
+ PreferencesDesktopSound PreferencesDesktopScreensaver
+ PreferencesDesktopTheme PreferencesDesktopWallpaper
+ PreferencesSystemNetworkProxy PreferencesSystemSession
+ PreferencesSystemWindows SystemFileManager SystemInstaller
+ SystemSoftwareUpdate SystemUsers UtilitiesSystemMonitor UtilitiesTerminal
+ ApplicationsAccessories ApplicationsDevelopment ApplicationsGames
+ ApplicationsGraphics ApplicationsInternet ApplicationsMultimedia
+ ApplicationsOffice ApplicationsOther ApplicationsSystem
+ PreferencesDesktopPeripherals PreferencesDesktop PreferencesSystem
+ AudioCard AudioInputMicrophone Battery CameraPhoto CameraVideo Computer
+ DriveCdrom DriveHarddisk DriveRemovableMedia InputGaming InputKeyboard
+ InputMouse MediaCdrom MediaFloppy MultimediaPlayer Network NetworkWireless
+ NetworkWired Printer PrinterRemote VideoDisplay EmblemFavorite
EmblemImportant
+ EmblemPhotos EmblemReadonly EmblemSymbolicLink EmblemSystem
EmblemUnreadable
+ FaceAngel FaceCrying FaceDevilGrin FaceGlasses FaceGrin FaceKiss FacePlain
+ FaceSad FaceSmileBig FaceSmile FaceSurprise FaceWink
ApplicationCertificate
+ ApplicationXExecutable AudioXGeneric FontXGeneric ImageXGeneric
PackageXGeneric
+ TextHtml TextXGeneric TextXGenericTemplate TextXScript VideoXGeneric
+ XDirectoryDesktop XDirectoryNormalDragAccept XDirectoryNormalHome
+ XDirectoryNormalOpen XDirectoryNormal XDirectoryNormalVisiting
XDirectoryRemote
+ XDirectoryRemoteServer XDirectoryRemoteWorkgroup XDirectoryTrashFull
+ XDirectoryTrash XOfficeAddressBook XOfficeCalendar XOfficeDocument
+ XOfficePresentation XOfficeSpreadsheet PlacesFolder PlacesFolderRemote
+ PlacesFolderSavedSearch PlacesNetworkServer PlacesNetworkWorkgroup
PlacesStartHere
+ PlacesUserDesktop PlacesUserHome PlacesUserTrash AudioVolumeHigh
AudioVolumeLow
+ AudioVolumeMedium AudioVolumeMuted BatteryCaution DialogError
DialogInformation
+ DialogWarning DialogQuestion FolderDragAccept FolderOpen FolderVisiting
+ ImageLoading ImageMissing MailAttachment NetworkError NetworkIdle
NetworkOffline
+ NetworkOnline NetworkReceive NetworkTransmit NetworkTransmitReceive
+ NetworkWirelessEncrypted PrinterError UserTrashFull humStockIds/]
+ );
+
+$EXPORT_TAGS{all} = [EMAIL PROTECTED] , @{$EXPORT_TAGS{stock}}];
+
+our @EXPORT_OK = @{$EXPORT_TAGS{all}};
use constant
{
@@ -34,7 +98,6 @@
EditUndo => 23,
EditDelete => 24,
EditFindReplace => 25,
-# EditSelectAll => 26, # this is not in etk_stock.h
FolderNew => 26,
FormatIndentLess => 27,
FormatIndentMore => 28,
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Table.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Table.pm 1 Jul 2006 20:20:22 -0000 1.2
+++ Table.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -26,6 +26,7 @@
my $col = shift;
my $row = shift;
Etk::etk_table_cell_clear($self->{WIDGET}, $col, $row);
+ return $self;
}
sub Resize
@@ -34,6 +35,7 @@
my $num_cols = shift;
my $num_rows = shift;
Etk::etk_table_resize($self->{WIDGET}, $num_cols, $num_rows);
+ return $self;
}
sub Attach
@@ -50,6 +52,7 @@
Etk::etk_table_attach($self->{WIDGET}, $child->{WIDGET}, $left_attach,
$right_attach, $top_attach, $bottom_attach, $x_padding, $y_padding,
$fill_policy);
+ return $self;
}
sub AttachDefaults
@@ -62,6 +65,7 @@
my $bottom_attach = shift;
Etk::etk_table_attach_defaults($self->{WIDGET}, $child->{WIDGET},
$left_attach, $right_attach, $top_attach, $bottom_attach);
+ return $self;
}
sub HomogenousSet
@@ -69,6 +73,7 @@
my $self = shift;
my $homogenous = shift;
Etk::etk_table_homogeneous_set($self->{WIDGET}, $homogenous);
+ return $self;
}
sub HomogenousGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/TextBlock.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- TextBlock.pm 5 Jul 2006 00:00:07 -0000 1.2
+++ TextBlock.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -27,6 +27,7 @@
my $text = shift;
my $markup = shift;
Etk::etk_textblock_text_set($self->{WIDGET}, $text, $markup);
+ return $self;
}
sub TextGet
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/ToggleButton.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ToggleButton.pm 20 Jul 2006 17:27:04 -0000 1.2
+++ ToggleButton.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -7,12 +7,9 @@
{
my $class = shift;
my $self = $class->SUPER::new();
- if(@_ == 1)
- {
+ if(@_ == 1) {
$self->{WIDGET} = Etk::etk_toggle_button_new_with_label(shift);
- }
- else
- {
+ } else {
$self->{WIDGET} = Etk::etk_toggle_button_new();
}
bless($self, $class);
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Tooltips.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Tooltips.pm 15 Jul 2006 19:19:05 -0000 1.2
+++ Tooltips.pm 20 Jul 2006 23:16:22 -0000 1.3
@@ -23,6 +23,7 @@
my $widget = shift;
my $text = shift;
Etk::etk_tooltips_tip_set($widget->{WIDGET}, $text);
+ return $widget;
}
sub TipGet
@@ -35,12 +36,14 @@
{
my $widget = shift;
Etk::etk_tooltips_pop_up($widget->{WIDGET});
+ return $widget;
}
sub Popdown
{
my $widget = shift;
Etk::etk_tooltips_pop_down($widget->{WIDGET});
+ return $widget;
}
sub TipVisible
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/ToplevelWidget.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ToplevelWidget.pm 1 Jul 2006 20:20:22 -0000 1.1
+++ ToplevelWidget.pm 20 Jul 2006 23:16:22 -0000 1.2
@@ -4,25 +4,6 @@
require Etk::Bin;
@ISA = ("Etk::Bin");
-use constant {
-
- PointerDefault => 0,
- PointerMove => 1,
- PointerHDoubleArrow => 2,
- PointerVDoubleArrow => 3,
- PointerResize => 4,
- PointerResizeTL => 5,
- PointerResizeT => 6,
- PointerResizeTR => 7,
- PointerResizeR => 8,
- PointerResizeBR => 9,
- PointerResizeB => 10,
- PointerResizeBL => 11,
- PointerResizeL => 12,
- PointerTextEdit => 13,
- PointerDndDrop => 14
-};
-
sub new
{
my $class = shift;
@@ -42,6 +23,7 @@
my $self = shift;
my $widget = shift;
Etk::etk_toplevel_widget_focused_widget_set($self->{WIDGET},
$widget->{WIDGET});
+ return $self;
}
sub FocusedWidgetGet
@@ -73,6 +55,7 @@
my $self = shift;
my $pointer = shift;
Etk::etk_toplevel_widget_pointer_push($self->{WIDGET}, $pointer);
+ return $self;
}
sub PointerPop
@@ -80,6 +63,7 @@
my $self = shift;
my $pointer = shift;
Etk::etk_toplevel_widget_pointer_pop($self->{WIDGET}, $pointer);
+ return $self;
}
1;
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Tree.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Tree.pm 20 Jul 2006 17:27:04 -0000 1.4
+++ Tree.pm 20 Jul 2006 23:16:22 -0000 1.5
@@ -2,10 +2,7 @@
use strict;
use vars qw(@ISA);
require Etk::Widget;
-require Exporter;
[EMAIL PROTECTED] = ("Etk::Widget", "Exporter");
-
-our @EXPORT = qw/ModeList ModeTree FromFile FromEdje cols/;
[EMAIL PROTECTED] = ("Etk::Widget");
use Etk::Tree::Col;
use Etk::Tree::Row;
@@ -19,13 +16,6 @@
use Etk::Tree::Model::ProgressBar;
use Etk::Tree::Model::Text;
-use constant
-{
- ModeList => 0,
- ModeTree => 1,
- FromFile => 0,
- FromEdje => 1
-};
sub new
{
@@ -46,6 +36,7 @@
my $self = shift;
my $mode = shift;
Etk::etk_tree_mode_set($self->{WIDGET}, $mode);
+ return $self;
}
sub ModeGet
@@ -64,9 +55,7 @@
{
my $self = shift;
my $nth = shift;
- my $col = Etk::Tree::Col->new_nocreate();
- $col->{WIDGET} = Etk::etk_tree_nth_col_get($self->{WIDGET}, $nth);
- return $col;
+ return $self->{COLS}->[$nth];
}
sub HeadersVisibleSet
@@ -74,6 +63,7 @@
my $self = shift;
my $headers_visible = shift;
Etk::etk_tree_headers_visible_set($self->{WIDGET}, $headers_visible);
+ return $self;
}
sub HeadersVisibleGet
@@ -86,18 +76,21 @@
{
my $self = shift;
Etk::etk_tree_build($self->{WIDGET});
+ return $self;
}
sub Freeze
{
my $self = shift;
Etk::etk_tree_freeze($self->{WIDGET});
+ return $self;
}
sub Thaw
{
my $self = shift;
Etk::etk_tree_thaw($self->{WIDGET});
+ return $self;
}
sub RowHeightSet
@@ -105,6 +98,7 @@
my $self = shift;
my $height = shift;
Etk::etk_tree_row_height_set($self->{WIDGET}, $height);
+ return $self;
}
sub RowHeightGet
@@ -118,6 +112,7 @@
my $self = shift;
my $multiple_select = shift;
Etk::etk_tree_multiple_select_set($self->{WIDGET}, $multiple_select);
+ return $self;
}
sub MultipleSelectGet
@@ -130,12 +125,14 @@
{
my $self = shift;
Etk::etk_tree_select_all($self->{WIDGET});
+ return $self;
}
sub UnselectAll
{
my $self = shift;
Etk::etk_tree_unselect_all($self->{WIDGET});
+ return $self;
}
# NOTE: since we cant transparently pass a variable number of arguments
@@ -181,6 +178,7 @@
{
my $self = shift;
Etk::etk_tree_clear($self->{WIDGET});
+ return $self;
}
sub Sort
@@ -189,10 +187,10 @@
my $callback = shift;
my $asc = shift;
my $col = shift;
- my $data = undef;
- $data = shift if (@_ > 0);
+ my $data = shift;
Etk::etk_tree_sort($self->{WIDGET}, $callback, $asc, $col->{WIDGET},
$data);
+ return $self;
}
sub FirstRowGet
@@ -215,14 +213,18 @@
{
my $self = shift;
my $row = Etk::Tree::Row->new();
- $row->{WIDGET} = etk_tree_selected_row_get($self->{WIDGET});
+ $row->{WIDGET} = Etk::etk_tree_selected_row_get($self->{WIDGET});
return $row;
}
sub SelectedRowsGet
{
my $self = shift;
- # TODO: pending list implementation
+ return map {
+ my $widget = Etk::Tree::Row->new();
+ $widget->{WIDGET} = $_;
+ $_ = $widget;
+ } Etk::etk_tree_selected_rows_get($self->{WIDGET});
}
sub AddCol
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Widget.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Widget.pm 20 Jul 2006 17:27:04 -0000 1.9
+++ Widget.pm 20 Jul 2006 23:16:22 -0000 1.10
@@ -20,6 +20,7 @@
my $self = shift;
my $name = shift;
Etk::etk_widget_name_set($self->{WIDGET}, $name);
+ return $self;
}
sub NameGet
@@ -42,6 +43,7 @@
my $self = shift;
my $parent = shift;
Etk::etk_widget_parent_set($self->{WIDGET}, $parent->{WIDGET});
+ return $self;
}
sub ParentGet
@@ -56,24 +58,28 @@
{
my $self = shift;
Etk::etk_widget_show($self->{WIDGET});
+ return $self;
}
sub ShowAll
{
my $self = shift;
Etk::etk_widget_show_all($self->{WIDGET});
+ return $self;
}
sub Hide
{
my $self = shift;
Etk::etk_widget_hide($self->{WIDGET});
+ return $self;
}
sub HideAll
{
my $self = shift;
Etk::etk_widget_hide_all($self->{WIDGET});
+ return $self;
}
sub isVisible
@@ -86,6 +92,7 @@
{
my $self = shift;
Etk::etk_widget_visibility_locked_set($self->{WIDGET}, shift);
+ return $self;
}
sub VisibilityLockedGet
@@ -98,12 +105,14 @@
{
my $self = shift;
Etk::etk_widget_raise($self->{WIDGET});
+ return $self;
}
sub Lower
{
my $self = shift;
Etk::etk_widget_lower($self->{WIDGET});
+ return $self;
}
sub SizeRecalcQueue
@@ -117,6 +126,7 @@
{
my $self = shift;
Etk::etk_widget_redraw_queue($self->{WIDGET});
+ return $self;
}
sub SizeRequestSet
@@ -140,30 +150,35 @@
{
my $self = shift;
Etk::etk_widget_enter($self->{WIDGET});
+ return $self;
}
sub Leave
{
my $self = shift;
Etk::etk_widget_leave($self->{WIDGET});
+ return $self;
}
sub Focus
{
my $self = shift;
Etk::etk_widget_focus($self->{WIDGET});
+ return $self;
}
sub Unfocus
{
my $self = shift;
Etk::etk_widget_unfocus($self->{WIDGET});
+ return $self;
}
sub PassMouseEventsSet
{
my $self = shift;
Etk::etk_widget_pass_mouse_events_set($self->{WIDGET}, shift);
+ return $self;
}
sub PassMouseEventsGet
@@ -177,6 +192,7 @@
my $self = shift;
my $on = shift;
Etk::etk_widget_dnd_dest_set($self->{WIDGET}, $on);
+ return $self;
}
sub DndDestGet
@@ -200,6 +216,7 @@
my $self = shift;
my $on = shift;
Etk::etk_widget_dnd_source_set($self->{WIDGET}, $on);
+ return $self;
}
sub DndSourceGet
@@ -213,6 +230,7 @@
my $self = shift;
my $drag = shift;
Etk::etk_widget_dnd_drag_widget_set($self->{WIDGET}, $drag->{WIDGET});
+ return $self;
}
sub DndDragWidgetGet
@@ -236,10 +254,10 @@
{
my $self = shift;
my @types = @_;
- if (@types > 0)
- {
+ if (@types > 0) {
Etk::etk_widget_dnd_types_set($self->{WIDGET}, @types);
}
+ return $self;
}
sub DndTypesGet
@@ -259,6 +277,7 @@
my $self = shift;
my $on = shift;
Etk::etk_widget_dnd_internal_set($self->{WIDGET}, $on);
+ return $self;
}
sub DragDrop
@@ -274,30 +293,35 @@
{
my $self = shift;
Etk::etk_widget_drag_motion($self->{WIDGET});
+ return $self;
}
sub DragEnter
{
my $self = shift;
Etk::etk_widget_drag_enter($self->{WIDGET});
+ return $self;
}
sub DragLeave
{
my $self = shift;
Etk::etk_widget_drag_leave($self->{WIDGET});
+ return $self;
}
sub DragBegin
{
my $self = shift;
Etk::etk_widget_drag_begin($self->{WIDGET});
+ return $self;
}
sub DragEnd
{
my $self = shift;
Etk::etk_widget_drag_end($self->{WIDGET});
+ return $self;
}
sub ThemeFileSet
@@ -305,6 +329,7 @@
my $self = shift;
my $theme_file = shift;
Etk::etk_widget_theme_file_set($self->{WIDGET}, $theme_file);
+ return $self;
}
@@ -320,6 +345,7 @@
my $self = shift;
my $theme_group = shift;
Etk::etk_widget_theme_group_set($self->{WIDGET}, $theme_group);
+ return $self;
}
sub ThemeGroupGet
@@ -333,6 +359,7 @@
my $self = shift;
my $parent = shift;
Etk::etk_widget_theme_parent_set($self->{WIDGET}, $parent->{WIDGET});
+ return $self;
}
sub ThemeParentGet
@@ -358,6 +385,7 @@
my $self = shift;
my $has = shift;
Etk::etk_widget_has_event_object_set($self->{WIDGET}, $has);
+ return $self;
}
sub HasEventObjectGet
@@ -371,6 +399,7 @@
my $self = shift;
my $repeat = shift;
Etk::etk_widget_repeat_mouse_events_set($self->{WIDGET}, $repeat);
+ return $self;
}
sub RepeatMouseEventsGet
@@ -398,6 +427,7 @@
my $self = shift;
my $widget = shift;
Etk::etk_widget_unswallow_widget($self->{WIDGET}, $widget->{WIDGET});
+ return $self;
}
sub IsSwallowingWidget
@@ -424,6 +454,7 @@
my $self = shift;
my $signal = shift;
Etk::etk_widget_theme_object_signal_emit($self->{WIDGET}, $signal);
+ return $self;
}
sub ThemeObjectPartTextSet
@@ -432,6 +463,7 @@
my $part = shift;
my $text = shift;
Etk::etk_widget_theme_object_part_text_set($self->{WIDGET}, $part, $text);
+ return $self;
}
# This is just a start.
@@ -461,10 +493,21 @@
sub PackStart
{
my $self = shift;
- if ($self->{PARENT}->isa("Etk::Box")) {
+ if (ref $self->{PARENT} && $self->{PARENT}->isa("Etk::Box")) {
$self->{PARENT}->PackStart($self, @_);
} else {
warn("Parent is not a Box\n");
+ }
+ return $self;
+}
+
+sub PackEnd
+{
+ my $self = shift;
+ if (ref $self->{PARENT} && $self->{PARENT}->isa("Etk::Box")) {
+ $self->{PARENT}->PackEnd($self, @_);
+ } else {
+ warn("Parent is not a Box at PackEnd\n");
}
return $self;
}
===================================================================
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Window.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Window.pm 20 Jul 2006 17:27:04 -0000 1.4
+++ Window.pm 20 Jul 2006 23:16:22 -0000 1.5
@@ -45,18 +45,21 @@
my $window_name = shift;
my $window_class = shift;
Etk::etk_window_wmclass_set($self->{WIDGET}, $window_name, $window_class);
+ return $self;
}
sub Move
{
my $self = shift;
Etk::etk_window_move($self->{WIDGET}, shift, shift);
+ return $self;
}
sub Resize
{
my $self = shift;
Etk::etk_window_resize($self->{WIDGET}, shift, shift);
+ return $self;
}
sub GeometryGet
@@ -70,24 +73,28 @@
my $self = shift;
my $window = shift;
Etk::etk_window_center_on_window($self->{WIDGET}, $window->{WIDGET});
+ return $self;
}
sub MoveToMouse
{
my $self = shift;
Etk::etk_window_move_to_mouse($self->{WIDGET});
+ return $self;
}
sub Iconify
{
my $self = shift;
Etk::etk_window_iconify($self->{WIDGET});
+ return $self;
}
sub Deiconify
{
my $self = shift;
Etk::etk_window_deiconify($self->{WIDGET});
+ return $self;
}
sub isIconified
@@ -100,12 +107,14 @@
{
my $self = shift;
Etk::etk_window_maximize($self->{WIDGET});
+ return $self;
}
sub Unmaximize
{
my $self = shift;
Etk::etk_window_unmaximize($self->{WIDGET});
+ return $self;
}
sub isMaximized
@@ -118,12 +127,14 @@
{
my $self = shift;
Etk::etk_window_fullscreen($self->{WIDGET});
+ return $self;
}
sub Unfullscreen
{
my $self = shift;
Etk::etk_window_unfullscreen($self->{WIDGET});
+ return $self;
}
sub isFullscreen
@@ -136,12 +147,14 @@
{
my $self = shift;
Etk::etk_window_stick($self->{WIDGET});
+ return $self;
}
sub Unstick
{
my $self = shift;
Etk::etk_window_unstick($self->{WIDGET});
+ return $self;
}
sub isSticky
@@ -154,12 +167,14 @@
{
my $self = shift;
Etk::etk_window_focus($self->{WIDGET});
+ return $self;
}
sub Unfocus
{
my $self = shift;
Etk::etk_window_unfocus($self->{WIDGET});
+ return $self;
}
sub isFocused
@@ -172,6 +187,7 @@
{
my $self = shift;
Etk::etk_window_decorated_set($self->{WIDGET}, shift);
+ return $self;
}
sub DecoratedGet
@@ -184,6 +200,7 @@
{
my $self = shift;
Etk::etk_window_shaped_set($self->{WIDGET}, shift);
+ return $self;
}
sub ShapedGet
@@ -196,6 +213,7 @@
{
my $self = shift;
Etk::etk_window_skip_taskbar_hint_set($self->{WIDGET}, shift);
+ return $self;
}
sub SkipTaskbarHintGet
@@ -208,6 +226,7 @@
{
my $self = shift;
Etk::etk_window_skip_pager_hint_set($self->{WIDGET}, shift);
+ return $self;
}
sub SkipPagerHintGet
@@ -220,6 +239,7 @@
{
my $self = shift;
Etk::etk_window_dnd_aware_set($self->{WIDGET}, shift);
+ return $self;
}
sub HideOnDelete
-------------------------------------------------------------------------
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
