r452 - in trunk/src/target/OM-2007/applications/openmoko-mainmenu: data src
tongsong_li at gta01.hmw-consulting.de
tongsong_li at gta01.hmw-consulting.de
Fri Dec 22 04:12:40 CET 2006
Author: tongsong_li
Date: 2006-12-22 04:12:23 +0100 (Fri, 22 Dec 2006)
New Revision: 452
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/main_menu_sel_text.png
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c
Log:
update
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/main_menu_sel_text.png
===================================================================
(Binary files differ)
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2006-12-22 02:26:18 UTC (rev 451)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2006-12-22 03:12:23 UTC (rev 452)
@@ -143,7 +143,7 @@
moko_icon_view_set_margin (mm->icon_view, ITEM_MARGIN);
moko_icon_view_set_row_spacing (mm->icon_view, ROW_SPACING);
moko_icon_view_set_column_spacing (mm->icon_view, COLUMN_SPACING);
- moko_icon_view_set_decoration_width (mm->icon_view, 30);
+ moko_icon_view_set_decoration_width (mm->icon_view, 20);
moko_icon_view_set_icon_bg (mm->icon_view, PKGDATADIR"/main_menu_sel_icon.png");
moko_icon_view_set_text_bg (mm->icon_view, PKGDATADIR"/main_menu_sel_text.png");
moko_icon_view_set_decorated (mm->icon_view, TRUE);
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2006-12-22 02:26:18 UTC (rev 451)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2006-12-22 03:12:23 UTC (rev 452)
@@ -40,7 +40,7 @@
#define COLUMN_NUM 3
#define ITEM_WIDTH 140
#define ITEM_MARGIN 0
-#define ROW_SPACING 40
+#define ROW_SPACING 20
#define COLUMN_SPACING 20
#define ITME_TOTAL_WIDTH 7
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c 2006-12-22 02:26:18 UTC (rev 451)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c 2006-12-22 03:12:23 UTC (rev 452)
@@ -1056,25 +1056,27 @@
if (icon_view->priv->pixbuf_column != -1)
{
pixbuf = moko_icon_view_get_item_icon (icon_view, item);
+
+ gint decr_width = icon_view->priv->decr_width;
+ gint scaled_w, scaled_h;
+ gint scaled_x, scaled_y;
+ scaled_w = item->pixbuf_width - 2*decr_width;
+ scaled_h = item->pixbuf_height - 2*decr_width;
+ scaled_x = item->pixbuf_x + decr_width;
+ scaled_y = item->pixbuf_y + decr_width;
+ scaled = gdk_pixbuf_scale_simple (pixbuf,
+ scaled_w, scaled_h, GDK_INTERP_NEAREST);
+
if (item->selected && icon_view->priv->decorated)
{
- gint decr_width = icon_view->priv->decr_width;
- gint scaled_w, scaled_h;
- gint scaled_x, scaled_y;
- scaled_w = item->pixbuf_width - 2*decr_width;
- scaled_h = item->pixbuf_height - 2*decr_width;
- scaled_x = item->pixbuf_x + decr_width;
- scaled_y = item->pixbuf_y + decr_width;
-
- scaled = gdk_pixbuf_scale_simple (pixbuf,
- scaled_w, scaled_h, GDK_INTERP_NEAREST);
- tmp = gdk_pixbuf_scale_simple (icon_view->priv->bg_icon,
+
+ tmp = gdk_pixbuf_scale_simple (icon_view->priv->bg_icon,
item->pixbuf_width, item->pixbuf_height,
GDK_INTERP_NEAREST);
- gdk_draw_pixbuf (icon_view->priv->bin_window, NULL,
+ gdk_draw_pixbuf (icon_view->priv->bin_window, NULL,
tmp,
0, 0,
item->pixbuf_x, item->pixbuf_y,
@@ -1082,42 +1084,42 @@
GDK_RGB_DITHER_NORMAL,
item->pixbuf_width, item->pixbuf_height);
- gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, scaled,
+ gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, scaled,
0, 0,
scaled_x, scaled_y,
scaled_w, scaled_h,
GDK_RGB_DITHER_NORMAL,
scaled_w, scaled_h);
- g_object_unref (tmp);
- g_object_unref (scaled);
- g_object_unref (pixbuf);
- }
+ g_object_unref (tmp);
+ g_object_unref (scaled);
+ }
else if (item->selected && !icon_view->priv->decorated)
{
- tmp = moko_icon_view_get_item_icon (icon_view, item);
- pixbuf = create_colorized_pixbuf (tmp,
+ tmp = create_colorized_pixbuf (scaled,
>K_WIDGET (icon_view)->style->base[state]);
- gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, pixbuf,
+ gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, tmp,
0, 0,
- item->pixbuf_x, item->pixbuf_y,
- item->pixbuf_width, item->pixbuf_height,
+ scaled_x, scaled_y,
+ scaled_w, scaled_h,
GDK_RGB_DITHER_NORMAL,
- item->pixbuf_width, item->pixbuf_height);
- g_object_unref (pixbuf);
- g_object_unref (tmp);
+ scaled_w, scaled_h);
+ g_object_unref (tmp);
}
else
{
- gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, pixbuf,
+ gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, scaled,
0, 0,
- item->pixbuf_x, item->pixbuf_y,
- item->pixbuf_width, item->pixbuf_height,
+ scaled_x, scaled_y,
+ scaled_w, scaled_h,
GDK_RGB_DITHER_NORMAL,
- item->pixbuf_width, item->pixbuf_height);
- g_object_unref (pixbuf);
+ scaled_w, scaled_h);
+
+ g_object_unref (scaled);
}
-
+
+ g_object_unref (pixbuf);
+
}
if (icon_view->priv->text_column != -1 ||
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c 2006-12-22 02:26:18 UTC (rev 451)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c 2006-12-22 03:12:23 UTC (rev 452)
@@ -57,6 +57,10 @@
moko_fill_model(store,"/usr/share/pixmaps/gnome-eyes.png","gnome-eyes");
moko_fill_model(store,"/usr/share/pixmaps/gnome-geg12.png","gnome-geg12");
moko_fill_model(store,"/usr/share/pixmaps/gdm.xpm","gdm");
+ moko_fill_model(store,"/usr/share/pixmaps/gnome-eyes.png","gnome-eyes");
+ moko_fill_model(store,"/usr/share/pixmaps/gnome-geg12.png","gnome-geg12");
+ moko_fill_model(store,"/usr/share/pixmaps/gdm.xpm","gdm");
+
}
/*test code, delete later*/
@@ -65,9 +69,10 @@
{
GtkWidget *image;
- image = gtk_image_new_from_file ("/usr/share/pixmaps/gdm.png");
+ image = gtk_image_new_from_file ("/usr/share/pixmaps/gnome-eyes.png");
moko_pixmap_button_set_finger_toolbox_btn_center_image(btn, image);
+
}
void
More information about the commitlog
mailing list