From 1067627131ded97ece700dca73ef0502af075463 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 4 Aug 2012 19:11:43 -0400 Subject: [PATCH] Add labels to some visual index images --- docs/reference/gtk/images/lock-button.png | Bin 2260 -> 3496 bytes docs/reference/gtk/images/menu-button.png | Bin 1809 -> 2881 bytes docs/tools/widgets.c | 46 ++++++++++++++++++---- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/docs/reference/gtk/images/lock-button.png b/docs/reference/gtk/images/lock-button.png index 28ce08ae0dcf48b93165b44026c7c5a9dda2cbe1..c46f88eab515fe08076913bc8f20635347b0e199 100644 GIT binary patch literal 3496 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 literal 2260 zcmb7GS5y<&7QG3Cpum8X5v2|)qk@1Eq$pCQS0hCt(t?N@S|ET3L;(p#gMy-h7*q&4 zBE3il0VyGrp-V5Kln{CVLo#vA&-;06y>~v&y&rqseeT-l?0XaJY)pmr9^4B65HdG2 zz5oD(y9FqIK5l+#g_`9qyjVl?i~QWU&5tGkz)v(cHnYdc4}6!N!IAEtj)_NP-#+ zZx(wD7%Nyo3Jwg5Y>~D8 zlm7)&-kmgURrAP9{})1#r#X-!4Jf{a5uF08-L5}wMRY>CdV51IsLIZPwe5LU^xc+x+Rt^x*0c{72>}s-%FgiFx9`N5C_ z8Pz2v`8KANQoP?)FTdOQkc}B$7Z&Uan11MhvX#-_3Wk~BtHAR%M7K`QP(QYllY5OF zgUk+#WVlgtd-T-mNb#YL>sU(Bt5{2jhzQ4^E`!INQKLzm?R-W5b}f`S;}vlHr*_XJ zTR5a4%M}kCf&?cf*f#h*&&cyQixUi30%llHSh#1SACjVcrG4^{sdLdSjWouNi$^$P zGuo%KkV&)QgTu=)beE;Ac^z<0Da=# zO~#G#anu~HEv|V(VE^hgeK=p4I9$7a-X{H=H5Q5V7>btBwJ?p4a@$^|Ympk5wM^H| z5S)E70ZXN6Vh7Tt3NUG#rH&mN8;@JBhAp;c53;*rf{RP6!%E0H_+Qdag@ELer89ET zcawEFuYw~&$ExEm}w>yhDauc{%h|Z|aY5hHg-~ zG-*1ZxH3)SgHuuPoR8K}PmFIW_rmXcvIXFqvcuczW9PyMp^0+jzf~T_8p-JER|(w7 z-H_Y8SjtS6!%RP`jY{E)`hZ008teZupos}0O1urY=XoO|&(4>qW^TrG-o zS}<0yzs3+tFrEbIoIpl;1jRSWCc71VN{eK4{Ha13%~O(ZB}}>pA+XToc~UgNxLf6} zn@;-dV1if9?#S2sY}%>vot;~FpF6gAYF+d8ToQwwp@Ro;eGuoArsZX|0_U9kJcir2 zTgH`op7V)6V{V|)nKRR4_2>L`sfBGdqfT5YxRbg<=Br9MJ~U>fq$R^ENQTPmBeez8 z(lH&5Md6FsIHC+wcp zx=vKO3ADp6ILKBJtjIAamQkIWm&b%Kh z#RnR>#}@cy+yq*mV15^*0eeal5}8-j(*6xrchqm?XC+=)f>-~Z5>by><79_c#7ce` z7xXf)E0(fT0m>tW%$l}eFP!|9rg~ya-`a0G-UkGr4EGH47hb?I3X-=ab3buUqdg$B z2UGl4$*`kRfb9zW$CTK-ev{2z8oUbX=^B2k@Vl@FL|tZwfF!Z)2Qm=zjMf^@B9= diff --git a/docs/reference/gtk/images/menu-button.png b/docs/reference/gtk/images/menu-button.png index 71ced34f9a28c2818899bc154c9871b93586f536..e1a0393d328a27e1c79b01bf9e5737f9ac363f44 100644 GIT binary patch literal 2881 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 Uj&~pYuL;@F*4gIWIp4(p0Jf%Kz5oCK 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_ diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 708f9b5588..87e539eaeb 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -228,9 +228,9 @@ static WidgetInfo * create_menu_button (void) { GtkWidget *widget; - GtkWidget *align; GtkWidget *image; GtkWidget *menu; + GtkWidget *vbox; widget = gtk_menu_button_new (); image = gtk_image_new (); @@ -238,10 +238,15 @@ create_menu_button (void) 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); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE, TRUE, 0); + + return new_widget_info ("menu-button", vbox, SMALL); } #define G_TYPE_TEST_PERMISSION (g_test_permission_get_type ()) @@ -282,14 +287,20 @@ g_test_permission_class_init (GTestPermissionClass *class) static WidgetInfo * create_lockbutton (void) { + GtkWidget *vbox; GtkWidget *widget; - GtkWidget *align; widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL)); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - return new_widget_info ("lock-button", align, SMALL); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), + gtk_label_new ("Lock Button"), + FALSE, FALSE, 0); + gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER); + gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER); + + return new_widget_info ("lock-button", vbox, SMALL); } static WidgetInfo * @@ -987,6 +998,24 @@ create_progressbar (void) return new_widget_info ("progressbar", vbox, SMALL); } +static WidgetInfo * +create_level_bar (void) +{ + GtkWidget *vbox; + GtkWidget *widget; + + widget = gtk_level_bar_new (); + gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.333); + + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), + gtk_label_new ("Level Bar"), + FALSE, FALSE, 0); + + return new_widget_info ("levelbar", vbox, SMALL); +} + static WidgetInfo * create_scrolledwindow (void) { @@ -1269,6 +1298,7 @@ get_all_widgets (void) retval = g_list_prepend (retval, create_colorchooserdialog ()); retval = g_list_prepend (retval, create_menu_button ()); retval = g_list_prepend (retval, create_search_entry ()); + retval = g_list_prepend (retval, create_level_bar ()); return retval; }