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

diff --git a/common/makegdesc b/common/makegdesc
index 4fd4f46..cf91c40 100755
--- a/common/makegdesc
+++ b/common/makegdesc
@@ -27,6 +27,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) = @_;
@@ -97,6 +100,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";
@@ -107,6 +117,9 @@ sub printwidgets
 	} 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";
+	    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";
@@ -207,6 +220,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"})) {