From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- calendar/gui/e-memo-table.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 0fc4821328..58f398bfb5 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -1,27 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - /* - * Author : - * Damon Chaplin - * Nathan Owens - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Damon Chaplin + * Nathan Owens + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA */ + #ifndef _E_MEMO_TABLE_H_ #define _E_MEMO_TABLE_H_ -- cgit v1.2.3 From 9515b98403f2f7ef77dc6c51f82505fccef08c2b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Sep 2008 22:53:30 +0000 Subject: Saving progress. Experimenting with directory layout. Saving progress. Experimenting with directory layout. svn path=/branches/kill-bonobo/; revision=36446 --- calendar/gui/e-memo-table.h | 90 ++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 42 deletions(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 58f398bfb5..2c31ee5b02 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -25,31 +25,43 @@ #ifndef _E_MEMO_TABLE_H_ #define _E_MEMO_TABLE_H_ -#include -#include +#include +#include #include -#include "e-activity-handler.h" #include "e-cal-model.h" -G_BEGIN_DECLS - /* * EMemoTable - displays the iCalendar objects in a table (an ETable). * Used for memo events and tasks. */ +/* Standard GObject macros */ +#define E_TYPE_MEMO_TABLE \ + (e_memo_table_get_type ()) +#define E_MEMO_TABLE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_MEMO_TABLE, EMemoTable)) +#define E_MEMO_TABLE_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_MEMO_TABLE, EMemoTableClass)) +#define E_IS_MEMO_TABLE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_MEMO_TABLE)) +#define E_IS_MEMO_TABLE_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_MEMO_TABLE)) +#define E_MEMO_TABLE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_MEMO_TABLE, EMemoTableClass)) -#define E_MEMO_TABLE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_memo_table_get_type (), EMemoTable) -#define E_MEMO_TABLE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_memo_table_get_type (), EMemoTableClass) -#define E_IS_MEMO_TABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_memo_table_get_type ()) - - -typedef struct _EMemoTable EMemoTable; -typedef struct _EMemoTableClass EMemoTableClass; +G_BEGIN_DECLS +typedef struct _EMemoTable EMemoTable; +typedef struct _EMemoTableClass EMemoTableClass; +typedef struct _EMemoTablePrivate EMemoTablePrivate; struct _EMemoTable { - GtkTable table; + GtkTable parent; /* The model that we use */ ECalModel *model; @@ -62,13 +74,12 @@ struct _EMemoTable { /* Fields used for cut/copy/paste */ icalcomponent *tmp_vcal; - /* Activity ID for the EActivityHandler (i.e. the status bar). */ - EActivityHandler *activity_handler; - guint activity_id; - - /* We should know which calendar has been used to create object, so store it here - before emitting "user_created" signal and make it NULL just after the emit. */ + /* We should know which calendar has been used to create object, + * so store it here before emitting "user_created" signal and make + * it NULL just after the emit. */ ECal *user_created_cal; + + EMemoTablePrivate *priv; }; struct _EMemoTableClass { @@ -79,34 +90,29 @@ struct _EMemoTableClass { }; -GType e_memo_table_get_type (void); -GtkWidget* e_memo_table_new (void); - -ECalModel *e_memo_table_get_model (EMemoTable *memo_table); - -ETable *e_memo_table_get_table (EMemoTable *memo_table); - -void e_memo_table_open_selected (EMemoTable *memo_table); -void e_memo_table_delete_selected (EMemoTable *memo_table); - -GSList *e_memo_table_get_selected (EMemoTable *memo_table); +GType e_memo_table_get_type (void); +GtkWidget * e_memo_table_new (EShellView *shell_view); +ECalModel * e_memo_table_get_model (EMemoTable *memo_table); +ETable * e_memo_table_get_table (EMemoTable *memo_table); +EShellView * e_memo_table_get_shell_view (EMemoTable *memo_table); +void e_memo_table_open_selected (EMemoTable *memo_table); +void e_memo_table_delete_selected (EMemoTable *memo_table); +GSList * e_memo_table_get_selected (EMemoTable *memo_table); /* Clipboard related functions */ -void e_memo_table_cut_clipboard (EMemoTable *memo_table); -void e_memo_table_copy_clipboard (EMemoTable *memo_table); -void e_memo_table_paste_clipboard (EMemoTable *memo_table); +void e_memo_table_cut_clipboard (EMemoTable *memo_table); +void e_memo_table_copy_clipboard (EMemoTable *memo_table); +void e_memo_table_paste_clipboard (EMemoTable *memo_table); /* These load and save the state of the table (headers shown etc.) to/from the given file. */ -void e_memo_table_load_state (EMemoTable *memo_table, - gchar *filename); -void e_memo_table_save_state (EMemoTable *memo_table, - gchar *filename); - -void e_memo_table_set_activity_handler (EMemoTable *memo_table, - EActivityHandler *activity_handler); -void e_memo_table_set_status_message (EMemoTable *memo_table, - const gchar *message); +void e_memo_table_load_state (EMemoTable *memo_table, + gchar *filename); +void e_memo_table_save_state (EMemoTable *memo_table, + gchar *filename); + +void e_memo_table_set_status_message (EMemoTable *memo_table, + const gchar *message); G_END_DECLS -- cgit v1.2.3 From cb78b84aecf1c011e0b013cc94a079e2dc0eabbc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 26 Sep 2008 02:42:23 +0000 Subject: Tasks and memos progress. Hoping to merge ECalendarTable and EMemoTable, or at least make EMemoTable derived from ECalendarTable. Possibly do the same with other calendar/memo class pairs. svn path=/branches/kill-bonobo/; revision=36454 --- calendar/gui/e-memo-table.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 2c31ee5b02..fcd6b6ee97 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -85,17 +85,21 @@ struct _EMemoTable { struct _EMemoTableClass { GtkTableClass parent_class; - /* Notification signals */ - void (* user_created) (EMemoTable *memo_table); + /* Signals */ + void (*open_component) (EMemoTable *memo_table, + ECalModelComponent *comp_data); + void (*popup_event) (EMemoTable *memo_table, + GdkEvent *event); + void (*status_message) (EMemoTable *memo_table, + const gchar *message); + void (*user_created) (EMemoTable *memo_table); }; - GType e_memo_table_get_type (void); GtkWidget * e_memo_table_new (EShellView *shell_view); ECalModel * e_memo_table_get_model (EMemoTable *memo_table); ETable * e_memo_table_get_table (EMemoTable *memo_table); EShellView * e_memo_table_get_shell_view (EMemoTable *memo_table); -void e_memo_table_open_selected (EMemoTable *memo_table); void e_memo_table_delete_selected (EMemoTable *memo_table); GSList * e_memo_table_get_selected (EMemoTable *memo_table); @@ -107,12 +111,9 @@ void e_memo_table_paste_clipboard (EMemoTable *memo_table); /* These load and save the state of the table (headers shown etc.) to/from the given file. */ void e_memo_table_load_state (EMemoTable *memo_table, - gchar *filename); + const gchar *filename); void e_memo_table_save_state (EMemoTable *memo_table, - gchar *filename); - -void e_memo_table_set_status_message (EMemoTable *memo_table, - const gchar *message); + const gchar *filename); G_END_DECLS -- cgit v1.2.3 From 098ea8aad8d3249d9faca5df5b4fe67b94ba660f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 29 Sep 2008 16:14:46 +0000 Subject: Get Memos to come up. Doesn't really work yet, but the widgets are all there. svn path=/branches/kill-bonobo/; revision=36491 --- calendar/gui/e-memo-table.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index fcd6b6ee97..536c545633 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -1,5 +1,4 @@ /* - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -16,7 +15,6 @@ * * Authors: * Damon Chaplin - * Nathan Owens * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * @@ -74,11 +72,6 @@ struct _EMemoTable { /* Fields used for cut/copy/paste */ icalcomponent *tmp_vcal; - /* We should know which calendar has been used to create object, - * so store it here before emitting "user_created" signal and make - * it NULL just after the emit. */ - ECal *user_created_cal; - EMemoTablePrivate *priv; }; -- cgit v1.2.3 From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 1 Oct 2008 20:56:04 +0000 Subject: Merge revisions 36016:36533 from trunk. svn path=/branches/kill-bonobo/; revision=36534 --- calendar/gui/e-memo-table.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 536c545633..e17c9506bb 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -1,4 +1,5 @@ /* + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -15,6 +16,7 @@ * * Authors: * Damon Chaplin + * Nathan Owens * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * -- cgit v1.2.3 From 253e90b8de63d9c064a0df05cf0e2e153f913474 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 3 Oct 2008 19:24:59 +0000 Subject: Tasks is working. Still need to deal with some loose ends and test it all. svn path=/branches/kill-bonobo/; revision=36551 --- calendar/gui/e-memo-table.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index e17c9506bb..12f51cb5e8 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -33,6 +33,10 @@ /* * EMemoTable - displays the iCalendar objects in a table (an ETable). * Used for memo events and tasks. + * + * XXX We should look at merging this back into ECalendarTable, or at + * least making ECalendarTable subclassable so we don't have so + * much duplicate code. */ /* Standard GObject macros */ -- cgit v1.2.3 From 5e82bdba14fba81603f3879a46b46a011db7d2e4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Oct 2008 17:30:32 +0000 Subject: Wire up status messages to include percentages if available. svn path=/branches/kill-bonobo/; revision=36692 --- calendar/gui/e-memo-table.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 12f51cb5e8..39838b4caa 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -90,7 +90,8 @@ struct _EMemoTableClass { void (*popup_event) (EMemoTable *memo_table, GdkEvent *event); void (*status_message) (EMemoTable *memo_table, - const gchar *message); + const gchar *message, + gdouble percent); void (*user_created) (EMemoTable *memo_table); }; -- cgit v1.2.3 From d6b8b58bb45b16c1cb3a575c277ffdc77441e2df Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 29 Oct 2008 20:11:07 +0000 Subject: Get the calendar's memopad and taskpad working. What's interesting here is we're actually sharing the ECalModel across views. Instead of having the Calendar view listen to GConf for changes to the Task and Memo models, the Calendar view fetches the models directly from the Task and Memo views -- starting the views if it has to, although the shell really takes care of that -- and loads the models into its own taskpad and memopad. We couldn't do that sort of thing before with Bonobo in the way. Big chunks of redundant code should begin falling out shortly. svn path=/branches/kill-bonobo/; revision=36696 --- calendar/gui/e-memo-table.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 39838b4caa..0a13006262 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -67,9 +67,6 @@ typedef struct _EMemoTablePrivate EMemoTablePrivate; struct _EMemoTable { GtkTable parent; - /* The model that we use */ - ECalModel *model; - GtkWidget *etable; /* The ECell used to view & edit dates. */ @@ -96,7 +93,8 @@ struct _EMemoTableClass { }; GType e_memo_table_get_type (void); -GtkWidget * e_memo_table_new (EShellView *shell_view); +GtkWidget * e_memo_table_new (EShellView *shell_view, + ECalModel *model); ECalModel * e_memo_table_get_model (EMemoTable *memo_table); ETable * e_memo_table_get_table (EMemoTable *memo_table); EShellView * e_memo_table_get_shell_view (EMemoTable *memo_table); -- cgit v1.2.3 From f4cf9af33ccde3142a3011e8b2dbcfb4cbc9ae81 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 20 May 2009 16:50:00 +0200 Subject: Use -no-undefined on Linux too There still left two things opened, search for KILL-BONOBO to find them. One is in calendar's Makefile.am, one in composer. --- calendar/gui/e-memo-table.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 0a13006262..421a15352f 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -26,8 +26,8 @@ #define _E_MEMO_TABLE_H_ #include -#include -#include +#include
+#include
#include "e-cal-model.h" /* -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- calendar/gui/e-memo-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 58f398bfb5..b593b9445b 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -11,7 +11,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3 From de85e3c7862100da10fe860aef2b651245a1fdbf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 1 Aug 2009 07:29:41 -0400 Subject: Replace more "config" classes with property bindings. --- calendar/gui/e-memo-table.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index f3b02e0c04..0bb79694b0 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -98,6 +98,14 @@ GtkWidget * e_memo_table_new (EShellView *shell_view, ECalModel * e_memo_table_get_model (EMemoTable *memo_table); ETable * e_memo_table_get_table (EMemoTable *memo_table); EShellView * e_memo_table_get_shell_view (EMemoTable *memo_table); +icaltimezone * e_memo_table_get_timezone (EMemoTable *memo_table); +void e_memo_table_set_timezone (EMemoTable *memo_table, + icaltimezone *timezone); +gboolean e_memo_table_get_use_24_hour_format + (EMemoTable *memo_table); +void e_memo_table_set_use_24_hour_format + (EMemoTable *memo_table, + gboolean use_24_hour_format); void e_memo_table_delete_selected (EMemoTable *memo_table); GSList * e_memo_table_get_selected (EMemoTable *memo_table); -- cgit v1.2.3 From 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 30 Aug 2009 00:48:57 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/e-memo-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/e-memo-table.h') diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h index 0bb79694b0..d7f1857374 100644 --- a/calendar/gui/e-memo-table.h +++ b/calendar/gui/e-memo-table.h @@ -99,7 +99,7 @@ ECalModel * e_memo_table_get_model (EMemoTable *memo_table); ETable * e_memo_table_get_table (EMemoTable *memo_table); EShellView * e_memo_table_get_shell_view (EMemoTable *memo_table); icaltimezone * e_memo_table_get_timezone (EMemoTable *memo_table); -void e_memo_table_set_timezone (EMemoTable *memo_table, +void e_memo_table_set_timezone (EMemoTable *memo_table, icaltimezone *timezone); gboolean e_memo_table_get_use_24_hour_format (EMemoTable *memo_table); -- cgit v1.2.3