[yast-commit] r51942 - in /trunk/gtk: ChangeLog mockups/wizard-look/help-background.png src/icons/help-bg.xpm src/ygtkhtmlwrap.c src/ygtkhtmlwrap.h src/ygtkrichtext.c src/ygtkrichtext.h src/ygtkwizard.c

Author: rpmcruz Date: Tue Oct 7 19:45:12 2008 New Revision: 51942 URL: http://svn.opensuse.org/viewcvs/yast?rev=51942&view=rev Log: * src/ygtkhtmlwrap.h/c & src/ygtkrichtext.h/c: added support for background image. * src/ygtkwizard.c: set anchor background. Added: trunk/gtk/mockups/wizard-look/help-background.png (with props) trunk/gtk/src/icons/help-bg.xpm Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtkhtmlwrap.c trunk/gtk/src/ygtkhtmlwrap.h trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtkrichtext.h trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=51942&r1=51941&r2=51942&view=diff ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 7 19:45:12 2008 @@ -6,6 +6,11 @@ * src/ygtkhtmlwrap.c: added support for WebKit. (compilation seems to break due to some -l missing.) + * src/ygtkhtmlwrap.h/c & src/ygtkrichtext.h/c: added support for + background image. + + * src/ygtkwizard.c: set anchor background. + 2008-10-06 Ricardo Cruz * src/ygtkwizard.h/.c: collapse all button functions and accept button Added: trunk/gtk/mockups/wizard-look/help-background.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/mockups/wizard-look/help-background.png?rev=51942&view=auto ============================================================================== Binary file - no diff available. Added: trunk/gtk/src/icons/help-bg.xpm URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/icons/help-bg.xpm?rev=51942&view=auto ============================================================================== --- trunk/gtk/src/icons/help-bg.xpm (added) +++ trunk/gtk/src/icons/help-bg.xpm Tue Oct 7 19:45:12 2008 @@ -0,0 +1,174 @@ +/* XPM */ +static const char * help_bg_xpm[] = { +"143 150 21 1", +" c None", +". c #FFFFFF", +"+ c #FCF6F6", +"@ c #FCF7F7", +"# c #FCF4F4", +"$ c #FBF1F1", +"% c #F9EBEB", +"& c #FAEFEF", +"* c #FEFDFD", +"= c #F6E2E2", +"- c #F7E4E4", +"; c #F7E6E6", +"> c #F7E7E7", +", c #F8E9E9", +"' c #F9EDED", +") c #FEFBFB", +"! c #FBF2F2", +"~ c #F6E1E1", +"{ c #F5DFDF", +"] c #F4DDDD", +"^ c #FDF9F9", +".....++@+@@@#$%&*....................&====-;;;>,,'''$$$$$$$$$$&'',,%&$$##$$',#.................................................................", +".....$@@#@@+#&,%*....................%===-;;;;,,%''&$$$$$$$$$$&'',,;;-=-,,%%>).................................................................", +".....!@++@@+!&,%*....................,===-;;;;,,%''&$$$$$$$$$$&'',,;;;=====~=*.................................................................", +".....#+++@@#!%%%)...................);===-;;;;,,%''&$$$$$$$$$$&'%,,;;-=====~;..................................................................", +".....++#@@@#$%&%)...................@-===-;;;;,,%''$$$$$$$$$$$''%,>;;-====={%..................................................................", +".....@##@@+#&,$%)...................@-===-;;;>,,'''$$$$$$$$$$$''%,;;;-=====]$..................................................................", +".....@##@@+!&'!%+...................@====-;;;>,,'''$$$$$$$$$$&'',,;;;======]+..................................................................", +".....)!+@@#!%$!'$...................+====-;;;>,,'''$$$$$$$$$$&'',,;;;======])..................................................................", +".....)!+@@#$%!!&'*..................@====-;;;>,,'''$$$$$$$$$$&'',,;;;=====~{)..................................................................", +".....*!@@@#$&+!&&*..................#====-;;;>,,''&$$$$$$$$$$&'',,;;;=====~~*..................................................................", +"......!@@@#$!+!&'*..................!====-;;;,,,''&$$$$$$$$$$&'',,;;;=====~=*..................................................................", +"......#@@+#$++#&&*..................$====-;;;,,,''&$$$$$$$$$$&'',,;;;=====~;...................................................................", +"......#@@+#$@+#&'*..................&===-;;;;,,,''&$$$$$$$$$$&'',,;;;=====~;...................................................................", +"......#@@+##@+#&,*..................&====;;;;,,%''&$$$$$$$$$$&'',,;;-=====~>...................................................................", +"......#@@+#+@+#$%^..................%====;;;;,,,''&$$$$$$$$$$&'',,;;-=====~,...................................................................", +"......!@@+#@@@#$%^..................&===-;;;;,,,''&$$$$$$$$$$&'',,;;-=====~,...................................................................", +"......#@@++@@@#$%)..................$====-;;;,,,''&$$$$$$$$$$&'',,;;;=====~;...................................................................", +"......++@@+@@@#$%)..................&====;;;;>,,''&$$$$$$$$$$&'',,;;;=====~;...................................................................", +"......@#@@+@@@#$%^..................$====;;;;>,,''&$$$$$$$$$$&'',,;;;=====~-*..................................................................", +"......*!+@+@@@#!%$*.................$====;;;;>,,''&$$$$$$$$$$&'',,;;;=====~~*..................................................................", +".......!+@+@@@#!%,).................#====-;;;>,,'''$$$$$$$$$$&'',,;;;=====~~*..................................................................", +".......++@#+@@#!%%!.................+====-;;;>,,'''$$$$$$$$$$&'',,;;;======])..................................................................", +".......^!+#+@@+!%%%)................+====-;;;>,,'''$$$$$$$$$$$'',,;;;======]@..................................................................", +"........+#++@@+!'%&$*...............+====-;;;>,,'''$$$$$$$$$$$''%,;;;-=====]#..................................................................", +"........*$##@@+!&%$'+...............@-===-;;;;,,%''&$$$$$$$$$$''%,>;;-====={&..................................................................", +".........+##@@+#&%!&'*..............);===-;;;;,,%''&$$$$$$$$$$''%,,;;-=====~%..................................................................", +".........*!!@@+#&%!$%@..............*>===-;;;;,,%''&$$$$$$$$$$&'',,;;-=====~;*.................................................................", +"..........##@@@#$'#!&&*..............,===-;;;;,,%''&$$$$$$$$$$&'',,;;;=====~~).................................................................", +"..........*$+@@#!&+#$%^..............&====-;;;>,,'''$$$$$$$$$$&'',,;;;-=====]@.................................................................", +"...........@#@@+!&+#!'$*.............$====-;;;>,,'''$$$$$$$$$$&''%,;;;-====={'.................................................................", +"...........*#@@+!$++!$%^.............+====-;;;>,,%''$$$$$$$$$$$''%,>;;-=====~;*................................................................", +"............#@@@#$+@#!%#.............@====-;;;;,,%''&$$$$$$$$$$&'%,,;;;=====~~)................................................................", +"............@#@@#!+@+!&$.............^-===-;;;;,,%''&$$$$$$$$$$&'',,;;;======]@................................................................", +"............@#@@##+@+#&&*............);===-;;;;,,,''&$$$$$$$$$$$''%,;;;-====={%................................................................", +"............)#@@+#+@@#$'@............*%====;;;;>,,'''$$$$$$$$$$$''%,,;;-=====~-*...............................................................", +"............*#+@@#+@@+!&,@............$====-;;;;,,%''&$$$$$$$$$$&'%,,;;;======]+...............................................................", +".............)!@@+++@+!&,%@...........@-===-;;;;,,%''&$$$$$$$$$$&'',,;;;-====={,*..............................................................", +"..............+#@@++@@#$%%'*..........);===-;;;;>,,''&$$$$$$$$$$$''%,>;;-=====~~)..............................................................", +"..............*#@@++@@#!%'&$*.........*%====-;;;>,,'''$$$$$$$$$$$&'',,;;;======]$..............................................................", +"...............+#@+#@@+!&%$'#..........$====-;;;;,,%''&$$$$$$$$$$&'',,;;;-=====~-*.............................................................", +"...............^#@+#@@+#$'!&%*.........@-===-;;;;,,%''&$$$$$$$$$$$''%,,;;-======]!.............................................................", +"...............*##@#+@@#$&!$&!*........);===-;;;;>,,'''&$$$$$$$$$$&'',,;;;-=====~;*............................................................", +"................*!###@@+!&##$%@........*,====;;;;>,,%''&$$$$$$$$$$&''%,>;;;======]#............................................................", +".................)!##@@+#$#+#&%)........$====-;;;;,,%'''$$$$$$$$$$$''%,,;;;-=====~;*...........................................................", +"..................^!!+@@+$#+#$%@........^-====;;;;>,,'''&$$$$$$$$$$&'',,>;;-=====~{+...........................................................", +"...................@$#@@+##@+#&&*.......*%====-;;;>,,%''&$$$$$$$$$$$''%,,;;;-=====~-*..........................................................", +"....................)!+@@##@@#$'@........!====-;;;;,,,'''$$$$$$$$$$$&'',,>;;-======]$..........................................................", +".....................@#@@+#+@+#&&).......);===-;;;;>,,'''&$$$$$$$$$$$''%,,;;;-=====~~).........................................................", +".....................)#@@@#+@@#$',#*.....*%====-;;;;,,%''&$$$$$$$$$$$&'',,>;;-======{,*........................................................", +"......................##@@++@@+#$,%$*.....!====-;;;;>,,'''&$$$$$$$$$$&''%,,;;;-======;#........................................................", +"......................)!+@@@@@@+$'%&&@....);====-;;;;,,%''&$$$$$$$$$$$&'',,>;;;====;%'%).......................................................", +".......................^!+@@+@@+#$%$$&&)..*%====-;;;;,,,'''&$$$$$$$$$$$''%,,>;;-=-&$$&%&*......................................................", +"........................@#@@#@@@+$'&#!&&@*.#=====;;;;>,,%''&$$$$$$$$$$$&''%,,;;;,!#$$$',!......................................................", +"........................*##@+#@@+#$'!##$'!*);====-;;;;,,,'''&$$$$$$$$$$$&'',,>,!+###$$&',+.....................................................", +".........................)#+@#+@@+!&$@+#$&$)$=====-;;;>,,%''&$$$$$$$$$$$&''%,$@@@####$$&%,@....................................................", +".........................*+$#+#@@+#$$+@+#!&&@;====-;;;;,,,'''$$$$$$$$$$$$&'&^))@@@###!$$&%,^...................................................", +"...........................)$###@@+#!#@@@#!$''=====;;;;>,,%''&$$$$$$$$$$$$#*.*))@@+###!$$&%%)..................................................", +"............................*+!#@@@+#!+@@@+#$%=====-;;;;,,,'''&$$$$$$$$$!)....*)^@@+###!$$&%').................................................", +".............................*@$#@@@+##@@@@+#$>=====;;;;>,,%''&&$$$$$$$@*......))^@@####$$&'%'*................................................", +"...............................@$#@@@+#++@@@+#$-====-;;;;,,,'''&$$$$$#*.........))^@@####$$&'%%)...............................................", +"................................*+#+@@@+++@@@+#,=====;;;;;,,,'''&$$$@...........*))@@@####$$&&%&)..............................................", +".................................*#!#+@@@##+@@@$=====-;;;;>,,%''&$#).............*))@@@####$$$&%%).............................................", +"...................................^!#+@@+##+@@+%=====-;;;;,,,''&@................*))@@@####$$$&%,@............................................", +"....................................*#####+##+@@#-====-;;;;>,,,$*..................)))@@@####$$$&%%!*..........................................", +".....................................*+$!!##$!+@@&-====-;;;;,,+.....................))^@@@+###$$$&'%&).........................................", +"........................................*@#$#!$#++>====-;;;;'@)......................)))@@@+###!$$$'%%@........................................", +"...........................................)#####+!-====-;;$)))*......................)))@@@+####$$$&'%#*......................................", +"................................................@$#,=====,+@^)))*......................)))@@@+####!$$&'%'@.....................................", +".................................................*+&-==;&@@@@^))).......................*))@@@+#####$$$&%,&*...................................", +"....................................................!-,!#+@@@@)))).......................*))^@@+#####$$$$'%,#).................................", +"....................................................*$!###+@@@@)))*.......................*))^@@@+#####$$$&'%%!*...............................", +".....................................................)$!###@@@@@)))*........................*))@@@+#####!$$$&''%$).............................", +"......................................................#$####@@@@^))).........................*)))@@@+#####!$$$&''%&@*..........................", +".....................................................*!!$###+@@@@^))).........................*)))@@@@+#####$$$$&&'%%!@........................", +".....................................................@#+$!###+@@@@^)))..........................*)))@@@+######!$$$$&''%%$@*....................", +".....................................................^#@+$####@@@@@))))..........................*)))^@@@+######!$$$$$&''%%'!@)*...............", +".....................................................)!@@#$####@@@@@))))...........................*)))@@@@++######!$$$$$&&&'>~~;%!+@^)**..*.)*", +".....................................................^#@@+$!###+@@@@@))))...........................*))))@@@@@+#######!$$$$$$;====~~~~~=~-=~~~=", +".....................................................+#@@#+$!####@@@@@))))............................*))))^@@@@++########!!$;=================", +".....................................................+#@+#@+$!###+@@@@@)))).............................*))))^@@@@@@########$-=================", +".....................................................@#@#+@@#$!###+@@@@@))))..............................**))))^@@@@@++####&==================", +".....................................................*!#!+@@#&$!###+@@@@@))))................................*)))))^@@@@@@@+'==================", +".....................................................*#!#@@+!'$$!###@@@@@@))))*.................................*)))))^@@@@@%;;;;--------------", +"......................................................#$#@@+$'$&$####+@@@@@^)))*...................................*))))))^@,;;;;;;;;;;;;;;;;;;", +"......................................................#!+@@#&$#&&$####+@@@@@^)))*.....................................**)))@,;;>;;;;;;;;;;;;;;;", +"......................................................+#@@+#&##&!!$#####@@@@@^))))........................................*@,,,,,,,,,,,>,>>,,,,", +"......................................................++@@+$#+!&@*!$#####@@@@@@))))*.......................................+%%%,,,,,,,,,,,,,,,,", +"......................................................++@@+!++$&@..!$!####@@@@@@^)))*......................................!'''''''''''%'%%%%''", +"......................................................++@@##@+$&+...#$!###++@@@@@^))))*...................................*$&''''''''''''''''''", +"......................................................++@@#+@+$&^....+&!####+@@@@@^))))*..................................*$$$$$&&&&&&&&&&'&&&&", +".....................................................*#+@+#@@+$%).....+&!####+@@@@@@)))))*................................^$$$$$$$$$$$$$$$$$$$$", +".....................................................*!+@++@@+$%$......@&!####+@@@@@@^))))**..............................+$$$$$$$$$$$$$$$$$$$$", +".....................................................*#+@++@@+$%'*......)&$#####+@@@@@@^))))*.............................#$$$$$$$$$$$$$$$$$$$$", +".....................................................*##@++@@+$%'+.......)$$######@@@@@@@)))))*..........................*!$$$$$$$$$$$$$$$$$$$$", +"......................................................+#@++@@+$%&'*.......*#&!#####+@@@@@@^)))))*........................*$$$$$$$$$$$$$$$$$$$$$", +"......................................................)!#++@@+$'$'#.........+$$#####+@@@@@@@^)))))*......................^$$$$$$$$$$$$$$$$$$$$$", +".......................................................+##+@@+$'#&%*.........)$$######+@@@@@@@^)))))**...................+$$$$$$$$$$$$$$$$$$$$$", +".......................................................)!$+@@#$'#$'@...........#$!######@@@@@@@@^))))))*................*#$$$$$$$$$$$$$$$$$$$$$", +".......................................................*#$+@@#$&+!&#............+&$!#####+@@@@@@@@^))))))**.............*&&&&&&$$$$$$$$$$$$$$$$", +"........................................................+$+@@#$&@#&%*............)!&$######+@@@@@@@@@)))))))**..........)''''''''&&&&&&&&&&&&&&", +"........................................................*!+@@+$$@+$'@..............^$$!######++@@@@@@@@^))))))))**......+''''''''''''''''''''''", +".........................................................^!@@+#$@+#&'...............*+&$!######++@@@@@@@@@^)))))))))**..$%%%%%'''''''''''''''''", +".........................................................*#+@+#!@@#$%)................*#$$#######+@@@@@@@@@@@^))))))))))',,,,,,,,%%%%%%%%%%%%%%", +"..........................................................+#@@##@@+!&+..................@$$$########+@@@@@@@@@@@^))))))@,,,,,,,,,,,,,,,,,,,,,,,", +"..........................................................)!@@##@@+#&&...................*+$$$!########@@@@@@@@@@@@@@^)#;;;;>>,,,,,,,,,,,,,,,,,", +"..........................................................*$+@+#@@@#$%#....................*^!$$!########+@@@@@@@@@@@@@$;;;;;;;;;;;;;>;;>;;>;;>", +"..........................................................*#+@@#@@@+$&,#.....................*@!&$!##########+@@@@@@@@@%;;;;;;;;;;;;;;;;;;;;;;;", +"...........................................................@#+@#+@@+#&,%#.......................^#$$$###########++@@@@+>;;;;;;;;;;;;;;;;;;;;;;;", +"............................................................##+@++@@#$%&'!*......................*)#$$$$############++#----;;;;;;;;;;;;;;;;;;;;", +"............................................................*!#@++@@+!&%$'!..........................@#$$$$###########&========----------------", +".............................................................@!+++@@@#$,!$%@...........................*@!$$$!!#######,========================", +".............................................................*$#+#+@@#$'&#&%@.............................)+$$$$$$!###>========================", +"..............................................................)!#$#@@+#&&#!&%)...............................*@#!&$$$$-========================", +"...............................................................*!#!@@@#$&+#!&%@..................................*@#$&-========================", +"................................................................)$!+@@+#&#+#!&'*.....................................)@#&,>-===================", +".................................................................*!!@@@#!$@+#$'+...........................................*)+!'%,,>--~========", +"...................................................................+#@@+#$@@+#&').......................................................))))**.", +"...................................................................*#+@@#!+@@#!&%@.............................................................", +"....................................................................+!@@+##@@@#$',$*...........................................................", +".....................................................................!+@@+#+@@+#$%%&)..........................................................", +".....................................................................^#@@@++@@@+#$%&%@.........................................................", +".....................................................................*+!+@@++@@@#!'%&%$*.......................................................", +".......................................................................+!+@@++@@+#$,&$''*......................................................", +"........................................................................+!+@@#@@@+!&%#$'&).....................................................", +".........................................................................#!@@+#@@@#$&$#$'%@....................................................", +".........................................................................*##+@#+@@+#$&+#$&%^...................................................", +"..........................................................................)#!#+#+@@+!$#+#!$&)..................................................", +"............................................................................@!###@@@#!$++#!&&).................................................", +".............................................................................)#!#+@@@#!#@+#!&'&+*..............................................", +"...............................................................................@!!+@@+##@@+#!$%%&#)............................................", +"................................................................................)+!+@@+#+@@@+!$%&&%&$@*........................................", +"..................................................................................@!@@@+#@@@@+!$%&$$&&$@*......................................", +"...................................................................................+#@@@++@@@@+!$%&##!$'&$^*...................................", +"...................................................................................*##+@@@++@@@+#$''###$$&%'+*................................)", +"....................................................................................*#!#@@@#+@@@+#$&&++###$$&&+*....**)^*.............*+#$!!$%'", +"......................................................................................^##+@+#+@@@+#!$$+@++##$&&%,,%'%%&'%'&'%&$+@)@$&&%&&$$$$!!", +".......................................................................................*#!+@+#+@@@+##$$+@@@++#!$&%%&$$!$$!$!!$$&&%%%,%&!#+###++", +"........................................................................................*+!#++##@@@+##!!+@@@@@+##$&%%%$#+#+######$!$$&'%'&!+@@@", +"..........................................................................................^#!!#!!+@@@+###+@@@@@@+##!$&&'!+@@@@@@+++####$!$$$$#+", +".............................................................................................@+!$!+@@@@+##+@@@@@@@@+##!$&$!+@@@@@@@@@@++++#####", +"...............................................................................................*+$$#+@@@@+####+@@@@@@++###$$#+@@@@@@@@@@@@@@@@+", +".................................................................................................**^#!+@@@@@@+##+@@@@@@@@+#####+@++@@@@@@@@@@@@", +".....................................................................................................@##++++@@+##!#+@@@@@@@@@++++++##!#+++@@++@", +"......................................................................................................*+$$!###+++#!$##++@@@@@@@@@@@@++#$!$$!$$!", +"........................................................................................................**^+#!#!!$!!$$$$!##++@@+++++++##!$&+).*", +".............................................................................................................*^))****^**^@+$!##!$$!!#$$+^)*....", +"............................................................................................................................)@@)))^@)..........", +"...............................................................................................................................................", +"...............................................................................................................................................", +"..............................................................................................................................................."}; Modified: trunk/gtk/src/ygtkhtmlwrap.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.c?rev=51942&r1=51941&r2=51942&view=diff ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.c (original) +++ trunk/gtk/src/ygtkhtmlwrap.c Tue Oct 7 19:45:12 2008 @@ -183,6 +183,11 @@ g_signal_connect (G_OBJECT (widget), "link-clicked", callback, data); } +void ygtk_html_wrap_set_background (GtkWidget *widget, GdkPixbuf *pixbuf) +{ + ygtk_rich_text_set_background (YGTK_RICH_TEXT (widget), pixbuf); +} + #endif #endif Modified: trunk/gtk/src/ygtkhtmlwrap.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.h?rev=51942&r1=51941&r2=51942&view=diff ============================================================================== --- trunk/gtk/src/ygtkhtmlwrap.h (original) +++ trunk/gtk/src/ygtkhtmlwrap.h Tue Oct 7 19:45:12 2008 @@ -29,6 +29,8 @@ gboolean ygtk_html_wrap_search (GtkWidget *widget, const gchar *text); gboolean ygtk_html_wrap_search_next (GtkWidget *widget, const gchar *text); // F3 +void ygtk_html_wrap_set_background (GtkWidget *widget, GdkPixbuf *pixbuf); + G_END_DECLS #endif /* YGTK_HTML_WRAP_H */ Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=51942&r1=51941&r2=51942&view=diff ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Tue Oct 7 19:45:12 2008 @@ -160,6 +160,7 @@ // destroy can be called multiple times, and we must ref only once YGtkRichText *rtext = YGTK_RICH_TEXT (object); gdk_cursor_unref (rtext->hand_cursor); + ygtk_rich_text_set_background (rtext, NULL); GTK_OBJECT_CLASS (ygtk_rich_text_parent_class)->destroy (object); } @@ -208,9 +209,23 @@ static gboolean ygtk_rich_text_expose_event (GtkWidget *widget, GdkEventExpose *event) { + GtkTextView *text = GTK_TEXT_VIEW (widget); + YGtkRichText *rtext = YGTK_RICH_TEXT (widget); + if (rtext->background_pixbuf) { + GdkWindow *window = gtk_text_view_get_window (text, GTK_TEXT_WINDOW_TEXT); + if (event->window == window) { + int x, y; + int width = gdk_pixbuf_get_width (rtext->background_pixbuf); + gtk_text_view_buffer_to_window_coords (text, GTK_TEXT_WINDOW_TEXT, + widget->allocation.width-width, 0, &x, &y); + gdk_draw_pixbuf (GDK_DRAWABLE (window), *widget->style->fg_gc, rtext->background_pixbuf, + 0, 0, x, y, -1, -1, GDK_RGB_DITHER_NONE, 0, 0); + } + } + gboolean ret; ret = GTK_WIDGET_CLASS (ygtk_rich_text_parent_class)->expose_event (widget, event); - set_cursor_if_appropriate (GTK_TEXT_VIEW (widget), -1, -1); + set_cursor_if_appropriate (text, -1, -1); return ret; } @@ -649,6 +664,15 @@ return FALSE; } +void ygtk_rich_text_set_background (YGtkRichText *rtext, GdkPixbuf *pixbuf) +{ + if (rtext->background_pixbuf) + g_object_unref (G_OBJECT (rtext->background_pixbuf)); + rtext->background_pixbuf = pixbuf; + if (pixbuf) + g_object_ref (G_OBJECT (pixbuf)); +} + void ygtk_rich_text_class_init (YGtkRichTextClass *klass) { GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass); Modified: trunk/gtk/src/ygtkrichtext.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.h?rev=51942&r1=51941&r2=51942&view=diff ============================================================================== --- trunk/gtk/src/ygtkrichtext.h (original) +++ trunk/gtk/src/ygtkrichtext.h Tue Oct 7 19:45:12 2008 @@ -30,6 +30,7 @@ GtkTextView parent; // members: GdkCursor *hand_cursor; + GdkPixbuf *background_pixbuf; } YGtkRichText; typedef struct _YGtkRichTextClass @@ -51,6 +52,8 @@ gboolean ygtk_rich_text_mark_text (YGtkRichText *rtext, const gchar *text); gboolean ygtk_rich_text_forward_mark (YGtkRichText *rtext, const gchar *text); // F3 +void ygtk_rich_text_set_background (YGtkRichText *rtext, GdkPixbuf *pixbuf); + G_END_DECLS #endif /* YGTK_RICH_TEXT_H */ Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=51942&r1=51941&r2=51942&view=diff ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Tue Oct 7 19:45:12 2008 @@ -21,6 +21,7 @@ #include "ygtklinklabel.h" #define YGI18N_C #include "YGi18n.h" +#include "icons/help-bg.xpm" // YGUtils bridge extern void ygutils_setWidgetFont (GtkWidget *widget, PangoWeight weight, @@ -80,6 +81,10 @@ dialog->help_text = ygtk_html_wrap_new(); gtk_container_add (GTK_CONTAINER (dialog->help_box), dialog->help_text); + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (help_bg_xpm); + ygtk_html_wrap_set_background (dialog->help_text, pixbuf); + g_object_unref (pixbuf); + // bottom part (search entry + close button) GtkWidget *bottom_box; bottom_box = gtk_hbox_new (FALSE, 0); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org