diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 7c30f91f18..84ead9749d 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -65,12 +65,26 @@ show_about (GtkMenuItem *item, GtkWidget *window) g_object_unref (pixbuf); } +static void +on_page_toggled (GtkToggleButton *button, + GtkNotebook *pages) +{ + gint page; + + if (!gtk_toggle_button_get_active (button)) + return; + + page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "page")); + gtk_notebook_set_current_page (pages, page); +} + int main (int argc, char *argv[]) { GtkBuilder *builder; GtkWidget *window; GtkWidget *widget; + GtkWidget *notebook; gboolean dark = FALSE; gtk_init (&argc, &argv); @@ -88,6 +102,15 @@ main (int argc, char *argv[]) g_signal_connect (widget, "toggled", G_CALLBACK (dark_toggled), NULL); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), dark); + notebook = (GtkWidget*) gtk_builder_get_object (builder, "toplevel_notebook"); + widget = (GtkWidget*) gtk_builder_get_object (builder, "togglepage1"); + g_object_set_data (G_OBJECT (widget), "page", GINT_TO_POINTER (0)); + g_signal_connect (widget, "toggled", G_CALLBACK (on_page_toggled), notebook); + + widget = (GtkWidget*) gtk_builder_get_object (builder, "togglepage2"); + g_object_set_data (G_OBJECT (widget), "page", GINT_TO_POINTER (1)); + g_signal_connect (widget, "toggled", G_CALLBACK (on_page_toggled), notebook); + widget = (GtkWidget*) gtk_builder_get_object (builder, "aboutmenuitem"); g_signal_connect (widget, "activate", G_CALLBACK (show_about), window); diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 22a95187e1..b76e04e8d4 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -475,6 +475,47 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True + + + True + False + False + + + + True + horizontal + True + center + True + + + + True + Page 1 + False + + + + + True + Page 2 + False + togglepage1 + + + + + + + True + True + + True @@ -485,7 +526,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - True + False True @@ -515,108 +556,484 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - + True - False - 6 + False - + True - False vertical - 4 - + True False - True - - - comboboxentry - - - - Donald Duck - Mickey Mouse - Jet McQuack - - - - False - False - 0 - - - - - True - False - False - True - - - False - • - comboboxentry - - - - - False - False - 1 - - - - - True - True - • - entry - - - False - False - 2 - - - - - True - False - True - • - entry - - - False - False - 3 - - - - - True - False - 20 + 6 - + True False - label + vertical + 4 + + + True + False + True + + + comboboxentry + + + + Donald Duck + Mickey Mouse + Jet McQuack + + + + False + False + 0 + + + + + True + False + False + True + + + False + • + comboboxentry + + + + + False + False + 1 + + + + + True + True + • + entry + + + False + False + 2 + + + + + True + False + True + • + entry + + + False + False + 3 + + + + + True + False + 20 + + + True + False + label + + + False + True + 0 + + + + + True + False + False + label + + + False + True + 1 + + + + + True + True + • + adjustment2 + + + False + False + 2 + + + + + True + True + • + False + + + False + False + 3 + + + + + False + False + 4 + + + + + True + False + True + True + + + checkbutton + True + True + False + False + 0 + True + True + + + 0 + 0 + 1 + 1 + + + + + checkbutton + True + True + False + False + 0 + True + + + 0 + 1 + 1 + 1 + + + + + checkbutton + True + True + True + False + False + 0 + True + + + 0 + 2 + 1 + 1 + + + + + checkbutton + True + False + True + False + False + 0 + True + True + + + 0 + 3 + 1 + 1 + + + + + checkbutton + True + False + True + False + False + 0 + True + + + 0 + 4 + 1 + 1 + + + + + checkbutton + True + False + True + True + False + False + 0 + True + + + 0 + 5 + 1 + 1 + + + + + radiobutton + True + True + False + False + 0 + True + True + + + 1 + 0 + 1 + 1 + + + + + radiobutton + True + True + False + False + 0 + True + True + radiobutton1 + + + 1 + 1 + 1 + 1 + + + + + radiobutton + True + True + True + False + False + 0 + True + True + radiobutton1 + + + 1 + 2 + 1 + 1 + + + + + radiobutton + True + False + True + False + False + 0 + True + True + + + 1 + 3 + 1 + 1 + + + + + radiobutton + True + False + True + False + False + 0 + True + True + radiobutton3 + + + 1 + 4 + 1 + 1 + + + + + radiobutton + True + False + True + True + False + False + 0 + True + True + radiobutton3 + + + 1 + 5 + 1 + 1 + + + + + True + True + + + 0 + 6 + 1 + 1 + + + + + True + False + + + 1 + 6 + 1 + 1 + + + + + True + False + True + + + 2 + 0 + 1 + 1 + + + + + True + False + + + 2 + 1 + 1 + 1 + + + + + True + False + True + False + + + 2 + 3 + 1 + 1 + + + + + True + False + False + + + 2 + 4 + 1 + 1 + + + + + False + False + 5 + + False - True + False + 4 0 - + True - False False - label + vertical False @@ -625,11 +1042,176 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - + + 110 True - True - • - adjustment2 + False + vertical + 4 + + + togglebutton + True + True + True + False + + + False + False + 0 + + + + + togglebutton + True + False + True + True + False + + + False + False + 1 + + + + + togglebutton + True + True + True + False + True + + + False + False + 2 + + + + + togglebutton + True + False + True + True + False + True + + + False + False + 3 + + + + + True + False + liststore1 + 0 + + + + 2 + + + + + False + True + 5 + + + + + True + False + False + liststore1 + 1 + + + + 2 + + + + + False + False + 6 + + + + + True + True + True + False + + + False + False + 6 + + + + + True + True + True + False + #31316867a09f + + + False + True + 8 + + + + + True + False + + + False + True + 8 + + + + + True + False + 0.6 + + + False + True + 9 + + + + + True + False + 0 + 5 + 2 + 1 + + + False + True + 10 + + False @@ -638,797 +1220,264 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - + True - True - • - False + False + vertical False - False + True 3 - - - False - False - 4 - - - - - True - False - True - True - - checkbutton - True - True - False - False - 0 - True - True - - - 0 - 0 - 1 - 1 - - - - - checkbutton - True - True - False - False - 0 - True - - - 0 - 1 - 1 - 1 - - - - - checkbutton - True - True - True - False - False - 0 - True - - - 0 - 2 - 1 - 1 - - - - - checkbutton - True - False - True - False - False - 0 - True - True - - - 0 - 3 - 1 - 1 - - - - - checkbutton - True - False - True - False - False - 0 - True - - - 0 - 4 - 1 - 1 - - - - - checkbutton - True - False - True - True - False - False - 0 - True - - - 0 - 5 - 1 - 1 - - - - - radiobutton - True - True - False - False - 0 - True - True - - - 1 - 0 - 1 - 1 - - - - - radiobutton - True - True - False - False - 0 - True - True - radiobutton1 - - - 1 - 1 - 1 - 1 - - - - - radiobutton - True - True - True - False - False - 0 - True - True - radiobutton1 - - - 1 - 2 - 1 - 1 - - - - - radiobutton - True - False - True - False - False - 0 - True - True - - - 1 - 3 - 1 - 1 - - - - - radiobutton - True - False - True - False - False - 0 - True - True - radiobutton3 - - - 1 - 4 - 1 - 1 - - - - - radiobutton - True - False - True - True - False - False - 0 - True - True - radiobutton3 - - - 1 - 5 - 1 - 1 - - - - - True - True - - - 0 - 6 - 1 - 1 - - - - - True - False - - - 1 - 6 - 1 - 1 - - - - + True False - True - - - 2 - 0 - 1 - 1 - - - - - True - False - - - 2 - 1 - 1 - 1 - - - - - True - False - True - False - - - 2 - 3 - 1 - 1 - - - - - True - False - False - - - 2 - 4 - 1 - 1 - - - - - False - False - 5 - - - - - False - False - 4 - 0 - - - - - True - False - vertical - - - False - True - 1 - - - - - 110 - True - False - vertical - 4 - - - togglebutton - True - True - True - False - - - False - False - 0 - - - - - togglebutton - True - False - True - True - False - - - False - False - 1 - - - - - togglebutton - True - True - True - False - True - - - False - False - 2 - - - - - togglebutton - True - False - True - True - False - True - - - False - False - 3 - - - - - True - False - liststore1 - 0 - - - - 2 - - - - - False - True - 5 - - - - - True - False - False - liststore1 - 1 - - - - 2 - - - - - False - False - 6 - - - - - True - True - True - False - - - False - False - 6 - - - - - True - True - True - False - #31316867a09f - - - False - True - 8 - - - - - True - False - - - False - True - 8 - - - - - True - False - 0.6 - - - False - True - 9 - - - - - True - False - 0 - 5 - 2 - 1 - - - False - True - 10 - - - - - False - False - 2 - - - - - True - False - vertical - - - False - True - 3 - - - - - True - False - vertical - 4 - - - True - False - vertical - 8 - True - - - True - False - 0.5 - - - False - False - 0 - - - - - True - False - 0.5 - True - - - False - False - 1 - - - - - False - False - 0 - - - - - True - False - - - True - False - True vertical - True - - - True - True - adjustment1 - False - 75 - False - - - False - True - 0 - - - - - True - False - True - adjustment1 - False - 75 - False - - - False - True - 1 - - - - - True - True - 0 - - - - - False - False - 1 - - - - - True - False - True - - - True - False - True 4 - + True False vertical - 0.5 - - - False - True - 0 - - - - - True - False - vertical - 0.5 - True - - - False - True - 1 - - - - - False - False - 0 - - - - - True - False - True - 4 - - - 100 - True - True - vertical - adjustment1 - False - 75 - False - - - False - True - 0 - - - - - 100 - True - False - True - vertical - adjustment1 - False - 75 - False - - - False - True - 1 - - - - - False - False - 1 - - - - - True - True - 2 - - - - - True - False - vertical - - - True - False - - - link button - True - True - True - True - False - none - http://www.gtk.org - - - - - False - True - 0 - - - - - True - True - - - True - True - in + 8 + True - + + True + False + 0.5 + + + False + False + 0 + + + + + True + False + 0.5 + True + + + False + False + 1 + + + + + False + False + 0 + + + + + True + False + + + True + False + True + vertical + True + + + True + True + adjustment1 + False + 75 + False + + + False + True + 0 + + + + + True + False + True + adjustment1 + False + 75 + False + + + False + True + 1 + + + + + True + True + 0 + + + + + False + False + 1 + + + + + True + False + True + + + True + False + True + 4 + + + True + False + vertical + 0.5 + + + False + True + 0 + + + + + True + False + vertical + 0.5 + True + + + False + True + 1 + + + + + False + False + 0 + + + + + True + False + True + 4 + + + 100 + True + True + vertical + adjustment1 + False + 75 + False + + + False + True + 0 + + + + + 100 + True + False + True + vertical + adjustment1 + False + 75 + False + + + False + True + 1 + + + + + False + False + 1 + + + + + True + True + 2 + + + + + True + False + vertical + + True False - + + link button True - False - Lorem ipsum dolor sit amet, consectetur adipiscing elit. + True + True + True + False + none + http://www.gtk.org + + + + + False + True + 0 + + + + + True + True + + + True + True + in + + + True + False + + + True + False + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam fringilla, est ut feugiat ultrices, elit lacus ultricies nibh, id commodo tortor nisi id elit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Morbi vel elit erat. Maecenas dignissim, dui et pharetra rutrum, tellus lectus rutrum mi, a convallis libero nisi quis tellus. @@ -1441,19 +1490,485 @@ Vestibulum in tortor diam, quis aliquet quam. Praesent ut justo neque, tempus ru Duis eu lectus quam. Vivamus eget metus a mauris molestie venenatis pulvinar eleifend nisi. Nulla facilisi. Pellentesque at dolor sit amet purus dapibus pulvinar molestie quis neque. Suspendisse feugiat quam quis dolor accumsan cursus. + + + + + + + + + True + False + expander + + + + + False + True + 1 + + + + + False + True + 3 + + + + + False + False + 4 + + + + + True + False + vertical + + + False + True + 5 + + + + + True + False + vertical + True + + + True + False + 0 + in + + + True + False + 12 + + + + + + + + True + False + <b>In</b> + True + + + + + True + True + 0 + + + + + True + False + 0 + out + + + True + False + 12 + + + + + + + + True + False + <b>Out</b> + True + + + + + True + True + 1 + + + + + True + False + 0 + + + True + False + 12 + + + + + + + + True + False + <b>Etched out</b> + True + + + + + True + True + 2 + + + + + True + False + 0 + etched-out + + + True + False + 12 + + + + + + + + True + False + <b>Etched out</b> + True + + + + + True + True + 3 + + + + + True + True + 6 + + + + + True + False + vertical + + + False + True + 7 + + + + + True + False + vertical + 4 + + + 150 + True + True + always + in + + + True + True + liststore1 + False + 0 + + + + + + Cool + + + + 0 + + + + + + + Icon + + + true + + + 1 + + + + + + + Name + + + + 2 + + + + + + + Nick + + + + 3 + + + + True + True + 0 + - - + + + True + True + in + + + True + True + textbuffer1 + + + + + True + True + 1 + + + + + True + True + 6 + 8 + + + + + False + True + 10 + 2 + + + + + True + False + + + False + True + 3 + + + + + True + False + 5 + 5 + 5 + 10 + True + + + True + True + + True False - expander + vertical + + + + + + True + False + page 1 + + + False + + + + + True + False + vertical + + + + + + 1 + + + + + True + False + page 2 + + + 1 + False + + + + + True + False + vertical + + + + + + 2 + + + + + True + False + page 3 + + + 2 + False + + + + + False + True + 0 + + + + + True + True + right + + + True + False + vertical + + + + + + + + True + False + page 1 + + + False + + + + + True + False + vertical + + + + + + 1 + + + + + True + False + page 2 + + + 1 + False + + + + + True + False + vertical + + + + + + 2 + + + + + True + False + page 3 + + + 2 + False + + False @@ -1461,638 +1976,206 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 - - - False - True - 3 - - - - - False - False - 4 - - - - - True - False - vertical - - - False - True - 5 - - - - - True - False - vertical - True - - - True - False - 0 - in - - True - False - 12 - - - - - - - - True - False - <b>In</b> - True - - - - - True - True - 0 - - - - - True - False - 0 - out - - - True - False - 12 - - - - - - - - True - False - <b>Out</b> - True - - - - - True - True - 1 - - - - - True - False - 0 - - - True - False - 12 - - - - - - - - True - False - <b>Etched out</b> - True - - - - - True - True - 2 - - - - - True - False - 0 - etched-out - - - True - False - 12 - - - - - - - - True - False - <b>Etched out</b> - True - - - - - True - True - 3 - - - - - True - True - 6 - - - - - True - False - vertical - - - False - True - 7 - - - - - True - False - vertical - 4 - - - 150 - True - True - always - in - - + True True - liststore1 - False - 0 - - - + bottom - - Cool + + True + False + vertical - - - 0 - + - - - Icon - - - true - - - 1 - - + + + True + False + page 1 + + False + - - Name + + True + False + vertical - - - 2 - + + + 1 + + + + + True + False + page 2 + + + 1 + False + - - Nick + + True + False + vertical - - - 3 - + + + 2 + + + + + True + False + page 3 + + + 2 + False + + + False + True + 2 + - - - True - True - 0 - - - - - True - True - in - + True True - textbuffer1 + left + + + True + False + vertical + + + + + + + + True + False + page 1 + + + False + + + + + True + False + vertical + + + + + + 1 + + + + + True + False + page 2 + + + 1 + False + + + + + True + False + vertical + + + + + + 2 + + + + + True + False + page 3 + + + 2 + False + + + + False + True + 3 + True True - 1 + 4 - - True - True - 6 - 8 - + + + + True + vertical + 6 + 6 + + + True + horizontal + 4 + + + True + vertical + adjustment2 + + + + + True + False + vertical + adjustment1 + + + + + - - False - True - 10 - 2 - - - - - True - False - - - False - True - 3 - - - - - True - False - 5 - 5 - 5 - 10 - True - - - True - True - - - True - False - vertical - - - - - - - - True - False - page 1 - - - False - - - - - True - False - vertical - - - - - - 1 - - - - - True - False - page 2 - - - 1 - False - - - - - True - False - vertical - - - - - - 2 - - - - - True - False - page 3 - - - 2 - False - - - - - False - True - 0 - - - - - True - True - right - - - True - False - vertical - - - - - - - - True - False - page 1 - - - False - - - - - True - False - vertical - - - - - - 1 - - - - - True - False - page 2 - - - 1 - False - - - - - True - False - vertical - - - - - - 2 - - - - - True - False - page 3 - - - 2 - False - - - - - False - True - 1 - - - - - True - True - bottom - - - True - False - vertical - - - - - - - - True - False - page 1 - - - False - - - - - True - False - vertical - - - - - - 1 - - - - - True - False - page 2 - - - 1 - False - - - - - True - False - vertical - - - - - - 2 - - - - - True - False - page 3 - - - 2 - False - - - - - False - True - 2 - - - - - True - True - left - - - True - False - vertical - - - - - - - - True - False - page 1 - - - False - - - - - True - False - vertical - - - - - - 1 - - - - - True - False - page 2 - - - 1 - False - - - - - True - False - vertical - - - - - - 2 - - - - - True - False - page 3 - - - 2 - False - - - - - False - True - 3 - - - - - True - True - 4 -