r1245 - trunk/src/target/OM-2007/applications/openmoko-mainmenu/src
zhiyong_sun at sita.openmoko.org
zhiyong_sun at sita.openmoko.org
Mon Mar 5 04:57:20 CET 2007
Author: zhiyong_sun
Date: 2007-03-05 04:57:03 +0100 (Mon, 05 Mar 2007)
New Revision: 1245
Modified:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.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.h
Log:
Use DBUS_BUS_SYSTEM bus connection instead of DBUS_BUS_SESSION
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c 2007-03-05 03:46:45 UTC (rev 1244)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c 2007-03-05 03:57:03 UTC (rev 1245)
@@ -46,16 +46,17 @@
gtk_widget_hide (GTK_WIDGET (mma->wheel));
gtk_widget_hide (GTK_WIDGET (mma->toolbox));
gtk_widget_hide (GTK_WIDGET (mma->window));
+ moko_dbus_send_message ("");
}
}
void
moko_wheel_left_up_press_cb (GtkWidget *self, MokoMainmenuApp *mma)
{
-
g_signal_emit_by_name (G_OBJECT(mma->mm->icon_view), "move-cursor", GTK_MOVEMENT_DISPLAY_LINES, -1);
//gtk_window_present (mma->window);
//gtk_widget_grab_focus (mma->mm->icon_view);
+
}
void
@@ -121,8 +122,9 @@
gchar *text;
selected_item = moko_icon_view_get_selected_items (iconview);
+
if (!selected_item)
- g_debug ("Can't get selected item");
+ g_debug ("Can't get mokoiconview selected item");
else
{
icon_view_model = moko_icon_view_get_model (iconview);
@@ -132,12 +134,14 @@
TEXT_COLUMN , &text,
-1);
- moko_dbus_send_message (text);
-
- g_list_foreach (selected_item, gtk_tree_path_free, NULL);
+ if (text)
+ {
+ moko_dbus_send_message (text);
+ free (text);
+ }
+
+ g_list_foreach (selected_item, gtk_tree_path_free, NULL);
g_list_free (selected_item);
- if (text)
- free (text);
}
moko_main_menu_update_item_total_label (mma->mm);
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.c 2007-03-05 03:46:45 UTC (rev 1244)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/dbus-conn.c 2007-03-05 03:57:03 UTC (rev 1245)
@@ -28,7 +28,7 @@
{
/* Get a connection to the session bus */
dbus_error_init (&error);
- bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
+ bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
if (!bus)
{
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2007-03-05 03:46:45 UTC (rev 1244)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2007-03-05 03:57:03 UTC (rev 1245)
@@ -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, 20);
+ moko_icon_view_set_decoration_width (mm->icon_view, DECORATION_WIDTH);
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 2007-03-05 03:46:45 UTC (rev 1244)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2007-03-05 03:57:03 UTC (rev 1245)
@@ -41,22 +41,23 @@
G_BEGIN_DECLS
/* property(s)*/
-#define COLUMN_NUM 3
-#define ITEM_WIDTH 140
-#define ITEM_MARGIN 10
-#define ROW_SPACING 0
-#define COLUMN_SPACING 20
-#define ITME_TOTAL_WIDTH 5
+#define COLUMN_NUM 3
+#define ITEM_WIDTH 140
+#define ITEM_MARGIN 10
+#define ROW_SPACING 0
+#define COLUMN_SPACING 20
+#define ITME_TOTAL_WIDTH 5
+#define DECORATION_WIDTH 10
-#define PIXBUF_WIDTH 140
-#define PIXBUF_HEIGHT 140
+#define PIXBUF_WIDTH 120
+#define PIXBUF_HEIGHT 120
-#define SECTION_ALG_X 0.6
-#define SECTION_ALG_Y 0.5
-#define SECTION_X_PADDING 0
-#define SECTION_Y_PADDING 5
-#define ITEM_TOTAL_ALG_X 0.5
-#define ITEM_TOTAL_ALG_Y 0.9
+#define SECTION_ALG_X 0.6
+#define SECTION_ALG_Y 0.5
+#define SECTION_X_PADDING 0
+#define SECTION_Y_PADDING 5
+#define ITEM_TOTAL_ALG_X 0.5
+#define ITEM_TOTAL_ALG_Y 0.9
/*Font styles*/
#define FONT_SIZE_SECTION 12*PANGO_SCALE
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.h 2007-03-05 03:46:45 UTC (rev 1244)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.h 2007-03-05 03:57:03 UTC (rev 1245)
@@ -218,6 +218,9 @@
moko_icon_view_get_selected_items (MokoIconView *icon_view);
void
+moko_icon_view_set_selected_item (MokoIconView *icon_view, GtkTreePath *path);
+
+void
moko_icon_view_select_all (MokoIconView *icon_view);
void
More information about the commitlog
mailing list
