Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1280

Timestamp:

11/30/06 10:49:02

Author:

pvanhoof

Message:

Renamed TnyGtkAccountTreeModel? to TnyGtkFolderStoreTreeModel

Files:

trunk/bindings/python/Makefile.am (modified) (1 diff)
trunk/bindings/python/tinymailui-gtk.defs.extra (modified) (1 diff)
trunk/bindings/python/tinymailui-gtk.override (modified) (1 diff)
trunk/docs/devel/reference/libtinymail-docs.sgml (modified) (2 diffs)
trunk/docs/devel/reference/tmpl/tny-gtk-folder-store-tree-model-iterator-priv.sgml (moved) (moved from trunk/docs/devel/reference/tmpl/tny-gtk-account-tree-model-iterator-priv.sgml)
trunk/docs/devel/reference/tmpl/tny-gtk-folder-store-tree-model-priv.sgml (moved) (moved from trunk/docs/devel/reference/tmpl/tny-gtk-account-tree-model-priv.sgml)
trunk/docs/devel/reference/tmpl/tny-gtk-folder-store-tree-model.sgml (moved) (moved from trunk/docs/devel/reference/tmpl/tny-gtk-account-tree-model.sgml) (7 diffs)
trunk/libtinymail-test/tny-list-test.c (modified) (2 diffs)
trunk/libtinymailui-gtk/Makefile.am (modified) (2 diffs)
trunk/libtinymailui-gtk/tny-gtk-account-tree-model-iterator-priv.h (deleted)
trunk/libtinymailui-gtk/tny-gtk-account-tree-model-iterator.c (deleted)
trunk/libtinymailui-gtk/tny-gtk-account-tree-model.c (deleted)
trunk/libtinymailui-gtk/tny-gtk-account-tree-model.h (deleted)
trunk/libtinymailui-gtk/tny-gtk-enums.h (modified) (1 diff)
trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model-iterator-priv.h (added)
trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model-iterator.c (added)
trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (added)
trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h (added)
trunk/tinymail/tny-demoui-summary-view.c (modified) (7 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/bindings/python/Makefile.am

r1279	r1280
139	139	tinymailui_gtk_h_files = \
140	140	$(top_srcdir)/libtinymailui-gtk/tny-gtk-account-list-model.h \
141		$(top_srcdir)/libtinymailui-gtk/tny-gtk-~~account~~-tree-model.h \
	141	$(top_srcdir)/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h \
142	142	$(top_srcdir)/libtinymailui-gtk/tny-gtk-attach-list-model.h \
143	143	$(top_srcdir)/libtinymailui-gtk/tny-gtk-attachment-mime-part-view.h \

trunk/bindings/python/tinymailui-gtk.defs.extra

r871	r1280
30	30	)
31	31
32		(define-enum Gtk~~Account~~TreeModelColumn
	32	(define-enum GtkFolderStoreTreeModelColumn
33	33	(in-module "Tny")
34		(c-name "TnyGtk~~Account~~TreeModelColumn")
35		(gtype-id "TNY_TYPE_GTK_~~ACCOUNT~~_TREE_MODEL_COLUMN")
	34	(c-name "TnyGtkFolderStoreTreeModelColumn")
	35	(gtype-id "TNY_TYPE_GTK_FOLDER_STORE_TREE_MODEL_COLUMN")
36	36	(values
37		'("name" "TNY_GTK_~~ACCOUNT~~_TREE_MODEL_NAME_COLUMN")
38		'("unread" "TNY_GTK_~~ACCOUNT~~_TREE_MODEL_UNREAD_COLUMN")
39		'("type" "TNY_GTK_~~ACCOUNT~~_TREE_MODEL_TYPE_COLUMN")
40		'("instance" "TNY_GTK_~~ACCOUNT~~_TREE_MODEL_INSTANCE_COLUMN")
41		'("n" "TNY_GTK_~~ACCOUNT~~_TREE_MODEL_N_COLUMNS")
	37	'("name" "TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN")
	38	'("unread" "TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN")
	39	'("type" "TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN")
	40	'("instance" "TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN")
	41	'("n" "TNY_GTK_FOLDER_STORE_TREE_MODEL_N_COLUMNS")
42	42	)
43	43	)

trunk/bindings/python/tinymailui-gtk.override

r1279	r1280
10	10
11	11	#include <tny-gtk-account-list-model.h>
12		#include <tny-gtk-~~account~~-tree-model.h>
	12	#include <tny-gtk-folder-store-tree-model.h>
13	13	#include <tny-gtk-attach-list-model.h>
14	14	#include <tny-gtk-attachment-mime-part-view.h>

trunk/docs/devel/reference/libtinymail-docs.sgml

r1279	r1280
47	47	<!ENTITY libtinymailui-gtk-TnyGtkAttachmentMimePartView SYSTEM "xml/tny-gtk-attachment-mime-part-view.xml">
48	48	<!ENTITY libtinymailui-gtk-TnyGtkEnums SYSTEM "xml/tny-gtk-enums.xml">
49		<!ENTITY libtinymailui-gtk-TnyGtk~~AccountTreeModel SYSTEM "xml/tny-gtk-account~~-tree-model.xml">
	49	<!ENTITY libtinymailui-gtk-TnyGtkFolderStoreTreeModel SYSTEM "xml/tny-gtk-folder-store-tree-model.xml">
50	50	<!ENTITY libtinymailui-gtk-TnyGtkAccountListModel SYSTEM "xml/tny-gtk-account-list-model.xml">
51	51	<!ENTITY libtinymailui-gtk-TnyGtkAttachListModel SYSTEM "xml/tny-gtk-attach-list-model.xml">
…	…
148	148	&libtinymailui-gtk-TnyGtkMsgWindow;
149	149	&libtinymailui-gtk-TnyGtkHeaderView;
150		&libtinymailui-gtk-TnyGtk~~Account~~TreeModel;
	150	&libtinymailui-gtk-TnyGtkFolderStoreTreeModel;
151	151	&libtinymailui-gtk-TnyGtkAccountListModel;
152	152	&libtinymailui-gtk-TnyGtkHeaderListModel;

trunk/docs/devel/reference/tmpl/tny-gtk-folder-store-tree-model.sgml

r1278	r1280
1	1	<!-- ##### SECTION Title ##### -->
2		TnyGtk~~Account~~TreeModel
	2	TnyGtkFolderStoreTreeModel
3	3
4	4	<!-- ##### SECTION Short_Description ##### -->
5		A tree model for ~~account~~ instances that lets a tree view show folders recursively
	5	A tree model for folder store instances that lets a tree view show folders recursively
6	6
7	7	<!-- ##### SECTION Long_Description ##### -->
8	8	<para>
9		A #GtkTreeModel implementation for storing #Tny~~StoreAccount~~ instances.
	9	A #GtkTreeModel implementation for storing #TnyFolderStore instances.
10	10	</para>
11	11	<para>
12	12	The implementation inherits the #GtkTreeStore, implements #GtkTreeModel and #TnyList.
13		It recursively walks the folders of account instances that get added. Using it as
14		a model for a #GtkTreeView will display both the account name as parent row with the
15		account's folders as the child rows and the folder's child folders as sub-child rows.
	13	It recursively walks the folders of folder store instances that get added. Using it as
	14	a model for a #GtkTreeView it will display both the account name as parent row, in case
	15	the folder store being added is of type #TnyAccount, with the account's folders as the
	16	child rows and the folder's child folders as sub-child rows.
16	17	</para>
17	18	<para>
…	…
20	21	TnyFolder *folder;
21	22	gtk_tree_model_get (model, &iter,
22		TNY_~~ACCOUNT~~_TREE_MODEL_INSTANCE_COLUMN,
	23	TNY_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
23	24	&folder, -1);
24	25	/* use folder */
…	…
29	30	</para>
30	31	<para>
31		Using the TNY_GTK_~~ACCOUNT~~_TREE_MODEL_TYPE_COLUMN you can know what type of instance you will
32		get when using the TNY_~~ACCOUNT~~_TREE_MODEL_INSTANCE_COLUMN. If its value isn't
	32	Using the TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN you can know what type of instance you will
	33	get when using the TNY_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN. If its value isn't
33	34	TNY_FOLDER_TYPE_ROOT, the instance type will be a #TnyFolder , if it is the instance type
34	35	will be a #TnyAccount. Read more about the available columns and folders-types at the
35		#TnyGtk~~Account~~TreeModelColumn, the #TnyFolderType and the #TnyFolder types.
	36	#TnyGtkFolderStoreTreeModelColumn, the #TnyFolderType and the #TnyFolder types.
36	37	</para>
37	38	<para>
…	…
40	41	TnyFolderType type;
41	42	gtk_tree_model_get (model, &iter,
42		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_TYPE_COLUMN,
	43	TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
43	44	&type, -1);
44	45	if (type != TNY_FOLDER_TYPE_ROOT)
…	…
46	47	TnyFolder *folder;
47	48	gtk_tree_model_get (model, &iter,
48		TNY_~~ACCOUNT~~_TREE_MODEL_INSTANCE_COLUMN,
	49	TNY_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
49	50	&folder, -1);
50	51	/* use folder */
…	…
53	54	TnyAccount *account;
54	55	gtk_tree_model_get (model, &iter,
55		TNY_~~ACCOUNT~~_TREE_MODEL_INSTANCE_COLUMN,
	56	TNY_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
56	57	&account, -1);
57	58	/* use account */
…	…
63	64	<!-- ##### SECTION See_Also ##### -->
64	65	<para>
65		#TnyList, #TnyStoreAccount, #GtkTreeView, #GtkTreeStore, #GtkTreeModel, #TnyGtkAccountTreeModelColumn
	66	#TnyList, #TnyStoreAccount, #TnyFolderStore, #GtkTreeView, #GtkTreeStore, #GtkTreeModel, #TnyGtkAccountTreeModelColumn
66	67	</para>
67	68

trunk/libtinymail-test/tny-list-test.c

r1203	r1280
24	24	#include <tny-gtk-account-list-model.h>
25	25	#include <tny-gtk-attach-list-model.h>
26		#include <tny-gtk-~~account~~-tree-model.h>
	26	#include <tny-gtk-folder-store-tree-model.h>
27	27	#include <tny-gtk-folder-tree-model.h>
28	28	#include <tny-gtk-header-list-model.h>
…	…
46	46	tny_list_test_setup (void)
47	47	{
48
49		CamelInternetAddress *addr = camel_internet_address_new ();
	48	CamelInternetAddress *addr = camel_internet_address_new ();
50	49	camel_object_unref (CAMEL_OBJECT (addr));
51	50
52		ifaces[0] = tny_simple_list_new ();
53		ifaces[1] = TNY_LIST (tny_gtk_account_list_model_new ());
	51	ifaces[0] = tny_simple_list_new ();
	52	ifaces[1] = TNY_LIST (tny_gtk_account_list_model_new ());
54	53	ifaces[2] = TNY_LIST (tny_gtk_attach_list_model_new ());
55		ifaces[3] = TNY_LIST (tny_gtk_~~account~~_tree_model_new (FALSE, NULL));
56		ifaces[4] = TNY_LIST (tny_gtk_~~account~~_tree_model_new (TRUE, NULL));
	54	ifaces[3] = TNY_LIST (tny_gtk_folder_store_tree_model_new (FALSE, NULL));
	55	ifaces[4] = TNY_LIST (tny_gtk_folder_store_tree_model_new (TRUE, NULL));
57	56	ifaces[5] = TNY_LIST (tny_gtk_header_list_model_new ());
58
	57
59	58	return;
60	59	}

trunk/libtinymailui-gtk/Makefile.am

r1279	r1280
18	18	tny-gtk-header-list-model.h \
19	19	tny-gtk-account-list-model.h \
20		tny-gtk-~~account~~-tree-model.h \
	20	tny-gtk-folder-store-tree-model.h \
21	21	tny-gtk-attach-list-model.h \
22	22	tny-gtk-text-buffer-stream.h \
…	…
30	30	tny-gtk-attachment-mime-part-view.c \
31	31	tny-gtk-msg-window.c \
32		tny-gtk-~~account~~-tree-model.c \
33		tny-gtk-~~account~~-tree-model-iterator-priv.h \
34		tny-gtk-~~account~~-tree-model-iterator.c \
	32	tny-gtk-folder-store-tree-model.c \
	33	tny-gtk-folder-store-tree-model-iterator-priv.h \
	34	tny-gtk-folder-store-tree-model-iterator.c \
35	35	tny-gtk-header-list-iterator-priv.h \
36	36	tny-gtk-header-list-model.c \

trunk/libtinymailui-gtk/tny-gtk-enums.h

r941	r1280
27	27
28	28	typedef enum {
29		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_NAME_COLUMN,
30		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_UNREAD_COLUMN,
31		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_TYPE_COLUMN,
32		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_INSTANCE_COLUMN,
33		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_N_COLUMNS
34		} TnyGtk~~Account~~TreeModelColumn;
	29	TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
	30	TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN,
	31	TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
	32	TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
	33	TNY_GTK_FOLDER_STORE_TREE_MODEL_N_COLUMNS
	34	} TnyGtkFolderStoreTreeModelColumn;
35	35
36	36	typedef enum

trunk/tinymail/tny-demoui-summary-view.c

r1277	r1280
61	61	#include <tny-folder.h>
62	62	#include <tny-gtk-account-list-model.h>
63		#include <tny-gtk-~~account~~-tree-model.h>
	63	#include <tny-gtk-folder-store-tree-model.h>
64	64	#include <tny-header.h>
65	65	#include <tny-gtk-header-list-model.h>
…	…
132	132	TnyList and the GtkTreeModel interfaces) */
133	133	#if PLATFORM==1
134		GtkTreeModel *mailbox_model = tny_gtk_~~account~~_tree_model_new (TRUE, NULL);
	134	GtkTreeModel *mailbox_model = tny_gtk_folder_store_tree_model_new (TRUE, NULL);
135	135	#else
136		GtkTreeModel *mailbox_model = tny_gtk_~~account~~_tree_model_new (FALSE, NULL);
	136	GtkTreeModel *mailbox_model = tny_gtk_folder_store_tree_model_new (FALSE, NULL);
137	137	#endif
138	138	g_object_unref (G_OBJECT (query));
…	…
166	166	sortable = gtk_tree_model_sort_new_with_model (mailbox_model);
167	167	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
168		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_NAME_COLUMN,
	168	TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
169	169	GTK_SORT_ASCENDING);
170	170
…	…
461	461
462	462	gtk_tree_model_get (model, &iter,
463		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_TYPE_COLUMN,
	463	TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
464	464	&type, -1);
465	465
…	…
477	477
478	478	gtk_tree_model_get (model, &iter,
479		TNY_GTK_~~ACCOUNT~~_TREE_MODEL_INSTANCE_COLUMN,
	479	TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
480	480	&folder, -1);
481	481
…	…
713	713	renderer = gtk_cell_renderer_text_new ();
714	714	column = gtk_tree_view_column_new_with_attributes (_("Folder"), renderer,
715		"text", TNY_GTK_~~ACCOUNT~~_TREE_MODEL_NAME_COLUMN, NULL);
716		gtk_tree_view_column_set_sort_column_id (column, TNY_GTK_~~ACCOUNT~~_TREE_MODEL_NAME_COLUMN);
	715	"text", TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, NULL);
	716	gtk_tree_view_column_set_sort_column_id (column, TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
717	717
718	718	gtk_tree_view_append_column (GTK_TREE_VIEW(priv->mailbox_view), column);
…	…
722	722	renderer = gtk_cell_renderer_text_new ();
723	723	column = gtk_tree_view_column_new_with_attributes (_("Unread"), renderer,
724		"text", TNY_GTK_~~ACCOUNT~~_TREE_MODEL_UNREAD_COLUMN, NULL);
725		gtk_tree_view_column_set_sort_column_id (column, TNY_GTK_~~ACCOUNT~~_TREE_MODEL_UNREAD_COLUMN);
	724	"text", TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, NULL);
	725	gtk_tree_view_column_set_sort_column_id (column, TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN);
726	726
727	727	gtk_tree_view_append_column (GTK_TREE_VIEW(priv->mailbox_view), column);

Changeset Navigation

Changeset 1280

Legend:

Download in other formats: