r3428 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
chris at sita.openmoko.org
chris at sita.openmoko.org
Wed Nov 14 18:18:18 CET 2007
Author: chris
Date: 2007-11-14 18:18:16 +0100 (Wed, 14 Nov 2007)
New Revision: 3428
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
Log:
* src/sms-main.c: (main):
* src/sms-notes.c: (page_hidden), (unmap_cb),
(sms_notes_data_func), (store_opened_cb), (sms_notes_page_new):
* src/sms.h:
Add a toggleable SMS input area
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2007-11-14 16:11:28 UTC (rev 3427)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2007-11-14 17:18:16 UTC (rev 3428)
@@ -0,0 +1,8 @@
+2007-11-14 Chris Lord <chris at openedhand.com>
+
+ * src/sms-main.c: (main):
+ * src/sms-notes.c: (page_hidden), (unmap_cb),
+ (sms_notes_data_func), (store_opened_cb), (sms_notes_page_new):
+ * src/sms.h:
+ Add a toggleable SMS input area
+
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c 2007-11-14 16:11:28 UTC (rev 3427)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c 2007-11-14 17:18:16 UTC (rev 3428)
@@ -54,10 +54,10 @@
/* Create toolbar */
toolbar = gtk_toolbar_new ();
- /* New/send button */
- data.new_send_button = gtk_tool_button_new_from_stock (GTK_STOCK_NEW);
- gtk_tool_item_set_expand (data.new_send_button, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.new_send_button, 0);
+ /* New button */
+ data.new_button = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_NEW);
+ gtk_tool_item_set_expand (data.new_button, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data.new_button, 0);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
gtk_separator_tool_item_new (), 1);
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c 2007-11-14 16:11:28 UTC (rev 3427)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c 2007-11-14 17:18:16 UTC (rev 3428)
@@ -20,6 +20,7 @@
#include "sms-notes.h"
#include <libjana-ecal/jana-ecal.h>
#include <libmokoui2/moko-finger-scroll.h>
+#include <libmokoui2/moko-search-bar.h>
#include <libhito/hito-contact-store.h>
#include <libebook/e-book.h>
@@ -71,6 +72,8 @@
{
jana_gtk_note_store_set_view (JANA_GTK_NOTE_STORE (
data->note_store), NULL);
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
+ data->new_button), FALSE);
}
static void
@@ -107,6 +110,18 @@
}
}
+static void
+new_toggled_cb (GtkToggleToolButton *button, SmsData *data)
+{
+ gboolean active = gtk_toggle_tool_button_get_active (button);
+
+ if (active)
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (
+ data->notebook), SMS_PAGE_NOTES);
+ g_object_set (data->sms_hbox, "visible", active, NULL);
+ gtk_widget_grab_focus (data->sms_textview);
+}
+
static void sms_notes_data_func (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell,
GtkTreeModel *model,
@@ -147,7 +162,8 @@
GtkWidget *
sms_notes_page_new (SmsData *data)
{
- GtkWidget *treeview, *scroll, *vbox;
+ GtkWidget *treeview, *scroll, *vbox, *searchbar,
+ *sms_vbox, *frame, *label, *button;
GtkCellRenderer *renderer;
GHashTable *colours_hash;
@@ -174,12 +190,46 @@
"Messages", renderer, (GtkTreeCellDataFunc)sms_notes_data_func,
data, NULL);
+ /* Create search bar */
+ data->notes_combo = gtk_combo_box_new_text ();
+ searchbar = moko_search_bar_new_with_combo (
+ GTK_COMBO_BOX (data->notes_combo));
+
+ /* Create text entry bits */
+ data->sms_textview = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (data->sms_textview),
+ GTK_WRAP_WORD_CHAR);
+ frame = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+ gtk_container_add (GTK_CONTAINER (frame), data->sms_textview);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_label_set_markup (GTK_LABEL (label),
+ "<small>0\n /\n 160</small>");
+
+ button = gtk_button_new_with_label ("Send");
+
+ sms_vbox = gtk_vbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (sms_vbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (sms_vbox), button, TRUE, TRUE, 0);
+
+ data->sms_hbox = gtk_hbox_new (FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (data->sms_hbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (data->sms_hbox), sms_vbox, FALSE, TRUE, 0);
+
+ gtk_widget_show_all (data->sms_hbox);
+ gtk_widget_set_no_show_all (data->sms_hbox, TRUE);
+ gtk_widget_hide (data->sms_hbox);
+
/* Pack widgets */
scroll = moko_finger_scroll_new ();
gtk_container_add (GTK_CONTAINER (scroll), treeview);
vbox = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), data->sms_hbox, FALSE, TRUE, 0);
gtk_widget_show_all (vbox);
/* Add events for detecting whether the page has been hidden/shown */
@@ -191,6 +241,10 @@
g_signal_connect (vbox, "unmap",
G_CALLBACK (unmap_cb), data);
+ /* Connect to new button toggle */
+ g_signal_connect (data->new_button, "toggled",
+ G_CALLBACK (new_toggled_cb), data);
+
jana_store_open (data->notes);
return vbox;
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h 2007-11-14 16:11:28 UTC (rev 3427)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h 2007-11-14 17:18:16 UTC (rev 3428)
@@ -34,10 +34,13 @@
GtkWidget *window;
GtkWidget *notebook;
- GtkToolItem *new_send_button;
+ GtkToolItem *new_button;
GtkToolItem *delete_all_button;
GtkToolItem *delete_button;
GtkWidget *contacts_treeview;
+ GtkWidget *notes_combo;
+ GtkWidget *sms_hbox;
+ GtkWidget *sms_textview;
gulong delete_all_handler;
gulong delete_handler;
More information about the commitlog
mailing list
