cvs commit: p5ee/App-Widget/lib/App/Widget AppFrame.pm TabbedAppFrame.pm DataTable.pm DateDropDowns.pm DualListSelect.pm Menu.pm SelectSaveAs.pm TabSet.pm Toolbar.pm RepositoryEditor.pm
[email protected] (Stephen Adkins)
| Newsgroups | perl.cvs.p5ee |
|---|---|
| Message-ID | <[email protected]> |
cvsuser 05/08/09 12:25:47
Modified: App-Widget/lib/App/Widget AppFrame.pm TabbedAppFrame.pm
DataTable.pm DateDropDowns.pm DualListSelect.pm
Menu.pm SelectSaveAs.pm TabSet.pm Toolbar.pm
RepositoryEditor.pm
Log:
change containment separator from . to -
Revision Changes Path
1.6 +10 -10 p5ee/App-Widget/lib/App/Widget/AppFrame.pm
Index: AppFrame.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/AppFrame.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AppFrame.pm 2 Sep 2004 21:05:00 -0000 1.5
+++ AppFrame.pm 9 Aug 2005 19:25:46 -0000 1.6
@@ -74,8 +74,8 @@
$name = $self->{name};
$context = $self->{context};
- if ($wname eq "$name.selector" && $event eq "select") {
- $selector_widget = $context->widget("$name.selector");
+ if ($wname eq "$name-selector" && $event eq "select") {
+ $selector_widget = $context->widget("$name-selector");
$screen_wname = $selector_widget->get_selected("wname");
$screen_widget = $context->widget($screen_wname);
$screen_settings = $selector_widget->get_selected("set");
@@ -135,20 +135,20 @@
if (1) { # view as table
- $menu = $context->widget("$name.menu",
+ $menu = $context->widget("$name-menu",
class => "App::Widget::Menu",
)->html();
- $toolbar = $context->widget("$name.toolbar",
+ $toolbar = $context->widget("$name-toolbar",
class => "App::Widget::Toolbar",
)->html();
- $screentoolbar = $context->widget("$name.screentoolbar",
+ $screentoolbar = $context->widget("$name-screentoolbar",
class => "App::Widget::Toolbar",
)->html();
- $selector_widget = $context->widget("$name.selector",
- class => "App::Widget::SelectorView",
+ $selector_widget = $context->widget("$name-selector",
+ class => "App::Widget::IconPaneSelector",
);
$selector = $selector_widget->html();
@@ -177,7 +177,7 @@
# return $screen; # no need to generate a frame
#}
- #$screentitle_widget = $context->widget("$name.screentitle",
+ #$screentitle_widget = $context->widget("$name-screentitle",
# -label => $screentitle_value,
# -bgcolor => "#888888",
#);
1.4 +38 -34 p5ee/App-Widget/lib/App/Widget/TabbedAppFrame.pm
Index: TabbedAppFrame.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/TabbedAppFrame.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TabbedAppFrame.pm 19 May 2003 17:41:18 -0000 1.3
+++ TabbedAppFrame.pm 9 Aug 2005 19:25:46 -0000 1.4
@@ -74,8 +74,8 @@
$name = $self->{name};
$context = $self->{context};
- if ($wname eq "$name.selector" && $event eq "select") {
- $selector_widget = $context->widget("$name.selector");
+ if ($wname eq "$name-selector" && $event eq "select") {
+ $selector_widget = $context->widget("$name-selector");
$screen_wname = $selector_widget->get_selected("wname");
$screen_widget = $context->widget($screen_wname);
@@ -132,29 +132,38 @@
$context = $self->{context};
my ($menu, $toolbar, $screentitle, $screentoolbar);
+ my ($top);
my ($selector_widget, $selector, $selector_bgcolor);
my ($screen_wname, $screen, $screen_widget, $screen_bgcolor);
my ($screentitle_widget, $screentitle_bgcolor, $screentitle_value);
if (1) { # view as table
- $menu = $context->widget("$name.menu",
- class => "App::Widget::Menu",
- )->html();
-
- $toolbar = $context->widget("$name.toolbar",
- class => "App::Widget::Toolbar",
- )->html();
-
- $screentoolbar = $context->widget("$name.screentoolbar",
- class => "App::Widget::Toolbar",
- )->html();
-
- $selector_widget = $context->widget("$name.selector",
- class => "App::Widget::SelectorView",
- );
-
- $selector_bgcolor = "#cccccc";
+ $top = $context->widget("$name-top",
+ class => "App::Widget::Template",
+ )->html();
+ $top = "" if ($top =~ /not found/i);
+
+ #$menu = $context->widget("$name-menu",
+ # class => "App::Widget::Menu",
+ # )->html();
+
+ #$toolbar = $context->widget("$name-toolbar",
+ # class => "App::Widget::Toolbar",
+ # )->html();
+
+ #$screentoolbar = $context->widget("$name-screentoolbar",
+ # class => "App::Widget::Toolbar",
+ # )->html();
+
+ $selector_widget = $context->widget("$name-selector",
+ class => "App::Widget::TabbedSelector",
+ );
+
+ $selector_bgcolor = "";
+ if ($self->{selector_bgcolor}) {
+ $selector_bgcolor = " bgcolor=\"$self->{selector_bgcolor}\"";
+ }
$selector = $selector_widget->html();
$screen_wname = $selector_widget->get_selected("wname");
@@ -176,7 +185,7 @@
return $screen; # no need to generate a frame
}
- #$screentitle_widget = $context->widget("$name.screentitle",
+ #$screentitle_widget = $context->widget("$name-screentitle",
# -label => $screentitle_value,
# -bgcolor => "#888888",
#);
@@ -207,9 +216,9 @@
$messagebox = "";
if (defined $messages && $messages ne "") {
my ($elem_begin, $elem_end, $fontFace, $fontSize, $fontColor);
- $fontFace = $self->{fontFace} || "verdana,geneva,arial,sans-serif";
- $fontSize = $self->{fontSize} || "+1";
- $fontColor = $self->{fontColor};
+ $fontFace = $self->{font_face} || "verdana,geneva,arial,sans-serif";
+ $fontSize = $self->{font_size} || "+1";
+ $fontColor = $self->{font_color};
$elem_begin = "";
$elem_end = "";
if ($fontFace || $fontSize || $fontColor) {
@@ -244,17 +253,12 @@
EOF
}
+ my $appframe_width = $self->{width} || "100%";
$html = <<EOF;
-<table width="100%" border="2" cellspacing="2" cellpadding="0">
- <tr>
- <td valign="top" bgcolor="$screentitle_bgcolor">
- $screentitle
- </td>
- </tr>
-</table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+$top
+<table width="$appframe_width" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td valign="top" bgcolor="$selector_bgcolor">
+ <td valign="top"$selector_bgcolor>
$selector
</td>
</tr>
1.7 +171 -168 p5ee/App-Widget/lib/App/Widget/DataTable.pm
Index: DataTable.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/DataTable.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DataTable.pm 2 Sep 2004 21:05:00 -0000 1.6
+++ DataTable.pm 9 Aug 2005 19:25:46 -0000 1.7
@@ -33,30 +33,35 @@
######################################################################
# ATTRIBUTES
######################################################################
-# {border} = 0;
-# {cellspacing} = 2;
-# {cellpadding} = 0;
-# {width} = "";
-# {bgcolor} = "";
-# {nowrap} = "1";
-# {fontFace} = "verdana,geneva,arial,sans-serif";
-# {fontSize} = "-2";
-# {fontColor} = "";
-# {headingBgcolor} = "#cccccc";
-# {headingNowrap} = 0;
-# {columns} = [ "Name", "Address", "City", "State", "Country", "Home Phone" ];
-# {headings} = [ "Name", "Address", "City", "State", "Country", "Home Phone" ];
-# {data} = [ [ "Smith, Harold", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1810" ],
-# [ "Smith, Mike", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1811" ],
-# [ "Smith, Sarah", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1812" ],
-# [ "Smith, Ken", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1813" ],
-# [ "Smith, Mary", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1814" ], ];
-# {startrow} = 1
-# {maxrows} = 20
-# {scrollable} = 0;
-# {sortable} = 0;
-# {filterable} = 0;
-# {editable} = 0;
+# {border} = 0;
+# {cellspacing} = 2;
+# {cellpadding} = 0;
+# {width} = "";
+# {bgcolor} = "";
+# {nowrap} = "1";
+# {font_face} = "verdana,geneva,arial,sans-serif";
+# {font_size} = "-2";
+# {font_color} = "";
+# {heading_bgcolor} = "#cccccc";
+# {heading_nowrap} = 0;
+# {heading_align} = 0;
+# {heading_valign} = 0;
+# {column_selectable} = 1;
+# {row_selectable} = 0;
+# {row_single_selectable} = 0;
+# {columns} = [ "Name", "Address", "City", "State", "Country", "Home Phone" ];
+# {headings} = [ "Name", "Address", "City", "State", "Country", "Home Phone" ];
+# {data} = [ [ "Smith, Harold", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1810" ],
+# [ "Smith, Mike", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1811" ],
+# [ "Smith, Sarah", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1812" ],
+# [ "Smith, Ken", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1813" ],
+# [ "Smith, Mary", "1215 Interloke Pass", "Jonesboro", "GA", "US", "770-603-1814" ], ];
+# {startrow} = 1
+# {maxrows} = 20
+# {scrollable} = 0;
+# {sortable} = 0;
+# {filterable} = 0;
+# {editable} = 0;
# INPUTS FROM THE ENVIRONMENT
@@ -87,6 +92,7 @@
# Usage: $widget->handle_event($event, @args);
sub handle_event {
+ &App::sub_entry if ($App::trace);
my ($self, $wname, $event, @args) = @_;
my ($name, $context, $colnum, $x, $y, $startrow, $maxrows, $width, $direction);
@@ -96,42 +102,43 @@
$self->{context}->dbgprint("DataTable($name)->handle_event($wname,$event,@args)")
if ($App::DEBUG && $self->{context}->dbg(1));
- if ($wname eq "$name.view") {
+ my $handled = 0;
+ if ($wname eq "$name-view") {
$self->set("mode","view");
$self->delete("editdata");
- return 1;
+ $handled = 1;
}
- elsif ($wname eq "$name.edit") {
+ elsif ($wname eq "$name-edit") {
$self->set("mode","edit");
- return 1;
+ $handled = 1;
}
- elsif ($wname eq "$name.next") {
+ elsif ($wname eq "$name-next") {
$startrow = $self->get("startrow",1,1);
$maxrows = $self->get("maxrows",20,1);
$startrow += $maxrows;
$self->set("startrow",$startrow);
- return 1;
+ $handled = 1;
}
- elsif ($wname eq "$name.prev") {
+ elsif ($wname eq "$name-prev") {
$startrow = $self->get("startrow",1,1);
$maxrows = $self->get("maxrows",20,1);
$startrow -= $maxrows;
$startrow = 1 if ($startrow < 1);
$self->set("startrow",$startrow);
- return 1;
+ $handled = 1;
}
- elsif ($wname eq "$name.save") {
+ elsif ($wname eq "$name-save") {
$self->save();
$self->delete("editdata");
- return 1;
+ $handled = 1;
}
- elsif ($wname eq "$name.add") {
+ elsif ($wname eq "$name-add") {
$self->{context}->add_message("Add Rows: not yet implemented");
- return 1;
+ $handled = 1;
}
- elsif ($wname eq "$name.delete") {
+ elsif ($wname eq "$name-delete") {
$self->{context}->add_message("Delete Rows: not yet implemented");
- return 1;
+ $handled = 1;
}
elsif ($event eq "sort") {
($colnum, $direction) = @args;
@@ -161,22 +168,24 @@
$self->set("ordercols",$ordercols);
$self->set("directions",$directions);
- return 1;
+ $handled = 1;
}
- elsif ($wname =~ /^$name.sort[0-9]*$/) {
+ elsif ($wname =~ /^-sort[0-9]*$/) {
($colnum, $x, $y) = @args;
$context = $self->{context};
$width = $context->widget($wname)->get("width");
if ($x <= $width/2) {
- return $self->handle_event($wname, "sort", $colnum, "UP");
+ $handled = $self->handle_event($wname, "sort", $colnum, "UP");
}
else {
- return $self->handle_event($wname, "sort", $colnum, "DOWN");
+ $handled = $self->handle_event($wname, "sort", $colnum, "DOWN");
}
}
else {
- return $self->SUPER::handle_event(@_);
+ $handled = $self->SUPER::handle_event(@_);
}
+ &App::sub_exit($handled) if ($App::trace);
+ return($handled);
}
######################################################################
@@ -249,6 +258,7 @@
}
sub load {
+ &App::sub_entry if ($App::trace);
my $self = shift;
$self->{context}->dbgprint("DataTable->load()")
if ($App::DEBUG && $self->{context}->dbg(1));
@@ -296,9 +306,8 @@
}
$params = $self->get("params");
- $paramvalues = $self->get("paramvalues",{});
+ $paramvalues = $self->substitute($self->get("paramvalues",{}));
%paramvalues = %$paramvalues;
- $self->substitute(\%paramvalues);
$filter = $self->get("filter",{});
foreach $column (%$filter) {
$param = $column;
@@ -394,6 +403,7 @@
}
$self->set("keys", $keys);
}
+ &App::sub_exit() if ($App::trace);
}
sub save {
@@ -424,16 +434,15 @@
push(@columns, $column);
push(@values, $editdata->{$key}{$column});
}
- $rep->set_values($table, $key, \@columns, \@values);
+ $rep->set($table, $key, \@columns, \@values);
}
}
$rep->commit();
}
sub substitute {
+ &App::sub_entry if ($App::trace);
my ($self, $text, $values) = @_;
- $self->{context}->dbgprint("DataTable->substitute()")
- if ($App::DEBUG && $self->{context}->dbg());
my ($phrase, $var, $value, $context);
$context = $self->{context};
$values = {} if (! defined $values);
@@ -445,10 +454,11 @@
foreach $var (keys %$hash) {
$newhash->{$var} = $self->substitute($hash->{$var}, $values);
}
+ &App::sub_exit($newhash) if ($App::trace);
return($newhash); # short-circuit this whole process
}
- while ( $text =~ /\[([^\[\]]+)\]/ ) {
+ while ( $text =~ /^\[([^\[\]]+)\]$/ ) {
$phrase = $1;
while ( $phrase =~ /\{([^\{\}]+)\}/ ) {
$var = $1;
@@ -457,14 +467,9 @@
$phrase =~ s/\{$var\}/$value/g;
}
else {
- if ($var =~ /^(.+)\.([^.]+)$/) {
- $value = $context->wget($1, $2);
- if (defined $value) {
- $phrase =~ s/\{$var\}/$value/g;
- }
- else {
- $phrase = "";
- }
+ $value = $context->so_get($var);
+ if (defined $value) {
+ $phrase =~ s/\{$var\}/$value/g;
}
else {
$phrase = "";
@@ -472,10 +477,10 @@
}
}
if ($phrase eq "") {
- $text =~ s/\[[^\[\]]+\]\n?//; # zap it including (optional) ending newline
+ $text =~ s/^\[[^\[\]]+\]\n?$//; # zap it including (optional) ending newline
}
else {
- $text =~ s/\[[^\[\]]+\]/$phrase/;
+ $text =~ s/^\[[^\[\]]+\]$/$phrase/;
}
}
while ( $text =~ /\{([^\{\}]+)\}/ ) { # vars of the form {var}
@@ -485,14 +490,12 @@
$text =~ s/\{$var\}/$value/g;
}
else {
- $value = "";
- if ($var =~ /^(.+)\.([^.]+)$/) {
- $value = $context->wget($1, $2);
- }
+ $value = $context->so_get($var);
}
$value = "" if (!defined $value);
$text =~ s/\{$var\}/$value/g;
}
+ &App::sub_exit($text) if ($App::trace);
$text;
}
@@ -518,67 +521,67 @@
my ($numcols, $table, $title);
my ($width, $border, $cellspacing, $cellpadding);
my ($bgcolor, $align, $valign, $nowrap);
- my ($fontFace, $fontSize, $fontColor);
- my ($headingBgcolor, $headingAlign, $headingValign, $headingNowrap);
+ my ($font_face, $font_size, $font_color);
+ my ($heading_bgcolor, $heading_align, $heading_valign, $heading_nowrap);
my ($columns, $headings, $scrollable, $sortable, $filterable, $editable);
my ($startrow, $numrow, $numbered);
my ($keys, $mode, $sql);
- my ($columnSelectable, $rowSelectable, $rowSingleSelectable, $elemSelected, $single_row_select);
+ my ($column_selectable, $row_selectable, $row_single_selectable, $elem_selected, $single_row_select);
my (@edit_style, @column_length);
my ($rowactions, $rowactiondefs, $rowaction, $rowactiondef);
my (@select_actions, @single_select_actions, @row_actions);
- $table = $self->get("table");
+ $table = $self->get("table");
return "No table defined." if (!$table);
- $columns = $self->get_columns();
+ $columns = $self->get_columns();
return "No columns defined for table [$table]. (maybe it doesn't exist)" if (!$columns || $#$columns == -1);
- $headings = $self->get_headings();
- $data = $self->get_data();
- $startrow = $self->get("startrow", 1);
- $title = $self->get("title");
- $width = $self->get("width");
- $bgcolor = $self->get("bgcolor");
- $fontColor = $self->get("fontColor");
- $border = $self->get("border", 0);
- $cellspacing = $self->get("cellspacing", 2);
- $cellpadding = $self->get("cellpadding", 2);
- $align = $self->get("align", "");
- $valign = $self->get("valign", "top");
- $nowrap = $self->get("nowrap", 1);
- $fontFace = $self->get("fontFace", "verdana,geneva,arial,sans-serif");
- $fontSize = $self->get("fontSize", -2);
- $headingBgcolor = $self->get("headingBgcolor", "#cccccc");
- $headingAlign = $self->get("headingAlign", $align);
- $headingValign = $self->get("headingValign", "bottom");
- $headingNowrap = $self->get("headingNowrap", $nowrap);
- $mode = $self->get("mode", "view");
- $scrollable = $self->get("scrollable", 0);
- $sortable = $self->get("sortable", 0);
- $filterable = $self->get("filterable", 0);
- $editable = $self->get("editable", 0);
- $numbered = $self->get("numbered", 1);
- $columnSelectable = $self->get("columnSelectable", 1);
- $rowSelectable = $self->get("rowSelectable", 0);
- $rowSingleSelectable = $self->get("rowSingleSelectable", 0);
- $keys = $self->get("keys");
- $sql = $self->get("sql");
- $rowactions = $self->get("rowactions");
- $rowactiondefs = $self->get("rowaction");
+ $headings = $self->get_headings();
+ $data = $self->get_data();
+ $startrow = $self->get("startrow", 1);
+ $title = $self->get("title");
+ $width = $self->get("width");
+ $bgcolor = $self->get("bgcolor");
+ $font_color = $self->get("font_color");
+ $border = $self->get("border", 0);
+ $cellspacing = $self->get("cellspacing", 2);
+ $cellpadding = $self->get("cellpadding", 2);
+ $align = $self->get("align", "");
+ $valign = $self->get("valign", "top");
+ $nowrap = $self->get("nowrap", 1);
+ $font_face = $self->get("font_face", "verdana,geneva,arial,sans-serif");
+ $font_size = $self->get("font_size", -2);
+ $heading_bgcolor = $self->get("heading_bgcolor", "#cccccc");
+ $heading_align = $self->get("heading_align", $align);
+ $heading_valign = $self->get("heading_valign", "bottom");
+ $heading_nowrap = $self->get("heading_nowrap", $nowrap);
+ $mode = $self->get("mode", "view");
+ $scrollable = $self->get("scrollable", 0);
+ $sortable = $self->get("sortable", 0);
+ $filterable = $self->get("filterable", 0);
+ $editable = $self->get("editable", 0);
+ $numbered = $self->get("numbered", 1);
+ $column_selectable = $self->get("column_selectable", 1);
+ $row_selectable = $self->get("row_selectable", (($mode eq "edit") ? 1 : 0));
+ $row_single_selectable = $self->get("row_single_selectable", 0);
+ $keys = $self->get("keys");
+ $sql = $self->get("sql");
+ $rowactions = $self->get("rowactions");
+ $rowactiondefs = $self->get("rowaction");
if (! $self->{keycolidx}) {
- $rowactions = 0;
- $rowSelectable = 0; # can't select row(s) if no primary key
- $rowSingleSelectable = 0; # can't select row if no primary key
+ $rowactions = undef;
+ $row_selectable = 0; # can't select row(s) if no primary key
+ $row_single_selectable = 0; # can't select row if no primary key
}
elsif ($rowactions && $rowactiondefs) {
foreach $rowaction (@$rowactions) {
if ($rowactiondefs->{$rowaction}{select} eq "single") {
push(@single_select_actions, $rowaction);
- $rowSingleSelectable = 1;
+ $row_single_selectable = 1;
}
elsif ($rowactiondefs->{$rowaction}{select} eq "multi") {
push(@select_actions, $rowaction);
- $rowSelectable = 1;
+ $row_selectable = 1;
}
else {
push(@row_actions, $rowaction);
@@ -587,9 +590,9 @@
}
# only needed for subtotals
- #my ($subtotal, $subtotalKeys, $ordercols);
- #$subtotalKeys = $self->get("subtotalKeys");
- #$subtotal = (defined $subtotalKeys && ref($subtotalKeys) eq "ARRAY" && $#$subtotalKeys > -1);
+ #my ($subtotal, $subtotal_keys, $ordercols);
+ #$subtotal_keys = $self->get("subtotal_keys");
+ #$subtotal = (defined $subtotal_keys && ref($subtotal_keys) eq "ARRAY" && $#$subtotal_keys > -1);
#if ($subtotal) {
# $ordercols = $self->get("ordercols");
#}
@@ -616,11 +619,11 @@
$elem_begin = "";
$elem_end = "";
- if ($fontFace || $fontSize || $fontColor) {
+ if ($font_face || $font_size || $font_color) {
$elem_begin = "<font";
- $elem_begin .= " face=\"$fontFace\"" if ($fontFace);
- $elem_begin .= " size=\"" . ($fontSize+1) . "\"" if ($fontSize);
- $elem_begin .= " color=\"$fontColor\"" if ($fontColor);
+ $elem_begin .= " face=\"$font_face\"" if ($font_face);
+ $elem_begin .= " size=\"" . ($font_size+1) . "\"" if ($font_size);
+ $elem_begin .= " color=\"$font_color\"" if ($font_color);
$elem_begin .= ">";
$elem_end = "</font>";
}
@@ -628,7 +631,7 @@
if ($scrollable) {
$html .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"5\"><tr><td>\n";
$html .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td valign=\"middle\" nowrap> \n";
- $html .= $context->widget("$name.view",
+ $html .= $context->widget("$name-view",
class => "App::Widget::ImageButton",
image_script => 'app-button',
#volatile => 1,
@@ -639,7 +642,7 @@
)->html();
$html .= " ";
if ($editable) {
- $html .= $context->widget("$name.edit",
+ $html .= $context->widget("$name-edit",
class => "App::Widget::ImageButton",
image_script => 'app-button',
#volatile => 1,
@@ -651,9 +654,9 @@
$html .= " ";
}
$html .= " </td><td nowrap";
- $html .= " bgcolor=\"$headingBgcolor\"" if ($headingBgcolor);
+ $html .= " bgcolor=\"$heading_bgcolor\"" if ($heading_bgcolor);
$html .= ">$elem_begin \n";
- $html .= $context->widget("$name.prev",
+ $html .= $context->widget("$name-prev",
class => "App::Widget::ImageButton",
image_script => 'app-button',
#volatile => 1,
@@ -663,19 +666,19 @@
bevel => 2,
)->html();
$html .= "\n Start Row:";
- $html .= $context->widget("$name.startrow",
+ $html .= $context->widget("$name-startrow",
class => "App::Widget::TextField",
size => 4,
maxlength => 12,
)->html();
$html .= " Num Rows:";
- $html .= $context->widget("$name.maxrows",
+ $html .= $context->widget("$name-maxrows",
class => "App::Widget::TextField",
size => 4,
maxlength => 12,
)->html();
$html .= "\n";
- $html .= $context->widget("$name.next",
+ $html .= $context->widget("$name-next",
class => "App::Widget::ImageButton",
image_script => 'app-button',
#volatile => 1,
@@ -691,7 +694,7 @@
if ($mode eq "edit") {
$html .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr>\n";
$html .= "<td>\n";
- $html .= $context->widget("$name.save",
+ $html .= $context->widget("$name-save",
class => "App::Widget::ImageButton",
image_script => 'app-button',
#volatile => 1,
@@ -713,7 +716,7 @@
)->html();
$html .= "</td>\n";
$html .= "<td>\n";
- $html .= $context->widget("$name.delete",
+ $html .= $context->widget("$name-delete",
class => "App::Widget::ImageButton",
image_script => 'app-button',
#volatile => 1,
@@ -724,7 +727,7 @@
)->html();
$html .= "</td>\n";
#$html .= "<td>\n";
- #$html .= $context->widget("$name.confirm",
+ #$html .= $context->widget("$name-confirm",
# class => "App::Widget::RadioButtonSet",
# #volatile => 1,
# values => [ "no_confirm", "confirm", "auto_confirm" ],
@@ -743,12 +746,12 @@
if ($sortable) {
$html .= "<tr>\n";
$html .= " <td> </td>\n" if ($numbered);
- $html .= " <td> </td>\n" if ($rowSelectable);
- $html .= " <td> </td>\n" if ($rowSingleSelectable);
+ $html .= " <td> </td>\n" if ($row_selectable);
+ $html .= " <td> </td>\n" if ($row_single_selectable);
$html .= " <td> </td>\n" if ($#row_actions > -1);
for ($col = 0; $col < $numcols; $col++) {
- $elem = $context->widget("$name.sort$col",
+ $elem = $context->widget("$name-sort$col",
class => "App::Widget::ImageButton",
image_script => 'app-button',
#volatile => 1,
@@ -766,8 +769,8 @@
my ($w);
$html .= "<tr>\n";
$html .= " <td> </td>\n" if ($numbered);
- $html .= " <td> </td>\n" if ($rowSelectable);
- $html .= " <td> </td>\n" if ($rowSingleSelectable);
+ $html .= " <td> </td>\n" if ($row_selectable);
+ $html .= " <td> </td>\n" if ($row_single_selectable);
$html .= " <td> </td>\n" if ($#row_actions > -1);
for ($col = 0; $col < $numcols; $col++) {
$column = $columns->[$col];
@@ -787,15 +790,15 @@
$html .= "</tr>\n";
}
}
- if ($mode eq "edit" && $columnSelectable) {
+ if ($mode eq "edit" && $column_selectable) {
$html .= "<tr>\n";
$html .= " <td bgcolor=\"#ffaaaa\"> </td>\n" if ($numbered);
- $html .= " <td bgcolor=\"#ffaaaa\"> </td>\n" if ($rowSelectable);
- $html .= " <td bgcolor=\"#ffaaaa\"> </td>\n" if ($rowSingleSelectable);
+ $html .= " <td bgcolor=\"#ffaaaa\"> </td>\n" if ($row_selectable);
+ $html .= " <td bgcolor=\"#ffaaaa\"> </td>\n" if ($row_single_selectable);
$html .= " <td bgcolor=\"#ffaaaa\"> </td>\n" if ($#row_actions > -1);
for ($col = 0; $col < $numcols; $col++) {
$column = $columns->[$col];
- $elem = $context->widget("$name\{columnSelected}{$column}",
+ $elem = $context->widget("$name\{column_selected}{$column}",
class => "App::Widget::Checkbox",
)->html();
$html .= " <td bgcolor=\"#ffaaaa\" valign=\"bottom\" align=\"center\">$elem</td>\n";
@@ -809,28 +812,28 @@
$elem_begin = "";
$elem_end = "";
- if ($fontFace || $fontSize || $fontColor) {
+ if ($font_face || $font_size || $font_color) {
$elem_begin = "<font";
- $elem_begin .= " face=\"$fontFace\"" if ($fontFace);
- $elem_begin .= " size=\"$fontSize\"" if ($fontSize);
- $elem_begin .= " color=\"$fontColor\"" if ($fontColor);
+ $elem_begin .= " face=\"$font_face\"" if ($font_face);
+ $elem_begin .= " size=\"$font_size\"" if ($font_size);
+ $elem_begin .= " color=\"$font_color\"" if ($font_color);
$elem_begin .= ">";
$elem_end = "</font>";
}
$td_row_attrib = "";
- $td_row_attrib .= " bgcolor=\"$headingBgcolor\"" if ($headingBgcolor);
- $td_row_attrib .= " align=\"$headingAlign\"" if ($headingAlign);
- $td_row_attrib .= " valign=\"$headingValign\"" if ($headingValign);
- $td_row_attrib .= " nowrap" if ($headingNowrap);
+ $td_row_attrib .= " bgcolor=\"$heading_bgcolor\"" if ($heading_bgcolor);
+ $td_row_attrib .= " align=\"$heading_align\"" if ($heading_align);
+ $td_row_attrib .= " valign=\"$heading_valign\"" if ($heading_valign);
+ $td_row_attrib .= " nowrap" if ($heading_nowrap);
$html .= "<tr>\n";
- $html .= " <td bgcolor=\"$headingBgcolor\"> </td>\n" if ($numbered);
+ $html .= " <td bgcolor=\"$heading_bgcolor\"> </td>\n" if ($numbered);
- if ($rowSelectable) {
+ if ($row_selectable) {
if ($#select_actions > -1) {
my (%args);
- $html .= " <td bgcolor=\"$headingBgcolor\" valign=\"bottom\">";
+ $html .= " <td bgcolor=\"$heading_bgcolor\" valign=\"bottom\">";
foreach $rowaction (@select_actions) {
%args = (
override => 1,
@@ -847,8 +850,8 @@
$args{$_} = $rowactiondef->{$_};
}
}
- $html .= $context->widget("$name.${rowaction}", %args,
- args => "{${name}" . "{rowSelected}}"
+ $html .= $context->widget("$name-${rowaction}", %args,
+ args => "{${name}" . "{row_selected}}"
)->html();
$html .= "<br>\n" if ($rowaction ne $select_actions[$#select_actions]);
}
@@ -859,10 +862,10 @@
}
}
- if ($rowSingleSelectable) {
+ if ($row_single_selectable) {
if ($#single_select_actions > -1) {
my (%args);
- $html .= " <td bgcolor=\"$headingBgcolor\" valign=\"bottom\">";
+ $html .= " <td bgcolor=\"$heading_bgcolor\" valign=\"bottom\">";
foreach $rowaction (@single_select_actions) {
%args = (
override => 1,
@@ -879,8 +882,8 @@
$args{$_} = $rowactiondef->{$_};
}
}
- $html .= $context->widget("$name.${rowaction}", %args,
- args => "{${name}" . "{rowSingleSelected}}"
+ $html .= $context->widget("$name-${rowaction}", %args,
+ args => "{${name}" . "{row_single_selected}}"
)->html();
$html .= "<br>\n" if ($rowaction ne $single_select_actions[$#select_actions]);
}
@@ -891,7 +894,7 @@
}
}
- $html .= " <td bgcolor=\"$headingBgcolor\"> </td>\n" if ($#row_actions > -1);
+ $html .= " <td bgcolor=\"$heading_bgcolor\"> </td>\n" if ($#row_actions > -1);
for ($col = 0; $col < $numcols; $col++) {
$td_col_attrib = "";
$elem = $headings->[$col];
@@ -913,13 +916,13 @@
if ($mode eq "edit") {
# prepare the style attribute arrays
- push(@edit_style, "fontFamily", $fontFace) if ($fontFace);
- push(@edit_style, "color", $fontColor) if ($fontColor);
+ push(@edit_style, "font_family", $font_face) if ($font_face);
+ push(@edit_style, "color", $font_color) if ($font_color);
# This seems to cause <input> elements to take on the font size
# currently active for text that surrounds them
# i.e. <font size="-2"><input type="text" style="font-size: 100%;"></font>
- push(@edit_style, "fontSize", "100%") if ($fontSize);
+ push(@edit_style, "font_size", "100%") if ($font_size);
# borderStyle",
# borderWidth",
@@ -935,8 +938,8 @@
$column = $columns->[$col];
}
- if (($column ne "" && $self->{columnSelected}{$column}) ||
- ($self->{rowSelected} && %{$self->{rowSelected}})) {
+ if (($column ne "" && $self->{column_selected}{$column}) ||
+ ($self->{row_selected} && %{$self->{row_selected}})) {
for ($row = 0; $row <= $#$data; $row++) {
$elem = $data->[$row][$col];
if (defined $elem && length($elem) > $column_length[$col]) {
@@ -957,19 +960,19 @@
$key = join(",", @{$keys->[$row]}); # need to HTML-escape these!
}
- $html .= " <td bgcolor=\"$headingBgcolor\" align=\"right\">$elem_begin$numrow$elem_end</td>\n" if ($numbered);
+ $html .= " <td bgcolor=\"$heading_bgcolor\" align=\"right\">$elem_begin$numrow$elem_end</td>\n" if ($numbered);
- if ($rowSelectable) {
+ if ($row_selectable) {
$html .= " <td bgcolor=\"#ffaaaa\" valign=\"middle\" align=\"center\">\n";
- $html .= $context->widget("$name\{rowSelected}{$key}",
+ $html .= $context->widget("$name\{row_selected}{$key}",
class => "App::Widget::Checkbox",
)->html();
$html .= " </td>\n";
}
- if ($rowSingleSelectable) {
+ if ($row_single_selectable) {
$html .= " <td bgcolor=\"#ffaaaa\" valign=\"middle\" align=\"center\">\n";
- $html .= $context->widget("$name\{rowSingleSelected}",
+ $html .= $context->widget("$name\{row_single_selected}",
class => "App::Widget::RadioButton",
override => 1,
value => $key,
@@ -979,7 +982,7 @@
if ($#row_actions > -1) {
my (%args);
- $html .= " <td bgcolor=\"$headingBgcolor\">";
+ $html .= " <td bgcolor=\"$heading_bgcolor\">";
foreach $rowaction (@row_actions) {
%args = (
override => 1,
@@ -1005,19 +1008,19 @@
$elem = $data->[$row][$col];
$column = "";
- $elemSelected = 0;
+ $elem_selected = 0;
if ($mode eq "edit") {
if (defined $columns && defined $columns->[$col]) {
$column = $columns->[$col];
}
- if (($self->{columnSelected}{$column} && $self->{rowSelected}{$key}) ||
- ($self->{columnSelected}{$column} && (!defined $self->{rowSelected} || !%{$self->{rowSelected}})) ||
- ((!defined $self->{columnSelected} || !%{$self->{columnSelected}}) && $self->{rowSelected}{$key})) {
- $elemSelected = 1;
+ if (($self->{column_selected}{$column} && $self->{row_selected}{$key}) ||
+ ($self->{column_selected}{$column} && (!defined $self->{row_selected} || !%{$self->{row_selected}})) ||
+ ((!defined $self->{column_selected} || !%{$self->{column_selected}}) && $self->{row_selected}{$key})) {
+ $elem_selected = 1;
}
}
- if ($elemSelected) {
+ if ($elem_selected) {
if (!defined $elem || $elem eq "") {
$elem = "";
$td_col_attrib = " align=\"left\"";
1.6 +8 -8 p5ee/App-Widget/lib/App/Widget/DateDropDowns.pm
Index: DateDropDowns.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/DateDropDowns.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DateDropDowns.pm 2 Sep 2004 21:05:00 -0000 1.5
+++ DateDropDowns.pm 9 Aug 2005 19:25:46 -0000 1.6
@@ -76,12 +76,12 @@
# NOTE: container is inferred by the naming convention
# otherwise, I should include "container => $name," line
- $context->widget("${name}.day", # note: container is inferred
+ $context->widget("${name}-day", # note: container is inferred
class => "App::Widget::Select",
values => \@dayvalues,
);
- $context->widget("${name}.month",
+ $context->widget("${name}-month",
class => "App::Widget::Select",
values => \@monthvalues,
labels => \%monthlabels,
@@ -90,7 +90,7 @@
my ($begin_year, $end_year);
$begin_year = $self->{begin_year} || 1980;
$end_year = $self->{end_year} || 2010;
- $context->widget("${name}.year",
+ $context->widget("${name}-year",
class => "App::Widget::Select",
values => [ $begin_year .. $end_year ],
);
@@ -200,9 +200,9 @@
$self->split_date();
return
- $context->widget("${name}.day")->html() .
- $context->widget("${name}.month")->html() .
- $context->widget("${name}.year")->html() .
+ $context->widget("${name}-day")->html() .
+ $context->widget("${name}-month")->html() .
+ $context->widget("${name}-year")->html() .
$self->callback_event_tag("change");
}
1.6 +20 -24 p5ee/App-Widget/lib/App/Widget/DualListSelect.pm
Index: DualListSelect.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/DualListSelect.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DualListSelect.pm 2 Sep 2004 21:05:00 -0000 1.5
+++ DualListSelect.pm 9 Aug 2005 19:25:46 -0000 1.6
@@ -37,14 +37,14 @@
my ($values, $labels) = $self->values_labels();
- $context->widget("${name}.unselected",
+ $context->widget("${name}-unselected",
class => "App::Widget::Select",
labels => $labels,
@select_attribs,
lightweight => 1,
);
- $context->widget("${name}.selected",
+ $context->widget("${name}-selected",
class => "App::Widget::Select",
labels => $labels,
@select_attribs,
@@ -52,7 +52,7 @@
);
if ($self->{noimagebuttons}) {
- $context->widget("${name}.select_button",
+ $context->widget("${name}-select_button",
class => "App::Widget::Button",
label => " >> ",
event => "select",
@@ -60,7 +60,7 @@
lightweight => 1,
);
- $context->widget("${name}.unselect_button",
+ $context->widget("${name}-unselect_button",
class => "App::Widget::Button",
label => " << ",
event => "unselect",
@@ -68,7 +68,7 @@
lightweight => 1,
);
- $context->widget("${name}.up_button",
+ $context->widget("${name}-up_button",
class => "App::Widget::Button",
label => " Up ",
event => "move_up",
@@ -76,7 +76,7 @@
lightweight => 1,
);
- $context->widget("${name}.dn_button",
+ $context->widget("${name}-dn_button",
class => "App::Widget::Button",
label => " Dn ",
event => "move_down",
@@ -85,7 +85,7 @@
);
}
else {
- $context->widget("${name}.select_button",
+ $context->widget("${name}-select_button",
class => "App::Widget::ImageButton",
image => "images/DualListSelect/rtarrow.gif",
height => "19",
@@ -96,7 +96,7 @@
lightweight => 1,
);
- $context->widget("${name}.unselect_button",
+ $context->widget("${name}-unselect_button",
class => "App::Widget::ImageButton",
image => "images/DualListSelect/lfarrow.gif",
height => "19",
@@ -107,7 +107,7 @@
lightweight => 1,
);
- $context->widget("${name}.up_button",
+ $context->widget("${name}-up_button",
class => "App::Widget::ImageButton",
image => "images/DualListSelect/uparrow.gif",
height => "19",
@@ -118,7 +118,7 @@
lightweight => 1,
);
- $context->widget("${name}.dn_button",
+ $context->widget("${name}-dn_button",
class => "App::Widget::ImageButton",
image => "images/DualListSelect/dnarrow.gif",
height => "19",
@@ -271,8 +271,8 @@
push(@selected_list, $NONE) if ($#selected_list == -1);
push(@unselected_list, $NONE) if ($#unselected_list == -1);
- $context->widget("$name.selected")->{values} = \@selected_list;
- $context->widget("$name.unselected")->{values} = \@unselected_list;
+ $context->widget("$name-selected")->{values} = \@selected_list;
+ $context->widget("$name-unselected")->{values} = \@unselected_list;
$context->so_delete($name, "selected");
$context->so_delete($name, "unselected");
}
@@ -285,15 +285,12 @@
$self->_set_child_widget_values();
- my $unselected_list = $context->widget("${name}.unselected")->html();
- my $selected_list = $context->widget("${name}.selected")->html();
- my $select_button = $context->widget("${name}.select_button")->html();
- my $unselect_button = $context->widget("${name}.unselect_button")->html();
- my $up_button = $context->widget("${name}.up_button")->html();
- my $dn_button = $context->widget("${name}.dn_button")->html();
-
- my $var_hidden = "";
- # my $var_hidden = $self->callback_event_tag("restore");
+ my $unselected_list = $context->widget("${name}-unselected")->html();
+ my $selected_list = $context->widget("${name}-selected")->html();
+ my $select_button = $context->widget("${name}-select_button")->html();
+ my $unselect_button = $context->widget("${name}-unselect_button")->html();
+ my $up_button = $context->widget("${name}-up_button")->html();
+ my $dn_button = $context->widget("${name}-dn_button")->html();
my $html = <<EOF;
<table border=0 cellspacing=3>
@@ -313,7 +310,6 @@
<td align=center valign=top>Selected</td>
</tr>
</table>
-$var_hidden
EOF
$html;
1.2 +3 -3 p5ee/App-Widget/lib/App/Widget/Menu.pm
Index: Menu.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/Menu.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Menu.pm 12 Oct 2002 03:13:08 -0000 1.1
+++ Menu.pm 9 Aug 2005 19:25:46 -0000 1.2
@@ -18,7 +18,7 @@
=head1 SYNOPSIS
- $name = "office.menu";
+ $name = "office-menu";
# official way
use App;
1.2 +14 -14 p5ee/App-Widget/lib/App/Widget/SelectSaveAs.pm
Index: SelectSaveAs.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/SelectSaveAs.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SelectSaveAs.pm 27 Oct 2004 15:53:28 -0000 1.1
+++ SelectSaveAs.pm 9 Aug 2005 19:25:46 -0000 1.2
@@ -44,36 +44,36 @@
# NOTE: container is inferred by the naming convention
# otherwise, I should include "container => $name," line
- $context->widget("${name}.selected", # note: container is inferred
+ $context->widget("${name}-selected", # note: container is inferred
class => "App::Widget::Select",
#lightweight => 1,
);
- $context->widget("${name}.open",
+ $context->widget("${name}-open",
class => "App::Widget::Button",
label => "Open",
#lightweight => 1,
);
- $context->widget("${name}.save",
+ $context->widget("${name}-save",
class => "App::Widget::Button",
label => "Save",
#lightweight => 1,
);
- $context->widget("${name}.delete",
+ $context->widget("${name}-delete",
class => "App::Widget::Button",
label => "Delete",
#lightweight => 1,
);
- $context->widget("${name}.saveas",
+ $context->widget("${name}-saveas",
class => "App::Widget::Button",
label => "Save As",
#lightweight => 1,
);
- $context->widget("${name}.saveas_selected", # note: container is inferred
+ $context->widget("${name}-saveas_selected", # note: container is inferred
class => "App::Widget::TextField",
#lightweight => 1,
);
@@ -112,12 +112,12 @@
$name = $self->{name};
return
- $context->widget("${name}.selected")->html() . " " .
- $context->widget("${name}.open")->html() . " " .
- $context->widget("${name}.save")->html() . " " .
- $context->widget("${name}.delete")->html() . " : " .
- $context->widget("${name}.saveas")->html() . " " .
- $context->widget("${name}.saveas_selected")->html();
+ $context->widget("${name}-selected")->html() . " " .
+ $context->widget("${name}-open")->html() . " " .
+ $context->widget("${name}-save")->html() . " " .
+ $context->widget("${name}-delete")->html() . " : " .
+ $context->widget("${name}-saveas")->html() . " " .
+ $context->widget("${name}-saveas_selected")->html();
# $self->callback_event_tag("change");
}
1.4 +8 -6 p5ee/App-Widget/lib/App/Widget/TabSet.pm
Index: TabSet.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/TabSet.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TabSet.pm 19 May 2003 17:41:18 -0000 1.3
+++ TabSet.pm 9 Aug 2005 19:25:46 -0000 1.4
@@ -74,8 +74,8 @@
$name = $self->{name};
$context = $self->{context};
- if ($wname eq "$name.selector" && $event eq "select") {
- $selector_widget = $context->widget("$name.selector");
+ if ($wname eq "$name-selector" && $event eq "select") {
+ $selector_widget = $context->widget("$name-selector");
$screen_wname = $selector_widget->get_selected("wname");
$screen_widget = $context->widget($screen_wname);
@@ -136,8 +136,8 @@
if (1) { # view as table
- $selector_widget = $context->widget("$name.selector",
- class => "App::Widget::TabbedView",
+ $selector_widget = $context->widget("$name-selector",
+ class => "App::Widget::TabbedSelector",
);
$selector = $selector_widget->html();
@@ -163,6 +163,8 @@
<td valign="top">
$selector
</td>
+ </tr>
+ <tr>
<td valign="top" bgcolor="$screen_bgcolor">
$screen
</td>
1.2 +3 -3 p5ee/App-Widget/lib/App/Widget/Toolbar.pm
Index: Toolbar.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/Toolbar.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Toolbar.pm 12 Oct 2002 03:13:08 -0000 1.1
+++ Toolbar.pm 9 Aug 2005 19:25:46 -0000 1.2
@@ -18,7 +18,7 @@
=head1 SYNOPSIS
- $name = "office.toolbar";
+ $name = "office-toolbar";
# official way
use App;
1.9 +22 -22 p5ee/App-Widget/lib/App/Widget/RepositoryEditor.pm
Index: RepositoryEditor.pm
===================================================================
RCS file: /cvs/public/p5ee/App-Widget/lib/App/Widget/RepositoryEditor.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RepositoryEditor.pm 10 Nov 2004 15:44:26 -0000 1.8
+++ RepositoryEditor.pm 9 Aug 2005 19:25:46 -0000 1.9
@@ -122,21 +122,21 @@
$self->{context}->dbgprint("RepositoryEditor($name)->handle_event($wname,$event,@args)")
if ($App::DEBUG && $self->{context}->dbg(1));
- if ($wname eq "$name.open_button") {
+ if ($wname eq "$name-open_button") {
}
- elsif ($wname eq "$name.save_button") {
+ elsif ($wname eq "$name-save_button") {
}
- elsif ($wname eq "$name.delete_button") {
+ elsif ($wname eq "$name-delete_button") {
}
- elsif ($wname eq "$name.saveas_button") {
+ elsif ($wname eq "$name-saveas_button") {
}
- elsif ($wname eq "$name.view_button") {
+ elsif ($wname eq "$name-view_button") {
$self->set_mode("view", 0);
}
- elsif ($wname eq "$name.edit_button") {
+ elsif ($wname eq "$name-edit_button") {
$self->set_mode("edit", 1);
}
- elsif ($wname eq "$name.select_button") {
+ elsif ($wname eq "$name-select_button") {
$table = $self->get("new_table");
$self->set("table", $table);
$self->set("columns", []);
@@ -264,19 +264,19 @@
my ($view_button, $edit_button, $select_button);
my ($columns, $params);
- $view = $context->widget("$name.view",
+ $view = $context->widget("$name-view",
class => "App::Widget::TextField",
size => 20,
maxwidth => 99,
)->html();
- $saveas_view = $context->widget("$name.saveas_view",
+ $saveas_view = $context->widget("$name-saveas_view",
class => "App::Widget::TextField",
size => 20,
maxwidth => 99,
)->html();
- $new_table = $context->widget("$name.new_table",
+ $new_table = $context->widget("$name-new_table",
class => "App::Widget::Select",
values => $table_names,
labels => $table_label_hashref,
@@ -284,13 +284,13 @@
$self->set_default("maxrows",25);
- $maxrows = $context->widget("$name.maxrows",
+ $maxrows = $context->widget("$name-maxrows",
class => "App::Widget::TextField",
size => 4,
maxlength => 99,
)->html();
- $open_button = $context->widget("$name.open_button",
+ $open_button = $context->widget("$name-open_button",
class => "App::Widget::ImageButton",
image_script => 'app-button',
label => "Open",
@@ -299,7 +299,7 @@
bevel => 2,
)->html();
- $save_button = $context->widget("$name.save_button",
+ $save_button = $context->widget("$name-save_button",
class => "App::Widget::ImageButton",
image_script => 'app-button',
label => "Save",
@@ -308,7 +308,7 @@
bevel => 2,
)->html();
- $delete_button = $context->widget("$name.delete_button",
+ $delete_button = $context->widget("$name-delete_button",
class => "App::Widget::ImageButton",
image_script => 'app-button',
label => "Delete",
@@ -317,7 +317,7 @@
bevel => 2,
)->html();
- $saveas_button = $context->widget("$name.saveas_button",
+ $saveas_button = $context->widget("$name-saveas_button",
class => "App::Widget::ImageButton",
image_script => 'app-button',
label => "Save As",
@@ -326,7 +326,7 @@
bevel => 2,
)->html();
- $view_button = $context->widget("$name.view_button",
+ $view_button = $context->widget("$name-view_button",
class => "App::Widget::ImageButton",
image_script => 'app-button',
label => "View",
@@ -335,7 +335,7 @@
bevel => 2,
)->html();
- $edit_button = $context->widget("$name.edit_button",
+ $edit_button = $context->widget("$name-edit_button",
class => "App::Widget::ImageButton",
image_script => 'app-button',
label => 'Edit',
@@ -344,7 +344,7 @@
bevel => 2,
)->html();
- $select_button = $context->widget("$name.select_button",
+ $select_button = $context->widget("$name-select_button",
class => "App::Widget::ImageButton",
image_script => 'app-button',
label => "Select Table",
@@ -411,7 +411,7 @@
my ($columns, $column_labels, $column_menu, $column_menu_html);
$columns = $rep->get_column_names($table);
$column_labels = $rep->get_column_labels($table);
- $column_menu = $context->widget("$name.columns",
+ $column_menu = $context->widget("$name-columns",
override => 1,
class => "App::Widget::Select",
values => $columns,
@@ -521,7 +521,7 @@
"NOT_OR" => "Not any of the following conditions",
);
- $conjunction_menu = $context->widget("$name.conjunction",
+ $conjunction_menu = $context->widget("$name-conjunction",
class => "App::Widget::Select",
values => \@conjunction,
labels => \%conjunction,