X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=common%2Fmakegdesc;h=0eaf7c7c24d26f514dd19b9f6c707b8f3f4ea924;hb=8d5c36108e5157e194cbdeadb9ebedfb869a4da1;hp=68138d3aced174cf76bdadce33e0020443a46bc3;hpb=55c6add0bacb563dfc8b7c218a17cc608c0d6cab;p=doldaconnect.git

diff --git a/common/makegdesc b/common/makegdesc
index 68138d3..0eaf7c7 100755
--- a/common/makegdesc
+++ b/common/makegdesc
@@ -120,7 +120,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}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";
@@ -197,6 +197,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) = @_;
@@ -356,6 +359,9 @@ sub printwidgets
 	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";
 	}
@@ -394,7 +400,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"})