From aa21c34911e9137fab841b9b0a8179f26ca034f1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 13 Jul 2012 22:31:34 -0400 Subject: [PATCH] Add GtkMenuButton and GtkSearchEntry to gallery At the same time, remove GtkComboBoxEntry, which no longer exists. --- docs/reference/gtk/Makefile.am | 4 ++- docs/reference/gtk/images/menu-button.png | Bin 0 -> 1809 bytes docs/reference/gtk/images/search-entry.png | Bin 0 -> 2628 bytes docs/reference/gtk/visual_index.xml | 9 ++++-- docs/tools/widgets.c | 36 +++++++++++++++++++++ 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 docs/reference/gtk/images/menu-button.png create mode 100644 docs/reference/gtk/images/search-entry.png diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index ca821e9403..db1f0123a8 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -296,6 +296,7 @@ HTML_IMAGES = \ $(srcdir)/images/combo-box.png \ $(srcdir)/images/combo-box-entry.png \ $(srcdir)/images/entry.png \ + $(srcdir)/images/search-entry.png \ $(srcdir)/images/figure-hierarchical-drawing.png \ $(srcdir)/images/figure-windowed-label.png \ $(srcdir)/images/file-button.png \ @@ -310,11 +311,12 @@ HTML_IMAGES = \ $(srcdir)/images/link-button.png \ $(srcdir)/images/list-and-tree.png \ $(srcdir)/images/lock-button.png \ - $(srcdir)/images/lockbutton.png \ + $(srcdir)/images/lockbutton.png \ $(srcdir)/images/lockbutton-locked.png \ $(srcdir)/images/lockbutton-unlocked.png \ $(srcdir)/images/lockbutton-sorry.png \ $(srcdir)/images/menubar.png \ + $(srcdir)/images/menu-button.png \ $(srcdir)/images/messagedialog.png \ $(srcdir)/images/multiline-text.png \ $(srcdir)/images/notebook.png \ diff --git a/docs/reference/gtk/images/menu-button.png b/docs/reference/gtk/images/menu-button.png new file mode 100644 index 0000000000000000000000000000000000000000..71ced34f9a28c2818899bc154c9871b93586f536 GIT binary patch literal 1809 zcmb_d`8ON*7XL;h5^Fo7Xa-HyM6^n0w6z2Y5=-sND_+~6X-$Xdw6$-Qs*bd@wpyyF zt;LL`<%KCCG<3AKQY8omjio8FXeptSGw1yS@0|Df;oi^roX@%E-h1vj_qMyMy^=gi z9sr=^=s@%Y03xN}3<55Vh0bRdq)9f+#?c!gMLgmH9RPTbBhlJBx^QJ`GX2|&nlFWG zxNwrYZ;8Q;bBL7uXlwc(LQh-M8i%&e8C83Ai|6$3pp2Z4V+x{aMCK6Dy>sb6fa+e0 zsVa@67dd+`_q~o}C#l={P7JJnI&Z!b-mI6LJJ2?$7xT8LXgM75#d4<~*LalvUnn?d z&phO8+4brSw^C!e66^fxe7fM+h+Ph`g58jOi(K$ylBm3YBqj@D8uyu+ch7@p*i1dC za4aRbbDQTO4r7BonOzT^dt2=oxG&@Md!o ze?j7)ZV+@9ISi?Qw`FXWo88cH_XhNev9nLqS#G|P{itxDlcgM%PnHbDcPNI-qqBm? z?jM-%PTa?vlS`8!=rZdt1`>-m_MFdyB`8olw)tEqD^ecpP044EOR%yJbF~vU8OG>OzZn zW@+1s^=Pwbh-K&3PL1&)dzm{)O_h4Cje%3}8pb(3uo#@*;@2(y$;L4@FD7`bS7+*%0S7FlZyyp+lwM*X!#2{AdEWpx zi$*9#aqVOL?@)V;V_Aq9avzLP?Hz1(-8?=&RK@azuc7@OS;^Ho-NZsu$33!zsP8EJ zn<`@QtpCJ>&zPH8MfnIscceQK=(!fZe^yx>bm>Y)*x~?0Fmi9v^u)=RT@Q?XCnob4 zCky2=yxoEB{gkoKIFSpRt*E4Y`i`Y&QaBH!^x9j&mEHu>jdDY@rF5Kku5yCz-TKW> zoF9S)3%aFEV6p=z6E+&I?!g4VSGyaYt-;Pc zV{eK#do^5I`efT%F2hismK?lzxMLyHg{nQC%*gdm*U~ew8YpINa~h-k`y-vyj249U z2dcSqlRtv{km^z|TJoJJQ0of2r)hcWa(v;faf6W4^>rU9{U6>L^aZ`Tn;!OlX{c#c zc4UgST&9dJop`RO@ocmqn0JaCKN|yAGkjmSz51sHJEXp?Z}~QooUr5abcL~TcsJYw z=z1SVa$K#I>(BKHCKx%qe;x7hp4cHlp=~>(-x1=vr(FMXxQ6{_Wl_M3xg~Py_s{1#B%U|Qh%gguc#6@RK@Iw zO~o7g7d8g#x%`=)5!xkHjaqYgisDzvwo0nn(UwhUZgGXw_O zVk@Y`Gv=mF;I*@8iP}M%sVt415GICgUIrf%I2C!29SLO2zr<=;n4kImry|HMZ08ncvmrSHf~85l`BBv)dcO+eD$#AiF_ literal 0 HcmV?d00001 diff --git a/docs/reference/gtk/images/search-entry.png b/docs/reference/gtk/images/search-entry.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc2f4930f8a52eacc5d9373bec41101b1050ac2 GIT binary patch literal 2628 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 literal 0 HcmV?d00001 diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml index 7fb63932d4..1609ab2917 100644 --- a/docs/reference/gtk/visual_index.xml +++ b/docs/reference/gtk/visual_index.xml @@ -18,12 +18,12 @@ - - - + + + @@ -54,6 +54,9 @@ + + + diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 5b326090f4..708f9b5588 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -224,6 +224,26 @@ create_link_button (void) return new_widget_info ("link-button", align, SMALL); } +static WidgetInfo * +create_menu_button (void) +{ + GtkWidget *widget; + GtkWidget *align; + GtkWidget *image; + GtkWidget *menu; + + widget = gtk_menu_button_new (); + image = gtk_image_new (); + gtk_image_set_from_icon_name (GTK_IMAGE (image), "emblem-system-symbolic", GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (widget), image); + menu = gtk_menu_new (); + gtk_menu_button_set_menu (GTK_MENU_BUTTON (widget), menu); + align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); + gtk_container_add (GTK_CONTAINER (align), widget); + + return new_widget_info ("menu-button", align, SMALL); +} + #define G_TYPE_TEST_PERMISSION (g_test_permission_get_type ()) #define G_TEST_PERMISSION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ G_TYPE_TEST_PERMISSION, \ @@ -287,6 +307,20 @@ create_entry (void) return new_widget_info ("entry", align, SMALL); } +static WidgetInfo * +create_search_entry (void) +{ + GtkWidget *widget; + GtkWidget *align; + + widget = gtk_search_entry_new (); + gtk_entry_set_placeholder_text (GTK_ENTRY (widget), "Search..."); + align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); + gtk_container_add (GTK_CONTAINER (align), widget); + + return new_widget_info ("search-entry", align, SMALL); +} + static WidgetInfo * create_radio (void) { @@ -1233,6 +1267,8 @@ get_all_widgets (void) retval = g_list_prepend (retval, create_lockbutton ()); retval = g_list_prepend (retval, create_fontchooserdialog ()); retval = g_list_prepend (retval, create_colorchooserdialog ()); + retval = g_list_prepend (retval, create_menu_button ()); + retval = g_list_prepend (retval, create_search_entry ()); return retval; }