X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=common%2Fmakegdesc;h=cfcb6f19ee54415042b02765423e7763806be9b9;hb=473597657df72ce78026ab1fe487219fa349e8d2;hp=99a8314d4258e8af929afb56b1800598e52decee;hpb=9b0816449c2a380eed7185dbcc65a6926dad040c;p=doldaconnect.git

diff --git a/common/makegdesc b/common/makegdesc
index 99a8314..cfcb6f1 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
@@ -115,8 +120,16 @@ sub printwidgets
 	    $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 "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";
@@ -189,6 +202,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) = @_;
@@ -224,16 +240,19 @@ sub printwidgets
 	    } 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 {
@@ -339,6 +358,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";
 	}
@@ -377,7 +405,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"})
@@ -400,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);
@@ -465,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";