X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=common%2Fmakegdesc;h=12c1cdaf8e3359f6d9c7be46674954208346b8e4;hb=e947d4e304d214302d38bfa2c99729190197335c;hp=f1df250ba324353c230a9cd080c26a7890a7cfa1;hpb=b699c67f4dbf9043077a00c70c9b128c5c4d22b7;p=doldaconnect.git

diff --git a/common/makegdesc b/common/makegdesc
index f1df250..12c1cda 100755
--- a/common/makegdesc
+++ b/common/makegdesc
@@ -115,8 +115,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";
@@ -177,6 +185,9 @@ sub printwidgets
 	    $widget->{"noshow"} = 1;
 	} elsif($widget->{"type"} =~ /^[hv]paned$/) {
 	    print "${p}stack[$sl] = gtk_" . $widget->{"type"} . "_new();\n";
+	    if(defined($widget->{"pos"})) {
+		print "${p}gtk_notebook_set_tab_pos(GTK_NOTEBOOK(stack[$sl]), GTK_POS_" . $widget->{"pos"} . ")\n";
+	    }
 	    $widget->{"cur"} = 1;
 	    $pf = sub
 	    {
@@ -342,6 +353,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";
 	}