r455 - trunk/src/target/OM-2007/applications/openmoko-mainmenu/src
tongsong_li at gta01.hmw-consulting.de
tongsong_li at gta01.hmw-consulting.de
Fri Dec 22 05:40:32 CET 2006
Author: tongsong_li
Date: 2006-12-22 05:40:25 +0100 (Fri, 22 Dec 2006)
New Revision: 455
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
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
Log:
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c 2006-12-22 04:23:54 UTC (rev 454)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c 2006-12-22 04:40:25 UTC (rev 455)
@@ -45,7 +45,7 @@
for (i=0; i<4; i++)
{
- mma->history[i] = moko_finger_tool_box_add_button (mma->toolbox);
+ mma->history[i] = moko_finger_tool_box_add_button_without_label (mma->toolbox);
gtk_widget_show (mma->history[i]);
}
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 04:23:54 UTC (rev 454)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2006-12-22 04:40:25 UTC (rev 455)
@@ -93,12 +93,11 @@
void
moko_main_menu_init(MokoMainMenu *mm) {
PangoFontDescription* PangoFont = pango_font_description_new(); //get system default PangoFontDesc
- GtkEventBox *bg_main;
- GtkEventBox *bg_item;
+ GtkEventBox *eventbox;
mm->section_name = gtk_label_new ("Main Menu");
gtk_widget_show (mm->section_name);
- //gtk_widget_set_name (GTK_WIDGET (mm->section_name), "Section Name");
+ gtk_widget_set_name (GTK_WIDGET (mm->section_name), "Section Name");
gtk_label_set_single_line_mode (mm->section_name, TRUE);
gtk_misc_set_alignment (GTK_MISC (mm->section_name), SECTION_ALG_X, SECTION_ALG_Y);
gtk_misc_set_padding (GTK_MISC (mm->section_name), SECTION_X_PADDING, SECTION_Y_PADDING);
@@ -113,11 +112,10 @@
}
*/
- bg_main = gtk_event_box_new ();
- gtk_event_box_set_visible_window (bg_main, TRUE);
- gtk_widget_show (bg_main);
- gtk_widget_set_name (bg_main, "gtkeventbox-black");
- //gtk_container_add (bg_main, mm->section_name);
+ eventbox = gtk_event_box_new ();
+ gtk_event_box_set_visible_window (eventbox, TRUE);
+ gtk_widget_show (eventbox);
+ gtk_widget_set_name (eventbox, "gtkeventbox-black");
mm->item_total = gtk_label_new ("11/22");
gtk_widget_show (mm->item_total);
@@ -147,7 +145,7 @@
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);
- moko_icon_view_set_max_text_length(mm->icon_view, 50);
+ moko_icon_view_set_max_text_length(mm->icon_view, 20);
//mm->icon_view = gtk_icon_view_new ();
//gtk_icon_view_set_item_width(mm->icon_view, ITEM_WIDTH);
@@ -163,27 +161,21 @@
moko_icon_view_set_pixbuf_column (GTK_ICON_VIEW (mm->icon_view), PIXBUF_COLUMN);
moko_icon_view_set_text_column (GTK_ICON_VIEW (mm->icon_view), TEXT_COLUMN);
- //gtk_icon_view_set_model (GTK_ICON_VIEW (mm->icon_view), GTK_TREE_MODEL (mm->list_store));
moko_icon_view_set_model (GTK_ICON_VIEW (mm->icon_view), GTK_TREE_MODEL (mm->list_store));
mm->scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mm->scrolled),
GTK_POLICY_NEVER, GTK_POLICY_NEVER);
gtk_widget_show (mm->scrolled);
- // gtk_scrolled_window_add_with_viewport (GTK_CONTAINER (mm->scrolled),
- // mm->icon_view);
gtk_container_add (GTK_CONTAINER (mm->scrolled), mm->icon_view);
-// mm->icon_view = MOKO_ICON_VIEW(moko_icon_view_new());
- // gtk_widget_show (mm->icon_view);
-
mm->hbox = gtk_hbox_new (FALSE, FALSE);
gtk_widget_show (mm->hbox);
- gtk_box_pack_start (mm, bg_main, FALSE, FALSE, 0);
- gtk_container_add (bg_main, mm->hbox);
- gtk_box_pack_start (mm->hbox, mm->section_name, TRUE, TRUE, 10);
- gtk_box_pack_end (mm->hbox, mm->item_total, FALSE, FALSE, 10);
+ gtk_box_pack_start (mm, eventbox, FALSE, FALSE, 0);
+ gtk_container_add (eventbox, mm->hbox);
+ gtk_box_pack_start (mm->hbox, mm->section_name, TRUE, TRUE, 0);
+ gtk_box_pack_end (mm->hbox, mm->item_total, FALSE, FALSE, 0);
gtk_box_pack_end (mm, mm->scrolled, TRUE, TRUE, 0);
moko_sample_model_fill(mm->list_store);
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 04:23:54 UTC (rev 454)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2006-12-22 04:40:25 UTC (rev 455)
@@ -40,12 +40,12 @@
#define COLUMN_NUM 3
#define ITEM_WIDTH 140
#define ITEM_MARGIN 10
-#define ROW_SPACING 20
+#define ROW_SPACING 0
#define COLUMN_SPACING 20
-#define ITME_TOTAL_WIDTH 7
+#define ITME_TOTAL_WIDTH 5
-#define PIXBUF_WIDTH 120
-#define PIXBUF_HEIGHT 120
+#define PIXBUF_WIDTH 140
+#define PIXBUF_HEIGHT 140
#define SECTION_ALG_X 0.6
#define SECTION_ALG_Y 0.5
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 04:23:54 UTC (rev 454)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c 2006-12-22 04:40:25 UTC (rev 455)
@@ -1156,29 +1156,15 @@
}
moko_icon_view_update_item_text (icon_view, item);
- pango_layout_set_alignment (icon_view->priv->layout, rtl ? PANGO_ALIGN_RIGHT: PANGO_ALIGN_LEFT);
+ pango_layout_set_alignment (icon_view->priv->layout, PANGO_ALIGN_CENTER);
pango_layout_set_width (icon_view->priv->layout, item->layout_width * PANGO_SCALE);
gtk_paint_layout (GTK_WIDGET (icon_view)->style,
icon_view->priv->bin_window,
item->selected ? state : GTK_STATE_NORMAL,
- TRUE, area, GTK_WIDGET (icon_view), "icon_view",
+ TRUE, area, GTK_WIDGET (icon_view), "moko_icon_view",
item->layout_x,
item->layout_y,
icon_view->priv->layout);
-
- if (GTK_WIDGET_HAS_FOCUS (icon_view) &&
- item == icon_view->priv->cursor_item)
- gtk_paint_focus (GTK_WIDGET (icon_view)->style,
- icon_view->priv->bin_window,
- GTK_STATE_NORMAL,
- area,
- GTK_WIDGET (icon_view),
- "icon_view",
- item->layout_x - ICON_TEXT_PADDING - focus_width - focus_pad,
- item->layout_y - ICON_TEXT_PADDING - focus_width - focus_pad,
- item->layout_width + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad),
- item->layout_height + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad));
-
}
}
@@ -2550,7 +2536,6 @@
else
pango_layout_set_text (icon_view->priv->layout, text, -1);
g_free (text);
-
}
else
pango_layout_set_text (icon_view->priv->layout, "", -1);
More information about the commitlog
mailing list