Changeset 3918

Timestamp:

01/22/08 16:07:45 (5 years ago)

Author:

chris

Message:

• src/sms.h:
• src/sms-contacts.c: (sms_contacts_page_new): Store the MokoFingerScroll? the treeview is placed in

• src/sms-notes.c: (forward_clicked_cb): Show a contacts chooser for picking which contact to forward to

• src/sms-utils.c: (sms_contact_picker_dialog):
• src/sms-utils.h: Add a utility function to pop up a dialog with the contacts chooser from the contacts page

Location:

trunk/src/target/OM-2007.2/applications/openmoko-messages2

Files:

• ChangeLog (modified) (1 diff)
• src/sms-contacts.c (modified) (2 diffs)
• src/sms-notes.c (modified) (2 diffs)
• src/sms-utils.c (modified) (2 diffs)
• src/sms-utils.h (modified) (1 diff)
• src/sms.h (modified) (1 diff)

trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog

@@ +1 @@
+2008-01-22  Chris Lord  <chris@openedhand.com>
+
+        * src/sms.h:
+        * src/sms-contacts.c: (sms_contacts_page_new):
+        Store the MokoFingerScroll the treeview is placed in
+
+        * src/sms-notes.c: (forward_clicked_cb):
+        Show a contacts chooser for picking which contact to forward to
+
+        * src/sms-utils.c: (sms_contact_picker_dialog):
+        * src/sms-utils.h:
+        Add a utility function to pop up a dialog with the contacts chooser
+        from the contacts page
+
 2008-01-17  Chris Lord  <chris@openedhand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c

@@ -595 +595 @@
 {
         EBookQuery *qrys[(E_CONTACT_LAST_PHONE_ID-E_CONTACT_FIRST_PHONE_ID)+1];
-        GtkWidget *contacts_combo, *scroll, *vbox;
+        GtkWidget *contacts_combo, *vbox;
         GtkTreeSelection *selection;
         GtkCellRenderer *renderer;
@@ -731 +731 @@
 
         /* Pack treeview into a finger-scroll */
-        scroll = moko_finger_scroll_new ();
-        gtk_container_add (GTK_CONTAINER (scroll), data->contacts_treeview);
+        data->contacts_scroll = moko_finger_scroll_new ();
+        gtk_container_add (GTK_CONTAINER (data->contacts_scroll),
+                data->contacts_treeview);
         
         /* Pack widgets into vbox and return */
         vbox = gtk_vbox_new (FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (vbox), data->contacts_search, FALSE, TRUE, 0);
-        gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), data->contacts_search,
+                FALSE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), data->contacts_scroll,
+                TRUE, TRUE, 0);
         gtk_widget_show_all (vbox);
         

trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c

@@ -616 +616 @@
 {
         gchar *body;
-        GtkTreeIter iter;
+        GtkTreeIter iter, citer;
         GtkTreeModel *model;
-        GtkTreeSelection *selection;
+        GtkTreeSelection *selection, *cselection;
 
         /* Fill in compose box with message text and call new */
@@ -633 +633 @@
         g_free (body);
         
-        /* TODO: Launch a contact-picker */
-        
-        gtk_notebook_set_current_page (
-                GTK_NOTEBOOK (data->notebook), SMS_PAGE_COMPOSE);
+        cselection = gtk_tree_view_get_selection (
+                GTK_TREE_VIEW (data->contacts_treeview));
+        if (cselection)
+                gtk_tree_selection_get_selected (cselection, NULL, &citer);
+        
+        if (sms_contact_picker_dialog (
+            data, "Choose a contact to forward to:")) {
+                gtk_notebook_set_current_page (
+                        GTK_NOTEBOOK (data->notebook), SMS_PAGE_COMPOSE);
+        } else {
+                gtk_tree_selection_select_iter (cselection, &citer);
+        }
 }
 

trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c

@@ -22 +22 @@
 #include <string.h>
 #include <libmokoui2/moko-search-bar.h>
+#include <libmokoui2/moko-finger-scroll.h>
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -444 +445 @@
         return FALSE;
 }
+
+gboolean
+sms_contact_picker_dialog (SmsData *data, const gchar *message)
+{
+        GtkWidget *dialog, *scroll, *frame;
+        gint width, height;
+        gint result;
+        
+        dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->window),
+                GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL,
+                message);
+        gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
+        gtk_button_box_set_layout (GTK_BUTTON_BOX (
+                GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_SPREAD);
+        gtk_window_get_size (GTK_WINDOW (data->window), &width, &height);
+        gtk_window_resize (GTK_WINDOW (dialog), width * 0.85, height * 0.85);
+        
+        /* Remove the main contacts treeview from the contacts page and add it 
+         * to this dialog... Bit hacky...
+         */
+        g_object_ref (data->contacts_treeview);
+        gtk_container_remove (GTK_CONTAINER (data->contacts_treeview->parent),
+                data->contacts_treeview);
+        
+        frame = gtk_frame_new (NULL);
+        scroll = moko_finger_scroll_new ();
+        gtk_container_add (GTK_CONTAINER (scroll), data->contacts_treeview);
+        gtk_container_add (GTK_CONTAINER (frame), scroll);
+        gtk_widget_show_all (frame);
+        gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+                frame, TRUE, TRUE, 0);
+        result = gtk_dialog_run (GTK_DIALOG (dialog));
+        
+        gtk_container_remove (GTK_CONTAINER (data->contacts_treeview->parent),
+                data->contacts_treeview);
+        gtk_container_add (GTK_CONTAINER (data->contacts_scroll),
+                data->contacts_treeview);
+        g_object_unref (data->contacts_treeview);
+        
+        gtk_widget_destroy (dialog);
+        
+        return (result == GTK_RESPONSE_OK) ? TRUE : FALSE;
+}

trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h

@@ -32 +32 @@
 gboolean sms_delete_selected_contact_messages (SmsData *data);
 gboolean sms_select_contact (SmsData *data, const gchar *uid);
+gboolean sms_contact_picker_dialog (SmsData *data, const gchar *message);
 
 #endif /* SMS_UTILS_H */

trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h

@@ -70 +70 @@
         guint notes_scroll_idle;
 
+        GtkWidget *contacts_scroll;
         GtkWidget *contacts_treeview;
         GtkWidget *contacts_search;