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=41399&r1=41398&r2=41399&view=diff
==============================================================================
--- 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
#include
#include
@@ -14,7 +14,7 @@
#include
-/* 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=41398&r2=41399&view=diff
==============================================================================
--- 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&view=auto
==============================================================================
--- 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=41399&view=auto
==============================================================================
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=41399&view=auto
==============================================================================
Binary file - no diff available.
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
