r2014 - in trunk/src/target/OM-2007/applications/openmoko-contacts: . src
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Fri May 18 16:45:40 CEST 2007
Author: thomas
Date: 2007-05-18 16:45:38 +0200 (Fri, 18 May 2007)
New Revision: 2014
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-defs.h
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
Log:
Patch by: Neil J Patel <njp at o-hand.com>
* src/Makefile.am:
* src/contacts-callbacks-ui.c: (contacts_selection_cb):
* src/contacts-defs.h:
* src/contacts-omoko.c: (create_contacts_list),
(create_main_window):
- Adds a new page onto the main notebook, hooks up signals, and
makes contacts aware that there is a history pane.
- Creates a contacts-history-view.h/c which handles the creation
and updating of the ContactsHistory widget. It also has
connects to the 'entry-activated' signal on the history
widget.
- Adds the ContactsHistory widget, which is a self contained
vbox that uses libmokojournal to display a list of
communication with a contact-uid.
- History is displayed with the most recent first.
- Each 'preview widget' van be clicked to reveal more
information (if it exists), and clicked again to close.
- Each 'preview widget' has a tap-and-hold menu, which
allows the user to either select or activate the
current widget.
- Each 'preview widget' is theme-able.
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog 2007-05-18 14:42:09 UTC (rev 2013)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog 2007-05-18 14:45:38 UTC (rev 2014)
@@ -1,3 +1,29 @@
+2007-05-18 Thomas Wood <thomas at openedhand.com>
+
+ Patch by: Neil J Patel <njp at o-hand.com>
+
+ * src/Makefile.am:
+ * src/contacts-callbacks-ui.c: (contacts_selection_cb):
+ * src/contacts-defs.h:
+ * src/contacts-omoko.c: (create_contacts_list),
+ (create_main_window):
+ - Adds a new page onto the main notebook, hooks up signals, and
+ makes contacts aware that there is a history pane.
+ - Creates a contacts-history-view.h/c which handles the creation
+ and updating of the ContactsHistory widget. It also has
+ connects to the 'entry-activated' signal on the history
+ widget.
+ - Adds the ContactsHistory widget, which is a self contained
+ vbox that uses libmokojournal to display a list of
+ communication with a contact-uid.
+ - History is displayed with the most recent first.
+ - Each 'preview widget' van be clicked to reveal more
+ information (if it exists), and clicked again to close.
+ - Each 'preview widget' has a tap-and-hold menu, which
+ allows the user to either select or activate the
+ current widget.
+ - Each 'preview widget' is theme-able.
+
2007-05-17 Thomas Wood <thomas at openedhand.com>
* src/contacts-omoko.c: (create_main_window):
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/Makefile.am 2007-05-18 14:42:09 UTC (rev 2013)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/Makefile.am 2007-05-18 14:45:38 UTC (rev 2014)
@@ -27,7 +27,11 @@
contacts-omoko.c \
contacts-omoko.h \
contacts-groups-editor.c \
- contacts-groups-editor.h
+ contacts-groups-editor.h \
+ contacts-history-view.c \
+ contacts-history-view.h \
+ contacts-history.c \
+ contacts-history.h
contacts_LDADD = $(CONTACTS_LIBS)
contacts_LDFLAGS = @CONTACTS_LIBS@
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c 2007-05-18 14:42:09 UTC (rev 2013)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c 2007-05-18 14:45:38 UTC (rev 2014)
@@ -33,6 +33,7 @@
#include "contacts-contact-pane.h"
#include "contacts-callbacks-ebook.h"
#include "contacts-main.h"
+#include "contacts-history-view.h"
void
contacts_chooser_add_cb (GtkWidget *button, ContactsData *data)
@@ -128,17 +129,21 @@
contacts_set_available_options (data, TRUE, GPOINTER_TO_INT (data->contact), GPOINTER_TO_INT (data->contact));
- if (current_pane == CONTACTS_CONTACT_PANE)
- {
- contacts_display_summary (data->contact, data);
- }
-
- if (current_pane == CONTACTS_GROUPS_PANE)
- {
- contacts_groups_pane_update_selection (
- selection,
- data);
- }
+ switch (current_pane) {
+ case CONTACTS_CONTACT_PANE:
+ contacts_display_summary (data->contact, data);
+ break;
+ case CONTACTS_GROUPS_PANE:
+ contacts_groups_pane_update_selection (selection,
+ data);
+ break;
+ case CONTACTS_HISTORY_PANE:
+ contacts_history_pane_update_selection (selection,
+ data);
+ break;
+ default:
+ break;
+ }
}
void
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-defs.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-defs.h 2007-05-18 14:42:09 UTC (rev 2013)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-defs.h 2007-05-18 14:45:38 UTC (rev 2014)
@@ -47,7 +47,8 @@
enum {
CONTACTS_CONTACT_PANE = 0,
- CONTACTS_GROUPS_PANE
+ CONTACTS_GROUPS_PANE,
+ CONTACTS_HISTORY_PANE
};
typedef struct {
@@ -84,6 +85,7 @@
GtkWidget *preview_header_hbox;
GtkWidget *groups_vbox;
+ GtkWidget *history;
GtkWidget *add_field_button;
GtkWidget *remove_field_button;
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c 2007-05-18 14:42:09 UTC (rev 2013)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c 2007-05-18 14:45:38 UTC (rev 2014)
@@ -26,6 +26,7 @@
#include "contacts-omoko.h"
#include "contacts-groups-editor.h"
#include "contacts-callbacks-ebook.h"
+#include "contacts-history-view.h"
@@ -93,6 +94,7 @@
column = gtk_tree_view_column_new_with_attributes (_("Name"), renderer,
"text", CONTACT_NAME_COL, NULL);
gtk_tree_view_column_set_sort_column_id (column, CONTACT_NAME_COL);
+ gtk_tree_view_column_set_expand (column, TRUE);
moko_tree_view_append_column (MOKO_TREE_VIEW (treeview), column);
/* mobile column */
@@ -100,6 +102,7 @@
column = gtk_tree_view_column_new_with_attributes (_("Mobile"), renderer,
"text", CONTACT_CELLPHONE_COL, NULL);
gtk_tree_view_column_set_sort_column_id (column, CONTACT_CELLPHONE_COL);
+ gtk_tree_view_column_set_expand (column, TRUE);
moko_tree_view_append_column (MOKO_TREE_VIEW (treeview), column);
return treeview;
@@ -220,6 +223,8 @@
/* history button */
widget = GTK_WIDGET (moko_tool_box_add_action_button (MOKO_TOOL_BOX (moko_tool_box)));
moko_pixmap_button_set_center_stock (MOKO_PIXMAP_BUTTON (widget), MOKO_STOCK_HISTORY);
+ g_signal_connect (G_OBJECT (widget), "clicked",
+ G_CALLBACK (contacts_history_pane_show),contacts_data);
/* edit button */
widget = GTK_WIDGET (moko_tool_box_add_action_button (MOKO_TOOL_BOX (moko_tool_box)));
@@ -262,6 +267,12 @@
ui->groups_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (ui->groups_vbox), 12);
gtk_notebook_append_page (GTK_NOTEBOOK (ui->main_notebook), ui->groups_vbox, NULL);
+
+ /*** history mode ***/
+ ui->history = contacts_history_pane_new ();
+ gtk_notebook_append_page (GTK_NOTEBOOK (ui->main_notebook),
+ ui->history,
+ NULL);
/*** connect signals ***/
g_signal_connect ((gpointer) ui->main_window, "destroy",
More information about the commitlog
mailing list