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

diff --git a/common/makegdesc b/common/makegdesc
index 99a8314..68138d3 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->{"label"} . "\"));\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";
@@ -224,16 +232,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 +350,12 @@ 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->{"var"} eq "y") {
 	    print $p . $options{"prefix"} . $widget->{"name"} . " = stack[$sl];\n";
 	}