October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41402 - in /branches/tmp/sh/mod-ui/qt/fonts/unused: newunifont.bdf unifont.bdf
by sh-sh-sh＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: sh-sh-sh Date: Fri Oct 12 13:00:44 2007 New Revision: 41402 URL: http://svn.opensuse.org/viewcvs/yast?rev=41402&view=rev Log: cruft Removed: branches/tmp/sh/mod-ui/qt/fonts/unused/newunifont.bdf branches/tmp/sh/mod-ui/qt/fonts/unused/unifont.bdf -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41401 - in /branches/tmp/sh/mod-ui/core/libyui/src: YAlignment.cc YSquash.cc
by sh-sh-sh＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: sh-sh-sh Date: Fri Oct 12 12:09:44 2007 New Revision: 41401 URL: http://svn.opensuse.org/viewcvs/yast?rev=41401&view=rev Log: make childless containers safe Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc Fri Oct 12 12:09:44 2007 @@ -175,8 +175,10 @@ bool YAlignment::stretchable( YUIDimension dim ) const { - if ( alignment( dim ) == YAlignUnchanged ) return firstChild()->stretchable( dim ); - else return true; + if ( alignment( dim ) == YAlignUnchanged && hasChildren() ) + return firstChild()->stretchable( dim ); + else + return true; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc Fri Oct 12 12:09:44 2007 @@ -63,6 +63,9 @@ bool YSquash::stretchable( YUIDimension dim ) const { + if ( ! hasChildren() ) + return false; + return ! priv->squash[ dim ] && firstChild()->stretchable( dim ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41400 - /trunk/squid/src/complex.ycp
by dfiser＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: dfiser Date: Fri Oct 12 09:46:45 2007 New Revision: 41400 URL: http://svn.opensuse.org/viewcvs/yast?rev=41400&view=rev Log: - Fixed problem with OpenFirewallWidget. Modified: trunk/squid/src/complex.ycp Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=41400&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Fri Oct 12 09:46:45 2007 @@ -123,7 +123,7 @@ ) ]), "firewall" : CWMFirewallInterfaces::CreateOpenFirewallWidget($[ - "services" : [Squid::GetFirewallServiceName], + "services" : [Squid::GetFirewallServiceName()], "display_details" : true, "open_firewall_checkbox" : _("Open Ports in Firewall") ]), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41399 - in /trunk/gtk: src/ygdkmngloader.c tests/Image.ycp tests/ImageMng.ycp tests/image.mng tests/movie-endless.mng tests/movie-loop3.mng
by rpmcruz＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: rpmcruz Date: Fri Oct 12 05:50:57 2007 New Revision: 41399 URL: http://svn.opensuse.org/viewcvs/yast?rev=41399&view=rev Log: Small fixes. Added: trunk/gtk/tests/ImageMng.ycp trunk/gtk/tests/movie-endless.mng (with props) trunk/gtk/tests/movie-loop3.mng (with props) Removed: trunk/gtk/tests/image.mng Modified: trunk/gtk/src/ygdkmngloader.c trunk/gtk/tests/Image.ycp Modified: trunk/gtk/src/ygdkmngloader.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygdkmngloader.c?rev=4139… ============================================================================== --- trunk/gtk/src/ygdkmngloader.c (original) +++ trunk/gtk/src/ygdkmngloader.c Fri Oct 12 05:50:57 2007 @@ -5,7 +5,7 @@ /* YGdkMngLoader image loader */ // check the header file for information about this loader -#include "mng-loader.h" +#include "ygdkmngloader.h" #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -14,7 +14,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> -/* Some select chunk IDs, from libmng.h */ +/* A few chunks ids */ #define MNG_UINT_MHDR 0x4d484452L #define MNG_UINT_BACK 0x4241434bL #define MNG_UINT_PLTE 0x504c5445L @@ -159,13 +159,13 @@ error = error || !read_uint32 (file, &mng_pixbuf->ticks_per_second); if (error) SET_ERROR ("Unexpected end of file on MHDR chunk") - /* Next atttributes: Nominal_layer_count, Nominal_frame_count, Nominal_play_time, Simplicity_profile */ else if (mng_pixbuf->frame_width <= 0 || mng_pixbuf->frame_height <= 0 || mng_pixbuf->ticks_per_second < 0) SET_ERROR ("Invalid MHDR parameter") +fprintf(stderr, "ticks per second: %d\n", mng_pixbuf->ticks_per_second); } else SET_ERROR ("MHDR chunk must be 28 bytes long") @@ -254,26 +254,26 @@ return GDK_PIXBUF_ANIMATION (mng_pixbuf); } -gboolean ygdk_mng_pixbuf_is_static_image (GdkPixbufAnimation *anim) +static gboolean ygdk_mng_pixbuf_is_static_image (GdkPixbufAnimation *anim) { return FALSE; } -GdkPixbuf *ygdk_mng_pixbuf_get_static_image (GdkPixbufAnimation *anim) +static GdkPixbuf *ygdk_mng_pixbuf_get_static_image (GdkPixbufAnimation *anim) { YGdkMngPixbuf *mng_anim = YGDK_MNG_PIXBUF (anim); return g_list_nth_data (mng_anim->frames, 0); } -void ygdk_mng_pixbuf_get_size (GdkPixbufAnimation *anim, int *width, int *height) +static void ygdk_mng_pixbuf_get_size (GdkPixbufAnimation *anim, int *width, int *height) { YGdkMngPixbuf *mng_anim = YGDK_MNG_PIXBUF (anim); if (width) *width = mng_anim->frame_width; if (height) *height = mng_anim->frame_height; } -GdkPixbufAnimationIter *ygdk_mng_pixbuf_get_iter (GdkPixbufAnimation *anim, - const GTimeVal *start_time) +static GdkPixbufAnimationIter *ygdk_mng_pixbuf_get_iter (GdkPixbufAnimation *anim, + const GTimeVal *start_time) { YGdkMngPixbufIter *iter = g_object_new (YGDK_TYPE_MNG_PIXBUF_ITER, NULL); iter->mng_pixbuf = YGDK_MNG_PIXBUF( anim ); @@ -300,18 +300,18 @@ { } -GdkPixbuf *ygdk_mng_pixbuf_iter_get_pixbuf (GdkPixbufAnimationIter *iter) +static GdkPixbuf *ygdk_mng_pixbuf_iter_get_pixbuf (GdkPixbufAnimationIter *iter) { YGdkMngPixbufIter *mng_iter = YGDK_MNG_PIXBUF_ITER (iter); return g_list_nth_data (mng_iter->mng_pixbuf->frames, mng_iter->cur_frame); } -gboolean ygdk_mng_pixbuf_iter_on_currently_loading_frame (GdkPixbufAnimationIter *iter) +static gboolean ygdk_mng_pixbuf_iter_on_currently_loading_frame (GdkPixbufAnimationIter *iter) { return FALSE; } -int ygdk_mng_pixbuf_iter_get_delay_time (GdkPixbufAnimationIter *iter) +static int ygdk_mng_pixbuf_iter_get_delay_time (GdkPixbufAnimationIter *iter) { YGdkMngPixbufIter *mng_iter = YGDK_MNG_PIXBUF_ITER (iter); int delay = mng_iter->mng_pixbuf->ticks_per_second; @@ -320,8 +320,8 @@ return delay; } -gboolean ygdk_mng_pixbuf_iter_advance (GdkPixbufAnimationIter *iter, - const GTimeVal *current_time) +static gboolean ygdk_mng_pixbuf_iter_advance (GdkPixbufAnimationIter *iter, + const GTimeVal *current_time) { YGdkMngPixbufIter *mng_iter = YGDK_MNG_PIXBUF_ITER (iter); YGdkMngPixbuf *mng_pixbuf = mng_iter->mng_pixbuf; Modified: trunk/gtk/tests/Image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/Image.ycp?rev=41399&r1… ============================================================================== --- trunk/gtk/tests/Image.ycp (original) +++ trunk/gtk/tests/Image.ycp Fri Oct 12 05:50:57 2007 @@ -1,4 +1,6 @@ // Image test +string filename = "image.gif"; + { UI::OpenDialog ( `VBox ( @@ -11,8 +13,7 @@ `RadioButtonGroup (`id(`rb), `VBox( `Left (`RadioButton(`id (`static),`opt(`notify), "&Static")), - `Left (`RadioButton(`id (`animation), `opt(`notify), "&Animation")), - `Left (`RadioButton(`id (`mng), `opt(`notify), "Animation (&MNG)")) + `Left (`RadioButton(`id (`animation), `opt(`notify), "&Animation")) ) ) ), @@ -56,9 +57,6 @@ zeroheight = `zeroHeight; } - string filename = "image.gif"; - if ((boolean) UI::QueryWidget(`id(`mng), `Value)) - filename = "image.mng"; UI::ReplaceWidget (`replace_image, `Image (`opt (type_opt, effect_opt, zerowidth, zeroheight), filename, filename + " not found")); Added: trunk/gtk/tests/ImageMng.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/ImageMng.ycp?rev=41399… ============================================================================== --- trunk/gtk/tests/ImageMng.ycp (added) +++ trunk/gtk/tests/ImageMng.ycp Fri Oct 12 05:50:57 2007 @@ -0,0 +1,67 @@ +// Image test +{ + UI::OpenDialog ( + `VBox ( + `ReplacePoint (`id (`replace_image), + `ColoredLabel ("Choose an image first!", `rgb (0, 0, 0), + `rgb (255, 0, 0), 5) + ), + + `Frame ("Which MNG file:", + `RadioButtonGroup (`id(`rb), + `VBox( + `Left (`RadioButton(`id (`endless), `opt(`notify), "&Endless")), + `Left (`RadioButton(`id (`loop3), `opt(`notify), "&Loop 3")) + ) + ) + ), + + `Frame ("Image effect:", + `RadioButtonGroup (`id(`rb), + `VBox( + `Left (`RadioButton(`id (`no_effect), `opt(`notify), "&None", true)), + `Left (`RadioButton(`id (`tiled_effect),`opt(`notify), "&Tiled")), + `Left (`RadioButton(`id (`scaled_effect), `opt(`notify), "&Scaled")) + ) + ) + ), + `Right (`Label ("Resize the window!")), + `PushButton(`id (`close), "&Close") + ) + ); + + any ret = nil; + while (true) + { + ret = UI::UserInput(); + if (ret == `close || ret == `cancel) + break; + + any effect_opt = nil; + if ((boolean) UI::QueryWidget(`id(`tiled_effect), `Value)) + effect_opt = `tiled; + else if ((boolean) UI::QueryWidget(`id(`scaled_effect), `Value)) + effect_opt = `scaleToFit; + + // needed for tiling (scaling sets this automatically, anyway...) + any zerowidth = nil; + any zeroheight = nil; + if (effect_opt != nil) { + zerowidth = `zeroWidth; + zeroheight = `zeroHeight; + } + + string filename = ""; + if ((boolean) UI::QueryWidget(`id(`loop3), `Value)) + filename = "movie-loop3.mng"; + else + filename = "movie-endless.mng"; + UI::ReplaceWidget (`replace_image, + `Image (`opt (`animated, effect_opt, zerowidth, zeroheight), + filename, filename + " not found")); + + } + + UI::CloseDialog(); +} + Added: trunk/gtk/tests/movie-endless.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie-endless.mng?rev=… ============================================================================== Binary file - no diff available. Added: trunk/gtk/tests/movie-loop3.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/movie-loop3.mng?rev=41… ============================================================================== Binary file - no diff available. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41398 - in /trunk/gtk: ChangeLog src/Makefile.am src/YGImage.cc src/ygdkmngloader.c src/ygdkmngloader.h tests/Image.ycp tests/image.mng
by rpmcruz＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: rpmcruz Date: Fri Oct 12 05:26:45 2007 New Revision: 41398 URL: http://svn.opensuse.org/viewcvs/yast?rev=41398&view=rev Log: * src/ygdkmngloader.h/c: bug fix #328500: added loader for MNG image. (just a very small subset of it). There is a bug on movies limited to a fixed iteration number -- it seems that ticks per second is calculated different for them; have to see... * tests/YGImage.ycp: added a MNG image and updated test. Added: trunk/gtk/src/ygdkmngloader.c trunk/gtk/src/ygdkmngloader.h trunk/gtk/tests/image.mng (with props) Modified: trunk/gtk/ChangeLog trunk/gtk/src/Makefile.am trunk/gtk/src/YGImage.cc trunk/gtk/tests/Image.ycp Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41398&r1=41397… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Oct 12 05:26:45 2007 @@ -38,6 +38,12 @@ highlighted. Calculate size_request as if they are all highlighted. TODO: we may want to get rid of PangoLayout in favor of the simpler Cairo. + * src/ygdkmngloader.h/c: bug fix #328500: added loader for MNG image. + (just a very small subset of it). There is a bug on movies limited to + a fixed iteration number -- it seems that ticks per second is calculated + different for them; have to see... + * tests/YGImage.ycp: added a MNG image and updated test. + 2007-10-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=41398&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Fri Oct 12 05:26:45 2007 @@ -48,7 +48,8 @@ ygtkmenubutton.c \ ygtkwizard.c \ ygtkcellrendererarrow.c \ - ygtkfindentry.c + ygtkfindentry.c \ + ygdkmngloader.c dummy_SOURCES = dummy.cc dummy_LDADD = libpy2gtk.la Modified: trunk/gtk/src/YGImage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGImage.cc?rev=41398&r1=… ============================================================================== --- trunk/gtk/src/YGImage.cc (original) +++ trunk/gtk/src/YGImage.cc Fri Oct 12 05:26:45 2007 @@ -2,12 +2,13 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ +#include "ygdkmngloader.h" #include <config.h> #include <ycp/y2log.h> #include <YGUI.h> #include "YEvent.h" -#include "YImage.h" #include "YGWidget.h" +#include "YImage.h" class YGImage : public YImage, public YGWidget { @@ -91,7 +92,7 @@ public: YGImage (const YWidgetOpt &opt, YGWidget *parent, - const YCPString &filename, const YCPString &text) + const YCPString &filename_str, const YCPString &text) : YImage (opt), YGWidget (this, parent, true, GTK_TYPE_DRAWING_AREA, NULL) { @@ -99,15 +100,18 @@ alt_text = g_strdup (text->value_cstr()); initOptions (opt); + const char *filename = filename_str->value_cstr(); GError *error = 0; if (m_isAnimation) { - GdkPixbufAnimation *pixbuf = - gdk_pixbuf_animation_new_from_file (filename->value_cstr(), &error); + GdkPixbufAnimation *pixbuf; + if (ygdk_mng_pixbuf_is_file_mng (filename)) + pixbuf = ygdk_mng_pixbuf_new_from_file (filename, &error); + else + pixbuf = gdk_pixbuf_animation_new_from_file (filename, &error); loadAnimation (pixbuf, error ? error->message : "(undefined)"); } else { - GdkPixbuf *pixbuf = - gdk_pixbuf_new_from_file (filename->value_cstr(), &error); + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (filename, &error); loadImage (pixbuf, error ? error->message : "(undefined)"); } } Added: trunk/gtk/src/ygdkmngloader.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygdkmngloader.c?rev=4139… ============================================================================== --- trunk/gtk/src/ygdkmngloader.c (added) +++ trunk/gtk/src/ygdkmngloader.c Fri Oct 12 05:26:45 2007 @@ -0,0 +1,357 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGdkMngLoader image loader */ +// check the header file for information about this loader + +#include "mng-loader.h" +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <assert.h> +#include <sys/mman.h> + +#include <gdk-pixbuf/gdk-pixbuf.h> + +/* Some select chunk IDs, from libmng.h */ +#define MNG_UINT_MHDR 0x4d484452L +#define MNG_UINT_BACK 0x4241434bL +#define MNG_UINT_PLTE 0x504c5445L +#define MNG_UINT_tRNS 0x74524e53L +#define MNG_UINT_IHDR 0x49484452L +#define MNG_UINT_IDAT 0x49444154L +#define MNG_UINT_IEND 0x49454e44L +#define MNG_UINT_MEND 0x4d454e44L +#define MNG_UINT_FRAM 0x4652414dL +#define MNG_UINT_LOOP 0x4c4f4f50L +#define MNG_UINT_ENDL 0x454e444cL +#define MNG_UINT_TERM 0x5445524dL + +//** Utilities to read the MNG file + +typedef gboolean (*ChunkParser)(YGdkMngPixbuf*, guint8*, GError**); + +struct ChunkLoad { + guint8 Id; + ChunkParser Function; + +}; + +static gboolean read_signature (FILE *file) +{ + guchar buf[8]; + fread (buf, 1, 8, file); + return memcmp (buf, "\212MNG\r\n\032\n", 8) == 0; +} + +static gboolean read_uint8 (FILE *file, guint8 *value) +{ + return fread (value, 1, 1, file) >= 1; +} + +static gboolean read_uint32 (FILE *file, guint32 *value) +{ + guint8 buffer[4]; + if (fread (buffer, 1, 4, file) < 4) + return FALSE; + *value = buffer[0] << 24; *value |= buffer[1] << 16; + *value |= buffer[2] << 8; *value |= buffer[3]; + return TRUE; +} + +static gboolean read_data (FILE *file, guint32 size, GdkPixbufLoader *loader, + GError **error) +{ + guchar data [size]; + if (fread (data, 1, size, file) < size) + { + g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, + "Unexpected end of file when reading PNG chunk"); + return FALSE; + } + return gdk_pixbuf_loader_write (loader, data, size, error); +} + +static void image_prepared_cb (GdkPixbufLoader *loader, YGdkMngPixbuf *mng_pixbuf) +{ + GdkPixbuf *pix = gdk_pixbuf_loader_get_pixbuf (loader); + mng_pixbuf->frames = g_list_append (mng_pixbuf->frames, pix); +} + +//** YGdkMngPixbuf + +G_DEFINE_TYPE (YGdkMngPixbuf, ygdk_mng_pixbuf, GDK_TYPE_PIXBUF_ANIMATION) + +static void ygdk_mng_pixbuf_init (YGdkMngPixbuf *pixbuf) +{ +} + +gboolean ygdk_mng_pixbuf_is_file_mng (const gchar *filename) +{ + FILE *file = fopen (filename, "rb"); + if (!file) + return FALSE; + return read_signature (file); +} + +GdkPixbufAnimation *ygdk_mng_pixbuf_new_from_file (const gchar *filename, + GError **error_msg) +{ + gboolean error = FALSE; + #define SET_ERROR(msg) { error = TRUE; \ + g_set_error (error_msg, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE, msg); } + + FILE *file = fopen (filename, "rb"); + if (!file) + { + SET_ERROR ("Could not open specified file") + return NULL; + } + + if (!read_signature (file)) + { + SET_ERROR ("Not a MNG file") + return NULL; + } + + YGdkMngPixbuf *mng_pixbuf = g_object_new (YGDK_TYPE_MNG_PIXBUF, NULL); + mng_pixbuf->iteration_max = 0x7fffffff; + + guint32 chunk_size, chunk_id; + long offset; + GdkPixbufLoader *loader = NULL; /* currently loading... */ + gboolean first_read = TRUE; + + do { + error = !read_uint32 (file, &chunk_size); + error = error || !read_uint32 (file, &chunk_id); + if (error) + { + SET_ERROR ("Unexpected end of file on new chunk") + break; + } + offset = ftell (file) + chunk_size + 4/*CRC*/; + + if (first_read && chunk_id != MNG_UINT_MHDR) + { + SET_ERROR ("MHDR chunk must come first") + break; + } + + // not currently reading a PNG stream + if (!loader) + { + switch (chunk_id) + { + case MNG_UINT_MHDR: + if (!first_read) + { + SET_ERROR ("Only one MHDR chunk allowed") + break; + } + + if (chunk_size == 7*4) + { + // Read MHDR chunk data + error = !read_uint32 (file, &mng_pixbuf->frame_width); + error = error || !read_uint32 (file, &mng_pixbuf->frame_height); + error = error || !read_uint32 (file, &mng_pixbuf->ticks_per_second); + if (error) + SET_ERROR ("Unexpected end of file on MHDR chunk") + + /* Next atttributes: Nominal_layer_count, Nominal_frame_count, + Nominal_play_time, Simplicity_profile */ + else if (mng_pixbuf->frame_width <= 0 || + mng_pixbuf->frame_height <= 0 || + mng_pixbuf->ticks_per_second < 0) + SET_ERROR ("Invalid MHDR parameter") + } + else + SET_ERROR ("MHDR chunk must be 28 bytes long") + break; + case MNG_UINT_IHDR: + loader = gdk_pixbuf_loader_new_with_type ("png", NULL); + g_signal_connect (G_OBJECT (loader), "area-prepared", + G_CALLBACK (image_prepared_cb), mng_pixbuf); + gdk_pixbuf_loader_set_size (loader, mng_pixbuf->frame_width, + mng_pixbuf->frame_height); + + { + const guchar sig[8] = { 137, 80, 78, 71, 13, 10, 26, 10 }; + if(!gdk_pixbuf_loader_write (loader, sig, 8, error_msg)) + { + error = TRUE; + break; + } + } + break; + case MNG_UINT_TERM: + if (chunk_size > 1) + { + // Read TERM chunk data + guint8 t; + error = !read_uint8 (file, &t); // term action + if (t == 3 && chunk_size == 2+8) + { + error = error || !read_uint8 (file, &t); // after term action + error = error || !read_uint32 (file, &mng_pixbuf->last_frame_delay); + error = error || !read_uint32 (file, &mng_pixbuf->iteration_max); + if (error) + SET_ERROR ("Unexpected end of file on TERM chunk") + } + else + SET_ERROR ("TERM chunk must be 10 bytes when term action is 3") + } + else + SET_ERROR ("TERM chunk must have at least 1 byte") + break; + case MNG_UINT_BACK: + // TODO: + break; + case MNG_UINT_IDAT: + case MNG_UINT_IEND: + if (loader != NULL) + SET_ERROR ("Corrupted PNG chunk closures") + break; + case MNG_UINT_MEND: + default: + break; + } + } + + if (error) + break; + + // loading a PNG stream + if (loader) + { + fseek (file, -8, SEEK_CUR); + if (!read_data (file, chunk_size+8+4, loader, error_msg)) + error = TRUE; + else if (chunk_id == MNG_UINT_IEND) + { + if (!gdk_pixbuf_loader_close (loader, error_msg)) + { + error = TRUE; + break; + } + loader = NULL; + } + } + + fseek (file, offset, SEEK_SET); + first_read = FALSE; + } while (chunk_id != MNG_UINT_MEND && !error); + + if (error) + { + g_object_unref (G_OBJECT (mng_pixbuf)); + return NULL; + } + #undef SET_ERROR + + return GDK_PIXBUF_ANIMATION (mng_pixbuf); +} + +gboolean ygdk_mng_pixbuf_is_static_image (GdkPixbufAnimation *anim) +{ + return FALSE; +} + +GdkPixbuf *ygdk_mng_pixbuf_get_static_image (GdkPixbufAnimation *anim) +{ + YGdkMngPixbuf *mng_anim = YGDK_MNG_PIXBUF (anim); + return g_list_nth_data (mng_anim->frames, 0); +} + +void ygdk_mng_pixbuf_get_size (GdkPixbufAnimation *anim, int *width, int *height) +{ + YGdkMngPixbuf *mng_anim = YGDK_MNG_PIXBUF (anim); + if (width) *width = mng_anim->frame_width; + if (height) *height = mng_anim->frame_height; +} + +GdkPixbufAnimationIter *ygdk_mng_pixbuf_get_iter (GdkPixbufAnimation *anim, + const GTimeVal *start_time) +{ + YGdkMngPixbufIter *iter = g_object_new (YGDK_TYPE_MNG_PIXBUF_ITER, NULL); + iter->mng_pixbuf = YGDK_MNG_PIXBUF( anim ); + iter->cur_frame = 0; + return GDK_PIXBUF_ANIMATION_ITER( iter ); +} + +static void ygdk_mng_pixbuf_class_init (YGdkMngPixbufClass *klass) +{ + ygdk_mng_pixbuf_parent_class = g_type_class_peek_parent (klass); + + GdkPixbufAnimationClass *pixbuf_class = GDK_PIXBUF_ANIMATION_CLASS (klass); + pixbuf_class->is_static_image = ygdk_mng_pixbuf_is_static_image; + pixbuf_class->get_static_image = ygdk_mng_pixbuf_get_static_image; + pixbuf_class->get_size = ygdk_mng_pixbuf_get_size; + pixbuf_class->get_iter = ygdk_mng_pixbuf_get_iter; +} + +//** YGdkMngPixbufIter + +G_DEFINE_TYPE (YGdkMngPixbufIter, ygdk_mng_pixbuf_iter, GDK_TYPE_PIXBUF_ANIMATION_ITER) + +static void ygdk_mng_pixbuf_iter_init (YGdkMngPixbufIter *iter) +{ +} + +GdkPixbuf *ygdk_mng_pixbuf_iter_get_pixbuf (GdkPixbufAnimationIter *iter) +{ + YGdkMngPixbufIter *mng_iter = YGDK_MNG_PIXBUF_ITER (iter); + return g_list_nth_data (mng_iter->mng_pixbuf->frames, mng_iter->cur_frame); +} + +gboolean ygdk_mng_pixbuf_iter_on_currently_loading_frame (GdkPixbufAnimationIter *iter) +{ + return FALSE; +} + +int ygdk_mng_pixbuf_iter_get_delay_time (GdkPixbufAnimationIter *iter) +{ + YGdkMngPixbufIter *mng_iter = YGDK_MNG_PIXBUF_ITER (iter); + int delay = mng_iter->mng_pixbuf->ticks_per_second; + if (mng_iter->cur_frame == g_list_length (mng_iter->mng_pixbuf->frames)-1) + delay += mng_iter->mng_pixbuf->last_frame_delay; + return delay; +} + +gboolean ygdk_mng_pixbuf_iter_advance (GdkPixbufAnimationIter *iter, + const GTimeVal *current_time) +{ + YGdkMngPixbufIter *mng_iter = YGDK_MNG_PIXBUF_ITER (iter); + YGdkMngPixbuf *mng_pixbuf = mng_iter->mng_pixbuf; + if (!mng_pixbuf->frames) + return FALSE; + + gboolean can_advance = TRUE; + int frames_len = g_list_length (mng_pixbuf->frames); + if (mng_iter->cur_frame+1 == frames_len) + { + if (mng_pixbuf->iteration_max == 0x7fffffff || + mng_iter->cur_iteration < mng_pixbuf->iteration_max) + mng_iter->cur_iteration++; + else + can_advance = FALSE; + } + + if (can_advance) + mng_iter->cur_frame = (mng_iter->cur_frame+1) % frames_len; + return can_advance; +} + +static void ygdk_mng_pixbuf_iter_class_init (YGdkMngPixbufIterClass *klass) +{ + ygdk_mng_pixbuf_iter_parent_class = g_type_class_peek_parent (klass); + + GdkPixbufAnimationIterClass *iter_class = GDK_PIXBUF_ANIMATION_ITER_CLASS (klass); + iter_class->get_delay_time = ygdk_mng_pixbuf_iter_get_delay_time; + iter_class->get_pixbuf = ygdk_mng_pixbuf_iter_get_pixbuf; + iter_class->on_currently_loading_frame = ygdk_mng_pixbuf_iter_on_currently_loading_frame; + iter_class->advance = ygdk_mng_pixbuf_iter_advance; +} + Added: trunk/gtk/src/ygdkmngloader.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygdkmngloader.h?rev=4139… ============================================================================== --- trunk/gtk/src/ygdkmngloader.h (added) +++ trunk/gtk/src/ygdkmngloader.h Fri Oct 12 05:26:45 2007 @@ -0,0 +1,78 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* GdkPixbuf doesn't support MNG files... MNG extends PNG adding movie playback + capabilities. + This code aims for MNG-VLC (smallest subset of the format), though + it isn't completely compliable. +*/ + +#ifndef YGDK_MNG_PIXBUF_H +#define YGDK_MNG_PIXBUF_H + +#define GDK_PIXBUF_ENABLE_BACKEND +#include <gdk-pixbuf/gdk-pixbuf-animation.h> +G_BEGIN_DECLS + +#define YGDK_TYPE_MNG_PIXBUF (ygdk_mng_pixbuf_get_type ()) +#define YGDK_MNG_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGDK_TYPE_MNG_PIXBUF, YGdkMngPixbuf)) +#define YGDK_MNG_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGDK_TYPE_MNG_PIXBUF, YGdkMngPixbufClass)) +#define YGDK_IS_MNG_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGDK_TYPE_MNG_PIXBUF)) +#define YGDK_IS_MNG_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGDK_TYPE_MNG_PIXBUF)) +#define YGDK_MNG_PIXBUF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGK_TYPE_MNG_PIXBUF, YGdkMngPixbufClass)) + +typedef struct YGdkMngPixbuf +{ + GdkPixbufAnimation parent; + + // private: (use GdkPixbufAnimation API) + GList *frames; // of GdkPixbufs + // MHDR header + guint32 frame_width, frame_height, ticks_per_second; + // TERM header + guint32 last_frame_delay, iteration_max; +} YGdkMngPixbuf; + +typedef struct YGdkMngPixbufClass +{ + GdkPixbufAnimationClass parent_class; +} YGdkMngPixbufClass; + +GdkPixbufAnimation *ygdk_mng_pixbuf_new_from_file (const gchar *filename, GError **error_msg); +gboolean ygdk_mng_pixbuf_is_file_mng (const gchar *filename); + +GType ygdk_mng_pixbuf_get_type (void) G_GNUC_CONST; + +#define YGDK_TYPE_MNG_PIXBUF_ITER (ygdk_mng_pixbuf_iter_get_type ()) +#define YGDK_MNG_PIXBUF_ITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGDK_TYPE_MNG_PIXBUF_ITER, YGdkMngPixbufIter)) +#define YGDK_MNG_PIXBUF_ITER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), YGDK_TYPE_MNG_PIXBUF_ITER, YGdkMngPixbufIterClass)) +#define YGDK_IS_MNG_PIXBUF_ITER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), YGDK_TYPE_MNG_PIXBUF_ITER)) +#define YGDK_MNG_PIXBUF_ITER_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), YGDK_TYPE_MNG_PIXBUF_ITER, YGdkMngPixbufIterClass)) + +typedef struct YGdkMngPixbufIter { + GdkPixbufAnimationIter parent; + + // private: + YGdkMngPixbuf *mng_pixbuf; + int cur_frame, cur_iteration; +} YGdkMngPixbufIter; + +typedef struct YGdkMngPixbufIterClass { + GdkPixbufAnimationIterClass parent_class; +} YGdkMngPixbufIterClass; + +GType ygdk_mng_pixbuf_iter_get_type (void) G_GNUC_CONST; + +G_END_DECLS +#endif /*YGDK_MNG_PIXBUF_H*/ + Modified: trunk/gtk/tests/Image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/Image.ycp?rev=41398&r1… ============================================================================== --- trunk/gtk/tests/Image.ycp (original) +++ trunk/gtk/tests/Image.ycp Fri Oct 12 05:26:45 2007 @@ -1,7 +1,5 @@ // Image test { - string filename = "image.gif"; - UI::OpenDialog ( `VBox ( `ReplacePoint (`id (`replace_image), @@ -13,7 +11,8 @@ `RadioButtonGroup (`id(`rb), `VBox( `Left (`RadioButton(`id (`static),`opt(`notify), "&Static")), - `Left (`RadioButton(`id (`animation), `opt(`notify), "&Animation")) + `Left (`RadioButton(`id (`animation), `opt(`notify), "&Animation")), + `Left (`RadioButton(`id (`mng), `opt(`notify), "Animation (&MNG)")) ) ) ), @@ -57,6 +56,9 @@ zeroheight = `zeroHeight; } + string filename = "image.gif"; + if ((boolean) UI::QueryWidget(`id(`mng), `Value)) + filename = "image.mng"; UI::ReplaceWidget (`replace_image, `Image (`opt (type_opt, effect_opt, zerowidth, zeroheight), filename, filename + " not found")); @@ -65,3 +67,4 @@ UI::CloseDialog(); } + Added: trunk/gtk/tests/image.mng URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/image.mng?rev=41398&vi… ============================================================================== Binary file - no diff available. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41397 - in /trunk/gtk: ChangeLog src/ygtksteps.c src/ygtksteps.h
by rpmcruz＠svn.opensuse.org 12 Oct '07

12 Oct '07

Author: rpmcruz Date: Fri Oct 12 03:22:41 2007 New Revision: 41397 URL: http://svn.opensuse.org/viewcvs/yast?rev=41397&view=rev Log: * src/ygtksteps.c: bug fix #328500: steps may be truncated when they get highlighted. Calculate size_request as if they are all highlighted. TODO: we may want to get rid of PangoLayout in favor of the simpler Cairo. Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtksteps.c trunk/gtk/src/ygtksteps.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41397&r1=41396… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Oct 12 03:22:41 2007 @@ -34,6 +34,10 @@ documented behavior, and the YCP code is at fault here, but we probably should emulate the other interfaces. + * src/ygtksteps.c: bug fix #328500: steps may be truncated when they get + highlighted. Calculate size_request as if they are all highlighted. + TODO: we may want to get rid of PangoLayout in favor of the simpler Cairo. + 2007-10-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to Modified: trunk/gtk/src/ygtksteps.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtksteps.c?rev=41397&r1… ============================================================================== --- trunk/gtk/src/ygtksteps.c (original) +++ trunk/gtk/src/ygtksteps.c Fri Oct 12 03:22:41 2007 @@ -66,6 +66,10 @@ g_object_unref (G_OBJECT (step->layout)); step->layout = NULL; } + if (step->layout_bold) { + g_object_unref (G_OBJECT (step->layout_bold)); + step->layout_bold = NULL; + } } // should be called rather than accessing step->layout @@ -76,25 +80,35 @@ if (!step->layout) { step->layout = gtk_widget_create_pango_layout (GTK_WIDGET (steps), NULL); - gchar *text; + gchar *text, *text_bold = 0; if (step->is_heading) { text = g_strdup_printf ("%s", step->text); pango_layout_set_spacing (step->layout, STEPS_HEADER_SPACING * PANGO_SCALE); } else { - if (steps->current_step == step_nb) - text = g_strdup_printf ("%s", step->text); - else - text = g_strdup (step->text); + if (!step->layout_bold) + step->layout_bold = gtk_widget_create_pango_layout (GTK_WIDGET (steps), NULL); + g_assert (step->layout_bold); + text = g_strdup (step->text); + text_bold = g_strdup_printf ("%s", step->text); pango_layout_set_indent (step->layout, STEPS_IDENTATION * PANGO_SCALE); + pango_layout_set_indent (step->layout_bold, STEPS_IDENTATION * PANGO_SCALE); pango_layout_set_spacing (step->layout, STEPS_SPACING * PANGO_SCALE); + pango_layout_set_spacing (step->layout_bold, STEPS_SPACING * PANGO_SCALE); } pango_layout_set_markup (step->layout, text, -1); g_free (text); + if (step->layout_bold) + { + pango_layout_set_markup (step->layout_bold, text_bold, -1); + g_free (text_bold); + } } + if (steps->current_step == step_nb) + return step->layout_bold; return step->layout; } @@ -106,6 +120,8 @@ YGtkSingleStep *step = it->data; if (step->layout) pango_layout_context_changed (step->layout); + if (step->layout_bold) + pango_layout_context_changed (step->layout_bold); } } @@ -129,6 +145,9 @@ int i; for (i = 0; i < ygtk_steps_total (steps); i++) { PangoLayout *layout = ygtk_steps_get_step_layout (steps, i); + YGtkSingleStep *step = ygtk_steps_get_step (steps, i); + if (!step->is_heading) + layout = step->layout_bold; int w, h; pango_layout_get_pixel_size (layout, &w, &h); @@ -213,7 +232,7 @@ step->is_heading = FALSE; step->text = g_strdup (step_text); step->strength = 1; - step->layout = NULL; + step->layout = step->layout_bold = NULL; steps->steps = g_list_append (steps->steps, step); gtk_widget_queue_resize (GTK_WIDGET (steps)); @@ -230,7 +249,7 @@ step->is_heading = TRUE; step->text = g_strdup (heading); step->strength = 1; // not important anyway - step->layout = NULL; + step->layout = step->layout_bold = NULL; steps->steps = g_list_append (steps->steps, step); gtk_widget_queue_resize (GTK_WIDGET (steps)); @@ -302,3 +321,4 @@ GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); gtkobject_class->destroy = ygtk_steps_destroy; } + Modified: trunk/gtk/src/ygtksteps.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtksteps.h?rev=41397&r1… ============================================================================== --- trunk/gtk/src/ygtksteps.h (original) +++ trunk/gtk/src/ygtksteps.h Fri Oct 12 03:22:41 2007 @@ -12,6 +12,9 @@ once to actually advance for a given step), you may append a step with the same name of the previous, that they'll be collapsed. (Internally, we call that the 'strength' of the step.) + + TODO: the PangoLayout usage is getting a bit hacky. We may want to + replace it with Cairo methods. */ #ifndef YGTK_STEPS_H @@ -59,7 +62,7 @@ guint strength; // check the text at top // private -- don't access it, call ygtk_step_get_layout() instead - PangoLayout *layout; // cache + PangoLayout *layout, *layout_bold; // cache } YGtkSingleStep; GtkWidget* ygtk_steps_new (void); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41396 - in /trunk/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: rpmcruz Date: Thu Oct 11 21:12:04 2007 New Revision: 41396 URL: http://svn.opensuse.org/viewcvs/yast?rev=41396&view=rev Log: * src/YGTable.cc: bug fix #327492: always make one row selected. This isn't documented behavior, and the YCP code is at fault here, but we probably should emulate the other interfaces. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGTable.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41396&r1=41395… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 11 21:12:04 2007 @@ -30,6 +30,10 @@ * src/ygtkratiobox.c: seems like we aren't being completely faithful to yast-core. Made widget base-size with the boss algo from yast-core. + * src/YGTable.cc: bug fix #327492: always make one row selected. This isn't + documented behavior, and the YCP code is at fault here, but we probably + should emulate the other interfaces. + 2007-10-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=41396&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Thu Oct 11 21:12:04 2007 @@ -305,6 +305,10 @@ addRow (index); for (unsigned int c = 0; c < elements.size(); c++) setItemText (elements[c], index, c); + + // always have one row selected + if (getCurrentRow() == -1) + setCurrentRow (index); } virtual void itemsCleared() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41395 - in /trunk/gtk: ChangeLog src/ygtkratiobox.c src/ygtkratiobox.h
by rpmcruz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: rpmcruz Date: Thu Oct 11 20:14:20 2007 New Revision: 41395 URL: http://svn.opensuse.org/viewcvs/yast?rev=41395&view=rev Log: * src/ygtkratiobox.c: seems like we aren't being completely faithful to yast-core. Made widget base-size with the boss algo from yast-core. Modified: trunk/gtk/ChangeLog trunk/gtk/src/ygtkratiobox.c trunk/gtk/src/ygtkratiobox.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41395&r1=41394… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 11 20:14:20 2007 @@ -27,6 +27,9 @@ * src/YGTable.cc: forgot to block new hook: select_delayed_cb when changing selection. + * src/ygtkratiobox.c: seems like we aren't being completely faithful to + yast-core. Made widget base-size with the boss algo from yast-core. + 2007-10-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to Modified: trunk/gtk/src/ygtkratiobox.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.c?rev=41395… ============================================================================== --- trunk/gtk/src/ygtkratiobox.c (original) +++ trunk/gtk/src/ygtkratiobox.c Thu Oct 11 20:14:20 2007 @@ -104,8 +104,7 @@ GtkOrientation orientation) { YGtkRatioBox* box = YGTK_RATIO_BOX (widget); - guint ratios_num = 0; - gfloat max_ratio = 0; + gfloat ratios_sum = 0; box->has_must_expand = FALSE; GList* child; for (child = box->children; child; child = child->next) { @@ -113,10 +112,7 @@ if (!GTK_WIDGET_VISIBLE (box_child->widget)) continue; if (box_child->ratio) - { - max_ratio = MAX (max_ratio, box_child->ratio); - ratios_num++; - } + ratios_sum += box_child->ratio; if (box_child->must_expand) box->has_must_expand = TRUE; } @@ -124,7 +120,7 @@ // If we want to calculate horizontal size, primary_req would be horizontal // length, while secondary the height. Idem for the inverse. guint primary_req = 0, secondary_req = 0; - box->ratio_width = 0; + box->weight_length = 0; // biggest ratio of widget-size / widget-ratio for (child = box->children; child; child = child->next) { YGtkRatioBoxChild* box_child = (YGtkRatioBoxChild*) child->data; @@ -145,14 +141,17 @@ } if (box_child->ratio) - box->ratio_width = MAX (box->ratio_width, (prim_length * max_ratio) / box_child->ratio); + { + int length = (prim_length * ratios_sum) / box_child->ratio; + box->weight_length = MAX (box->weight_length, length); + } else primary_req += prim_length; primary_req += box_child->padding + box->spacing; secondary_req = MAX (secondary_req, sec_length); } - primary_req += box->ratio_width * ratios_num; + primary_req += box->weight_length; guint border = GTK_CONTAINER (widget)->border_width * 2; primary_req += border*2; secondary_req += border*2; @@ -171,6 +170,7 @@ GtkAllocation *allocation, GtkOrientation orientation) { + YGtkRatioBox* box = YGTK_RATIO_BOX (widget); guint border = GTK_CONTAINER (widget)->border_width; // a first loop to get some data for expansibles (ie. childs with weight) @@ -183,7 +183,6 @@ expansable_length = allocation->height - border*2; GList* child; - YGtkRatioBox* box = YGTK_RATIO_BOX (widget); for (child = box->children; child; child = child->next) { YGtkRatioBoxChild* box_child = (YGtkRatioBoxChild*) child->data; if (!GTK_WIDGET_VISIBLE (box_child->widget)) @@ -197,12 +196,7 @@ max_ratio = MAX (max_ratio, box_child->ratio); } - if (box_child->ratio) - { - if (box->has_must_expand) - expansable_length -= (box->ratio_width * box_child->ratio) / max_ratio; - } - else + if (!box_child->ratio) { GtkRequisition child_req; gtk_widget_get_child_requisition (box_child->widget, &child_req); @@ -213,6 +207,8 @@ } expansable_length -= box->spacing - box_child->padding; } + expansable_length -= box->weight_length; + gint child_pos = 0; if (orientation == GTK_ORIENTATION_HORIZONTAL) @@ -232,9 +228,7 @@ GtkRequisition child_req; gtk_widget_get_child_requisition (box_child->widget, &child_req); - if (box_child->ratio) - length = box->ratio_width; - else + if (!box_child->ratio) { if (orientation == GTK_ORIENTATION_HORIZONTAL) length = child_req.width; @@ -245,10 +239,10 @@ // give extra size (honor stretch order) if (box_child->ratio) { - if (box->has_must_expand) - length = (box->ratio_width * box_child->ratio) / max_ratio; - else - length = (box_child->ratio * expansable_length) / ratios_sum; + int available_length = box->weight_length; + if (!box->has_must_expand) + available_length += expansable_length; + length = (box_child->ratio * available_length) / ratios_sum; } else if (box_child->expand && (ratios_sum == 0 || box_child->must_expand)) length += expansable_length / expand_num; Modified: trunk/gtk/src/ygtkratiobox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.h?rev=41395… ============================================================================== --- trunk/gtk/src/ygtkratiobox.h (original) +++ trunk/gtk/src/ygtkratiobox.h Thu Oct 11 20:14:20 2007 @@ -51,7 +51,7 @@ // private (read-only): GList *children; gint16 spacing; - guint ratio_width; // the width of ratio widgets + guint weight_length; // min-length for weight widgets gboolean has_must_expand; // cache } YGtkRatioBox; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41394 - in /trunk/gtk: ChangeLog src/YGTable.cc
by rpmcruz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: rpmcruz Date: Thu Oct 11 19:37:26 2007 New Revision: 41394 URL: http://svn.opensuse.org/viewcvs/yast?rev=41394&view=rev Log: * src/YGTable.cc: forgot to block new hook: select_delayed_cb when changing selection. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGTable.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41394&r1=41393… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 11 19:37:26 2007 @@ -24,6 +24,9 @@ * tests/Layout-AlignStretch.ycp: the #326144 bug. * tests/MultiSelectionBox.ycp: the other bug mentioned. + * src/YGTable.cc: forgot to block new hook: select_delayed_cb when + changing selection. + 2007-10-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=41394&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Thu Oct 11 19:37:26 2007 @@ -212,10 +212,12 @@ GtkTreePath *path = gtk_tree_model_get_path (getModel(), &iter); g_signal_handlers_block_by_func (getWidget(), (gpointer) selected_cb, this); + g_signal_handlers_block_by_func (getWidget(), (gpointer) selected_delayed_cb, this); gtk_tree_view_set_cursor (GTK_TREE_VIEW (getWidget()), path, NULL, false); gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (getWidget()), path, NULL, TRUE, 0.5, 0.5); g_signal_handlers_unblock_by_func (getWidget(), (gpointer) selected_cb, this); + g_signal_handlers_unblock_by_func (getWidget(), (gpointer) selected_delayed_cb, this); gtk_tree_path_free (path); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41393 - in /trunk/gtk: ./ src/ tests/
by rpmcruz＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: rpmcruz Date: Thu Oct 11 19:04:48 2007 New Revision: 41393 URL: http://svn.opensuse.org/viewcvs/yast?rev=41393&view=rev Log: * src/YGPackageSelector.cc: speed up Patterns view. * src/ygtkratioboxh.h/c: bug fix #326144: the layout algorithm should be the same as yast-core. It was ignoring the insane yast some policies, including the layout-stretch (also called rubber-band) variable. * src/YGTable.cc: bug fix: Comunity Repos tool was showing descriptions on single click. Moved the event hooks to the different Table-like implementations, as they differ in subtlety. * src/YGWidget.h: added getDebugLabel() which is our replacement for YWidget::debugLabel() which is of little use for most widgets. * src/YGLayout.cc (YGAlignment): added align info to YGAlignment's getDebugLabel(). * src/YGUI.cc: improved YWidget Tree dialog (ctrl+alt+shift+T). * src/YGWidget.cc: added delay flag to emitEvent() (waits 250 ms then tries to send it if nothing is pending). * testcases: * tests/Layout-AlignStretch.ycp: the #326144 bug. * tests/MultiSelectionBox.ycp: the other bug mentioned. Added: trunk/gtk/tests/Layout-AlignStretch.ycp trunk/gtk/tests/MultiSelectionBox.ycp Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGLayout.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGProgressBar.cc trunk/gtk/src/YGTable.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGWidget.cc trunk/gtk/src/YGWidget.h trunk/gtk/src/ygtkbargraph.c trunk/gtk/src/ygtkratiobox.c trunk/gtk/src/ygtkratiobox.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41393&r1=41392… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 11 19:04:48 2007 @@ -1,3 +1,29 @@ +2007-10-11 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc: speed up Patterns view. + + * src/ygtkratioboxh.h/c: bug fix #326144: the layout algorithm + should be the same as yast-core. It was ignoring the insane yast + some policies, including the layout-stretch (also called rubber-band) + variable. + + * src/YGTable.cc: bug fix: Comunity Repos tool was showing descriptions + on single click. Moved the event hooks to the different Table-like + implementations, as they differ in subtlety. + + * src/YGWidget.h: added getDebugLabel() which is our replacement for + YWidget::debugLabel() which is of little use for most widgets. + * src/YGLayout.cc (YGAlignment): added align info to YGAlignment's + getDebugLabel(). + * src/YGUI.cc: improved YWidget Tree dialog (ctrl+alt+shift+T). + + * src/YGWidget.cc: added delay flag to emitEvent() (waits 250 ms + then tries to send it if nothing is pending). + + * testcases: + * tests/Layout-AlignStretch.ycp: the #326144 bug. + * tests/MultiSelectionBox.ycp: the other bug mentioned. + 2007-10-10 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: fixed bug #330467. Do a full match to Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=41393&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Thu Oct 11 19:04:48 2007 @@ -91,7 +91,8 @@ ygtk_ratio_box_set_child_packing (box, child->getLayout(), ychild->weight (dim), horiz_fill, vert_fill, 0); ygtk_ratio_box_set_child_expand (box, child->getLayout(), - child->isStretchable (dim)); + child->isStretchable (dim), + ychild->isLayoutStretch (dim)); YGWidget::sync_stretchable(); } @@ -226,6 +227,33 @@ virtual void moveChild (YWidget *, long, long) {}; // ignore + virtual string getDebugLabel() const + { + struct inner { + static const char *alignLabel (YAlignmentType align) + { + switch (align) { + case YAlignUnchanged: + return "unchanged"; + case YAlignBegin: + return "begin"; + case YAlignEnd: + return "end"; + case YAlignCenter: + return "center"; + } + return ""; /*not run*/ + } + }; + + string str; + str += inner::alignLabel (align [YD_HORIZ]); + str += " x "; + str += inner::alignLabel (align [YD_VERT]); + return str; + } + +private: // helper -- converts YWidget YAlignmentType to Gtk's align float static float yToGtkAlign (YAlignmentType align) { Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Oct 11 19:04:48 2007 @@ -1366,7 +1366,7 @@ GtkTreeModel *model = GTK_TREE_MODEL (store); g_object_set_data (G_OBJECT (model), "detail-package", GINT_TO_POINTER (1)); - SET_PROGRESS (zyppPool().size <zypp::Package>(), 50) + SET_PROGRESS (zyppPool().size <zypp::Package>(), 200) GtkTreeIter iter; for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Package>(); it != zyppPool().byKindEnd <zypp::Package>(); it++) @@ -1390,7 +1390,7 @@ // we need to create the categories tree as we iterate packages map <string, GtkTreePath *> tree; - SET_PROGRESS (zyppPool().size <zypp::Package>(), 50) + SET_PROGRESS (zyppPool().size <zypp::Package>(), 80) GtkTreeIter iter, parent_iter; for (ZyppPool::const_iterator it = zyppPool().byKindBegin <zypp::Package>(); it != zyppPool().byKindEnd <zypp::Package>(); it++) @@ -1497,16 +1497,16 @@ // adding children packages const set <string> &packages = pattern->install_packages(); - for (set <string>::iterator pt1 = packages.begin(); - pt1 != packages.end(); pt1++) { - for (ZyppPool::const_iterator pt2 = - zyppPool().byKindBegin <zypp::Package>(); - pt2 != zyppPool().byKindEnd <zypp::Package>(); pt2++) { - ZyppSelectable sel = *pt2; - if (sel->name() == *pt1) { - gtk_tree_store_append (store, &package_iter, &pattern_iter); - loadPackageRow (model, &package_iter, sel); - } + for (ZyppPool::const_iterator pt2 = + zyppPool().byKindBegin <zypp::Package>(); + pt2 != zyppPool().byKindEnd <zypp::Package>(); pt2++) { + ZyppSelectable sel = *pt2; + for (set <string>::iterator pt1 = packages.begin(); + pt1 != packages.end(); pt1++) { + if (sel->name() == *pt1) { + gtk_tree_store_append (store, &package_iter, &pattern_iter); + loadPackageRow (model, &package_iter, sel); + } } } } Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=413… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Thu Oct 11 19:04:48 2007 @@ -118,7 +118,7 @@ , YGWidget (this, parent, true, horizontal ? YGTK_TYPE_RATIO_HBOX : YGTK_TYPE_RATIO_VBOX, NULL) { - ygtk_ratio_box_set_homogeneous (YGTK_RATIO_BOX (getWidget()), TRUE); +// ygtk_ratio_box_set_homogeneous (YGTK_RATIO_BOX (getWidget()), TRUE); ygtk_ratio_box_set_spacing (YGTK_RATIO_BOX (getWidget()), 2); for (int i = 0; i < segments(); i++) { Modified: trunk/gtk/src/YGTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTable.cc?rev=41393&r1=… ============================================================================== --- trunk/gtk/src/YGTable.cc (original) +++ trunk/gtk/src/YGTable.cc Thu Oct 11 19:04:48 2007 @@ -29,13 +29,7 @@ gtk_tree_selection_set_mode (gtk_tree_view_get_selection ( GTK_TREE_VIEW (getWidget())), GTK_SELECTION_BROWSE); - if (opt.notifyMode.value()) { - g_signal_connect (G_OBJECT (getWidget()), "row-activated", - G_CALLBACK (activated_cb), y_widget); - if (opt.immediateMode.value()) - g_signal_connect (G_OBJECT (getWidget()), "cursor-changed", - G_CALLBACK (selected_cb), y_widget); - } + // let the derivates do the event hooks. They have subtile differences. } void initModel (const vector <GType> &types, bool show_headers) @@ -82,12 +76,13 @@ } else if (type == G_TYPE_BOOLEAN) { // toggle button GtkCellRenderer *renderer = gtk_cell_renderer_toggle_new(); + g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (col_nb)); g_object_set (renderer, "xalign", xalign, NULL); column = gtk_tree_view_column_new_with_attributes (header.c_str(), renderer, "active", col_nb, NULL); g_signal_connect (G_OBJECT (renderer), "toggled", - G_CALLBACK (toggled_cb), YGWidget::get (m_y_widget)); + G_CALLBACK (toggled_cb), this); } else if (type == GDK_TYPE_PIXBUF) { GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); @@ -226,38 +221,48 @@ } } - static void selected_cb (GtkTreeView *tree_view, YWidget* pThis) + // toggled by user (through clicking on the renderer or some other action) + void toggle (GtkTreePath *path, gint column) + { + IMPL + GtkTreeIter iter; + if (!gtk_tree_model_get_iter (getModel(), &iter, path)) + return; + gboolean state; + + gtk_tree_model_get (getModel(), &iter, column, &state, -1); + gtk_list_store_set (getStore(), &iter, column, !state, -1); + + emitEvent (YEvent::ValueChanged); + } + + static void selected_cb (GtkTreeView *tree_view, YGTableView* pThis) + { + IMPL + pThis->emitEvent (YEvent::SelectionChanged);//, true, true, true); + } + + static void selected_delayed_cb (GtkTreeView *tree_view, YGTableView* pThis) { IMPL - if (pThis->getNotify() && !YGUI::ui()->eventPendingFor(pThis)) - YGUI::ui()->sendEvent (new YWidgetEvent (pThis, YEvent::SelectionChanged)); + pThis->emitEvent (YEvent::SelectionChanged, true, true, false); } static void activated_cb (GtkTreeView *tree_view, GtkTreePath *path, - GtkTreeViewColumn *column, YWidget* pThis) + GtkTreeViewColumn *column, YGTableView* pThis) { IMPL - if (pThis->getNotify()) - YGUI::ui()->sendEvent (new YWidgetEvent (pThis, YEvent::Activated)); + pThis->emitEvent (YEvent::Activated); } static void toggled_cb (GtkCellRendererToggle *renderer, gchar *path_str, - YGWidget *pThis) + YGTableView *pThis) { IMPL - // Toggle the box - GtkTreeModel* model = ((YGTableView*) pThis)->getModel(); GtkTreePath *path = gtk_tree_path_new_from_string (path_str); - gint *column = (gint*) g_object_get_data (G_OBJECT (renderer), "column"); - GtkTreeIter iter; - gtk_tree_model_get_iter (model, &iter, path); + gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), "column")); + pThis->toggle (path, column); gtk_tree_path_free (path); - - gboolean state; - gtk_tree_model_get (model, &iter, column, &state, -1); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, column, !state, -1); - - pThis->emitEvent (YEvent::ValueChanged); } }; @@ -284,6 +289,12 @@ YGUtils::tree_view_set_sortable (GTK_TREE_VIEW (getWidget()), 0); if (numCols() >= 3) gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (getWidget()), TRUE); + + g_signal_connect (G_OBJECT (getWidget()), "row-activated", + G_CALLBACK (activated_cb), (YGTableView*) this); + if (opt.immediateMode.value()) + g_signal_connect (G_OBJECT (getWidget()), "cursor-changed", + G_CALLBACK (selected_cb), (YGTableView*) this); } virtual void itemAdded (vector<string> elements, int index) @@ -335,6 +346,15 @@ insertColumn (1, "", G_TYPE_STRING); setSearchCol (1); // pixbuf column will be added later, if needed + + g_signal_connect (G_OBJECT (getWidget()), "row-activated", + G_CALLBACK (activated_cb), (YGTableView*) this); + if (opt.immediateMode.value()) + g_signal_connect (G_OBJECT (getWidget()), "cursor-changed", + G_CALLBACK (selected_cb), (YGTableView*) this); + else + g_signal_connect (G_OBJECT (getWidget()), "cursor-changed", + G_CALLBACK (selected_delayed_cb), (YGTableView*) this); } // YSelectionBox @@ -381,7 +401,7 @@ { public: YGMultiSelectionBox (const YWidgetOpt &opt, YGWidget *parent, - const YCPString &label) + const YCPString &label) : YMultiSelectionBox (opt, label), YGTableView (this, parent, opt, label) { @@ -396,11 +416,11 @@ setSearchCol (2); // pixbuf column will be added later, if needed - // Besides the Toggle buttons, allow the user to also use space/enter - // and double click. - if (!getNotify()) - g_signal_connect_after (G_OBJECT (getWidget()), "row-activated", - G_CALLBACK (multi_activated_cb), this); + g_signal_connect (G_OBJECT (getWidget()), "cursor-changed", + G_CALLBACK (selected_cb), (YGTableView*) this); + // Let the user toggle, using space/enter or double click (not an event). + g_signal_connect_after (G_OBJECT (getWidget()), "row-activated", + G_CALLBACK (multi_activated_cb), this); } // YMultiSelectionBox @@ -470,16 +490,10 @@ } static void multi_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, - GtkTreeViewColumn *column, YGMultiSelectionBox* pThis) + GtkTreeViewColumn *column, YGMultiSelectionBox* pThis) { IMPL - GtkTreeIter iter; - if (!gtk_tree_model_get_iter (pThis->getModel(), &iter, path)) - return; - - gboolean state; - gtk_tree_model_get (pThis->getModel(), &iter, 0, &state, -1); - gtk_list_store_set (pThis->getStore(), &iter, 0, !state, -1); + pThis->toggle (path, 0); } YGWIDGET_IMPL_COMMON Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=41393&r1=413… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Thu Oct 11 19:04:48 2007 @@ -200,13 +200,14 @@ gtk_tree_store_append (store, &iter, parent_node); YContainerWidget *container = dynamic_cast <YContainerWidget *> (widget); - gchar *props = g_strdup_printf ("stretch: %d x %d - weight: %ld x %ld", - ygwidget->isStretchable (YD_HORIZ), - ygwidget->isStretchable (YD_VERT), widget->weight (YD_HORIZ), - widget->weight (YD_VERT)); + gchar *stretch = g_strdup_printf ("%d x %d", + ygwidget->isStretchable (YD_HORIZ), ygwidget->isStretchable (YD_VERT)); + gchar *weight = g_strdup_printf ("%ld x %ld", + widget->weight (YD_HORIZ), widget->weight (YD_VERT)); gtk_tree_store_set (store, &iter, 0, widget->widgetClass(), - 1, container ? "" : widget->debugLabel().c_str(), 2, props, -1); - g_free (props); + 1, ygwidget->getDebugLabel().c_str(), 2, stretch, 3, weight, -1); + g_free (stretch); + g_free (weight); if (container) for (int i = 0; i < container->numChildren(); i++) @@ -219,15 +220,15 @@ void dumpYastTree (YWidget *widget, GtkWindow *parent_window) { IMPL - GtkTreeStore *store = gtk_tree_store_new (3, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING); + GtkTreeStore *store = gtk_tree_store_new (4, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); dumpYastTree (widget, store, NULL); GtkWidget *dialog = gtk_dialog_new_with_buttons ("YWidgets Tree", parent_window, GtkDialogFlags (GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); - gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300); + gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 400); GtkWidget *view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); gtk_tree_view_append_column (GTK_TREE_VIEW (view), @@ -237,15 +238,19 @@ gtk_tree_view_column_new_with_attributes ("Label", gtk_cell_renderer_text_new(), "text", 1, NULL)); gtk_tree_view_append_column (GTK_TREE_VIEW (view), - gtk_tree_view_column_new_with_attributes ("Properties", + gtk_tree_view_column_new_with_attributes ("Stretch", gtk_cell_renderer_text_new(), "text", 2, NULL)); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), + gtk_tree_view_column_new_with_attributes ("Weight", + gtk_cell_renderer_text_new(), "text", 3, NULL)); gtk_tree_view_expand_all (GTK_TREE_VIEW (view)); + gtk_tree_view_set_enable_tree_lines (GTK_TREE_VIEW (view), TRUE); GtkWidget *scroll_win = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll_win), GTK_SHADOW_OUT); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_win), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (scroll_win), view); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scroll_win); Modified: trunk/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=41393&r1… ============================================================================== --- trunk/gtk/src/YGWidget.cc (original) +++ trunk/gtk/src/YGWidget.cc Thu Oct 11 19:04:48 2007 @@ -92,12 +92,30 @@ gtk_widget_set_sensitive (getWidget(), enabled); } -void YGWidget::emitEvent (YEvent::EventReason reason, bool if_notify, - bool if_not_pending) +void YGWidget::emitEvent(YEvent::EventReason reason, bool if_notify, + bool if_not_pending, bool immediate) { - if ((!if_notify || m_y_widget->getNotify()) && - (!if_not_pending || !YGUI::ui()->eventPendingFor(m_y_widget))) - YGUI::ui()->sendEvent (new YWidgetEvent (m_y_widget, reason)); + struct inner + { + static gboolean dispatchEvent (gpointer data) + { + YWidgetEvent *event = (YWidgetEvent *) data; + if (!YGUI::ui()->eventPendingFor (event->widget())) + YGUI::ui()->sendEvent (event); + return FALSE; + } + }; + + if (!if_notify || m_y_widget->getNotify()) + { + if (!immediate) + g_timeout_add (250, inner::dispatchEvent, new YWidgetEvent (m_y_widget, reason)); + else if (!if_not_pending || !YGUI::ui()->eventPendingFor (m_y_widget)) + { + if (immediate) + YGUI::ui()->sendEvent (new YWidgetEvent (m_y_widget, reason)); + } + } } void YGWidget::setBorder (unsigned int border) @@ -134,6 +152,8 @@ YGWidget::get (parent)->sync_stretchable (m_y_widget); } +// JEEZ. WHEN the hell will yast-ui code fix their damn code. +#if 1 /* Checks everywhere in a container to see if there are children (so he is completely initialized) so that we may ask him for stretchable() because some YContainerWidgets crash when they don't have children. */ @@ -158,6 +178,12 @@ } return true; } +#else +static bool safe_stretchable (YWidget *widget) +{ + return true; +} +#endif bool YGWidget::isStretchable (YUIDimension dim) { Modified: trunk/gtk/src/YGWidget.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.h?rev=41393&r1=… ============================================================================== --- trunk/gtk/src/YGWidget.h (original) +++ trunk/gtk/src/YGWidget.h Thu Oct 11 19:04:48 2007 @@ -20,6 +20,11 @@ virtual GtkWidget *getWidget() { return m_widget; } const char *getWidgetName() const { return const_cast <YWidget *> (m_y_widget)->widgetClass(); } + // YWidget::debugLabel() sucks for most widgets -- let's allow it to be overload + virtual string getDebugLabel() const + { // container debug labels are worse than useless + if (dynamic_cast <YContainerWidget *> (m_y_widget) == NULL) + return const_cast <YWidget *> (m_y_widget)->debugLabel(); return string(); } void show(); // containers should use this call rather than getWidget() @@ -34,7 +39,7 @@ // Event handling void emitEvent(YEvent::EventReason reason, bool if_notify = true, - bool if_not_pending = false); + bool if_not_pending = false, bool immediate = true); // Aesthicts void setBorder (unsigned int border); // in pixels Modified: trunk/gtk/src/ygtkbargraph.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkbargraph.c?rev=41393… ============================================================================== --- trunk/gtk/src/ygtkbargraph.c (original) +++ trunk/gtk/src/ygtkbargraph.c Thu Oct 11 19:04:48 2007 @@ -15,7 +15,7 @@ static void ygtk_bar_graph_init (YGtkBarGraph *bar) { - ygtk_ratio_box_set_homogeneous (YGTK_RATIO_BOX (bar), TRUE); +// ygtk_ratio_box_set_homogeneous (YGTK_RATIO_BOX (bar), TRUE); bar->m_tooltips = gtk_tooltips_new(); gtk_container_set_border_width (GTK_CONTAINER (bar), 12); @@ -94,6 +94,7 @@ } // Set proportion + gtk_widget_set_size_request (box, 10, -1); // for homogeneous... ygtk_ratio_box_set_child_packing (YGTK_RATIO_BOX (bar), box, MAX (value, 1), TRUE, TRUE, 0); Modified: trunk/gtk/src/ygtkratiobox.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.c?rev=41393… ============================================================================== --- trunk/gtk/src/ygtkratiobox.c (original) +++ trunk/gtk/src/ygtkratiobox.c Thu Oct 11 19:04:48 2007 @@ -30,7 +30,7 @@ child_info->padding = padding; child_info->xfill = xfill; child_info->yfill = yfill; - child_info->fully_expandable = 0; + child_info->expand = 0; box->children = g_list_append (box->children, child_info); @@ -103,32 +103,34 @@ GtkRequisition *requisition, GtkOrientation orientation) { - gfloat ratios_sum = 0, max_ratio = 1; - GList* child; YGtkRatioBox* box = YGTK_RATIO_BOX (widget); + guint ratios_num = 0; + gfloat max_ratio = 0; + box->has_must_expand = FALSE; + GList* child; for (child = box->children; child; child = child->next) { YGtkRatioBoxChild* box_child = (YGtkRatioBoxChild*) child->data; if (!GTK_WIDGET_VISIBLE (box_child->widget)) continue; - if (box_child->ratio) { - ratios_sum += box_child->ratio; + if (box_child->ratio) + { max_ratio = MAX (max_ratio, box_child->ratio); + ratios_num++; } + if (box_child->must_expand) + box->has_must_expand = TRUE; } // If we want to calculate horizontal size, primary_req would be horizontal // length, while secondary the height. Idem for the inverse. guint primary_req = 0, secondary_req = 0; - gfloat pixels_per_percent = 0; + box->ratio_width = 0; for (child = box->children; child; child = child->next) { YGtkRatioBoxChild* box_child = (YGtkRatioBoxChild*) child->data; if (!GTK_WIDGET_VISIBLE (box_child->widget)) continue; - if (box_child->fully_expandable) - box_child->ratio = max_ratio; - GtkRequisition child_req; gtk_widget_size_request (box_child->widget, &child_req); @@ -142,17 +144,15 @@ sec_length = child_req.width; } - if (box->homogeneous && box_child->ratio) { - gfloat percent_of_whole = box_child->ratio / ratios_sum * 100; - pixels_per_percent = MAX (pixels_per_percent, prim_length / percent_of_whole); - } + if (box_child->ratio) + box->ratio_width = MAX (box->ratio_width, (prim_length * max_ratio) / box_child->ratio); else primary_req += prim_length; primary_req += box_child->padding + box->spacing; secondary_req = MAX (secondary_req, sec_length); } - primary_req += (guint) (pixels_per_percent * 100); + primary_req += box->ratio_width * ratios_num; guint border = GTK_CONTAINER (widget)->border_width * 2; primary_req += border*2; secondary_req += border*2; @@ -175,6 +175,7 @@ // a first loop to get some data for expansibles (ie. childs with weight) gfloat ratios_sum = 0; + guint expand_num = 0, max_ratio = 0; gint expansable_length; if (orientation == GTK_ORIENTATION_HORIZONTAL) expansable_length = allocation->width - border*2; @@ -188,15 +189,23 @@ if (!GTK_WIDGET_VISIBLE (box_child->widget)) continue; + if (box_child->expand) + expand_num++; if (box_child->ratio) + { ratios_sum += box_child->ratio; + max_ratio = MAX (max_ratio, box_child->ratio); + } - GtkRequisition child_req; - gtk_widget_get_child_requisition (box_child->widget, &child_req); - - if (box->homogeneous && box_child->ratio) - ; - else { + if (box_child->ratio) + { + if (box->has_must_expand) + expansable_length -= (box->ratio_width * box_child->ratio) / max_ratio; + } + else + { + GtkRequisition child_req; + gtk_widget_get_child_requisition (box_child->widget, &child_req); if (orientation == GTK_ORIENTATION_HORIZONTAL) expansable_length -= child_req.width; else @@ -223,17 +232,26 @@ GtkRequisition child_req; gtk_widget_get_child_requisition (box_child->widget, &child_req); - if (box->homogeneous && box_child->ratio) - length = 0; - else { + if (box_child->ratio) + length = box->ratio_width; + else + { if (orientation == GTK_ORIENTATION_HORIZONTAL) length = child_req.width; else length = child_req.height; } + // give extra size (honor stretch order) if (box_child->ratio) - length += ((box_child->ratio / ratios_sum) * expansable_length); + { + if (box->has_must_expand) + length = (box->ratio_width * box_child->ratio) / max_ratio; + else + length = (box_child->ratio * expansable_length) / ratios_sum; + } + else if (box_child->expand && (ratios_sum == 0 || box_child->must_expand)) + length += expansable_length / expand_num; if (orientation == GTK_ORIENTATION_HORIZONTAL) { child_alloc.x = child_pos; @@ -282,7 +300,8 @@ child_info->xfill = xfill; child_info->yfill = yfill; child_info->padding = padding; - child_info->fully_expandable = 0; + child_info->expand = 0; + child_info->must_expand = 0; if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (box)) gtk_widget_queue_resize (child); @@ -306,17 +325,21 @@ if (xfill) *xfill = child_info->xfill; if (yfill) *yfill = child_info->yfill; if (padding) *padding = child_info->padding; - if (expand) *expand = child_info->fully_expandable; + if (expand) *expand = child_info->expand; } } void ygtk_ratio_box_set_child_expand (YGtkRatioBox *box, GtkWidget *child, - gboolean expand) + gboolean expand, gboolean must_expand) { YGtkRatioBoxChild *child_info; child_info = ygtk_ratio_get_child_info (box, child); if (child_info) - child_info->fully_expandable = expand; + { + child_info->expand = expand; + if (expand) + child_info->must_expand = must_expand; + } } void ygtk_ratio_box_set_child_ratio (YGtkRatioBox *box, GtkWidget *child, @@ -328,11 +351,6 @@ child_info->ratio = ratio; } -void ygtk_ratio_box_set_homogeneous (YGtkRatioBox *box, gboolean homogeneous) -{ - box->homogeneous = homogeneous; -} - void ygtk_ratio_box_set_spacing (YGtkRatioBox *box, gint spacing) { box->spacing = spacing; @@ -369,10 +387,9 @@ ygtk_ratio_box_size_allocate (widget, allocation, GTK_ORIENTATION_HORIZONTAL); } -GtkWidget* ygtk_ratio_hbox_new (gboolean homogeneous, gint spacing) +GtkWidget* ygtk_ratio_hbox_new (gint spacing) { YGtkRatioBox* box = (YGtkRatioBox*) g_object_new (YGTK_TYPE_RATIO_HBOX, NULL); - box->homogeneous = homogeneous; box->spacing = spacing; return GTK_WIDGET (box); } @@ -406,10 +423,9 @@ ygtk_ratio_box_size_allocate (widget, allocation, GTK_ORIENTATION_VERTICAL); } -GtkWidget* ygtk_ratio_vbox_new (gboolean homogeneous, gint spacing) +GtkWidget* ygtk_ratio_vbox_new (gint spacing) { YGtkRatioBox* box = (YGtkRatioBox*) g_object_new (YGTK_TYPE_RATIO_VBOX, NULL); - box->homogeneous = homogeneous; box->spacing = spacing; return GTK_WIDGET (box); } Modified: trunk/gtk/src/ygtkratiobox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.h?rev=41393… ============================================================================== --- trunk/gtk/src/ygtkratiobox.h (original) +++ trunk/gtk/src/ygtkratiobox.h Thu Oct 11 19:04:48 2007 @@ -10,6 +10,20 @@ behave just the same as a GtkBox if you give 0 for not expand and 1 to. */ +/* + Quirks (cause of yast-core): + if one of the children has certain special properties, then only widgets with + the same properties will be expanded. These are, by order: + both stretch and rubber-band + both stretch and weight + weight + stretch + + We use different naming: + stretch = expand + rubber-band or layout-stretch = must expand + weight = ratio +*/ #ifndef YGTK_RATIO_BOX_H #define YGTK_RATIO_BOX_H @@ -37,7 +51,8 @@ // private (read-only): GList *children; gint16 spacing; - gboolean homogeneous; + guint ratio_width; // the width of ratio widgets + gboolean has_must_expand; // cache } YGtkRatioBox; typedef struct _YGtkRatioBoxClass @@ -53,23 +68,22 @@ gfloat ratio; guint xfill : 1; guint yfill : 1; - guint fully_expandable : 1; + guint expand : 1; // twilight zone flag; use ratio + guint must_expand : 1; // higher order expand } YGtkRatioBoxChild; GType ygtk_ratio_box_get_type (void) G_GNUC_CONST; -void ygtk_ratio_box_set_homogeneous (YGtkRatioBox *box, gboolean homogeneous); void ygtk_ratio_box_set_spacing (YGtkRatioBox *box, gint spacing); void ygtk_ratio_box_pack (YGtkRatioBox *box, GtkWidget *child, gfloat ratio, gboolean xfill, gboolean yfill, guint padding); -// Since ratio may be of any value, this function is provided to let programmers -// specify this child to be fully expandable (avoid its use; stick to some fixed range) -// NOTE: when disabling expand, you should call child_packing to define a ratio -// since it is lost. +// If you don't want to use ratios, you can use the ordinary expand flag. NOTE: +// If some other child has ratio > 0, this one won't expand. +// All this mess is so we can conform with yast-core. void ygtk_ratio_box_set_child_expand (YGtkRatioBox *box, GtkWidget *child, - gboolean expand); + gboolean expand, gboolean must_expand); void ygtk_ratio_box_set_child_ratio (YGtkRatioBox *box, GtkWidget *child, gfloat ratio); @@ -80,7 +94,7 @@ void ygtk_ratio_box_get_child_packing (YGtkRatioBox *box, GtkWidget *child, gfloat *ratio, gboolean *xfill, gboolean *yfill, guint *padding, - gboolean *fully_expandable); + gboolean *expandable); /* RatioHBox */ @@ -106,7 +120,7 @@ YGtkRatioBoxClass parent_class; } YGtkRatioHBoxClass; -GtkWidget* ygtk_ratio_hbox_new (gboolean homogeneous, gint spacing); +GtkWidget* ygtk_ratio_hbox_new (gint spacing); GType ygtk_ratio_hbox_get_type (void) G_GNUC_CONST; /* RatioVBox */ @@ -133,7 +147,7 @@ YGtkRatioBoxClass parent_class; } YGtkRatioVBoxClass; -GtkWidget* ygtk_ratio_vbox_new (gboolean homogeneous, gint spacing); +GtkWidget* ygtk_ratio_vbox_new (gint spacing); GType ygtk_ratio_vbox_get_type (void) G_GNUC_CONST; G_END_DECLS Added: trunk/gtk/tests/Layout-AlignStretch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/Layout-AlignStretch.yc… ============================================================================== --- trunk/gtk/tests/Layout-AlignStretch.ycp (added) +++ trunk/gtk/tests/Layout-AlignStretch.ycp Thu Oct 11 19:04:48 2007 @@ -0,0 +1,15 @@ +// alignment (test case for inst_productsources bug) +{ +UI::OpenDialog( + `VBox( + `HBox( + `PushButton ("Fixed"), + `Bottom (`PushButton ("Test")) + ), + `VWeight( 1, `MultiLineEdit("Description", "bla bla") ) + ) +); +UI::UserInput(); +UI::CloseDialog(); +} + Added: trunk/gtk/tests/MultiSelectionBox.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/MultiSelectionBox.ycp?… ============================================================================== --- trunk/gtk/tests/MultiSelectionBox.ycp (added) +++ trunk/gtk/tests/MultiSelectionBox.ycp Thu Oct 11 19:04:48 2007 @@ -0,0 +1,16 @@ +// MultiSelectionBox -- test notify flag +{ +list items = + [ "Spaghetti", "Steak Sandwich", "Chili", "Salami Baguette" ]; + +UI::OpenDialog ( + `MinSize (30, 10, + `MultiSelectionBox (`id(`list), `opt (`notify), + "Plates", items) + ) + ); + +UI::UserInput(); +UI::CloseDialog(); +} + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0