X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=common%2Fmakegdesc;h=b61ed758aa6abb0a81a2fad9b9de1cced28009e8;hb=HEAD;hp=4fd4f46e9c44d5e0371784ed6b982a7ed519252a;hpb=79138dda33e24df0823b9d39ad78d05ed2b4c4e3;p=doldaconnect.git

diff --git a/common/makegdesc b/common/makegdesc
index 4fd4f46..b61ed75 100755
--- a/common/makegdesc
+++ b/common/makegdesc
@@ -1,5 +1,10 @@
 #!/usr/bin/perl
 
+use Getopt::Long;
+use IO::File;
+
+GetOptions(\%args, "h=s") || exit 1;
+
 $tempvar = 0;
 
 sub printwidgets
@@ -27,6 +32,9 @@ sub printwidgets
 	    }
 	} elsif($widget->{"type"} eq "assistant") {
 	    print "${p}stack[$sl] = gtk_assistant_new();\n";
+	    if(defined($widget->{"title"})) {
+		print "${p}gtk_window_set_title(GTK_WINDOW(stack[$sl]), \"" . $widget->{"title"} . "\");\n";
+	    }
 	    $pf = sub
 	    {
 		my($widget, $p, $sl) = @_;
@@ -55,6 +63,16 @@ sub printwidgets
 		print $widget->{"pad"} || "0";
 		print ");\n";
 	    }
+	} elsif($widget->{"type"} =~ /([hv])btnbox/) {
+	    print "${p}stack[$sl] = gtk_" . $1 . "button_box_new();\n";
+	    if(defined($widget->{"layout"})) {
+		print "${p}gtk_button_box_set_layout(GTK_BUTTON_BOX(stack[$sl]), GTK_BUTTONBOX_" . $widget->{"layout"} . ");\n";
+	    }
+	    $pf = sub
+	    {
+		my($widget, $p, $sl) = @_;
+		print "${p}gtk_container_add(GTK_CONTAINER(stack[" . ($sl - 1) . "]), stack[$sl]);\n";
+	    }
 	} elsif($widget->{"type"} eq "table") {
 	    print "${p}stack[$sl] = gtk_table_new(" . $widget->{"rows"} . ", " . $widget->{"cols"};
 	    print ", " . (($widget->{"homo"} eq "TRUE")?"TRUE":"FALSE");
@@ -97,6 +115,13 @@ sub printwidgets
 	} elsif($widget->{"type"} eq "chk") {
 	    $widget->{"label"} || die("Can't have check button without label\n");
 	    print "${p}stack[$sl] = gtk_check_button_new_with_mnemonic(_(\"" . $widget->{"label"} . "\"));\n";
+	} elsif($widget->{"type"} eq "radio") {
+	    $widget->{"label"} || die("Can't have check button without label\n");
+	    if(defined($widget->{"group"})) {
+		print "${p}stack[$sl] = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(" . $options{"prefix"} . $widget->{"group"} . "), _(\"" . $widget->{"label"} . "\"));\n";
+	    } else {
+		print "${p}stack[$sl] = gtk_radio_button_new_with_mnemonic(NULL, _(\"" . $widget->{"label"} . "\"));\n";
+	    }
 	} elsif($widget->{"type"} eq "sbtn") {
 	    $widget->{"stock"} || die("Can't have button without stock\n");
 	    print "${p}stack[$sl] = gtk_button_new_from_stock(GTK_STOCK_" . $widget->{"stock"} . ");\n";
@@ -104,9 +129,20 @@ sub printwidgets
 	    $widget->{"stock"} || die("Can't have image without stock\n");
 	    $widget->{"size"} || die("Can't have image without size\n");
 	    print "${p}stack[$sl] = gtk_image_new_from_stock(GTK_STOCK_" . $widget->{"stock"} . ", GTK_ICON_SIZE_" . $widget->{"size"} . ");\n";
+	} elsif($widget->{"type"} eq "xpmimg") {
+	    $widget->{"data"} || die("Can't have XPM image without data\n");
+	    print "${p}stack[$sl] = gtk_image_new_from_pixbuf(gdk_pixbuf_new_from_xpm_data((const char **)" . $widget->{"data"} . "));\n";
 	} elsif($widget->{"type"} eq "lbl") {
-	    $widget->{"label"} || die("Can't have label without label\n");
-	    print "${p}stack[$sl] = gtk_label_new(_(\"" . $widget->{"label"} . "\"));\n";
+	    $widget->{"label"} || $widget->{"markup"} || die("Can't have label without label\n");
+	    if($widget->{"label"}) {
+		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->{"markup"} . "\"));\n";
+	    }
+	    if($widget->{"wrap"} eq "y") {
+		print "${p}gtk_label_set_line_wrap(GTK_LABEL(stack[$sl]), TRUE);\n";
+	    }
 	} elsif($widget->{"type"} eq "mlbl") {
 	    $widget->{"label"} || die("Can't have label without label\n");
 	    print "${p}stack[$sl] = gtk_label_new_with_mnemonic(_(\"" . $widget->{"label"} . "\"));\n";
@@ -179,6 +215,9 @@ sub printwidgets
 	    }
 	} 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) = @_;
@@ -207,6 +246,37 @@ sub printwidgets
 		my($widget, $p, $sl) = @_;
 		print "${p}gtk_container_add(GTK_CONTAINER(stack[" . ($sl - 1) . "]), stack[$sl]);\n";
 	    }
+	} elsif($widget->{"type"} eq "align") {
+	    print "${p}stack[$sl] = gtk_alignment_new(";
+	    if(defined($widget->{"xa"})) {
+		print $widget->{"xa"};
+	    } else {
+		print "0.5";
+	    }
+	    print ", ";
+	    if(defined($widget->{"ya"})) {
+		print $widget->{"ya"};
+	    } else {
+		print "0.5";
+	    }
+	    print ", ";
+	    if(defined($widget->{"xs"})) {
+		print $widget->{"xs"};
+	    } else {
+		print "1.0";
+	    }
+	    print ", ";
+	    if(defined($widget->{"ys"})) {
+		print $widget->{"ys"};
+	    } else {
+		print "1.0";
+	    }
+	    print ");\n";
+	    $pf = sub
+	    {
+		my($widget, $p, $sl) = @_;
+		print "${p}gtk_container_add(GTK_CONTAINER(stack[" . ($sl - 1) . "]), stack[$sl]);\n";
+	    }
 	} elsif($widget->{"type"} eq "treeview") {
 	    print "${p}stack[$sl] = gtk_tree_view_new();\n";
 	    if(defined($widget->{"hvis"})) {
@@ -261,6 +331,16 @@ sub printwidgets
 		print "${p}gtk_tree_view_column_set_cell_data_func(column, renderer, " . $widget->{"func"} . ", " . ($widget->{"funcdata"} || "NULL") . ", NULL);\n";
 	    }
 	    $widget->{"noshow"} = 1;
+	} elsif($widget->{"type"} eq "progrend") {
+	    print "${p}renderer = gtk_cell_renderer_progress_new();\n";
+	    print "${p}gtk_tree_view_column_pack_start(column, renderer, " . (defined($widget->{"expand"})?$widget->{"expand"}:"FALSE") . ");\n";
+	    if(defined($widget->{"value"})) {
+		print "${p}gtk_tree_view_column_add_attribute(column, renderer, \"value\", " . $widget->{"value"} . ");\n";
+	    }
+	    if(defined($widget->{"func"})) {
+		print "${p}gtk_tree_view_column_set_cell_data_func(column, renderer, " . $widget->{"func"} . ", " . ($widget->{"funcdata"} || "NULL") . ", NULL);\n";
+	    }
+	    $widget->{"noshow"} = 1;
 	} elsif($widget->{"type"} eq "custrend") {
 	    print "${p}renderer = GTK_CELL_RENDERER(" . $widget->{"newfunc"} . "());\n";
 	    print "${p}gtk_tree_view_column_pack_start(column, renderer, " . (defined($widget->{"expand"})?$widget->{"expand"}:"FALSE") . ");\n";
@@ -301,6 +381,15 @@ sub printwidgets
 	if($widget->{"sensitive"}) {
 	    print "${p}gtk_widget_set_sensitive(stack[$sl], " . $widget->{"sensitive"} . ");\n";
 	}
+	if($widget->{"rqsz"} =~ /(\d+)x(\d+)/) {
+	    print "${p}gtk_widget_set_size_request(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";
 	}
@@ -339,7 +428,7 @@ sub printwidgets
 		    $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"})
@@ -362,6 +451,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);
@@ -427,6 +530,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";