r324 - trunk/src/target/OM-2007/applications/openmoko-taskmanager
tongsong_li at gta01.hmw-consulting.de
tongsong_li at gta01.hmw-consulting.de
Thu Dec 7 03:22:45 CET 2006
Author: tongsong_li
Date: 2006-12-07 02:22:37 +0000 (Thu, 07 Dec 2006)
New Revision: 324
Removed:
trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.h
trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.c
trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.h
trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.c
trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.h
trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro
Log:
files move to openmoko-footer application
Deleted: trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.c 2006-12-07 02:18:33 UTC (rev 323)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.c 2006-12-07 02:22:37 UTC (rev 324)
@@ -1,69 +0,0 @@
-#include "callbacks.h"
-#include "footer.h"
-#include "main.h"
-
-/* footer */
-void footer_leftbutton_clicked(GtkWidget *widget, gpointer my_data)
-{
- g_debug( "left button clicked" );
-
- GtkMessageDialog* dialog = gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(widget)),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "Display Task List Now..." );
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy(GTK_WIDGET(dialog));
-}
-
-void footer_rightbutton_clicked(GtkWidget *widget, gpointer my_data)
-{
- g_debug( "right button clicked" );
-
- GtkMessageDialog* dialog = gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(widget)),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- "Flip current/list application now..." );
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy(GTK_WIDGET(dialog));
-}
-
-/* dbus */
-DBusHandlerResult signal_filter(DBusConnection *connection, DBusMessage *message, void *user_data)
-{
- g_debug( "signal_filter called" );
- g_debug( "type of message was %d", dbus_message_get_type(message) );
- g_debug( "path of message was %s", dbus_message_get_path(message) );
- g_debug( "interface of message was %s", dbus_message_get_interface(message) );
-
- /* Application object is the user data */
- Application* app = user_data;
-
- /* A signal from the bus saying we are about to be disconnected */
- if (dbus_message_is_signal
- (message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
- /* Tell the main loop to quit */
- g_main_loop_quit(app->loop);
- /* We have handled this message, don't pass it on */
- return DBUS_HANDLER_RESULT_HANDLED;
- }
- /* A message on our interface */
- else if (dbus_message_is_signal(message, "org.openmoko.dbus.TaskManager", "push_statusbar_message")) {
- DBusError error;
- char *s;
- dbus_error_init (&error);
- if (dbus_message_get_args
- (message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) {
- g_debug("Setting status bar text to '%s", s);
- footer_set_status( app->footer, s );
- //FIXME: SIGSEGV, when uncommented. It now leaks! :M:
- //dbus_free(s);
- } else {
- g_print("Ping received, but error getting message: %s", error.message);
- dbus_error_free (&error);
- }
- return DBUS_HANDLER_RESULT_HANDLED;
- }
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
Deleted: trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.h 2006-12-07 02:18:33 UTC (rev 323)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/callbacks.h 2006-12-07 02:22:37 UTC (rev 324)
@@ -1,10 +0,0 @@
-#include <gtk/gtk.h>
-#include <dbus/dbus.h>
-#include "main.h"
-
-/* footer */
-void footer_leftbutton_clicked(GtkWidget *widget, gpointer my_data);
-void footer_rightbutton_clicked(GtkWidget *widget, gpointer my_data);
-
-/* dbus */
-DBusHandlerResult signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data);
Deleted: trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.c 2006-12-07 02:18:33 UTC (rev 323)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.c 2006-12-07 02:22:37 UTC (rev 324)
@@ -1,83 +0,0 @@
-#include "footer.h"
-
-enum {
- FOOTER_SIGNAL,
- LAST_SIGNAL
-};
-
-static void footer_class_init (FooterClass *klass);
-static void footer_init (Footer *f);
-
-static guint footer_signals[LAST_SIGNAL] = { 0 };
-
-GType footer_get_type (void) /* Typechecking */
-{
- static GType f_type = 0;
-
- if (!f_type)
- {
- static const GTypeInfo f_info =
- {
- sizeof (FooterClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) footer_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (Footer),
- 0,
- (GInstanceInitFunc) footer_init,
- };
-
- f_type = g_type_register_static(GTK_TYPE_HBOX, "Footer", &f_info, 0);
- }
-
- return f_type;
-}
-
-static void footer_class_init (FooterClass *klass) /* Class Initialization */
-{
- footer_signals[FOOTER_SIGNAL] = g_signal_new ("footer",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (FooterClass, footer),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
-
-}
-
-static void footer_init (Footer *f) /* Instance Construction */
-{
- f->leftbutton = gtk_button_new_with_label( "A" );
- gtk_box_pack_start( f, GTK_WIDGET(f->leftbutton), FALSE, FALSE, 0 );
-
- f->statusbar = gtk_statusbar_new();
- gtk_statusbar_set_has_resize_grip( f->statusbar, FALSE );
- gtk_box_pack_start( f, GTK_WIDGET(f->statusbar), TRUE, TRUE, 0 );
-
- gtk_statusbar_push( f->statusbar, 1, "Ready." );
-
- f->rightbutton = gtk_button_new_with_label( "B" );
- gtk_box_pack_start( f, GTK_WIDGET(f->rightbutton), FALSE, FALSE, 0 );
-
- gtk_widget_show( f->leftbutton );
- gtk_widget_show( f->statusbar );
- gtk_widget_show( f->rightbutton );
-}
-
-GtkWidget* footer_new() /* Construction */
-{
- return GTK_WIDGET(g_object_new(footer_get_type(), NULL));
-}
-
-void footer_clear(Footer *f) /* Destruction */
-{
-}
-
-void footer_set_status(Footer *f, const char* s)
-{
- gtk_statusbar_push( f->statusbar, 1, s );
-}
Deleted: trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.h 2006-12-07 02:18:33 UTC (rev 323)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/footer.h 2006-12-07 02:22:37 UTC (rev 324)
@@ -1,43 +0,0 @@
-#ifndef OPENMOKO_FOOTER_H
-#define OPENMOKO_FOOTER_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkbutton.h>
-
-G_BEGIN_DECLS
-
-#define FOOTER_TYPE (footer_get_type())
-#define FOOTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOOTER_TYPE, Footer))
-#define FOOTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FOOTER_TYPE, FooterClass))
-#define IS_FOOTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOOTER_TYPE))
-#define IS_FOOTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FOOTER_TYPE))
-
-typedef struct _Footer Footer;
-typedef struct _FooterClass FooterClass;
-
-struct _Footer
-{
- GtkHBox hbox;
- GtkButton* leftbutton;
- GtkStatusbar* statusbar;
- GtkButton* rightbutton;
-};
-
-struct _FooterClass
-{
- GtkHBoxClass parent_class;
- void (*footer) (Footer *f);
-};
-
-GType footer_get_type (void);
-GtkWidget* footer_new (void);
-void footer_clear (Footer *f);
-
-void footer_set_status (Footer *f, const char* s);
-
-G_END_DECLS
-
-#endif /* OPENMOKO_FOOTER_H */
Deleted: trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.c 2006-12-07 02:18:33 UTC (rev 323)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.c 2006-12-07 02:22:37 UTC (rev 324)
@@ -1,41 +0,0 @@
-#include "main.h"
-#include "callbacks.h"
-
-int main( int argc, char **argv )
-{
- Application* app = g_malloc( sizeof(Application) );
- DBusError error;
- dbus_error_init(&error);
-
- app->loop = g_main_loop_new( NULL, FALSE );
-
- // using the low-level dbus interface here to get the point across
- // final version should rather create a task manager gobject and hook
- // into the dbus-glib API
- app->bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
- if (!app->bus) {
- g_warning ("Failed to connect to the D-BUS daemon: %s", error.message);
- dbus_error_free(&error);
- return 1;
- }
-
- gtk_init (&argc, &argv);
-
- app->window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_show( app->window );
- app->footer = FOOTER(footer_new());
- gtk_container_add( GTK_CONTAINER(app->window), GTK_WIDGET(app->footer) );
- // this violates the privacy concept, but it's a demo for now...
- g_signal_connect( GTK_WIDGET(app->footer->leftbutton), "clicked", G_CALLBACK(footer_leftbutton_clicked), NULL );
- g_signal_connect( GTK_WIDGET(app->footer->rightbutton), "clicked", G_CALLBACK(footer_rightbutton_clicked), NULL );
-
- gtk_widget_show_all( GTK_WIDGET(app->footer) );
-
- dbus_connection_setup_with_g_main(app->bus, NULL);
- dbus_bus_add_match(app->bus, "type='signal',interface='org.openmoko.dbus.TaskManager'", &error );
- dbus_connection_add_filter(app->bus, signal_filter, app, NULL );
-
- g_main_loop_run( app->loop );
- g_free( app );
- return 0;
-}
Deleted: trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.h 2006-12-07 02:18:33 UTC (rev 323)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/main.h 2006-12-07 02:22:37 UTC (rev 324)
@@ -1,17 +0,0 @@
-#ifndef MYAPP_MAIN_H
-#define MYAPP_MAIN_H
-
-#include "footer.h"
-#include <glib/gmain.h>
-#include <dbus/dbus.h>
-#include <gtk/gtkwidget.h>
-
-/* Types */
-typedef struct _Application {
- DBusConnection* bus;
- GMainLoop* loop;
- GtkWidget* window;
- Footer* footer;
-} Application;
-
-#endif /* MAIN_H */
Deleted: trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro 2006-12-07 02:18:33 UTC (rev 323)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/openmoko-taskmanager.pro 2006-12-07 02:22:37 UTC (rev 324)
@@ -1,10 +0,0 @@
-HEADERS = footer.h callbacks.h main.h
-SOURCES = footer.c callbacks.c main.c
-
-PKGCONFIG += gtk+-2.0 dbus-glib-1
-
-SERVICES = services.xml
-
-DEFINES += DBUS_API_SUBJECT_TO_CHANGE
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
More information about the commitlog
mailing list
