r512 - trunk/src/target/OM-2007/applications/openmoko-mainmenu/src
tongsong_li at gta01.hmw-consulting.de
tongsong_li at gta01.hmw-consulting.de
Mon Jan 8 03:56:47 CET 2007
Author: tongsong_li
Date: 2007-01-08 03:56:33 +0100 (Mon, 08 Jan 2007)
New Revision: 512
Removed:
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.h
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/mokoiconview.c
Log:
small modify by Sun-Zhiyong <sunzhiyong at fic-sh.com.cn>
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c 2007-01-08 02:22:58 UTC (rev 511)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c 2007-01-08 02:56:33 UTC (rev 512)
@@ -110,6 +110,16 @@
pid_t lockapp;
int i;
+ lockapp = testlock (LOCK_FILE);
+ g_debug ("lock app = %x", lockapp);
+ if (lockapp > 0)
+ {
+ kill (lockapp, SIGUSR1);
+ return 0;
+ }
+ setlock (LOCK_FILE);
+ g_debug ("test");
+
mma = g_malloc0 (sizeof (MokoMainmenuApp));
if (!mma) {
fprintf (stderr, "openmoko-mainmenu application initialize FAILED");
@@ -119,21 +129,13 @@
gtk_init( &argc, &argv );
- lockapp = testlock (LOCK_FILE);
- g_debug ("lock app = %x", lockapp);
- if (lockapp > 0)
- {
- kill (lockapp, SIGUSR1);
- return 0;
- }
- setlock (LOCK_FILE);
-
/* application object */
mma->app = MOKO_APPLICATION(moko_application_get_instance());
g_set_application_name( "OpenMoko Main Menu" );
/* finger based window */
mma->window = MOKO_FINGER_WINDOW(moko_finger_window_new());
+// gtk_window_set_decorated (mma->window, FALSE);
gtk_widget_show (GTK_WIDGET (mma->window));
main_window = mma->window;
@@ -172,6 +174,8 @@
g_signal_connect (mma->mm->icon_view, "item_activated",
G_CALLBACK (moko_icon_view_item_acitvated_cb), mma);
+ signal (SIGUSR1, handle_sigusr1);
+
/* put MokoMainMenu object and MokoClosePange object into the finger based window */
moko_finger_window_set_contents (mma->window, GTK_WIDGET(mma->mm));
moko_finger_window_set_contents (mma->window, GTK_WIDGET(mma->close));
@@ -188,7 +192,6 @@
/*test code, delete later*/
moko_sample_hisory_app_fill (mma->history[0]);
- signal (SIGUSR1, handle_sigusr1);
gtk_main();
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2007-01-08 02:22:58 UTC (rev 511)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2007-01-08 02:56:33 UTC (rev 512)
@@ -303,7 +303,7 @@
}
}
- snprintf (total_item, 6, "0/%d", count);
+ snprintf (total_item, 6, "00/%.2d", count);
moko_set_label_content(mm->item_total, total_item);
return TRUE;
@@ -328,7 +328,7 @@
if (cursor <0)
return;
- snprintf (item_total, 6, "%d/%d", cursor, total);
+ snprintf (item_total, 6, "%.2d/%.2d", cursor, total);
moko_set_label_content (mm->item_total, item_total);
}
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c 2007-01-08 02:22:58 UTC (rev 511)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c 2007-01-08 02:56:33 UTC (rev 512)
@@ -151,22 +151,6 @@
const GValue *value,
GParamSpec *pspec);
-static void
-moko_icon_view_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-
-/* GObject signals */
-static void
-moko_icon_view_finalize (GObject *object);
-
-static void
-moko_icon_view_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-
static void
moko_icon_view_get_property (GObject *object,
guint prop_id,
Deleted: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c 2007-01-08 02:22:58 UTC (rev 511)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c 2007-01-08 02:56:33 UTC (rev 512)
@@ -1,38 +0,0 @@
-/*
- * openmoko-mainmenu
- *
- * Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
- *
- * Copyright (C) 2006 First International Computer Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Public License for more details.
- *
- * Current Version: $Rev$ ($Date$) [$Author$]
- */
-
-#include "support.h"
-
-#include <libmokoui/moko-pixmap-button.h>
-
-
-
-
-
-
-
-
-/* Use this function to set the directory containing installed pixmaps. */
-/*void
-add_pixmap_directory(const gchar *directory){
- pixmaps_directories = g_list_prepend (pixmaps_directories,
- g_strdup (directory));
-}
-*/
-
Deleted: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.h 2007-01-08 02:22:58 UTC (rev 511)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.h 2007-01-08 02:56:33 UTC (rev 512)
@@ -1,26 +0,0 @@
-/*
- * openmoko-mainmenu
- *
- * Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
- *
- * Copyright (C) 2006 First International Computer Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Public License for more details.
- *
- * Current Version: $Rev$ ($Date$) [$Author$]
- */
-
- #ifndef _MAIN_MENU_SUPPORT_H
- #define _MAIN_MENU_SUPPORT_H
-
-#include "mainmenu.h"
-
-#endif
-
More information about the commitlog
mailing list
