Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slight updates.
[doldaconnect.git]
/
common
/
makegdesc
diff --git
a/common/makegdesc
b/common/makegdesc
index
68138d3
..
cfcb6f1
100755
(executable)
--- a/
common/makegdesc
+++ b/
common/makegdesc
@@
-1,5
+1,10
@@
#!/usr/bin/perl
#!/usr/bin/perl
+use Getopt::Long;
+use IO::File;
+
+GetOptions(\%args, "h=s") || exit 1;
+
$tempvar = 0;
sub printwidgets
$tempvar = 0;
sub printwidgets
@@
-120,7
+125,7
@@
sub printwidgets
print "${p}stack[$sl] = gtk_label_new(_(\"" . $widget->{"label"} . "\"));\n";
} else {
print "${p}stack[$sl] = gtk_label_new(NULL);\n";
print "${p}stack[$sl] = gtk_label_new(_(\"" . $widget->{"label"} . "\"));\n";
} else {
print "${p}stack[$sl] = gtk_label_new(NULL);\n";
- print "${p}gtk_label_set_markup(GTK_LABEL(stack[$sl]), _(\"" . $widget->{"
label
"} . "\"));\n";
+ print "${p}gtk_label_set_markup(GTK_LABEL(stack[$sl]), _(\"" . $widget->{"
markup
"} . "\"));\n";
}
if($widget->{"wrap"} eq "y") {
print "${p}gtk_label_set_line_wrap(GTK_LABEL(stack[$sl]), TRUE);\n";
}
if($widget->{"wrap"} eq "y") {
print "${p}gtk_label_set_line_wrap(GTK_LABEL(stack[$sl]), TRUE);\n";
@@
-197,6
+202,9
@@
sub printwidgets
}
} elsif($widget->{"type"} eq "notebook") {
print "${p}stack[$sl] = gtk_notebook_new();\n";
}
} elsif($widget->{"type"} eq "notebook") {
print "${p}stack[$sl] = gtk_notebook_new();\n";
+ if(defined($widget->{"pos"})) {
+ print "${p}gtk_notebook_set_tab_pos(GTK_NOTEBOOK(stack[$sl]), GTK_POS_" . $widget->{"pos"} . ");\n";
+ }
$pf = sub
{
my($widget, $p, $sl) = @_;
$pf = sub
{
my($widget, $p, $sl) = @_;
@@
-356,6
+364,9
@@
sub printwidgets
if($widget->{"align"} =~ /([\d\.]+):([\d\.]+)/) {
print "${p}gtk_misc_set_alignment(GTK_MISC(stack[$sl]), $1, $2);\n";
}
if($widget->{"align"} =~ /([\d\.]+):([\d\.]+)/) {
print "${p}gtk_misc_set_alignment(GTK_MISC(stack[$sl]), $1, $2);\n";
}
+ if($widget->{"wpad"} =~ /([\d\.]+):([\d\.]+)/) {
+ print "${p}gtk_misc_set_padding(GTK_MISC(stack[$sl]), $1, $2);\n";
+ }
if($widget->{"var"} eq "y") {
print $p . $options{"prefix"} . $widget->{"name"} . " = stack[$sl];\n";
}
if($widget->{"var"} eq "y") {
print $p . $options{"prefix"} . $widget->{"name"} . " = stack[$sl];\n";
}
@@
-394,7
+405,7
@@
sub printwidgets
$cb = $widget->{$attr};
$data = "NULL";
}
$cb = $widget->{$attr};
$data = "NULL";
}
- print "${p}g_signal_connect(G_OBJECT(stack[$sl]), \"$
1
\", G_CALLBACK($cb), (gpointer)$data);\n";
+ print "${p}g_signal_connect(G_OBJECT(stack[$sl]), \"$
sig
\", G_CALLBACK($cb), (gpointer)$data);\n";
}
}
if($widget->{"subwidgets"})
}
}
if($widget->{"subwidgets"})
@@
-417,6
+428,20
@@
sub printwidgets
}
}
}
}
+sub printheader
+{
+ my($widget, $handle);
+ $handle = $_[1];
+ foreach $widget (@{$_[0]})
+ {
+ if($widget->{"var"})
+ {
+ $handle->print("extern GtkWidget *" . $options{"prefix"} . $widget->{"name"} .";\n");
+ }
+ printheader($widget->{"subwidgets"}, $handle) if($widget->{"subwidgets"});
+ }
+}
+
sub printvars
{
my($widget);
sub printvars
{
my($widget);
@@
-482,6
+507,14
@@
while(<>)
}
}
}
}
+if($args{"h"})
+{
+ $hfile = IO::File->new($args{"h"}, "w") || die;
+ $hfile->print("GtkWidget *create_" . $options{"prefix"} . "wnd(void);\n");
+ printheader $rootwidgets, $hfile;
+ $hfile->close();
+}
+
printvars $rootwidgets;
print "\n";
print "GtkWidget *create_" . $options{"prefix"} . "wnd(void)\n";
printvars $rootwidgets;
print "\n";
print "GtkWidget *create_" . $options{"prefix"} . "wnd(void)\n";