r1452 - trunk/src/target/OM-2007/applications/openmoko-messages/src
alex_tang at sita.openmoko.org
alex_tang at sita.openmoko.org
Wed Mar 21 09:29:44 CET 2007
Author: alex_tang
Date: 2007-03-21 09:29:35 +0100 (Wed, 21 Mar 2007)
New Revision: 1452
Modified:
trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c
trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.h
Log:
Create a new message membership window instread of hide the original
Remove some compile warnings
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c 2007-03-21 03:43:11 UTC (rev 1451)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c 2007-03-21 08:29:35 UTC (rev 1452)
@@ -22,6 +22,7 @@
#include "detail-area.h"
#include <gtk/gtk.h>
#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
void
send_signal_to_footer (DBusConnection* bus, gchar* message_str)
@@ -39,9 +40,7 @@
dbus_message_append_args (message,
DBUS_TYPE_STRING, &message_str,
DBUS_TYPE_INVALID);
- g_debug("begin send message");
dbus_connection_send (bus, message, NULL);
- g_debug("end send message");
dbus_message_unref (message);
}
@@ -65,10 +64,8 @@
gboolean cb_filter_changed(GtkWidget* widget, gchar* text, MessengerData* d)
{
- //g_debug("changed to %s folder",text);
d->currentfolder = g_strdup(text);
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(d->filter));
- g_debug("folder %s has %d messages",text,get_model_number(d));
gchar* str = g_strdup_printf("folder %s has %d messages",text,get_model_number(d));
send_signal_to_footer(d->bus,str);
@@ -107,7 +104,7 @@
gtk_widget_set_size_request (nfBox, 480, -1);
GtkWidget* nfAlign = gtk_alignment_new (0,0,1,1);
gtk_alignment_set_padding (GTK_ALIGNMENT(nfAlign), 100, 0, 30, 10);
- moko_dialog_window_set_title (d->nfWin, "New Folder");
+ moko_dialog_window_set_title ( MOKO_DIALOG_WINDOW(d->nfWin), "New Folder");
GtkWidget* nfLabel = gtk_label_new ("Please input new folder name:");
gtk_misc_set_alignment (GTK_MISC(nfLabel),0,0.5);
@@ -125,7 +122,7 @@
gtk_container_add (GTK_CONTAINER(nfAlign),nfBox);
- moko_dialog_window_set_contents (d->nfWin, nfAlign);
+ moko_dialog_window_set_contents (MOKO_DIALOG_WINDOW(d->nfWin), nfAlign);
g_signal_connect (G_OBJECT(nfConfirmBtn),
"clicked",
G_CALLBACK(cb_nfBtn_clicked),
@@ -273,11 +270,10 @@
void cb_mmitem_activate (GtkMenuItem* item, MessengerData* d)
{
g_debug ("message membership");
- if (d->mmWin == NULL)
- d->mmWin = sms_membership_window_new();
+ d->mmWin = sms_membership_window_new();
gtk_window_set_decorated (GTK_WINDOW(d->mmWin), FALSE);
- sms_membership_window_set_menubox (SMS_MEMBERSHIP_WINDOW(d->mmWin), d->folderlist);
sms_membership_window_set_messages (SMS_MEMBERSHIP_WINDOW(d->mmWin), d->liststore);
+ sms_membership_window_set_menubox (SMS_MEMBERSHIP_WINDOW(d->mmWin), d->folderlist);
sms_membership_window_show ( SMS_MEMBERSHIP_WINDOW(d->mmWin) );
}
@@ -302,7 +298,7 @@
}
}
d->filtmenu = reload_filter_menu (d,d->folderlist);
- MokoMenuBox* menubox = moko_paned_window_get_menubox( d->window );
+ MokoMenuBox* menubox = (MokoMenuBox*)moko_paned_window_get_menubox( MOKO_PANED_WINDOW(d->window) );
g_signal_connect( G_OBJECT(menubox), "filter_changed", G_CALLBACK(cb_filter_changed), d );
moko_menu_box_set_filter_menu(menubox, GTK_MENU(d->filtmenu));
gtk_widget_show_all (GTK_WIDGET(menubox));
@@ -346,7 +342,7 @@
gtk_widget_set_size_request (frBox, 480, -1);
GtkWidget* frAlign = gtk_alignment_new (0,0,1,1);
gtk_alignment_set_padding (GTK_ALIGNMENT(frAlign), 100, 0, 30, 10);
- moko_dialog_window_set_title (d->frWin, "Folder Rename");
+ moko_dialog_window_set_title (MOKO_DIALOG_WINDOW(d->frWin), "Folder Rename");
GtkWidget* menuitem = gtk_menu_get_attach_widget (GTK_MENU(d->filtmenu));
GtkWidget* menulabel = GTK_BIN(menuitem)->child;
@@ -365,7 +361,7 @@
gtk_box_pack_start (GTK_BOX(frBox), hbox, FALSE, TRUE, 0);
gtk_container_add (GTK_CONTAINER(frAlign),frBox);
- moko_dialog_window_set_contents (d->frWin, frAlign);
+ moko_dialog_window_set_contents (MOKO_DIALOG_WINDOW(d->frWin), frAlign);
g_signal_connect (G_OBJECT(frConfirmBtn),
"clicked",
G_CALLBACK(cb_frBtn_clicked),
@@ -385,7 +381,7 @@
g_debug ("new folder %s",folder);
d->folderlist = g_slist_append (d->folderlist,folder);
d->filtmenu = reload_filter_menu (d,d->folderlist);
- MokoMenuBox* menubox = moko_paned_window_get_menubox( d->window );
+ MokoMenuBox* menubox = (MokoMenuBox*)moko_paned_window_get_menubox( d->window );
g_signal_connect( G_OBJECT(menubox), "filter_changed", G_CALLBACK(cb_filter_changed), d );
moko_menu_box_set_filter_menu(menubox,GTK_MENU(d->filtmenu));
gtk_widget_show_all (GTK_WIDGET(menubox));
@@ -412,7 +408,7 @@
}
d->filtmenu = reload_filter_menu (d,d->folderlist);
- MokoMenuBox* menubox = moko_paned_window_get_menubox( d->window );
+ MokoMenuBox* menubox = (MokoMenuBox*)moko_paned_window_get_menubox( MOKO_PANED_WINDOW(d->window) );
g_signal_connect( G_OBJECT(menubox), "filter_changed", G_CALLBACK(cb_filter_changed), d );
moko_menu_box_set_filter_menu(menubox,GTK_MENU(d->filtmenu));
@@ -438,12 +434,13 @@
for( c =d->folderlist; c; c=g_slist_next(c)) {
if(!g_strcasecmp((gchar*)c->data, oldName)) {
- d->folderlist = g_slist_remove (d->folderlist, c->data); break;
+ d->folderlist = g_slist_remove (d->folderlist, c->data);
+ break;
}
}
d->filtmenu = reload_filter_menu (d,d->folderlist);
- MokoMenuBox* menubox = moko_paned_window_get_menubox( d->window );
+ MokoMenuBox* menubox = (MokoMenuBox*)moko_paned_window_get_menubox( MOKO_PANED_WINDOW(d->window) );
g_signal_connect( G_OBJECT(menubox), "filter_changed", G_CALLBACK(cb_filter_changed), d );
moko_menu_box_set_filter_menu(menubox,GTK_MENU(d->filtmenu));
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c 2007-03-21 03:43:11 UTC (rev 1451)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/detail-area.c 2007-03-21 08:29:35 UTC (rev 1452)
@@ -31,7 +31,6 @@
#define DETAIL_AREA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DETAIL_AREA, DetailAreaPrivate))
typedef struct _DetailAreaPrivate{
-
} DetailAreaPrivate;
/* parent class pointer */
@@ -99,8 +98,9 @@
GtkWidget* detail_area_get_notebook(DetailArea* self)
{
- return self->notebook;
+ return GTK_WIDGET(self->notebook);
}
+
GtkWidget* detail_area_mode_edit (DetailArea* self)
{
/* create detail box */
@@ -109,8 +109,8 @@
/* create tool box */
self->toolbox = GTK_HBOX(gtk_hbox_new(FALSE,0));
- MokoToolBox* mokobox = MOKO_TOOL_BOX(moko_tool_box_new());
- GtkHBox* toolbox = moko_tool_box_get_button_box(mokobox);
+ MokoToolBox* mokobox = (MokoToolBox*)MOKO_TOOL_BOX(moko_tool_box_new());
+ GtkHBox* toolbox = moko_tool_box_get_button_box(MOKO_TOOL_BOX(mokobox));
editAttributes->sendBtn = gtk_button_new_with_label("Send");
gtk_box_pack_start( GTK_BOX(toolbox), GTK_WIDGET(editAttributes->sendBtn), FALSE, FALSE, 0 );
editAttributes->addrBtn = gtk_button_new_with_label("Address");
@@ -157,7 +157,7 @@
/* create tool box */
self->toolbox = GTK_HBOX(gtk_hbox_new(FALSE,0));
MokoToolBox* mokobox = MOKO_TOOL_BOX(moko_tool_box_new());
- GtkHBox* toolbox = moko_tool_box_get_button_box(mokobox);
+ GtkHBox* toolbox = moko_tool_box_get_button_box(MOKO_TOOL_BOX(mokobox));
GtkWidget* button = gtk_button_new_with_label("Send");
gtk_box_pack_start( GTK_BOX(toolbox), GTK_WIDGET(button), FALSE, FALSE, 0 );
button = gtk_button_new_with_label("Attach");
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c 2007-03-21 03:43:11 UTC (rev 1451)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c 2007-03-21 08:29:35 UTC (rev 1452)
@@ -22,6 +22,8 @@
#include <fcntl.h>
#include <errno.h>
#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
#include "main.h"
#include "foldersdb.h"
@@ -138,6 +140,7 @@
/* application menu */
d->menu = gtk_menu_new();
+ gtk_widget_show (d->menu);
d->mmitem = gtk_menu_item_new_with_label( "Message Membership" );
d->fnitem = gtk_menu_item_new_with_label( "Folder Rename" );
GtkWidget* accountitem = gtk_menu_item_new_with_label( "Account" );
@@ -157,6 +160,7 @@
/* filter menu */
d->filtmenu = gtk_menu_new();
+ gtk_widget_show (d->filtmenu);
d->folderlist = foldersdb_get_folders( d->foldersdb );
d->filtmenu = reload_filter_menu( d, d->folderlist );
@@ -184,7 +188,9 @@
/* set tool bar */
d->toolbox = moko_tool_box_new_with_search();
+ gtk_widget_show (d->toolbox);
GtkWidget* searchEntry = GTK_WIDGET (moko_tool_box_get_entry (MOKO_TOOL_BOX(d->toolbox)));
+ gtk_widget_show (searchEntry);
g_signal_connect( G_OBJECT(searchEntry), "changed", G_CALLBACK(cb_search_entry_changed), d );
g_signal_connect_swapped ( G_OBJECT(d->toolbox), "searchbox_visible", G_CALLBACK(cb_search_on), d );
g_signal_connect_swapped( G_OBJECT(d->toolbox), "searchbox_invisible", G_CALLBACK(cb_search_off), d );
@@ -368,8 +374,8 @@
{
d->details = detail_area_new();
gtk_widget_show (d->details);
- gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(d->details), detail_area_get_notebook(d->details));
- moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(moko_details_window_put_in_box(d->details)));
+ gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(d->details), detail_area_get_notebook(DETAIL_AREA(d->details)));
+ moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(moko_details_window_put_in_box(DETAIL_AREA(d->details))));
}
void main_quit(GtkMenuItem* item, MessengerData* d)
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h 2007-03-21 03:43:11 UTC (rev 1451)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h 2007-03-21 08:29:35 UTC (rev 1452)
@@ -26,7 +26,7 @@
#include <libmokoui/moko-tree-view.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtktreemodelfilter.h>
-//#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib.h>
#include <dbus/dbus.h>
#include "foldersdb.h"
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c 2007-03-21 03:43:11 UTC (rev 1451)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-dialog-window.c 2007-03-21 08:29:35 UTC (rev 1452)
@@ -153,7 +153,7 @@
static void
sms_dialog_window_init(SmsDialogWindow* self)
{
- MokoWindow* parent = moko_application_get_main_window( moko_application_get_instance() );
+ MokoWindow* parent = (MokoWindow*)moko_application_get_main_window( moko_application_get_instance() );
if ( parent )
{
gtk_window_set_transient_for( GTK_WINDOW(self), GTK_WINDOW(parent) );
@@ -195,8 +195,8 @@
if ( !priv->vbox )
{
GtkWidget* image;
- MokoPixmapButton* smsSendBtn;
- MokoPixmapButton* emailBtn;
+ GtkWidget* smsSendBtn;
+ GtkWidget* emailBtn;
priv->vbox = gtk_vbox_new( FALSE, 0 );
gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(priv->eventbox), FALSE, FALSE, 0 );
@@ -204,7 +204,7 @@
//Add toolbox
priv->hbox = gtk_hbox_new( FALSE, 0 );
priv->toolbox = moko_tool_box_new();
- GtkHBox* btnBox = moko_tool_box_get_button_box (MOKO_TOOL_BOX(priv->toolbox));
+ GtkWidget* btnBox = moko_tool_box_get_button_box (MOKO_TOOL_BOX(priv->toolbox));
priv->closebutton = moko_pixmap_button_new();
image = gtk_image_new_from_file (PKGDATADIR "/Cancel.png");
moko_pixmap_button_set_center_image ( MOKO_PIXMAP_BUTTON(priv->closebutton),image);
@@ -281,9 +281,9 @@
}
if ( !priv->vbox ){
GtkWidget* image;
- MokoPixmapButton* smsSendBtn;
- MokoPixmapButton* emailBtn;
- MokoPixmapButton* attachBtn;
+ GtkWidget* smsSendBtn;
+ GtkWidget* emailBtn;
+ GtkWidget* attachBtn;
priv->vbox = gtk_vbox_new( FALSE, 0 );
gtk_box_pack_start( GTK_BOX(priv->vbox), GTK_WIDGET(priv->eventbox), FALSE, FALSE, 0 );
@@ -291,7 +291,7 @@
//Add toolbox
priv->hbox = gtk_hbox_new( FALSE, 0 );
priv->toolbox = moko_tool_box_new();
- GtkHBox* btnBox = moko_tool_box_get_button_box (MOKO_TOOL_BOX(priv->toolbox));
+ GtkWidget* btnBox = moko_tool_box_get_button_box (MOKO_TOOL_BOX(priv->toolbox));
priv->closebutton = moko_pixmap_button_new();
image = gtk_image_new_from_file (PKGDATADIR "/Cancel.png");
moko_pixmap_button_set_center_image ( MOKO_PIXMAP_BUTTON(priv->closebutton),image);
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c 2007-03-21 03:43:11 UTC (rev 1451)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c 2007-03-21 08:29:35 UTC (rev 1452)
@@ -55,7 +55,6 @@
GtkTreeModel* filter;
GtkWidget* view;
GtkListStore* liststore;
- gchar* currentfolder;
GSList* rdoBtnList;
};
@@ -67,7 +66,7 @@
gboolean destroyed;
} SmsMembershipRunInfo;
-/*static void sms_membership_window_close(SmsMembershipWindow* self);*/
+static void sms_membership_window_close(SmsMembershipWindow* self);
/*static void
shutdown_loop (SmsMembershipRunInfo *ri)
@@ -124,18 +123,12 @@
{
g_debug("changed to %s folder",text);
SmsMembershipWindowPrivate* priv = SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(self);
- priv->currentfolder = g_strdup(text);
+ self->currentfolder = g_strdup(text);
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(priv->filter));
return FALSE;
}
-void sms_membership_hide (GtkButton* closebutton, SmsMembershipWindow* self)
-{
- GtkWidget *widget = GTK_WIDGET(self);
- gtk_widget_hide (widget);
-}
-
void sms_membership_window_show (SmsMembershipWindow* self){
GtkWidget *widget = GTK_WIDGET(self);
gtk_widget_show (widget);
@@ -144,7 +137,7 @@
static void
sms_membership_window_init(SmsMembershipWindow* self)
{
- MokoWindow* parent = moko_application_get_main_window( moko_application_get_instance() );
+ MokoWindow* parent = (MokoWindow*)moko_application_get_main_window( moko_application_get_instance() );
if ( parent )
{
gtk_window_set_transient_for( GTK_WINDOW(self), GTK_WINDOW(parent) );
@@ -155,7 +148,7 @@
}
SmsMembershipWindowPrivate* priv = SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(self);
- priv->currentfolder = g_strdup("Inbox");
+ self->currentfolder = g_strdup("Inbox");
//Set title
priv->liststore = NULL;
priv->vbox = gtk_vbox_new( FALSE, 0 );
@@ -215,14 +208,13 @@
gtk_widget_show_all( GTK_WIDGET(priv->vbox) );
gtk_container_add( GTK_CONTAINER(self), GTK_WIDGET(priv->vbox) );
- g_signal_connect( G_OBJECT(priv->closebutton), "clicked", G_CALLBACK(sms_membership_hide), self );
+ g_signal_connect_swapped ( G_OBJECT(priv->closebutton), "clicked", G_CALLBACK(sms_membership_window_close), self );
g_signal_connect( G_OBJECT(priv->menubox), "filter_changed", G_CALLBACK(membership_filter_changed), self );
}
void membeship_rdo_btn_clicked ( GtkButton* button, SmsMembershipWindow* self)
{
- g_debug (gtk_button_get_label(button));
GtkTreeModel* model;
GtkTreeIter iter;
GtkTreeIter childiter;
@@ -235,9 +227,9 @@
gchar* folder;
gtk_tree_model_get (model, &iter, COLUMN_FOLDER, &folder, -1);
g_debug ("folder is %s",folder);
+ self->currentfolder = g_strdup(folder);
gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(priv->filter),&childiter,&iter);
gtk_list_store_set(priv->liststore, &childiter, COLUMN_FOLDER, gtk_button_get_label(button), -1);
- g_debug (gtk_button_get_label(button));
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(priv->filter));
}
}
@@ -293,9 +285,7 @@
if (!GTK_IS_ALIGNMENT(priv->radioAlign)){
g_debug("Should be the first fime");
priv->radioAlign = GTK_ALIGNMENT(gtk_alignment_new (0.5, 0.5, 1, 1));
- gtk_alignment_set_padding (priv->radioAlign, 5, 5, 30, 5);
- //if (priv->radioBtnBox != NULL)
- // gtk_container_remove( GTK_CONTAINER(alignment), GTK_WIDGET(priv->radioBtnBox) );
+ gtk_alignment_set_padding (GTK_ALIGNMENT(priv->radioAlign), 5, 5, 30, 5);
priv->radioBtnBox = rdobtnbox;
gtk_container_add( GTK_CONTAINER(priv->radioAlign), GTK_WIDGET(priv->radioBtnBox) );
gtk_box_pack_start (GTK_BOX (priv->folderbox), GTK_WIDGET(priv->radioAlign), FALSE, FALSE, 0);
@@ -361,10 +351,9 @@
gboolean membership_filter_visible_function (GtkTreeModel* model, GtkTreeIter* iter, SmsMembershipWindow* self)
{
gchar* folder;
- SmsMembershipWindowPrivate* priv = SMS_MEMBERSHIP_WINDOW_GET_PRIVATE(self);
gtk_tree_model_get (model, iter, COLUMN_FOLDER, &folder, -1);
- g_debug ("message folder %s, current folder %s", folder, priv->currentfolder);
- if(!g_strcasecmp(folder,priv->currentfolder))
+
+ if(!g_strcasecmp(folder,self->currentfolder))
return TRUE;
else
return FALSE;
@@ -397,7 +386,7 @@
gtk_tree_view_column_set_attributes(column, ren, "text", COLUMN_FROM, NULL);
/* Bold if UNREAD */
- gtk_tree_view_column_set_cell_data_func (column, ren, membership_cell_data_func, liststore, NULL);
+ gtk_tree_view_column_set_cell_data_func (column, ren, membership_cell_data_func, priv->liststore, NULL);
moko_tree_view_append_column( MOKO_TREE_VIEW(priv->view), column );
ren = gtk_cell_renderer_text_new();
Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.h 2007-03-21 03:43:11 UTC (rev 1451)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.h 2007-03-21 08:29:35 UTC (rev 1452)
@@ -43,6 +43,7 @@
typedef struct {
MokoWindow parent;
+ gchar* currentfolder;
} SmsMembershipWindow;
typedef struct {
More information about the commitlog
mailing list
