From 2ded5c8d7b2fc0b7fad127294e997939fe8d6a8e Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Fri, 19 Jan 2007 12:29:32 +0000 Subject: [PATCH] * Added ModestWindow object * Migrated the toplevel windows to the new ModestWindow * Added some new UI actions * Added context-sensitive menus * Added and deleted some sgml * Added support to do make dist pmo-trunk-r673 --- docs/reference/Makefile.am | 4 +- docs/reference/modest-sections.txt | 1399 ++++++++++---------- docs/reference/tmpl/modest-account-keys.sgml | 161 --- docs/reference/tmpl/modest-account-mgr.sgml | 50 +- docs/reference/tmpl/modest-conf-keys.sgml | 189 --- docs/reference/tmpl/modest-conf.sgml | 9 - docs/reference/tmpl/modest-debug.sgml | 60 + docs/reference/tmpl/modest-defs.sgml | 189 +++ docs/reference/tmpl/modest-edit-msg-window-ui.sgml | 21 + docs/reference/tmpl/modest-edit-msg-window.sgml | 40 + docs/reference/tmpl/modest-folder-view.sgml | 47 +- docs/reference/tmpl/modest-header-view.sgml | 103 +- docs/reference/tmpl/modest-icon-names.sgml | 70 + docs/reference/tmpl/modest-init.sgml | 38 + docs/reference/tmpl/modest-local-folder-info.sgml | 70 + docs/reference/tmpl/modest-mail-operation.sgml | 9 +- docs/reference/tmpl/modest-main-window-ui.sgml | 21 + docs/reference/tmpl/modest-main-window.sgml | 2 +- docs/reference/tmpl/modest-msg-view.sgml | 72 - docs/reference/tmpl/modest-pair.sgml | 10 +- docs/reference/tmpl/modest-proto.sgml | 155 --- docs/reference/tmpl/modest-protocol-info.sgml | 114 ++ docs/reference/tmpl/modest-protocol-mgr.sgml | 178 --- docs/reference/tmpl/modest-store-widget.sgml | 35 - docs/reference/tmpl/modest-text-utils.sgml | 9 + docs/reference/tmpl/modest-tny-account-store.sgml | 25 +- docs/reference/tmpl/modest-tny-attachment.sgml | 114 -- docs/reference/tmpl/modest-tny-folder.sgml | 56 + docs/reference/tmpl/modest-tny-msg-view.sgml | 19 - .../tmpl/modest-tny-platform-factory.sgml | 6 +- docs/reference/tmpl/modest-tny-store-actions.sgml | 57 - .../tmpl/modest-tny-transport-actions.sgml | 35 - docs/reference/tmpl/modest-toolbar.sgml | 79 -- .../tmpl/modest-transport-widget.sgml.bak | 82 ++ docs/reference/tmpl/modest-ui-actions.sgml | 21 + docs/reference/tmpl/modest-ui-priv.sgml | 31 + docs/reference/tmpl/modest-ui.sgml | 10 + docs/reference/tmpl/modest-unused.sgml | 881 ------------ docs/reference/tmpl/modest-widget-factory.sgml | 1 + docs/reference/tmpl/modest-widget-memory-priv.sgml | 63 + docs/reference/tmpl/modest-window-priv.sgml | 41 + docs/reference/tmpl/modest-window.sgml | 57 + docs/reference/tmpl/modest.glade.sgml | 19 - po/modest.pot | 508 ------- src/gtk/modest-edit-msg-window.c | 109 +- src/gtk/modest-main-window.c | 201 ++- src/gtk/ui/modest-ui.xml | 15 + src/modest-mail-operation.h | 1 + src/modest-ui-actions.h | 9 + src/modest-ui.c | 180 ++- src/widgets/Makefile.am | 1 + src/widgets/modest-edit-msg-window.h | 21 - src/widgets/modest-folder-view.c | 14 + src/widgets/modest-folder-view.h | 14 +- src/widgets/modest-header-view.c | 1 - src/widgets/modest-header-view.h | 3 +- src/widgets/modest-main-window-ui.h | 4 + src/widgets/modest-main-window.h | 28 - src/widgets/modest-window-priv.h | 58 + src/widgets/modest-window.c | 148 +++ src/widgets/modest-window.h | 71 +- 61 files changed, 2366 insertions(+), 3672 deletions(-) delete mode 100644 docs/reference/tmpl/modest-account-keys.sgml delete mode 100644 docs/reference/tmpl/modest-conf-keys.sgml create mode 100644 docs/reference/tmpl/modest-debug.sgml create mode 100644 docs/reference/tmpl/modest-defs.sgml create mode 100644 docs/reference/tmpl/modest-edit-msg-window-ui.sgml create mode 100644 docs/reference/tmpl/modest-init.sgml create mode 100644 docs/reference/tmpl/modest-local-folder-info.sgml create mode 100644 docs/reference/tmpl/modest-main-window-ui.sgml delete mode 100644 docs/reference/tmpl/modest-proto.sgml create mode 100644 docs/reference/tmpl/modest-protocol-info.sgml delete mode 100644 docs/reference/tmpl/modest-protocol-mgr.sgml delete mode 100644 docs/reference/tmpl/modest-tny-attachment.sgml create mode 100644 docs/reference/tmpl/modest-tny-folder.sgml delete mode 100644 docs/reference/tmpl/modest-tny-msg-view.sgml delete mode 100644 docs/reference/tmpl/modest-tny-store-actions.sgml delete mode 100644 docs/reference/tmpl/modest-tny-transport-actions.sgml delete mode 100644 docs/reference/tmpl/modest-toolbar.sgml create mode 100644 docs/reference/tmpl/modest-transport-widget.sgml.bak create mode 100644 docs/reference/tmpl/modest-ui-actions.sgml create mode 100644 docs/reference/tmpl/modest-ui-priv.sgml create mode 100644 docs/reference/tmpl/modest-widget-memory-priv.sgml create mode 100644 docs/reference/tmpl/modest-window-priv.sgml create mode 100644 docs/reference/tmpl/modest-window.sgml delete mode 100644 docs/reference/tmpl/modest.glade.sgml delete mode 100644 po/modest.pot create mode 100644 src/widgets/modest-window-priv.h create mode 100644 src/widgets/modest-window.c diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 6db216f..a444e4e 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -59,8 +59,7 @@ content_files= \ modest-preface.sgml \ modest-architecture.sgml \ modest-design.sgml \ - modest-coding-guidelines.sgml \ - xml/tree_index.sgml + modest-coding-guidelines.sgml # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # These files must be listed here *and* in content_files @@ -89,6 +88,7 @@ GTKDOC_LIBS= \ ${top_builddir}/src/modest-conf.o \ ${top_builddir}/src/modest-formatter.o \ ${top_builddir}/src/modest-icon-factory.o \ + ${top_builddir}/src/modest-local-folder-info.o \ ${top_builddir}/src/modest-mail-operation.o \ ${top_builddir}/src/modest-mail-operation-queue.o \ ${top_builddir}/src/modest-marshal.o \ diff --git a/docs/reference/modest-sections.txt b/docs/reference/modest-sections.txt index 859d317..cf816e5 100644 --- a/docs/reference/modest-sections.txt +++ b/docs/reference/modest-sections.txt @@ -1,33 +1,10 @@
-modest-tny-attachment -ModestTnyAttachment -ModestTnyAttachment -modest_tny_attachment_new -modest_tny_attachment_set_name -modest_tny_attachment_get_name -modest_tny_attachment_set_filename -modest_tny_attachment_get_filename -modest_tny_attachment_set_mime_type -modest_tny_attachment_get_mime_type -modest_tny_attachment_guess_mime_type -modest_tny_attachment_get_stream -modest_tny_attachment_free_list - -MODEST_TNY_ATTACHMENT -MODEST_IS_TNY_ATTACHMENT -MODEST_TYPE_TNY_ATTACHMENT -modest_tny_attachment_get_type -MODEST_TNY_ATTACHMENT_CLASS -MODEST_IS_TNY_ATTACHMENT_CLASS -MODEST_TNY_ATTACHMENT_GET_CLASS -
- -
modest-ui ModestUI ModestUI modest_ui_new modest_ui_main_window +modest_ui_edit_window MODEST_UI MODEST_IS_UI @@ -48,11 +25,11 @@ modest_account_mgr_new modest_account_mgr_add_account modest_account_mgr_add_server_account modest_account_mgr_remove_account +modest_account_mgr_get_account_data +modest_account_mgr_free_account_data modest_account_mgr_account_names modest_account_mgr_search_server_accounts modest_account_mgr_account_exists -modest_account_mgr_get_account_data -modest_account_mgr_free_account_data modest_account_mgr_account_set_enabled modest_account_mgr_account_get_enabled modest_account_mgr_get_string @@ -75,39 +52,6 @@ MODEST_ACCOUNT_MGR_GET_CLASS
-modest-protocol-mgr -ModestProtocolMgr -ModestProtocolMgr -MODEST_PROTOCOL_TRANSPORT_SENDMAIL -MODEST_PROTOCOL_TRANSPORT_SMTP -MODEST_PROTOCOL_STORE_NONE -MODEST_PROTOCOL_STORE_POP -MODEST_PROTOCOL_STORE_IMAP -MODEST_PROTOCOL_STORE_MAILDIR -MODEST_PROTOCOL_STORE_MBOX -MODEST_PROTOCOL_SECURITY_NONE -MODEST_PROTOCOL_SECURITY_SSL -MODEST_PROTOCOL_SECURITY_TLS -MODEST_PROTOCOL_AUTH_NONE -MODEST_PROTOCOL_AUTH_PASSWORD -ModestProtocolType -modest_protocol_mgr_new -modest_protocol_mgr_get_transport_protocols -modest_protocol_mgr_get_store_protocols -modest_protocol_mgr_get_security_protocols -modest_protocol_mgr_get_auth_protocols -modest_protocol_mgr_protocol_is_valid - -MODEST_PROTOCOL_MGR -MODEST_IS_PROTOCOL_MGR -MODEST_TYPE_PROTOCOL_MGR -modest_protocol_mgr_get_type -MODEST_PROTOCOL_MGR_CLASS -MODEST_IS_PROTOCOL_MGR_CLASS -MODEST_PROTOCOL_MGR_GET_CLASS -
- -
modest-conf ModestConfValueType ModestConfEvent @@ -139,13 +83,32 @@ MODEST_CONF_GET_CLASS
+modest-formatter +ModestFormatter +ModestFormatter +modest_formatter_new +modest_formatter_cite +modest_formatter_quote +modest_formatter_inline +modest_formatter_attach + +MODEST_FORMATTER +MODEST_IS_FORMATTER +MODEST_TYPE_FORMATTER +modest_formatter_get_type +MODEST_FORMATTER_CLASS +MODEST_IS_FORMATTER_CLASS +MODEST_FORMATTER_GET_CLASS +
+ +
modest-tny-platform-factory ModestTnyPlatformFactory ModestTnyPlatformFactory modest_tny_platform_factory_get_instance -modest_tny_platform_factory_get_modest_account_mgr_instance -modest_tny_platform_factory_get_modest_conf_instance -modest_tny_platform_factory_get_modest_mail_operation_queue_instance +modest_tny_platform_factory_get_account_mgr_instance +modest_tny_platform_factory_get_conf_instance +modest_tny_platform_factory_get_mail_operation_queue_instance MODEST_TNY_PLATFORM_FACTORY MODEST_IS_TNY_PLATFORM_FACTORY @@ -176,40 +139,6 @@ MODEST_MAIL_OPERATION_QUEUE_GET_CLASS
-modest-formatter -ModestFormatter -ModestFormatter -modest_formatter_new -modest_formatter_cite -modest_formatter_quote -modest_formatter_inline -modest_formatter_attach - -MODEST_FORMATTER -MODEST_IS_FORMATTER -MODEST_TYPE_FORMATTER -modest_formatter_get_type -MODEST_FORMATTER_CLASS -MODEST_IS_FORMATTER_CLASS -MODEST_FORMATTER_GET_CLASS -
- -
-modest-tny-stream-gtkhtml -ModestTnyStreamGtkhtml -ModestTnyStreamGtkhtml -modest_tny_stream_gtkhtml_new - -MODEST_TNY_STREAM_GTKHTML -MODEST_IS_TNY_STREAM_GTKHTML -MODEST_TYPE_TNY_STREAM_GTKHTML -modest_tny_stream_gtkhtml_get_type -MODEST_TNY_STREAM_GTKHTML_CLASS -MODEST_IS_TNY_STREAM_GTKHTML_CLASS -MODEST_TNY_STREAM_GTKHTML_GET_CLASS -
- -
modest-mail-operation ModestMailOperationForwardType ModestMailOperationReplyType @@ -262,8 +191,6 @@ modest_widget_factory_get_status_bar modest_widget_factory_get_combo_box modest_widget_factory_get_online_toggle modest_widget_factory_get_folder_info_label -modest_widget_factory_get_main_toolbar -modest_widget_factory_get_edit_toolbar MODEST_WIDGET_FACTORY MODEST_IS_WIDGET_FACTORY @@ -322,26 +249,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
-modest-transport-widget -ModestTransportWidget -ModestTransportWidget -modest_transport_widget_new -modest_transport_widget_get_remember_password -modest_transport_widget_get_requires_auth -modest_transport_widget_get_username -modest_transport_widget_get_servername -modest_transport_widget_get_proto - -MODEST_TRANSPORT_WIDGET -MODEST_IS_TRANSPORT_WIDGET -MODEST_TYPE_TRANSPORT_WIDGET -modest_transport_widget_get_type -MODEST_TRANSPORT_WIDGET_CLASS -MODEST_IS_TRANSPORT_WIDGET_CLASS -MODEST_TRANSPORT_WIDGET_GET_CLASS -
- -
modest-store-widget ModestStoreWidget ModestStoreWidget @@ -361,36 +268,23 @@ MODEST_STORE_WIDGET_GET_CLASS
-modest-edit-msg-window -ModestEditMsgWindow -ModestEditMsgWindow -ModestEditType -modest_edit_msg_window_new -modest_edit_msg_window_set_msg - -MODEST_EDIT_MSG_WINDOW -MODEST_IS_EDIT_MSG_WINDOW -MODEST_TYPE_EDIT_MSG_WINDOW -modest_edit_msg_window_get_type -MODEST_EDIT_MSG_WINDOW_CLASS -MODEST_IS_EDIT_MSG_WINDOW_CLASS -MODEST_EDIT_MSG_WINDOW_GET_CLASS -
- -
-modest-main-window -ModestMainWindow -ModestMainWindow -modest_main_window_new -modest_main_window_get_widget_factory +modest-transport-widget +ModestTransportWidget +ModestTransportWidget +modest_transport_widget_new +modest_transport_widget_get_remember_password +modest_transport_widget_get_requires_auth +modest_transport_widget_get_username +modest_transport_widget_get_servername +modest_transport_widget_get_proto -MODEST_MAIN_WINDOW -MODEST_IS_MAIN_WINDOW -MODEST_TYPE_MAIN_WINDOW -modest_main_window_get_type -MODEST_MAIN_WINDOW_CLASS -MODEST_IS_MAIN_WINDOW_CLASS -MODEST_MAIN_WINDOW_GET_CLASS +MODEST_TRANSPORT_WIDGET +MODEST_IS_TRANSPORT_WIDGET +MODEST_TYPE_TRANSPORT_WIDGET +modest_transport_widget_get_type +MODEST_TRANSPORT_WIDGET_CLASS +MODEST_IS_TRANSPORT_WIDGET_CLASS +MODEST_TRANSPORT_WIDGET_GET_CLASS
@@ -424,25 +318,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
-modest-transport-widget -ModestTransportWidget -ModestTransportWidget -modest_transport_widget_new -modest_transport_widget_get_remember_password -modest_transport_widget_get_username -modest_transport_widget_get_servername -modest_transport_widget_get_proto - -MODEST_TRANSPORT_WIDGET -MODEST_IS_TRANSPORT_WIDGET -MODEST_TYPE_TRANSPORT_WIDGET -modest_transport_widget_get_type -MODEST_TRANSPORT_WIDGET_CLASS -MODEST_IS_TRANSPORT_WIDGET_CLASS -MODEST_TRANSPORT_WIDGET_GET_CLASS -
- -
modest-store-widget ModestStoreWidget ModestStoreWidget @@ -462,50 +337,22 @@ MODEST_STORE_WIDGET_GET_CLASS
-modest-edit-msg-window -ModestEditMsgWindow -ModestEditMsgWindow -ModestEditType -modest_edit_msg_window_new - -MODEST_EDIT_MSG_WINDOW -MODEST_IS_EDIT_MSG_WINDOW -MODEST_TYPE_EDIT_MSG_WINDOW -modest_edit_msg_window_get_type -MODEST_EDIT_MSG_WINDOW_CLASS -MODEST_IS_EDIT_MSG_WINDOW_CLASS -MODEST_EDIT_MSG_WINDOW_GET_CLASS -
- -
-modest-main-window -ModestMainWindow -ModestMainWindow -modest_main_window_new - -MODEST_MAIN_WINDOW -MODEST_IS_MAIN_WINDOW -MODEST_TYPE_MAIN_WINDOW -modest_main_window_get_type -MODEST_MAIN_WINDOW_CLASS -MODEST_IS_MAIN_WINDOW_CLASS -MODEST_MAIN_WINDOW_GET_CLASS -
- -
-modest-account-view -ModestAccountView -ModestAccountView -modest_account_view_new -modest_account_view_get_selected_account +modest-transport-widget +ModestTransportWidget +ModestTransportWidget +modest_transport_widget_new +modest_transport_widget_get_remember_password +modest_transport_widget_get_username +modest_transport_widget_get_servername +modest_transport_widget_get_proto -MODEST_ACCOUNT_VIEW -MODEST_IS_ACCOUNT_VIEW -MODEST_TYPE_ACCOUNT_VIEW -modest_account_view_get_type -MODEST_ACCOUNT_VIEW_CLASS -MODEST_IS_ACCOUNT_VIEW_CLASS -MODEST_ACCOUNT_VIEW_GET_CLASS +MODEST_TRANSPORT_WIDGET +MODEST_IS_TRANSPORT_WIDGET +MODEST_TYPE_TRANSPORT_WIDGET +modest_transport_widget_get_type +MODEST_TRANSPORT_WIDGET_CLASS +MODEST_IS_TRANSPORT_WIDGET_CLASS +MODEST_TRANSPORT_WIDGET_GET_CLASS
@@ -524,6 +371,8 @@ modest_header_view_get_columns modest_header_view_set_style modest_header_view_get_style modest_header_view_get_selected_headers +modest_header_view_is_empty +modest_header_view_select_next MODEST_HEADER_VIEW MODEST_IS_HEADER_VIEW @@ -535,19 +384,54 @@ MODEST_HEADER_VIEW_GET_CLASS
-modest-toolbar -ModestToolbarButton -ModestToolbar -ModestToolbar -modest_toolbar_new +modest-account-view +ModestAccountView +ModestAccountView +modest_account_view_new +modest_account_view_get_selected_account + +MODEST_ACCOUNT_VIEW +MODEST_IS_ACCOUNT_VIEW +MODEST_TYPE_ACCOUNT_VIEW +modest_account_view_get_type +MODEST_ACCOUNT_VIEW_CLASS +MODEST_IS_ACCOUNT_VIEW_CLASS +MODEST_ACCOUNT_VIEW_GET_CLASS +
+ +
+modest-tny-stream-gtkhtml +ModestTnyStreamGtkhtml +ModestTnyStreamGtkhtml +modest_tny_stream_gtkhtml_new + +MODEST_TNY_STREAM_GTKHTML +MODEST_IS_TNY_STREAM_GTKHTML +MODEST_TYPE_TNY_STREAM_GTKHTML +modest_tny_stream_gtkhtml_get_type +MODEST_TNY_STREAM_GTKHTML_CLASS +MODEST_IS_TNY_STREAM_GTKHTML_CLASS +MODEST_TNY_STREAM_GTKHTML_GET_CLASS +
+ +
+modest-edit-msg-window +ModestEditMsgWindow +ModestEditMsgWindow +ModestEditType +MsgData +modest_edit_msg_window_new +modest_edit_msg_window_set_msg +modest_edit_msg_window_get_msg_data +modest_edit_msg_window_free_msg_data -MODEST_TOOLBAR -MODEST_IS_TOOLBAR -MODEST_TYPE_TOOLBAR -modest_toolbar_get_type -MODEST_TOOLBAR_CLASS -MODEST_IS_TOOLBAR_CLASS -MODEST_TOOLBAR_GET_CLASS +MODEST_EDIT_MSG_WINDOW +MODEST_IS_EDIT_MSG_WINDOW +MODEST_TYPE_EDIT_MSG_WINDOW +modest_edit_msg_window_get_type +MODEST_EDIT_MSG_WINDOW_CLASS +MODEST_IS_EDIT_MSG_WINDOW_CLASS +MODEST_EDIT_MSG_WINDOW_GET_CLASS
@@ -556,9 +440,7 @@ MODEST_TOOLBAR_GET_CLASS ModestFolderView modest_folder_view_new modest_folder_view_set_title -modest_folder_view_is_empty -modest_folder_view_guess_folder_type -modest_folder_view_get_selected_account +modest_folder_view_get_selected MODEST_FOLDER_VIEW MODEST_IS_FOLDER_VIEW @@ -587,12 +469,27 @@ MODEST_COMBO_BOX_GET_CLASS
-modest-msg-view -ModestMsgView -ModestMsgView -modest_msg_view_new -modest_msg_view_set_message - +modest-main-window +ModestMainWindow +ModestMainWindow +modest_main_window_new + +MODEST_MAIN_WINDOW +MODEST_IS_MAIN_WINDOW +MODEST_TYPE_MAIN_WINDOW +modest_main_window_get_type +MODEST_MAIN_WINDOW_CLASS +MODEST_IS_MAIN_WINDOW_CLASS +MODEST_MAIN_WINDOW_GET_CLASS +
+ +
+modest-msg-view +ModestMsgView +ModestMsgView +modest_msg_view_new +modest_msg_view_set_message + MODEST_MSG_VIEW MODEST_IS_MSG_VIEW MODEST_TYPE_MSG_VIEW @@ -603,19 +500,21 @@ MODEST_MSG_VIEW_GET_CLASS
-modest-account-view -ModestAccountView -ModestAccountView -modest_account_view_new -modest_account_view_get_selected_account +modest-window +ModestWindowParent +ModestWindowParentClass +ModestWindow +ModestWindow +modest_window_get_account_store +modest_window_get_widget_factory -MODEST_ACCOUNT_VIEW -MODEST_IS_ACCOUNT_VIEW -MODEST_TYPE_ACCOUNT_VIEW -modest_account_view_get_type -MODEST_ACCOUNT_VIEW_CLASS -MODEST_IS_ACCOUNT_VIEW_CLASS -MODEST_ACCOUNT_VIEW_GET_CLASS +MODEST_WINDOW +MODEST_IS_WINDOW +MODEST_TYPE_WINDOW +modest_window_get_type +MODEST_WINDOW_CLASS +MODEST_IS_WINDOW_CLASS +MODEST_WINDOW_GET_CLASS
@@ -634,6 +533,8 @@ modest_header_view_get_columns modest_header_view_set_style modest_header_view_get_style modest_header_view_get_selected_headers +modest_header_view_is_empty +modest_header_view_select_next MODEST_HEADER_VIEW MODEST_IS_HEADER_VIEW @@ -645,19 +546,54 @@ MODEST_HEADER_VIEW_GET_CLASS
-modest-toolbar -ModestToolbarButton -ModestToolbar -ModestToolbar -modest_toolbar_new +modest-account-view +ModestAccountView +ModestAccountView +modest_account_view_new +modest_account_view_get_selected_account + +MODEST_ACCOUNT_VIEW +MODEST_IS_ACCOUNT_VIEW +MODEST_TYPE_ACCOUNT_VIEW +modest_account_view_get_type +MODEST_ACCOUNT_VIEW_CLASS +MODEST_IS_ACCOUNT_VIEW_CLASS +MODEST_ACCOUNT_VIEW_GET_CLASS +
+ +
+modest-tny-stream-gtkhtml +ModestTnyStreamGtkhtml +ModestTnyStreamGtkhtml +modest_tny_stream_gtkhtml_new + +MODEST_TNY_STREAM_GTKHTML +MODEST_IS_TNY_STREAM_GTKHTML +MODEST_TYPE_TNY_STREAM_GTKHTML +modest_tny_stream_gtkhtml_get_type +MODEST_TNY_STREAM_GTKHTML_CLASS +MODEST_IS_TNY_STREAM_GTKHTML_CLASS +MODEST_TNY_STREAM_GTKHTML_GET_CLASS +
+ +
+modest-edit-msg-window +ModestEditMsgWindow +ModestEditMsgWindow +ModestEditType +MsgData +modest_edit_msg_window_new +modest_edit_msg_window_set_msg +modest_edit_msg_window_get_msg_data +modest_edit_msg_window_free_msg_data -MODEST_TOOLBAR -MODEST_IS_TOOLBAR -MODEST_TYPE_TOOLBAR -modest_toolbar_get_type -MODEST_TOOLBAR_CLASS -MODEST_IS_TOOLBAR_CLASS -MODEST_TOOLBAR_GET_CLASS +MODEST_EDIT_MSG_WINDOW +MODEST_IS_EDIT_MSG_WINDOW +MODEST_TYPE_EDIT_MSG_WINDOW +modest_edit_msg_window_get_type +MODEST_EDIT_MSG_WINDOW_CLASS +MODEST_IS_EDIT_MSG_WINDOW_CLASS +MODEST_EDIT_MSG_WINDOW_GET_CLASS
@@ -666,9 +602,7 @@ MODEST_TOOLBAR_GET_CLASS ModestFolderView modest_folder_view_new modest_folder_view_set_title -modest_folder_view_is_empty -modest_folder_view_guess_folder_type -modest_folder_view_get_selected_account +modest_folder_view_get_selected MODEST_FOLDER_VIEW MODEST_IS_FOLDER_VIEW @@ -697,6 +631,21 @@ MODEST_COMBO_BOX_GET_CLASS
+modest-main-window +ModestMainWindow +ModestMainWindow +modest_main_window_new + +MODEST_MAIN_WINDOW +MODEST_IS_MAIN_WINDOW +MODEST_TYPE_MAIN_WINDOW +modest_main_window_get_type +MODEST_MAIN_WINDOW_CLASS +MODEST_IS_MAIN_WINDOW_CLASS +MODEST_MAIN_WINDOW_GET_CLASS +
+ +
modest-msg-view ModestMsgView ModestMsgView @@ -713,6 +662,24 @@ MODEST_MSG_VIEW_GET_CLASS
+modest-window +ModestWindowParent +ModestWindowParentClass +ModestWindow +ModestWindow +modest_window_get_account_store +modest_window_get_widget_factory + +MODEST_WINDOW +MODEST_IS_WINDOW +MODEST_TYPE_WINDOW +modest_window_get_type +MODEST_WINDOW_CLASS +MODEST_IS_WINDOW_CLASS +MODEST_WINDOW_GET_CLASS +
+ +
modest-account-assistant ModestAccountAssistant ModestAccountAssistant @@ -743,26 +710,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
-modest-transport-widget -ModestTransportWidget -ModestTransportWidget -modest_transport_widget_new -modest_transport_widget_get_remember_password -modest_transport_widget_get_requires_auth -modest_transport_widget_get_username -modest_transport_widget_get_servername -modest_transport_widget_get_proto - -MODEST_TRANSPORT_WIDGET -MODEST_IS_TRANSPORT_WIDGET -MODEST_TYPE_TRANSPORT_WIDGET -modest_transport_widget_get_type -MODEST_TRANSPORT_WIDGET_CLASS -MODEST_IS_TRANSPORT_WIDGET_CLASS -MODEST_TRANSPORT_WIDGET_GET_CLASS -
- -
modest-store-widget ModestStoreWidget ModestStoreWidget @@ -782,60 +729,23 @@ MODEST_STORE_WIDGET_GET_CLASS
-modest-edit-msg-window -ModestEditMsgWindow -ModestEditMsgWindow -ModestEditType -modest_edit_msg_window_new -modest_edit_msg_window_set_msg - -MODEST_EDIT_MSG_WINDOW -MODEST_IS_EDIT_MSG_WINDOW -MODEST_TYPE_EDIT_MSG_WINDOW -modest_edit_msg_window_get_type -MODEST_EDIT_MSG_WINDOW_CLASS -MODEST_IS_EDIT_MSG_WINDOW_CLASS -MODEST_EDIT_MSG_WINDOW_GET_CLASS -
- -
-modest-main-window -ModestMainWindow -ModestMainWindow -modest_main_window_new -modest_main_window_get_widget_factory - -MODEST_MAIN_WINDOW -MODEST_IS_MAIN_WINDOW -MODEST_TYPE_MAIN_WINDOW -modest_main_window_get_type -MODEST_MAIN_WINDOW_CLASS -MODEST_IS_MAIN_WINDOW_CLASS -MODEST_MAIN_WINDOW_GET_CLASS -
- -
-modest-tny-attachment -ModestTnyAttachment -ModestTnyAttachment -modest_tny_attachment_new -modest_tny_attachment_set_name -modest_tny_attachment_get_name -modest_tny_attachment_set_filename -modest_tny_attachment_get_filename -modest_tny_attachment_set_mime_type -modest_tny_attachment_get_mime_type -modest_tny_attachment_guess_mime_type -modest_tny_attachment_get_stream -modest_tny_attachment_free_list +modest-transport-widget +ModestTransportWidget +ModestTransportWidget +modest_transport_widget_new +modest_transport_widget_get_remember_password +modest_transport_widget_get_requires_auth +modest_transport_widget_get_username +modest_transport_widget_get_servername +modest_transport_widget_get_proto -MODEST_TNY_ATTACHMENT -MODEST_IS_TNY_ATTACHMENT -MODEST_TYPE_TNY_ATTACHMENT -modest_tny_attachment_get_type -MODEST_TNY_ATTACHMENT_CLASS -MODEST_IS_TNY_ATTACHMENT_CLASS -MODEST_TNY_ATTACHMENT_GET_CLASS +MODEST_TRANSPORT_WIDGET +MODEST_IS_TRANSPORT_WIDGET +MODEST_TYPE_TRANSPORT_WIDGET +modest_transport_widget_get_type +MODEST_TRANSPORT_WIDGET_CLASS +MODEST_IS_TRANSPORT_WIDGET_CLASS +MODEST_TRANSPORT_WIDGET_GET_CLASS
@@ -844,6 +754,7 @@ MODEST_TNY_ATTACHMENT_GET_CLASS ModestUI modest_ui_new modest_ui_main_window +modest_ui_edit_window MODEST_UI MODEST_IS_UI @@ -864,11 +775,11 @@ modest_account_mgr_new modest_account_mgr_add_account modest_account_mgr_add_server_account modest_account_mgr_remove_account +modest_account_mgr_get_account_data +modest_account_mgr_free_account_data modest_account_mgr_account_names modest_account_mgr_search_server_accounts modest_account_mgr_account_exists -modest_account_mgr_get_account_data -modest_account_mgr_free_account_data modest_account_mgr_account_set_enabled modest_account_mgr_account_get_enabled modest_account_mgr_get_string @@ -891,39 +802,6 @@ MODEST_ACCOUNT_MGR_GET_CLASS
-modest-protocol-mgr -ModestProtocolMgr -ModestProtocolMgr -MODEST_PROTOCOL_TRANSPORT_SENDMAIL -MODEST_PROTOCOL_TRANSPORT_SMTP -MODEST_PROTOCOL_STORE_NONE -MODEST_PROTOCOL_STORE_POP -MODEST_PROTOCOL_STORE_IMAP -MODEST_PROTOCOL_STORE_MAILDIR -MODEST_PROTOCOL_STORE_MBOX -MODEST_PROTOCOL_SECURITY_NONE -MODEST_PROTOCOL_SECURITY_SSL -MODEST_PROTOCOL_SECURITY_TLS -MODEST_PROTOCOL_AUTH_NONE -MODEST_PROTOCOL_AUTH_PASSWORD -ModestProtocolType -modest_protocol_mgr_new -modest_protocol_mgr_get_transport_protocols -modest_protocol_mgr_get_store_protocols -modest_protocol_mgr_get_security_protocols -modest_protocol_mgr_get_auth_protocols -modest_protocol_mgr_protocol_is_valid - -MODEST_PROTOCOL_MGR -MODEST_IS_PROTOCOL_MGR -MODEST_TYPE_PROTOCOL_MGR -modest_protocol_mgr_get_type -MODEST_PROTOCOL_MGR_CLASS -MODEST_IS_PROTOCOL_MGR_CLASS -MODEST_PROTOCOL_MGR_GET_CLASS -
- -
modest-conf ModestConfValueType ModestConfEvent @@ -955,13 +833,32 @@ MODEST_CONF_GET_CLASS
+modest-formatter +ModestFormatter +ModestFormatter +modest_formatter_new +modest_formatter_cite +modest_formatter_quote +modest_formatter_inline +modest_formatter_attach + +MODEST_FORMATTER +MODEST_IS_FORMATTER +MODEST_TYPE_FORMATTER +modest_formatter_get_type +MODEST_FORMATTER_CLASS +MODEST_IS_FORMATTER_CLASS +MODEST_FORMATTER_GET_CLASS +
+ +
modest-tny-platform-factory ModestTnyPlatformFactory ModestTnyPlatformFactory modest_tny_platform_factory_get_instance -modest_tny_platform_factory_get_modest_account_mgr_instance -modest_tny_platform_factory_get_modest_conf_instance -modest_tny_platform_factory_get_modest_mail_operation_queue_instance +modest_tny_platform_factory_get_account_mgr_instance +modest_tny_platform_factory_get_conf_instance +modest_tny_platform_factory_get_mail_operation_queue_instance MODEST_TNY_PLATFORM_FACTORY MODEST_IS_TNY_PLATFORM_FACTORY @@ -992,40 +889,6 @@ MODEST_MAIL_OPERATION_QUEUE_GET_CLASS
-modest-formatter -ModestFormatter -ModestFormatter -modest_formatter_new -modest_formatter_cite -modest_formatter_quote -modest_formatter_inline -modest_formatter_attach - -MODEST_FORMATTER -MODEST_IS_FORMATTER -MODEST_TYPE_FORMATTER -modest_formatter_get_type -MODEST_FORMATTER_CLASS -MODEST_IS_FORMATTER_CLASS -MODEST_FORMATTER_GET_CLASS -
- -
-modest-tny-stream-gtkhtml -ModestTnyStreamGtkhtml -ModestTnyStreamGtkhtml -modest_tny_stream_gtkhtml_new - -MODEST_TNY_STREAM_GTKHTML -MODEST_IS_TNY_STREAM_GTKHTML -MODEST_TYPE_TNY_STREAM_GTKHTML -modest_tny_stream_gtkhtml_get_type -MODEST_TNY_STREAM_GTKHTML_CLASS -MODEST_IS_TNY_STREAM_GTKHTML_CLASS -MODEST_TNY_STREAM_GTKHTML_GET_CLASS -
- -
modest-mail-operation ModestMailOperationForwardType ModestMailOperationReplyType @@ -1078,8 +941,6 @@ modest_widget_factory_get_status_bar modest_widget_factory_get_combo_box modest_widget_factory_get_online_toggle modest_widget_factory_get_folder_info_label -modest_widget_factory_get_main_toolbar -modest_widget_factory_get_edit_toolbar MODEST_WIDGET_FACTORY MODEST_IS_WIDGET_FACTORY @@ -1138,6 +999,25 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
+modest-store-widget +ModestStoreWidget +ModestStoreWidget +modest_store_widget_new +modest_store_widget_get_remember_password +modest_store_widget_get_username +modest_store_widget_get_servername +modest_store_widget_get_proto + +MODEST_STORE_WIDGET +MODEST_IS_STORE_WIDGET +MODEST_TYPE_STORE_WIDGET +modest_store_widget_get_type +MODEST_STORE_WIDGET_CLASS +MODEST_IS_STORE_WIDGET_CLASS +MODEST_STORE_WIDGET_GET_CLASS +
+ +
modest-transport-widget ModestTransportWidget ModestTransportWidget @@ -1158,58 +1038,6 @@ MODEST_TRANSPORT_WIDGET_GET_CLASS
-modest-store-widget -ModestStoreWidget -ModestStoreWidget -modest_store_widget_new -modest_store_widget_get_remember_password -modest_store_widget_get_username -modest_store_widget_get_servername -modest_store_widget_get_proto - -MODEST_STORE_WIDGET -MODEST_IS_STORE_WIDGET -MODEST_TYPE_STORE_WIDGET -modest_store_widget_get_type -MODEST_STORE_WIDGET_CLASS -MODEST_IS_STORE_WIDGET_CLASS -MODEST_STORE_WIDGET_GET_CLASS -
- -
-modest-edit-msg-window -ModestEditMsgWindow -ModestEditMsgWindow -ModestEditType -modest_edit_msg_window_new -modest_edit_msg_window_set_msg - -MODEST_EDIT_MSG_WINDOW -MODEST_IS_EDIT_MSG_WINDOW -MODEST_TYPE_EDIT_MSG_WINDOW -modest_edit_msg_window_get_type -MODEST_EDIT_MSG_WINDOW_CLASS -MODEST_IS_EDIT_MSG_WINDOW_CLASS -MODEST_EDIT_MSG_WINDOW_GET_CLASS -
- -
-modest-main-window -ModestMainWindow -ModestMainWindow -modest_main_window_new -modest_main_window_get_widget_factory - -MODEST_MAIN_WINDOW -MODEST_IS_MAIN_WINDOW -MODEST_TYPE_MAIN_WINDOW -modest_main_window_get_type -MODEST_MAIN_WINDOW_CLASS -MODEST_IS_MAIN_WINDOW_CLASS -MODEST_MAIN_WINDOW_GET_CLASS -
- -
modest-account-assistant ModestAccountAssistant ModestAccountAssistant @@ -1240,25 +1068,6 @@ MODEST_ACCOUNT_VIEW_WINDOW_GET_CLASS
-modest-transport-widget -ModestTransportWidget -ModestTransportWidget -modest_transport_widget_new -modest_transport_widget_get_remember_password -modest_transport_widget_get_username -modest_transport_widget_get_servername -modest_transport_widget_get_proto - -MODEST_TRANSPORT_WIDGET -MODEST_IS_TRANSPORT_WIDGET -MODEST_TYPE_TRANSPORT_WIDGET -modest_transport_widget_get_type -MODEST_TRANSPORT_WIDGET_CLASS -MODEST_IS_TRANSPORT_WIDGET_CLASS -MODEST_TRANSPORT_WIDGET_GET_CLASS -
- -
modest-store-widget ModestStoreWidget ModestStoreWidget @@ -1278,50 +1087,22 @@ MODEST_STORE_WIDGET_GET_CLASS
-modest-edit-msg-window -ModestEditMsgWindow -ModestEditMsgWindow -ModestEditType -modest_edit_msg_window_new - -MODEST_EDIT_MSG_WINDOW -MODEST_IS_EDIT_MSG_WINDOW -MODEST_TYPE_EDIT_MSG_WINDOW -modest_edit_msg_window_get_type -MODEST_EDIT_MSG_WINDOW_CLASS -MODEST_IS_EDIT_MSG_WINDOW_CLASS -MODEST_EDIT_MSG_WINDOW_GET_CLASS -
- -
-modest-main-window -ModestMainWindow -ModestMainWindow -modest_main_window_new - -MODEST_MAIN_WINDOW -MODEST_IS_MAIN_WINDOW -MODEST_TYPE_MAIN_WINDOW -modest_main_window_get_type -MODEST_MAIN_WINDOW_CLASS -MODEST_IS_MAIN_WINDOW_CLASS -MODEST_MAIN_WINDOW_GET_CLASS -
- -
-modest-account-view -ModestAccountView -ModestAccountView -modest_account_view_new -modest_account_view_get_selected_account +modest-transport-widget +ModestTransportWidget +ModestTransportWidget +modest_transport_widget_new +modest_transport_widget_get_remember_password +modest_transport_widget_get_username +modest_transport_widget_get_servername +modest_transport_widget_get_proto -MODEST_ACCOUNT_VIEW -MODEST_IS_ACCOUNT_VIEW -MODEST_TYPE_ACCOUNT_VIEW -modest_account_view_get_type -MODEST_ACCOUNT_VIEW_CLASS -MODEST_IS_ACCOUNT_VIEW_CLASS -MODEST_ACCOUNT_VIEW_GET_CLASS +MODEST_TRANSPORT_WIDGET +MODEST_IS_TRANSPORT_WIDGET +MODEST_TYPE_TRANSPORT_WIDGET +modest_transport_widget_get_type +MODEST_TRANSPORT_WIDGET_CLASS +MODEST_IS_TRANSPORT_WIDGET_CLASS +MODEST_TRANSPORT_WIDGET_GET_CLASS
@@ -1340,6 +1121,8 @@ modest_header_view_get_columns modest_header_view_set_style modest_header_view_get_style modest_header_view_get_selected_headers +modest_header_view_is_empty +modest_header_view_select_next MODEST_HEADER_VIEW MODEST_IS_HEADER_VIEW @@ -1351,19 +1134,54 @@ MODEST_HEADER_VIEW_GET_CLASS
-modest-toolbar -ModestToolbarButton -ModestToolbar -ModestToolbar -modest_toolbar_new +modest-account-view +ModestAccountView +ModestAccountView +modest_account_view_new +modest_account_view_get_selected_account + +MODEST_ACCOUNT_VIEW +MODEST_IS_ACCOUNT_VIEW +MODEST_TYPE_ACCOUNT_VIEW +modest_account_view_get_type +MODEST_ACCOUNT_VIEW_CLASS +MODEST_IS_ACCOUNT_VIEW_CLASS +MODEST_ACCOUNT_VIEW_GET_CLASS +
+ +
+modest-tny-stream-gtkhtml +ModestTnyStreamGtkhtml +ModestTnyStreamGtkhtml +modest_tny_stream_gtkhtml_new + +MODEST_TNY_STREAM_GTKHTML +MODEST_IS_TNY_STREAM_GTKHTML +MODEST_TYPE_TNY_STREAM_GTKHTML +modest_tny_stream_gtkhtml_get_type +MODEST_TNY_STREAM_GTKHTML_CLASS +MODEST_IS_TNY_STREAM_GTKHTML_CLASS +MODEST_TNY_STREAM_GTKHTML_GET_CLASS +
+ +
+modest-edit-msg-window +ModestEditMsgWindow +ModestEditMsgWindow +ModestEditType +MsgData +modest_edit_msg_window_new +modest_edit_msg_window_set_msg +modest_edit_msg_window_get_msg_data +modest_edit_msg_window_free_msg_data -MODEST_TOOLBAR -MODEST_IS_TOOLBAR -MODEST_TYPE_TOOLBAR -modest_toolbar_get_type -MODEST_TOOLBAR_CLASS -MODEST_IS_TOOLBAR_CLASS -MODEST_TOOLBAR_GET_CLASS +MODEST_EDIT_MSG_WINDOW +MODEST_IS_EDIT_MSG_WINDOW +MODEST_TYPE_EDIT_MSG_WINDOW +modest_edit_msg_window_get_type +MODEST_EDIT_MSG_WINDOW_CLASS +MODEST_IS_EDIT_MSG_WINDOW_CLASS +MODEST_EDIT_MSG_WINDOW_GET_CLASS
@@ -1372,9 +1190,7 @@ MODEST_TOOLBAR_GET_CLASS ModestFolderView modest_folder_view_new modest_folder_view_set_title -modest_folder_view_is_empty -modest_folder_view_guess_folder_type -modest_folder_view_get_selected_account +modest_folder_view_get_selected MODEST_FOLDER_VIEW MODEST_IS_FOLDER_VIEW @@ -1403,6 +1219,21 @@ MODEST_COMBO_BOX_GET_CLASS
+modest-main-window +ModestMainWindow +ModestMainWindow +modest_main_window_new + +MODEST_MAIN_WINDOW +MODEST_IS_MAIN_WINDOW +MODEST_TYPE_MAIN_WINDOW +modest_main_window_get_type +MODEST_MAIN_WINDOW_CLASS +MODEST_IS_MAIN_WINDOW_CLASS +MODEST_MAIN_WINDOW_GET_CLASS +
+ +
modest-msg-view ModestMsgView ModestMsgView @@ -1419,35 +1250,25 @@ MODEST_MSG_VIEW_GET_CLASS
-modest-tny-store-actions -modest_tny_store_actions_create_folder -modest_tny_store_actions_remove_folder -modest_tny_store_actions_rename_folder -modest_tny_store_actions_move_folder +modest-window +ModestWindowParent +ModestWindowParentClass +ModestWindow +ModestWindow +modest_window_get_account_store +modest_window_get_widget_factory + +MODEST_WINDOW +MODEST_IS_WINDOW +MODEST_TYPE_WINDOW +modest_window_get_type +MODEST_WINDOW_CLASS +MODEST_IS_WINDOW_CLASS +MODEST_WINDOW_GET_CLASS
-modest-account-keys -MODEST_CONF_DEFAULT_ACCOUNT -MODEST_ACCOUNT_NAMESPACE -MODEST_SERVER_ACCOUNT_NAMESPACE -MODEST_CONF_REPLY_TYPE -MODEST_CONF_FORWARD_TYPE -MODEST_ACCOUNT_DISPLAY_NAME -MODEST_ACCOUNT_STORE_ACCOUNT -MODEST_ACCOUNT_TRANSPORT_ACCOUNT -MODEST_ACCOUNT_FULLNAME -MODEST_ACCOUNT_EMAIL -MODEST_ACCOUNT_PASSWORD -MDOEST_ACCOUNT_REMEMBER_PWD -MODEST_ACCOUNT_HOSTNAME -MODEST_ACCOUNT_USERNAME -MODEST_ACCOUNT_PROTO -MODEST_ACCOUNT_ENABLED -MODEST_ACCOUNT_TYPE -MODEST_ACCOUNT_LEAVE_ON_SERVER -MODEST_ACCOUNT_PREFERRED_CNX -MODEST_ACCOUNT_OPTIONS +modest-ui-actions
@@ -1463,6 +1284,15 @@ modest_text_utils_get_display_address modest_text_utils_get_subject_prefix_len modest_text_utils_utf8_strcmp modest_text_utils_get_display_date +modest_text_utils_validate_email_address +
+ +
+modest-tny-folder +ModestTnyFolderRules +modest_tny_folder_guess_folder_type +modest_tny_folder_guess_folder_type_from_name +modest_tny_folder_get_rules
@@ -1479,9 +1309,10 @@ modest_presets_destroy
modest-pair ModestPair +ModestPairList modest_pair_new -modest_pair_destroy -modest_pair_gslist_destroy +modest_pair_free +modest_pair_list_free
@@ -1495,53 +1326,77 @@ modest_icon_factory_get_big_icon
-modest-conf-keys +modest-defs +MODEST_DIR +MODEST_CACHE_DIR +MODEST_LOCAL_FOLDERS_MAILDIR MODEST_CONF_NAMESPACE MODEST_CONF_WIDGET_NAMESPACE -MODEST_MAIN_WINDOW_HEIGHT -MODEST_MAIN_WINDOW_HEIGHT_DEFAULT -MODEST_MAIN_WINDOW_WIDTH -MODEST_MAIN_WINDOW_WIDTH_DEFAULT -MODEST_MAIN_PANED_HEIGHT -MODEST_MAIN_PANED_HEIGHT_DEFAULT -MODEST_FOLDER_PANED_WIDTH -MODEST_FOLDER_PANED_WIDTH_DEFAULT -MODEST_FOLDER_PANED_DIVIDER_POS -MODEST_FOLDER_PANED_DIVIDER_POS_DEFAULT -MODEST_MSG_PANED_WIDTH -MODEST_MSG_PANED_WIDTH_DEFAULT -MODEST_MSG_PANED_DIVIDER_POS -MODEST_MSG_PANED_DIVIDER_POS_DEFAULT -MODEST_ACCOUNT_VIEW_WINDOW_HEIGHT_DEFAULT -MODEST_ACCOUNT_VIEW_WINDOW_WIDTH_DEFAULT -MODEST_EDIT_WINDOW_HEIGHT -MODEST_EDIT_WINDOW_HEIGHT_DEFAULT -MODEST_EDIT_WINDOW_WIDTH -MODEST_EDIT_WINDOW_WIDTH_DEFAULT -MODEST_MSG_VIEW_NAMESPACE -MODEST_MSG_VIEW_SHOW_ATTACHMENTS_INLINE -
- -
-modest-proto -MODEST_PROTO_SENDMAIL -MODEST_PROTO_SMTP -MODEST_PROTO_NONE -MODEST_PROTO_POP -MODEST_PROTO_IMAP -MODEST_PROTO_MAILDIR -MODEST_PROTO_MBOX -MODEST_SECURITY_PROTO_NONE -MODEST_SECURITY_PROTO_SSL -MODEST_SECURITY_PROTO_TLS -MODEST_AUTH_PROTO_PASSWORD -ModestProtoType -modest_proto_is_valid -modest_proto_type -modest_proto_store_protos -modest_proto_transport_protos -modest_proto_security_protos -modest_proto_auth_protos +MODEST_ACCOUNT_NAMESPACE +MODEST_SERVER_ACCOUNT_NAMESPACE +MODEST_CONF_REPLY_TYPE +MODEST_CONF_FORWARD_TYPE +MODEST_ACCOUNT_DISPLAY_NAME +MODEST_ACCOUNT_STORE_ACCOUNT +MODEST_ACCOUNT_TRANSPORT_ACCOUNT +MODEST_ACCOUNT_FULLNAME +MODEST_ACCOUNT_EMAIL +MODEST_ACCOUNT_PASSWORD +MDOEST_ACCOUNT_REMEMBER_PWD +MODEST_ACCOUNT_HOSTNAME +MODEST_ACCOUNT_USERNAME +MODEST_ACCOUNT_PROTO +MODEST_ACCOUNT_ENABLED +MODEST_ACCOUNT_TYPE +MODEST_ACCOUNT_LEAVE_ON_SERVER +MODEST_ACCOUNT_PREFERRED_CNX +MODEST_ACCOUNT_OPTIONS +
+ +
+modest-debug +MODEST_DEBUG +ModestDebugFlags +modest_debug_get_flags +modest_debug_g_type_init +modest_debug_logging_init +
+ +
+modest-error +ModestErrorDomain +ModestErrorCode +
+ +
+modest-widget-memory +modest_widget_memory_save +modest_widget_memory_restore +
+ +
+modest-protocol-info +ModestProtocol +ModestProtocolType +modest_protocol_info_get_protocol_list +modest_protocol_info_get_protocol_pair_list +modest_protocol_info_get_protocol_type +modest_protocol_info_get_protocol +modest_protocol_info_get_protocol_name +modest_protocol_info_get_protocol_display_name +modest_protocol_info_protocol_is_local_store +
+ +
+modest-ui-priv +ModestUIPrivate +
+ +
+modest-tny-msg-actions +modest_tny_msg_actions_find_body_part +modest_tny_msg_actions_find_nth_part +modest_tny_msg_actions_find_body
@@ -1560,27 +1415,32 @@ modest_marshal_VOID__STRING_POINTER_POINTER_POINTER
-modest-widget-memory -modest_widget_memory_save -modest_widget_memory_restore +modest-init +modest_init_header_columns +modest_init_local_folders
-modest-tny-msg-actions -modest_tny_msg_actions_find_body_part -modest_tny_msg_actions_find_nth_part -modest_tny_msg_actions_find_body +modest-local-folder-info +ModestLocalFolderType +modest_local_folder_info_get_type +modest_local_folder_info_get_type_name +modest_local_folder_info_get_type_display_name +modest_local_folder_info_get_maildir_path
-modest-error -ModestErrorDomain -ModestErrorCode +modest-widget-memory-priv +MODEST_WIDGET_MEMORY_PARAM_X +MODEST_WIDGET_MEMORY_PARAM_Y +MODEST_WIDGET_MEMORY_PARAM_HEIGHT +MODEST_WIDGET_MEMORY_PARAM_WIDTH +MODEST_WIDGET_MEMORY_PARAM_POS +MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH
modest-icon-names -PIXMAP_PREFIX MODEST_APP_ICON MODEST_HEADER_ICON_READ MODEST_HEADER_ICON_UNREAD @@ -1622,18 +1482,7 @@ MODEST_STOCK_STOP
-modest-ui-actions -modest_ui_actions_on_about -modest_ui_actions_on_delete -modest_ui_actions_on_quit -modest_ui_actions_on_accounts -modest_ui_actions_on_new_msg -modest_ui_actions_on_reply_forward -
- -
modest-icon-names -PIXMAP_PREFIX MODEST_APP_ICON MODEST_HEADER_ICON_READ MODEST_HEADER_ICON_UNREAD @@ -1662,6 +1511,20 @@ MODEST_TOOLBAR_ICON_DELETE MODEST_TOOLBAR_ICON_NEXT MODEST_TOOLBAR_ICON_PREV MODEST_TOOLBAR_ICON_STOP +MODEST_STOCK_MAIL_SEND +MODEST_STOCK_NEW_MAIL +MODEST_STOCK_SEND_RECEIVE +MODEST_STOCK_REPLY +MODEST_STOCK_REPLY_ALL +MODEST_STOCK_FORWARD +MODEST_STOCK_DELETE +MODEST_STOCK_NEXT +MODEST_STOCK_PREV +MODEST_STOCK_STOP +
+ +
+modest-main-window-ui
@@ -1669,39 +1532,77 @@ MODEST_TOOLBAR_ICON_STOP
+modest-edit-msg-window-ui +
+ +
+modest-window-priv +ModestWindowPrivate +MODEST_WINDOW_GET_PRIVATE +
+ +
+modest-main-window-ui +
+ +
modest-header-view-priv
-modest-tny-store-actions -modest_tny_store_actions_create_folder -modest_tny_store_actions_remove_folder -modest_tny_store_actions_rename_folder -modest_tny_store_actions_move_folder +modest-edit-msg-window-ui
-modest-account-keys -MODEST_CONF_DEFAULT_ACCOUNT -MODEST_ACCOUNT_NAMESPACE -MODEST_SERVER_ACCOUNT_NAMESPACE -MODEST_CONF_REPLY_TYPE -MODEST_CONF_FORWARD_TYPE -MODEST_ACCOUNT_DISPLAY_NAME -MODEST_ACCOUNT_STORE_ACCOUNT -MODEST_ACCOUNT_TRANSPORT_ACCOUNT -MODEST_ACCOUNT_FULLNAME -MODEST_ACCOUNT_EMAIL -MODEST_ACCOUNT_PASSWORD -MDOEST_ACCOUNT_REMEMBER_PWD -MODEST_ACCOUNT_HOSTNAME -MODEST_ACCOUNT_USERNAME -MODEST_ACCOUNT_PROTO -MODEST_ACCOUNT_ENABLED -MODEST_ACCOUNT_TYPE -MODEST_ACCOUNT_LEAVE_ON_SERVER -MODEST_ACCOUNT_PREFERRED_CNX -MODEST_ACCOUNT_OPTIONS +modest-window-priv +ModestWindowPrivate +MODEST_WINDOW_GET_PRIVATE +
+ +
+modest-icon-names +MODEST_APP_ICON +MODEST_HEADER_ICON_READ +MODEST_HEADER_ICON_UNREAD +MODEST_HEADER_ICON_DELETED +MODEST_HEADER_ICON_ATTACH +MODEST_FOLDER_ICON_OPEN +MODEST_FOLDER_ICON_CLOSED +MODEST_FOLDER_ICON_ACCOUNT +MODEST_FOLDER_ICON_INBOX +MODEST_FOLDER_ICON_OUTBOX +MODEST_FOLDER_ICON_SENT +MODEST_FOLDER_ICON_TRASH +MODEST_FOLDER_ICON_JUNK +MODEST_FOLDER_ICON_DRAFTS +MODEST_FOLDER_ICON_NORMAL +MODEST_FOLDER_ICON_CONTACTS +MODEST_FOLDER_ICON_NOTES +MODEST_FOLDER_ICON_CALENDAR +MODEST_TOOLBAR_ICON_MAIL_SEND +MODEST_TOOLBAR_ICON_NEW_MAIL +MODEST_TOOLBAR_ICON_SEND_RECEIVE +MODEST_TOOLBAR_ICON_REPLY +MODEST_TOOLBAR_ICON_REPLY_ALL +MODEST_TOOLBAR_ICON_FORWARD +MODEST_TOOLBAR_ICON_DELETE +MODEST_TOOLBAR_ICON_NEXT +MODEST_TOOLBAR_ICON_PREV +MODEST_TOOLBAR_ICON_STOP +MODEST_STOCK_MAIL_SEND +MODEST_STOCK_NEW_MAIL +MODEST_STOCK_SEND_RECEIVE +MODEST_STOCK_REPLY +MODEST_STOCK_REPLY_ALL +MODEST_STOCK_FORWARD +MODEST_STOCK_DELETE +MODEST_STOCK_NEXT +MODEST_STOCK_PREV +MODEST_STOCK_STOP +
+ +
+modest-ui-actions
@@ -1717,6 +1618,15 @@ modest_text_utils_get_display_address modest_text_utils_get_subject_prefix_len modest_text_utils_utf8_strcmp modest_text_utils_get_display_date +modest_text_utils_validate_email_address +
+ +
+modest-tny-folder +ModestTnyFolderRules +modest_tny_folder_guess_folder_type +modest_tny_folder_guess_folder_type_from_name +modest_tny_folder_get_rules
@@ -1733,9 +1643,10 @@ modest_presets_destroy
modest-pair ModestPair +ModestPairList modest_pair_new -modest_pair_destroy -modest_pair_gslist_destroy +modest_pair_free +modest_pair_list_free
@@ -1749,53 +1660,77 @@ modest_icon_factory_get_big_icon
-modest-conf-keys +modest-defs +MODEST_DIR +MODEST_CACHE_DIR +MODEST_LOCAL_FOLDERS_MAILDIR MODEST_CONF_NAMESPACE MODEST_CONF_WIDGET_NAMESPACE -MODEST_MAIN_WINDOW_HEIGHT -MODEST_MAIN_WINDOW_HEIGHT_DEFAULT -MODEST_MAIN_WINDOW_WIDTH -MODEST_MAIN_WINDOW_WIDTH_DEFAULT -MODEST_MAIN_PANED_HEIGHT -MODEST_MAIN_PANED_HEIGHT_DEFAULT -MODEST_FOLDER_PANED_WIDTH -MODEST_FOLDER_PANED_WIDTH_DEFAULT -MODEST_FOLDER_PANED_DIVIDER_POS -MODEST_FOLDER_PANED_DIVIDER_POS_DEFAULT -MODEST_MSG_PANED_WIDTH -MODEST_MSG_PANED_WIDTH_DEFAULT -MODEST_MSG_PANED_DIVIDER_POS -MODEST_MSG_PANED_DIVIDER_POS_DEFAULT -MODEST_ACCOUNT_VIEW_WINDOW_HEIGHT_DEFAULT -MODEST_ACCOUNT_VIEW_WINDOW_WIDTH_DEFAULT -MODEST_EDIT_WINDOW_HEIGHT -MODEST_EDIT_WINDOW_HEIGHT_DEFAULT -MODEST_EDIT_WINDOW_WIDTH -MODEST_EDIT_WINDOW_WIDTH_DEFAULT -MODEST_MSG_VIEW_NAMESPACE -MODEST_MSG_VIEW_SHOW_ATTACHMENTS_INLINE -
- -
-modest-proto -MODEST_PROTO_SENDMAIL -MODEST_PROTO_SMTP -MODEST_PROTO_NONE -MODEST_PROTO_POP -MODEST_PROTO_IMAP -MODEST_PROTO_MAILDIR -MODEST_PROTO_MBOX -MODEST_SECURITY_PROTO_NONE -MODEST_SECURITY_PROTO_SSL -MODEST_SECURITY_PROTO_TLS -MODEST_AUTH_PROTO_PASSWORD -ModestProtoType -modest_proto_is_valid -modest_proto_type -modest_proto_store_protos -modest_proto_transport_protos -modest_proto_security_protos -modest_proto_auth_protos +MODEST_ACCOUNT_NAMESPACE +MODEST_SERVER_ACCOUNT_NAMESPACE +MODEST_CONF_REPLY_TYPE +MODEST_CONF_FORWARD_TYPE +MODEST_ACCOUNT_DISPLAY_NAME +MODEST_ACCOUNT_STORE_ACCOUNT +MODEST_ACCOUNT_TRANSPORT_ACCOUNT +MODEST_ACCOUNT_FULLNAME +MODEST_ACCOUNT_EMAIL +MODEST_ACCOUNT_PASSWORD +MDOEST_ACCOUNT_REMEMBER_PWD +MODEST_ACCOUNT_HOSTNAME +MODEST_ACCOUNT_USERNAME +MODEST_ACCOUNT_PROTO +MODEST_ACCOUNT_ENABLED +MODEST_ACCOUNT_TYPE +MODEST_ACCOUNT_LEAVE_ON_SERVER +MODEST_ACCOUNT_PREFERRED_CNX +MODEST_ACCOUNT_OPTIONS +
+ +
+modest-debug +MODEST_DEBUG +ModestDebugFlags +modest_debug_get_flags +modest_debug_g_type_init +modest_debug_logging_init +
+ +
+modest-error +ModestErrorDomain +ModestErrorCode +
+ +
+modest-widget-memory +modest_widget_memory_save +modest_widget_memory_restore +
+ +
+modest-protocol-info +ModestProtocol +ModestProtocolType +modest_protocol_info_get_protocol_list +modest_protocol_info_get_protocol_pair_list +modest_protocol_info_get_protocol_type +modest_protocol_info_get_protocol +modest_protocol_info_get_protocol_name +modest_protocol_info_get_protocol_display_name +modest_protocol_info_protocol_is_local_store +
+ +
+modest-ui-priv +ModestUIPrivate +
+ +
+modest-tny-msg-actions +modest_tny_msg_actions_find_body_part +modest_tny_msg_actions_find_nth_part +modest_tny_msg_actions_find_body
@@ -1814,27 +1749,32 @@ modest_marshal_VOID__STRING_POINTER_POINTER_POINTER
-modest-widget-memory -modest_widget_memory_save -modest_widget_memory_restore +modest-init +modest_init_header_columns +modest_init_local_folders
-modest-tny-msg-actions -modest_tny_msg_actions_find_body_part -modest_tny_msg_actions_find_nth_part -modest_tny_msg_actions_find_body +modest-local-folder-info +ModestLocalFolderType +modest_local_folder_info_get_type +modest_local_folder_info_get_type_name +modest_local_folder_info_get_type_display_name +modest_local_folder_info_get_maildir_path
-modest-error -ModestErrorDomain -ModestErrorCode +modest-widget-memory-priv +MODEST_WIDGET_MEMORY_PARAM_X +MODEST_WIDGET_MEMORY_PARAM_Y +MODEST_WIDGET_MEMORY_PARAM_HEIGHT +MODEST_WIDGET_MEMORY_PARAM_WIDTH +MODEST_WIDGET_MEMORY_PARAM_POS +MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH
modest-icon-names -PIXMAP_PREFIX MODEST_APP_ICON MODEST_HEADER_ICON_READ MODEST_HEADER_ICON_UNREAD @@ -1876,18 +1816,7 @@ MODEST_STOCK_STOP
-modest-ui-actions -modest_ui_actions_on_about -modest_ui_actions_on_delete -modest_ui_actions_on_quit -modest_ui_actions_on_accounts -modest_ui_actions_on_new_msg -modest_ui_actions_on_reply_forward -
- -
modest-icon-names -PIXMAP_PREFIX MODEST_APP_ICON MODEST_HEADER_ICON_READ MODEST_HEADER_ICON_UNREAD @@ -1916,9 +1845,33 @@ MODEST_TOOLBAR_ICON_DELETE MODEST_TOOLBAR_ICON_NEXT MODEST_TOOLBAR_ICON_PREV MODEST_TOOLBAR_ICON_STOP +MODEST_STOCK_MAIL_SEND +MODEST_STOCK_NEW_MAIL +MODEST_STOCK_SEND_RECEIVE +MODEST_STOCK_REPLY +MODEST_STOCK_REPLY_ALL +MODEST_STOCK_FORWARD +MODEST_STOCK_DELETE +MODEST_STOCK_NEXT +MODEST_STOCK_PREV +MODEST_STOCK_STOP +
+ +
+modest-main-window-ui
modest-header-view-priv
+
+modest-edit-msg-window-ui +
+ +
+modest-window-priv +ModestWindowPrivate +MODEST_WINDOW_GET_PRIVATE +
+ diff --git a/docs/reference/tmpl/modest-account-keys.sgml b/docs/reference/tmpl/modest-account-keys.sgml deleted file mode 100644 index ef904c0..0000000 --- a/docs/reference/tmpl/modest-account-keys.sgml +++ /dev/null @@ -1,161 +0,0 @@ - -modest-account-keys - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/reference/tmpl/modest-account-mgr.sgml b/docs/reference/tmpl/modest-account-mgr.sgml index 9451b66..8e9f40e 100644 --- a/docs/reference/tmpl/modest-account-mgr.sgml +++ b/docs/reference/tmpl/modest-account-mgr.sgml @@ -44,25 +44,6 @@ ModestAccountMgr @arg1: @arg2: - - - - - -@modestaccountmgr: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@modestaccountmgr: the object which received the signal. -@arg1: -@arg2: - @@ -80,7 +61,8 @@ ModestAccountMgr @account_name: -@full_name: +@display_name: +@fullname: @email: @enabled: @transport_account: @@ -134,57 +116,57 @@ ModestAccountMgr @Returns: - + @self: -@err: +@name: @Returns: - + @self: -@account_name: -@type: -@proto: -@Returns: +@data: - + @self: -@name: -@server_account: @err: @Returns: - + @self: -@name: +@account_name: +@type: +@proto: @Returns: - + @self: -@data: +@name: +@server_account: +@err: +@Returns: diff --git a/docs/reference/tmpl/modest-conf-keys.sgml b/docs/reference/tmpl/modest-conf-keys.sgml deleted file mode 100644 index 642163d..0000000 --- a/docs/reference/tmpl/modest-conf-keys.sgml +++ /dev/null @@ -1,189 +0,0 @@ - -modest-conf-keys - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/reference/tmpl/modest-conf.sgml b/docs/reference/tmpl/modest-conf.sgml index bc6dde9..1381572 100644 --- a/docs/reference/tmpl/modest-conf.sgml +++ b/docs/reference/tmpl/modest-conf.sgml @@ -52,15 +52,6 @@ ModestConf @arg1: @arg2: - - - - - -@modestconf: the object which received the signal. -@arg1: -@arg2: - diff --git a/docs/reference/tmpl/modest-debug.sgml b/docs/reference/tmpl/modest-debug.sgml new file mode 100644 index 0000000..40c0b97 --- /dev/null +++ b/docs/reference/tmpl/modest-debug.sgml @@ -0,0 +1,60 @@ + +modest-debug + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@MODEST_DEBUG_ABORT_ON_WARNING: +@MODEST_DEBUG_LOG_ACTIONS: +@MODEST_DEBUG_DEBUG_OBJECTS: +@MODEST_DEBUG_DEBUG_SIGNALS: + + + + + + +@Returns: + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/modest-defs.sgml b/docs/reference/tmpl/modest-defs.sgml new file mode 100644 index 0000000..5bf5326 --- /dev/null +++ b/docs/reference/tmpl/modest-defs.sgml @@ -0,0 +1,189 @@ + +modest-defs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/modest-edit-msg-window-ui.sgml b/docs/reference/tmpl/modest-edit-msg-window-ui.sgml new file mode 100644 index 0000000..f46409f --- /dev/null +++ b/docs/reference/tmpl/modest-edit-msg-window-ui.sgml @@ -0,0 +1,21 @@ + +modest-edit-msg-window-ui + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/modest-edit-msg-window.sgml b/docs/reference/tmpl/modest-edit-msg-window.sgml index ecc2065..cb6c3e8 100644 --- a/docs/reference/tmpl/modest-edit-msg-window.sgml +++ b/docs/reference/tmpl/modest-edit-msg-window.sgml @@ -36,13 +36,53 @@ ModestEditMsgWindow @MODEST_EDIT_TYPE_VIEW: @MODEST_EDIT_TYPE_NUM: + + + + + +@from: +@to: +@cc: +@bcc: +@subject: +@body: + @factory: +@account_store: @type: @Returns: + + + + + +@self: +@msg: + + + + + + + +@edit_window: +@Returns: + + + + + + + +@edit_window: +@data: + + diff --git a/docs/reference/tmpl/modest-folder-view.sgml b/docs/reference/tmpl/modest-folder-view.sgml index c743bf6..a2e0ce1 100644 --- a/docs/reference/tmpl/modest-folder-view.sgml +++ b/docs/reference/tmpl/modest-folder-view.sgml @@ -25,33 +25,6 @@ ModestFolderView - - - - - -@: -@: -@: - - - - - - -@: -@: -@: - - - - - - -@: -@: -@: - @@ -71,25 +44,7 @@ ModestFolderView @title: - - - - - -@self: -@Returns: - - - - - - - -@folder: -@Returns: - - - + diff --git a/docs/reference/tmpl/modest-header-view.sgml b/docs/reference/tmpl/modest-header-view.sgml index 78d291e..642aef8 100644 --- a/docs/reference/tmpl/modest-header-view.sgml +++ b/docs/reference/tmpl/modest-header-view.sgml @@ -38,7 +38,9 @@ ModestHeaderView @MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE: @MODEST_HEADER_VIEW_COLUMN_MSGTYPE: @MODEST_HEADER_VIEW_COLUMN_ATTACH: -@MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER: +@MODEST_HEADER_VIEW_COLUMN_SIZE: +@MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN: +@MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT: @MODEST_HEADER_VIEW_COLUMN_NUM: @@ -46,8 +48,8 @@ ModestHeaderView -@MODEST_HEADER_VIEW_STYLE_NORMAL: -@MODEST_HEADER_VIEW_STYLE_COMPACT: +@MODEST_HEADER_VIEW_STYLE_DETAILS: +@MODEST_HEADER_VIEW_STYLE_TWOLINES: @MODEST_HEADER_VIEW_STYLE_NUM: @@ -65,84 +67,6 @@ ModestHeaderView - - - - - -@modestheaderview: the object which received the signal. -@arg1: - - - - - - -@: -@: - - - - - - -@modestheaderview: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@modestheaderview: the object which received the signal. -@arg1: - - - - - - -@: -@: - - - - - - -@modestheaderview: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@modestheaderview: the object which received the signal. -@arg1: - - - - - - -@: -@: - - - - - - -@modestheaderview: the object which received the signal. -@arg1: -@arg2: -@arg3: - @@ -220,3 +144,20 @@ ModestHeaderView @Returns: + + + + + +@self: +@Returns: + + + + + + + +@self: + + diff --git a/docs/reference/tmpl/modest-icon-names.sgml b/docs/reference/tmpl/modest-icon-names.sgml index 065178e..40c98ab 100644 --- a/docs/reference/tmpl/modest-icon-names.sgml +++ b/docs/reference/tmpl/modest-icon-names.sgml @@ -215,3 +215,73 @@ modest-icon-names + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/modest-init.sgml b/docs/reference/tmpl/modest-init.sgml new file mode 100644 index 0000000..01460bd --- /dev/null +++ b/docs/reference/tmpl/modest-init.sgml @@ -0,0 +1,38 @@ + +modest-init + + + + + + + + + + + + + + + + + + + + + + + + +@overwrite: +@Returns: + + + + + + + +@Returns: + + diff --git a/docs/reference/tmpl/modest-local-folder-info.sgml b/docs/reference/tmpl/modest-local-folder-info.sgml new file mode 100644 index 0000000..7cfb9f9 --- /dev/null +++ b/docs/reference/tmpl/modest-local-folder-info.sgml @@ -0,0 +1,70 @@ + +modest-local-folder-info + + + + + + + + + + + + + + + + + + + + + + + + +@MODEST_LOCAL_FOLDER_TYPE_UNKNOWN: +@MODEST_LOCAL_FOLDER_TYPE_DRAFTS: +@MODEST_LOCAL_FOLDER_TYPE_SENT: +@MODEST_LOCAL_FOLDER_TYPE_OUTBOX: +@MODEST_LOCAL_FOLDER_TYPE_ARCHIVE: +@MODEST_LOCAL_FOLDER_TYPE_JUNK: +@MODEST_LOCAL_FOLDER_TYPE_TRASH: +@MODEST_LOCAL_FOLDER_TYPE_NUM: + + + + + + +@name: +@Returns: + + + + + + + +@type: +@Returns: + + + + + + + +@type: +@Returns: + + + + + + + +@Returns: + + diff --git a/docs/reference/tmpl/modest-mail-operation.sgml b/docs/reference/tmpl/modest-mail-operation.sgml index 8d15059..d839619 100644 --- a/docs/reference/tmpl/modest-mail-operation.sgml +++ b/docs/reference/tmpl/modest-mail-operation.sgml @@ -67,14 +67,7 @@ ModestMailOperation -@: - - - - - - -@: +@modestmailoperation: the object which received the signal. diff --git a/docs/reference/tmpl/modest-main-window-ui.sgml b/docs/reference/tmpl/modest-main-window-ui.sgml new file mode 100644 index 0000000..7e99d5c --- /dev/null +++ b/docs/reference/tmpl/modest-main-window-ui.sgml @@ -0,0 +1,21 @@ + +modest-main-window-ui + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/modest-main-window.sgml b/docs/reference/tmpl/modest-main-window.sgml index 935d576..5812f77 100644 --- a/docs/reference/tmpl/modest-main-window.sgml +++ b/docs/reference/tmpl/modest-main-window.sgml @@ -31,7 +31,7 @@ ModestMainWindow @factory: -@ui_manager: +@account_store: @Returns: diff --git a/docs/reference/tmpl/modest-msg-view.sgml b/docs/reference/tmpl/modest-msg-view.sgml index 9b7de65..ee95a93 100644 --- a/docs/reference/tmpl/modest-msg-view.sgml +++ b/docs/reference/tmpl/modest-msg-view.sgml @@ -25,78 +25,6 @@ ModestMsgView - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - diff --git a/docs/reference/tmpl/modest-pair.sgml b/docs/reference/tmpl/modest-pair.sgml index 66b40e6..e665fc1 100644 --- a/docs/reference/tmpl/modest-pair.sgml +++ b/docs/reference/tmpl/modest-pair.sgml @@ -28,6 +28,12 @@ modest-pair @second: @own: + + + + + + @@ -39,7 +45,7 @@ modest-pair @Returns: - + @@ -47,7 +53,7 @@ modest-pair @self: - + diff --git a/docs/reference/tmpl/modest-proto.sgml b/docs/reference/tmpl/modest-proto.sgml deleted file mode 100644 index 6c2544d..0000000 --- a/docs/reference/tmpl/modest-proto.sgml +++ /dev/null @@ -1,155 +0,0 @@ - -modest-proto - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@proto: -@store_proto: -@Returns: - - - - - - - -@proto: -@Returns: - - - - - - - -@Returns: - - - - - - - -@Returns: - - - - - - - -@Returns: - - - - - - - -@Returns: - - diff --git a/docs/reference/tmpl/modest-protocol-info.sgml b/docs/reference/tmpl/modest-protocol-info.sgml new file mode 100644 index 0000000..9214187 --- /dev/null +++ b/docs/reference/tmpl/modest-protocol-info.sgml @@ -0,0 +1,114 @@ + +modest-protocol-info + + + + + + + + + + + + + + + + + + + + + + + + +@MODEST_PROTOCOL_UNKNOWN: +@MODEST_PROTOCOL_TRANSPORT_SENDMAIL: +@MODEST_PROTOCOL_TRANSPORT_SMTP: +@MODEST_PROTOCOL_STORE_POP: +@MODEST_PROTOCOL_STORE_IMAP: +@MODEST_PROTOCOL_STORE_MAILDIR: +@MODEST_PROTOCOL_STORE_MBOX: +@MODEST_PROTOCOL_SECURITY_SSL: +@MODEST_PROTOCOL_SECURITY_TLS: +@MODEST_PROTOCOL_AUTH_NONE: +@MODEST_PROTOCOL_AUTH_PASSWORD: +@MODEST_PROTOCOL_NUM: + + + + + + +@MODEST_PROTOCOL_TYPE_UNKNOWN: +@MODEST_PROTOCOL_TYPE_TRANSPORT: +@MODEST_PROTOCOL_TYPE_STORE: +@MODEST_PROTOCOL_TYPE_SECURITY: +@MODEST_PROTOCOL_TYPE_AUTH: +@MODEST_PROTOCOL_TYPE_NUM: + + + + + + +@type: +@Returns: + + + + + + + +@type: +@Returns: + + + + + + + +@proto: +@Returns: + + + + + + + +@name: +@Returns: + + + + + + + +@proto: +@Returns: + + + + + + + +@proto: +@Returns: + + + + + + + +@proto: +@Returns: + + diff --git a/docs/reference/tmpl/modest-protocol-mgr.sgml b/docs/reference/tmpl/modest-protocol-mgr.sgml deleted file mode 100644 index d8aea74..0000000 --- a/docs/reference/tmpl/modest-protocol-mgr.sgml +++ /dev/null @@ -1,178 +0,0 @@ - -ModestProtocolMgr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@MODEST_PROTOCOL_TYPE_TRANSPORT: -@MODEST_PROTOCOL_TYPE_STORE: -@MODEST_PROTOCOL_TYPE_SECURITY: -@MODEST_PROTOCOL_TYPE_AUTH: -@MODEST_PROTOCOL_TYPE_ANY: -@MODEST_PROTOCOL_TYPE_NUM: - - - - - - -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@proto: -@type: -@Returns: - - diff --git a/docs/reference/tmpl/modest-store-widget.sgml b/docs/reference/tmpl/modest-store-widget.sgml index 67aa850..f07392a 100644 --- a/docs/reference/tmpl/modest-store-widget.sgml +++ b/docs/reference/tmpl/modest-store-widget.sgml @@ -25,41 +25,6 @@ ModestStoreWidget - - - - - -@modeststorewidget: the object which received the signal. - - - - - - -@modeststorewidget: the object which received the signal. - - - - - - -@modeststorewidget: the object which received the signal. - - - - - - -@modeststorewidget: the object which received the signal. - - - - - - -@modeststorewidget: the object which received the signal. - diff --git a/docs/reference/tmpl/modest-text-utils.sgml b/docs/reference/tmpl/modest-text-utils.sgml index f40aab9..ae8f6be 100644 --- a/docs/reference/tmpl/modest-text-utils.sgml +++ b/docs/reference/tmpl/modest-text-utils.sgml @@ -137,3 +137,12 @@ modest-text-utils @Returns: + + + + + +@email_address: +@Returns: + + diff --git a/docs/reference/tmpl/modest-tny-account-store.sgml b/docs/reference/tmpl/modest-tny-account-store.sgml index dbf4c6c..d49a634 100644 --- a/docs/reference/tmpl/modest-tny-account-store.sgml +++ b/docs/reference/tmpl/modest-tny-account-store.sgml @@ -44,30 +44,11 @@ ModestTnyAccountStore -@: -@Param2: -@Param3: -@Param4: -@Param5: - - - - - - @modesttnyaccountstore: the object which received the signal. @arg1: - - - - - - -@: -@Param2: -@Param3: -@Param4: -@Param5: +@arg2: +@arg3: +@arg4: diff --git a/docs/reference/tmpl/modest-tny-attachment.sgml b/docs/reference/tmpl/modest-tny-attachment.sgml deleted file mode 100644 index 2c31467..0000000 --- a/docs/reference/tmpl/modest-tny-attachment.sgml +++ /dev/null @@ -1,114 +0,0 @@ - -ModestTnyAttachment - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@Returns: - - - - - - - -@self: -@thing: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@thing: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@thing: - - - - - - - -@self: -@Returns: - - - - - - - -@self: - - - - - - - -@self: -@Returns: - - - - - - - -@list: - - diff --git a/docs/reference/tmpl/modest-tny-folder.sgml b/docs/reference/tmpl/modest-tny-folder.sgml new file mode 100644 index 0000000..28a9e1c --- /dev/null +++ b/docs/reference/tmpl/modest-tny-folder.sgml @@ -0,0 +1,56 @@ + +modest-tny-folder + + + + + + + + + + + + + + + + + + + + + + + + +@MODEST_FOLDER_RULES_FOLDER_READ_ONLY: +@MODEST_FOLDER_RULES_FOLDER_DELETABLE: + + + + + + +@folder: +@Returns: + + + + + + + +@folder_name: +@Returns: + + + + + + + +@folder: +@Returns: + + diff --git a/docs/reference/tmpl/modest-tny-msg-view.sgml b/docs/reference/tmpl/modest-tny-msg-view.sgml deleted file mode 100644 index e047d7a..0000000 --- a/docs/reference/tmpl/modest-tny-msg-view.sgml +++ /dev/null @@ -1,19 +0,0 @@ - -ModestTnyMsgView - - -A widget that displays the body of a message - - - - - - - - - - - - - - diff --git a/docs/reference/tmpl/modest-tny-platform-factory.sgml b/docs/reference/tmpl/modest-tny-platform-factory.sgml index b95a37d..37f5731 100644 --- a/docs/reference/tmpl/modest-tny-platform-factory.sgml +++ b/docs/reference/tmpl/modest-tny-platform-factory.sgml @@ -33,7 +33,7 @@ ModestTnyPlatformFactory @Returns: - + @@ -42,7 +42,7 @@ ModestTnyPlatformFactory @Returns: - + @@ -51,7 +51,7 @@ ModestTnyPlatformFactory @Returns: - + diff --git a/docs/reference/tmpl/modest-tny-store-actions.sgml b/docs/reference/tmpl/modest-tny-store-actions.sgml deleted file mode 100644 index 36c4222..0000000 --- a/docs/reference/tmpl/modest-tny-store-actions.sgml +++ /dev/null @@ -1,57 +0,0 @@ - -modest-tny-store-actions - - - - - - - - - - - - - - - - - - - - - - - - -@parent: -@name: -@Returns: - - - - - - - -@folder: - - - - - - - -@folder: -@name: - - - - - - - -@folder: -@parent: - - diff --git a/docs/reference/tmpl/modest-tny-transport-actions.sgml b/docs/reference/tmpl/modest-tny-transport-actions.sgml deleted file mode 100644 index 898f638..0000000 --- a/docs/reference/tmpl/modest-tny-transport-actions.sgml +++ /dev/null @@ -1,35 +0,0 @@ - -ModestTnyTransportActions - - - - - - - - - - - - - - - - - - - - - - -@transport_account: -@from: -@to: -@cc: -@bcc: -@subject: -@body: -@attachments_list: -@Returns: - - diff --git a/docs/reference/tmpl/modest-toolbar.sgml b/docs/reference/tmpl/modest-toolbar.sgml deleted file mode 100644 index b2c1084..0000000 --- a/docs/reference/tmpl/modest-toolbar.sgml +++ /dev/null @@ -1,79 +0,0 @@ - -ModestToolbar - - - - - - - - - - - - - - - - - - - - - - - - -@MODEST_TOOLBAR_BUTTON_MAIL_SEND: -@MODEST_TOOLBAR_BUTTON_NEW_MAIL: -@MODEST_TOOLBAR_BUTTON_REPLY: -@MODEST_TOOLBAR_BUTTON_REPLY_ALL: -@MODEST_TOOLBAR_BUTTON_FORWARD: -@MODEST_TOOLBAR_BUTTON_PRINT: -@MODEST_TOOLBAR_BUTTON_DELETE: -@MODEST_TOOLBAR_BUTTON_NEXT: -@MODEST_TOOLBAR_BUTTON_PREV: -@MODEST_TOOLBAR_BUTTON_STOP: -@MODEST_TOOLBAR_BUTTON_SEND_RECEIVE: -@MODEST_TOOLBAR_SEPARATOR: -@MODEST_TOOLBAR_BUTTON_NUM: - - - - - - - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@: -@: - - - - - - -@buttons: -@Returns: - - diff --git a/docs/reference/tmpl/modest-transport-widget.sgml.bak b/docs/reference/tmpl/modest-transport-widget.sgml.bak new file mode 100644 index 0000000..f780a59 --- /dev/null +++ b/docs/reference/tmpl/modest-transport-widget.sgml.bak @@ -0,0 +1,82 @@ + +ModestTransportWidget + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@factory: +@proto: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + + + + + + +@self: +@Returns: + + diff --git a/docs/reference/tmpl/modest-ui-actions.sgml b/docs/reference/tmpl/modest-ui-actions.sgml new file mode 100644 index 0000000..a7d82b2 --- /dev/null +++ b/docs/reference/tmpl/modest-ui-actions.sgml @@ -0,0 +1,21 @@ + +modest-ui-actions + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/modest-ui-priv.sgml b/docs/reference/tmpl/modest-ui-priv.sgml new file mode 100644 index 0000000..072d48f --- /dev/null +++ b/docs/reference/tmpl/modest-ui-priv.sgml @@ -0,0 +1,31 @@ + +modest-ui-priv + + + + + + + + + + + + + + + + + + + + + + + + +@widget_factory: +@account_store: +@main_window: +@ui_manager: + diff --git a/docs/reference/tmpl/modest-ui.sgml b/docs/reference/tmpl/modest-ui.sgml index 057d514..35ad959 100644 --- a/docs/reference/tmpl/modest-ui.sgml +++ b/docs/reference/tmpl/modest-ui.sgml @@ -43,3 +43,13 @@ ModestUI @Returns: + + + + + +@modest_ui: +@edit_type: +@Returns: + + diff --git a/docs/reference/tmpl/modest-unused.sgml b/docs/reference/tmpl/modest-unused.sgml index c9f58b0..e69de29 100644 --- a/docs/reference/tmpl/modest-unused.sgml +++ b/docs/reference/tmpl/modest-unused.sgml @@ -1,881 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -ModestEditWindow - - - - - - - - - - - - - - - - - - - - - - - -ModestTnyFolderTreeView - - - - - - - - - - - - - - - - - - - - - - - -ModestTnyHeaderTreeView - - - - - - - - - - - - - - - -A widget that displays the body of a message - - - - - - - -ModestTnyMsgView - - - - - - - - - - - - - - - - - - - - - - - -ModestTnyTransportActions - - - - - - - - - - - - - - - - - - - - - - - -ModestWindowMgr - - - - - - - - - - - - - - - - - - - - - - - -modest.glade - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@parent: - - - - - - -@modestheaderview: the object which received the signal. -@arg1: - - - - - - -@win: -@type: -@id: - - - - - - -@parent: - - - - - - -@parent: - - - - - - -@parent: - - - - - - -@parent: - - - - - - -@parent: - - - - - - - - - - - - - - - - - - -@self: -@name: -@key: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@err: -@Returns: - - - - - - -@self: -@name: -@err: -@Returns: - - - - - - -@self: -@name: -@err: -@Returns: - - - - - - -@self: -@account_name: -@type: -@proto: -@only_enabled: -@Returns: - - - - - - -@self: -@name: -@key: -@val: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@val: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@val: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@val: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@val: -@err: -@Returns: - - - - - - -@self: -@name: -@key: -@val: -@err: -@Returns: - - - - - - -@self: -@key: -@defaultval: -@Returns: - - - - - - -@self: -@key: -@defaultval: -@Returns: - - - - - - -@to: -@cc: -@bcc: -@subject: -@body: -@attachments: -@Returns: - - - - - - -@mail_operation: -@folder: - - - - - - -@from: -@sent_date: -@text: -@Returns: - - - - - - -@subject: -@Returns: - - - - - - -@from: -@sent_date: -@to: -@subject: -@text: -@Returns: - - - - - - -@subject: -@Returns: - - - - - - -@address: -@Returns: - - - - - - -@emails: -@email: -@Returns: - - - - - - -@self: -@Returns: - - - - - - -@iface: -@Returns: - - - - - - -@folder: -@columns: -@style: -@Returns: - - - - - - -@self: -@folder: -@Returns: - - - - - - -@header: -@folder: - - - - - - -@header: -@folder: - - - - - - -@header: - - - - - - -@tny_msg: -@Returns: - - - - - - -@self: -@tny_msg: - - - - - - -@Returns: - - - - - - -@transport_account: -@from: -@to: -@cc: -@bcc: -@subject: -@body: -@attachments_list: -@Returns: - - - - - - -@widget: -@user_data: - - - - - - -@widget: -@main_window: - - - - - - -@widget: -@main_window: - - - - - - -@widget: -@main_window: - - - - - - -@widget: -@main_window: - - - - - - -@widget: -@main_window: - - - - - - -@bcc: -@window_data: -@Returns: - - - - - - -@body: -@window_data: -@Returns: - - - - - - -@cc: -@window_data: -@Returns: - - - - - - -@subject: -@window_data: -@Returns: - - - - - - -@to: -@window_data: -@Returns: - - - - - - -@window_data: -@Returns: - - - - - - -@ui: -@to: -@cc: -@bcc: -@subject: -@body: -@att: -@Returns: - - - - - - -@modest_ui: -@user_data: -@Returns: - - - - - - -@modest_ui: -@msg_view: -@msg: -@user_data: -@Returns: - - - - - - -@ui: -@to: -@cc: -@bcc: -@subject: -@body: -@att: -@Returns: - - - - - - -@ui: -@Returns: - - - - - - -@self: -@items: -@Returns: - - - - - - -@self: -@items: -@Returns: - - - - - - -@self: -@window_id: -@Returns: - - - - - - -@self: -@type: -@Returns: - - - - - - -@Returns: - - - - - - -@self: -@win: -@type: -@window_id: -@Returns: - - - - - - -@self: -@win: -@Returns: - diff --git a/docs/reference/tmpl/modest-widget-factory.sgml b/docs/reference/tmpl/modest-widget-factory.sgml index d529a32..178a8a2 100644 --- a/docs/reference/tmpl/modest-widget-factory.sgml +++ b/docs/reference/tmpl/modest-widget-factory.sgml @@ -35,6 +35,7 @@ ModestWidgetFactory @MODEST_COMBO_BOX_TYPE_SECURITY_PROTOS: @MODEST_COMBO_BOX_TYPE_AUTH_PROTOS: @MODEST_COMBO_BOX_TYPE_TRANSPORTS: +@MODEST_COMBO_BOX_TYPE_REMOTE_STORES: diff --git a/docs/reference/tmpl/modest-widget-memory-priv.sgml b/docs/reference/tmpl/modest-widget-memory-priv.sgml new file mode 100644 index 0000000..05eec75 --- /dev/null +++ b/docs/reference/tmpl/modest-widget-memory-priv.sgml @@ -0,0 +1,63 @@ + +modest-widget-memory-priv + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/tmpl/modest-window-priv.sgml b/docs/reference/tmpl/modest-window-priv.sgml new file mode 100644 index 0000000..85fc378 --- /dev/null +++ b/docs/reference/tmpl/modest-window-priv.sgml @@ -0,0 +1,41 @@ + +modest-window-priv + + + + + + + + + + + + + + + + + + + + + + + + +@widget_factory: +@plat_factory: +@account_store: +@ui_manager: +@toolbar: +@menubar: + + + + + + +@o: + + diff --git a/docs/reference/tmpl/modest-window.sgml b/docs/reference/tmpl/modest-window.sgml new file mode 100644 index 0000000..f0fb089 --- /dev/null +++ b/docs/reference/tmpl/modest-window.sgml @@ -0,0 +1,57 @@ + +ModestWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@window: +@Returns: + + + + + + + +@window: +@Returns: + + diff --git a/docs/reference/tmpl/modest.glade.sgml b/docs/reference/tmpl/modest.glade.sgml deleted file mode 100644 index 7a5412f..0000000 --- a/docs/reference/tmpl/modest.glade.sgml +++ /dev/null @@ -1,19 +0,0 @@ - -modest.glade - - - - - - - - - - - - - - - - - diff --git a/po/modest.pot b/po/modest.pot deleted file mode 100644 index 9edcc95..0000000 --- a/po/modest.pot +++ /dev/null @@ -1,508 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-10 11:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../src/modest-mail-operation.c:188 ../src/modest-mail-operation.c:232 -msgid "Error trying to send a mail. Use a transport account" -msgstr "" - -#: ../src/modest-mail-operation.c:223 -msgid "Error trying to send a mail. You need to set almost one a recipient" -msgstr "" - -#: ../src/modest-mail-operation.c:523 -msgid "Error trying to update an account. Use a store account" -msgstr "" - -#: ../src/modest-protocol-mgr.c:137 -msgid "Sendmail" -msgstr "" - -#: ../src/modest-protocol-mgr.c:142 -msgid "SMTP-server" -msgstr "" - -#: ../src/modest-protocol-mgr.c:162 -msgid "POP3" -msgstr "" - -#: ../src/modest-protocol-mgr.c:167 -msgid "IMAP v4" -msgstr "" - -#: ../src/modest-protocol-mgr.c:172 -msgid "Mbox" -msgstr "" - -#: ../src/modest-protocol-mgr.c:177 -msgid "Maildir" -msgstr "" - -#: ../src/modest-protocol-mgr.c:196 ../src/modest-protocol-mgr.c:227 -msgid "None" -msgstr "" - -#: ../src/modest-protocol-mgr.c:201 -msgid "TLS" -msgstr "" - -#: ../src/modest-protocol-mgr.c:206 -msgid "SSL" -msgstr "" - -#: ../src/modest-protocol-mgr.c:232 -msgid "Password" -msgstr "" - -#: ../src/modest-text-utils.c:225 -#, c-format -msgid "On %s, %s wrote:\n" -msgstr "" - -#: ../src/modest-text-utils.c:302 -msgid "Re:" -msgstr "" - -#: ../src/modest-text-utils.c:316 -msgid "Fw:" -msgstr "" - -#: ../src/modest-text-utils.c:340 -msgid "-----Original message-----" -msgstr "" - -#: ../src/modest-text-utils.c:341 ../src/gtk/modest-edit-msg-window.c:384 -msgid "From:" -msgstr "" - -#: ../src/modest-text-utils.c:342 -msgid "Sent:" -msgstr "" - -#: ../src/modest-text-utils.c:343 -msgid "To:" -msgstr "" - -#: ../src/modest-text-utils.c:344 ../src/gtk/modest-edit-msg-window.c:389 -msgid "Subject:" -msgstr "" - -#: ../src/modest-widget-factory.c:480 -#, c-format -msgid "%d %s, %d unread" -msgstr "" - -#: ../src/modest-widget-factory.c:481 -msgid "item" -msgstr "" - -#: ../src/modest-widget-factory.c:481 -msgid "items" -msgstr "" - -#: ../src/modest-widget-factory.c:582 -#, c-format -msgid "Opening %s..." -msgstr "" - -#: ../src/modest-widget-factory.c:593 -#, c-format -msgid "Opening attachment %d..." -msgstr "" - -#: ../src/modest-widget-factory.c:610 -msgid "Online" -msgstr "" - -#: ../src/modest-widget-factory.c:610 -msgid "Offline" -msgstr "" - -#: ../src/modest-widget-factory.c:612 -msgid "Modest went online" -msgstr "" - -#: ../src/modest-widget-factory.c:612 -msgid "Modest went offline" -msgstr "" - -#: ../src/modest-widget-factory.c:657 -#, c-format -msgid "The %s you selected cannot be found" -msgstr "" - -#: ../src/modest-widget-factory.c:662 -msgid "Connection requested" -msgstr "" - -#: ../src/modest-widget-factory.c:671 -#, c-format -msgid "" -"This %s is not available in offline mode.\n" -"Do you want to get online?" -msgstr "" - -#: ../src/modest-widget-factory.c:694 -msgid "Password requested" -msgstr "" - -#: ../src/modest-widget-factory.c:703 -#, c-format -msgid "Please enter your password for %s" -msgstr "" - -#: ../src/gtk/modest-account-view-window.c:294 -msgid "Accounts" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:128 -msgid "" -"Welcome to the account assistant\n" -"\n" -"It will help to set up a new e-mail account\n" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:136 -msgid "Modest Account Assistant" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:196 -msgid "" -"Please enter your name and your e-mail address below.\n" -"\n" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:200 -msgid "Full name" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:202 -msgid "E-mail address" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:222 -msgid "Identity" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:264 -#: ../src/gtk/modest-account-assistant.c:336 -msgid "Please select among the following options" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:268 -#: ../src/gtk/modest-account-assistant.c:340 -msgid "Server type" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:288 -msgid "Receiving mail" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:360 -msgid "Sending mail" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:381 -msgid "We're almost done. Press 'Apply' to store this new account" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:388 -msgid "Account name:" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:397 -msgid "Account Management" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:451 -msgid "" -"Are you sure you want to cancel\n" -"setting up a new account?" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:454 -msgid "Cancel" -msgstr "" - -#: ../src/gtk/modest-account-assistant.c:590 -msgid "Modest Account Wizard" -msgstr "" - -#: ../src/gtk/modest-edit-msg-window.c:371 -msgid "To..." -msgstr "" - -#: ../src/gtk/modest-edit-msg-window.c:372 -msgid "Cc..." -msgstr "" - -#: ../src/gtk/modest-edit-msg-window.c:373 -msgid "Bcc..." -msgstr "" - -#: ../src/gtk/modest-transport-widget.c:124 -msgid "SMTP configuration" -msgstr "" - -#: ../src/gtk/modest-transport-widget.c:130 -msgid "Servername: " -msgstr "" - -#: ../src/gtk/modest-transport-widget.c:136 -msgid "Requires authentication" -msgstr "" - -#: ../src/gtk/modest-transport-widget.c:140 -#: ../src/gtk/modest-store-widget.c:220 -msgid "Security" -msgstr "" - -#: ../src/gtk/modest-transport-widget.c:145 -#: ../src/gtk/modest-store-widget.c:225 -msgid "Connection type:" -msgstr "" - -#: ../src/gtk/modest-transport-widget.c:155 -#: ../src/gtk/modest-store-widget.c:235 -msgid "Authentication:" -msgstr "" - -#: ../src/gtk/modest-transport-widget.c:161 -#: ../src/gtk/modest-store-widget.c:242 -msgid "Remember password" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:134 -msgid "Maildir configuration" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:138 -msgid "Please select the path to your Maildir below" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:141 -msgid "Path:" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:144 ../src/gtk/modest-store-widget.c:178 -msgid "(none)" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:168 -msgid "Mbox configuration" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:172 -msgid "Please select your mbox file below" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:175 -msgid "mbox:" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:200 -msgid "Server configuration" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:204 -msgid "Username:" -msgstr "" - -#: ../src/gtk/modest-store-widget.c:212 -msgid "Server:" -msgstr "" - -#: ../src/widgets/modest-account-view.c:269 -msgid "Enabled" -msgstr "" - -#: ../src/widgets/modest-account-view.c:273 -msgid "Account" -msgstr "" - -#: ../src/widgets/modest-account-view.c:278 -msgid "Type" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:178 -msgid "inbox" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:181 -msgid "outbox" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:184 -msgid "junk" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:187 -msgid "trash" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:190 -msgid "sent" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:195 -msgid "draft" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:198 -msgid "notes" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:201 -msgid "contacts" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:204 -msgid "calendar" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:293 -msgid "All Mail Folders" -msgstr "" - -#: ../src/widgets/modest-folder-view.c:405 -msgid "(empty)" -msgstr "" - -#: ../src/widgets/modest-header-view.c:286 -#, c-format -msgid "%X" -msgstr "" - -#: ../src/widgets/modest-header-view.c:400 -msgid "M" -msgstr "" - -#: ../src/widgets/modest-header-view.c:408 -msgid "A" -msgstr "" - -#: ../src/widgets/modest-header-view.c:415 -msgid "Received" -msgstr "" - -#: ../src/widgets/modest-header-view.c:422 -msgid "From" -msgstr "" - -#: ../src/widgets/modest-header-view.c:429 -msgid "To" -msgstr "" - -#: ../src/widgets/modest-header-view.c:436 -msgid "Header" -msgstr "" - -#: ../src/widgets/modest-header-view.c:443 -msgid "Subject" -msgstr "" - -#: ../src/widgets/modest-header-view.c:451 -msgid "Sent" -msgstr "" - -#: ../src/widgets/modest-msg-view.c:398 -msgid "attachment" -msgstr "" - -#: ../src/widgets/modest-msg-view.c:411 -msgid "Attachments" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:124 -msgid "Send" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:125 -msgid "Send the current email message" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:129 -msgid "New mail" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:130 -msgid "Compose a new email message" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:134 -msgid "Send/Receive" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:135 -msgid "Send and receive messages" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:139 -msgid "Reply" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:140 -msgid "Reply to the selected email message" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:144 -msgid "Reply all" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:145 -msgid "Reply to all people the selected email was sent to" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:149 -msgid "Forward" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:150 -msgid "Forward the selected email" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:154 -msgid "Delete" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:155 -msgid "Delete the selected email message(s)" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:159 -msgid "Next" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:160 -msgid "Move to the next message" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:164 -msgid "Previous" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:165 -msgid "Move to the previous message" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:169 -msgid "Stop" -msgstr "" - -#: ../src/widgets/modest-toolbar.c:170 -msgid "Stop whatever" -msgstr "" diff --git a/src/gtk/modest-edit-msg-window.c b/src/gtk/modest-edit-msg-window.c index 5707116..113111f 100644 --- a/src/gtk/modest-edit-msg-window.c +++ b/src/gtk/modest-edit-msg-window.c @@ -33,6 +33,7 @@ #include "modest-icon-names.h" #include "modest-icon-factory.h" #include "modest-widget-memory.h" +#include "modest-window-priv.h" #include "modest-mail-operation.h" #include "modest-tny-platform-factory.h" #include "modest-tny-msg-actions.h" @@ -53,15 +54,15 @@ enum { typedef struct _ModestEditMsgWindowPrivate ModestEditMsgWindowPrivate; struct _ModestEditMsgWindowPrivate { - ModestWidgetFactory *widget_factory; - TnyPlatformFactory *fact; - TnyAccountStore *account_store; - GtkUIManager *ui_manager; - - GtkWidget *toolbar, *menubar; - GtkWidget *msg_body; - GtkWidget *from_field, *to_field, *cc_field, *bcc_field, - *subject_field; + GtkWidget *toolbar; + GtkWidget *menubar; + + GtkWidget *msg_body; + GtkWidget *from_field; + GtkWidget *to_field; + GtkWidget *cc_field; + GtkWidget *bcc_field; + GtkWidget *subject_field; }; #define MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -90,7 +91,7 @@ modest_edit_msg_window_get_type (void) (GInstanceInitFunc) modest_edit_msg_window_init, NULL }; - my_type = g_type_register_static (GTK_TYPE_WINDOW, + my_type = g_type_register_static (MODEST_TYPE_WINDOW, "ModestEditMsgWindow", &my_info, 0); } @@ -107,13 +108,6 @@ modest_edit_msg_window_class_init (ModestEditMsgWindowClass *klass) gobject_class->finalize = modest_edit_msg_window_finalize; g_type_class_add_private (gobject_class, sizeof(ModestEditMsgWindowPrivate)); - - /* signal definitions go here, e.g.: */ -/* signals[MY_SIGNAL_1] = */ -/* g_signal_new ("my_signal_1",....); */ -/* signals[MY_SIGNAL_2] = */ -/* g_signal_new ("my_signal_2",....); */ -/* etc. */ } static void @@ -122,23 +116,25 @@ modest_edit_msg_window_init (ModestEditMsgWindow *obj) ModestEditMsgWindowPrivate *priv; priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj); - priv->fact = modest_tny_platform_factory_get_instance (); - priv->widget_factory = NULL; - priv->toolbar = NULL; - priv->menubar = NULL; + priv->toolbar = NULL; + priv->menubar = NULL; + priv->msg_body = NULL; + priv->from_field = NULL; + priv->to_field = NULL; + priv->cc_field = NULL; + priv->bcc_field = NULL; + priv->subject_field = NULL; } - - static void save_settings (ModestEditMsgWindow *self) { - ModestEditMsgWindowPrivate *priv; + ModestWindowPrivate *parent_priv; ModestConf *conf; - priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); conf = modest_tny_platform_factory_get_conf_instance - (MODEST_TNY_PLATFORM_FACTORY(priv->fact)); + (MODEST_TNY_PLATFORM_FACTORY(parent_priv->plat_factory)); modest_widget_memory_save (conf, G_OBJECT(self), "modest-edit-msg-window"); } @@ -147,12 +143,12 @@ save_settings (ModestEditMsgWindow *self) static void restore_settings (ModestEditMsgWindow *self) { - ModestEditMsgWindowPrivate *priv; + ModestWindowPrivate *parent_priv; ModestConf *conf; - priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); conf = modest_tny_platform_factory_get_conf_instance - (MODEST_TNY_PLATFORM_FACTORY(priv->fact)); + (MODEST_TNY_PLATFORM_FACTORY(parent_priv->plat_factory)); modest_widget_memory_restore (conf, G_OBJECT(self), "modest-edit-msg-window"); } @@ -163,15 +159,17 @@ init_window (ModestEditMsgWindow *obj) GtkWidget *to_button, *cc_button, *bcc_button; GtkWidget *header_table; GtkWidget *main_vbox; - ModestEditMsgWindowPrivate *priv; + ModestWindowPrivate *parent_priv; + priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj); + parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); to_button = gtk_button_new_with_label (_("To...")); cc_button = gtk_button_new_with_label (_("Cc...")); bcc_button = gtk_button_new_with_label (_("Bcc...")); - priv->from_field = modest_widget_factory_get_combo_box (priv->widget_factory, + priv->from_field = modest_widget_factory_get_combo_box (parent_priv->widget_factory, MODEST_COMBO_BOX_TYPE_TRANSPORTS); priv->to_field = gtk_entry_new_with_max_length (80); priv->cc_field = gtk_entry_new_with_max_length (80); @@ -212,13 +210,6 @@ init_window (ModestEditMsgWindow *obj) static void modest_edit_msg_window_finalize (GObject *obj) { - ModestEditMsgWindowPrivate *priv; - - priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj); - - g_object_unref (G_OBJECT(priv->widget_factory)); - priv->widget_factory = NULL; - G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -240,6 +231,7 @@ modest_edit_msg_window_new (ModestWidgetFactory *factory, { GObject *obj; ModestEditMsgWindowPrivate *priv; + ModestWindowPrivate *parent_priv; GtkActionGroup *action_group; GError *error = NULL; @@ -248,12 +240,13 @@ modest_edit_msg_window_new (ModestWidgetFactory *factory, obj = g_object_new(MODEST_TYPE_EDIT_MSG_WINDOW, NULL); priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj); + parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); - priv->widget_factory = g_object_ref (factory); - priv->account_store = g_object_ref (account_store); + parent_priv->widget_factory = g_object_ref (factory); + parent_priv->account_store = g_object_ref (account_store); /* ****** */ - priv->ui_manager = gtk_ui_manager_new(); + parent_priv->ui_manager = gtk_ui_manager_new(); action_group = gtk_action_group_new ("ModestEditMsgWindowActions"); /* Add common actions */ @@ -265,11 +258,11 @@ modest_edit_msg_window_new (ModestWidgetFactory *factory, modest_edit_msg_toggle_action_entries, G_N_ELEMENTS (modest_edit_msg_toggle_action_entries), obj); - gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, 0); + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); g_object_unref (action_group); /* Load the UI definition */ - gtk_ui_manager_add_ui_from_file (priv->ui_manager, MODEST_UIDIR "modest-edit-msg-window-ui.xml", &error); + gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-edit-msg-window-ui.xml", &error); if (error != NULL) { g_warning ("Could not merge modest-edit-msg-window-ui.xml: %s", error->message); g_error_free (error); @@ -279,12 +272,12 @@ modest_edit_msg_window_new (ModestWidgetFactory *factory, /* Add accelerators */ gtk_window_add_accel_group (GTK_WINDOW (obj), - gtk_ui_manager_get_accel_group (priv->ui_manager)); + gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); /* Toolbar / Menubar */ - priv->toolbar = gtk_ui_manager_get_widget (priv->ui_manager, "/EditMsgWindowToolBar"); - priv->menubar = gtk_ui_manager_get_widget (priv->ui_manager, "/EditMsgWindowMenuBar"); + priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/EditMsgWindowToolBar"); + priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/EditMsgWindowMenuBar"); gtk_toolbar_set_tooltips (GTK_TOOLBAR (priv->toolbar), TRUE); @@ -343,30 +336,6 @@ modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, TnyMsg *msg) /* TODO: set attachments */ } -ModestWidgetFactory * -modest_edit_msg_window_get_widget_factory (ModestEditMsgWindow *edit_window) -{ - ModestEditMsgWindowPrivate *priv; - - g_return_val_if_fail (MODEST_IS_EDIT_MSG_WINDOW (edit_window), NULL); - - priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (edit_window); - - return g_object_ref (priv->widget_factory); -} - -TnyAccountStore * -modest_edit_msg_window_get_account_store (ModestEditMsgWindow *edit_window) -{ - ModestEditMsgWindowPrivate *priv; - - g_return_val_if_fail (MODEST_IS_EDIT_MSG_WINDOW (edit_window), NULL); - - priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (edit_window); - - return g_object_ref (priv->account_store); -} - MsgData * modest_edit_msg_window_get_msg_data (ModestEditMsgWindow *edit_window) { diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c index 6d00015..76c78b3 100644 --- a/src/gtk/modest-main-window.c +++ b/src/gtk/modest-main-window.c @@ -31,7 +31,7 @@ #include #include "modest-main-window.h" -#include "modest-widget-factory.h" +#include "modest-window-priv.h" #include "modest-widget-memory.h" #include "modest-icon-factory.h" #include "modest-ui.h" @@ -40,7 +40,6 @@ #include "modest-account-mgr.h" #include "modest-conf.h" #include "modest-edit-msg-window.h" -#include "modest-tny-platform-factory.h" #include "modest-tny-msg-actions.h" #include "modest-mail-operation.h" #include "modest-icon-names.h" @@ -53,6 +52,19 @@ static void modest_main_window_finalize (GObject *obj); static void restore_sizes (ModestMainWindow *self); static void save_sizes (ModestMainWindow *self); +static gboolean on_header_view_button_press_event (ModestHeaderView *header_view, + GdkEventButton *event, + ModestMainWindow *self); + +static gboolean on_folder_view_button_press_event (ModestFolderView *folder_view, + GdkEventButton *event, + ModestMainWindow *self); + +static gboolean show_context_popup_menu (ModestMainWindow *window, + GtkTreeView *tree_view, + GdkEventButton *event, + GtkWidget *menu); + /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -63,14 +75,6 @@ enum { typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate; struct _ModestMainWindowPrivate { - GtkUIManager *ui_manager; - ModestWidgetFactory *widget_factory; - TnyPlatformFactory *factory; - ModestTnyAccountStore *account_store; - - GtkWidget *toolbar; - GtkWidget *menubar; - GtkWidget *folder_paned; GtkWidget *msg_paned; GtkWidget *main_paned; @@ -117,7 +121,7 @@ modest_main_window_get_type (void) (GInstanceInitFunc) modest_main_window_init, NULL }; - my_type = g_type_register_static (GTK_TYPE_WINDOW, + my_type = g_type_register_static (MODEST_TYPE_WINDOW, "ModestMainWindow", &my_info, 0); } @@ -134,13 +138,6 @@ modest_main_window_class_init (ModestMainWindowClass *klass) gobject_class->finalize = modest_main_window_finalize; g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate)); - - /* signal definitions go here, e.g.: */ -/* signals[MY_SIGNAL_1] = */ -/* g_signal_new ("my_signal_1",....); */ -/* signals[MY_SIGNAL_2] = */ -/* g_signal_new ("my_signal_2",....); */ -/* etc. */ } static void @@ -150,30 +147,17 @@ modest_main_window_init (ModestMainWindow *obj) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); - priv->factory = modest_tny_platform_factory_get_instance (); - priv->widget_factory = NULL; - priv->ui_manager = NULL; - priv->account_store = NULL; + priv->folder_paned = NULL; + priv->msg_paned = NULL; + priv->main_paned = NULL; + priv->header_view = NULL; + priv->folder_view = NULL; + priv->msg_preview = NULL; } static void modest_main_window_finalize (GObject *obj) { - ModestMainWindowPrivate *priv; - priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); - if (priv->widget_factory) { - g_object_unref (G_OBJECT(priv->widget_factory)); - priv->widget_factory = NULL; - } - if (priv->ui_manager) { - g_object_unref (G_OBJECT(priv->ui_manager)); - priv->ui_manager = NULL; - } - if (priv->account_store) { - g_object_unref (G_OBJECT(priv->account_store)); - priv->account_store = NULL; - } - G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -182,10 +166,11 @@ static ModestHeaderView* header_view_new (ModestMainWindow *self) { ModestHeaderView *header_view; - ModestMainWindowPrivate *priv; - priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + ModestWindowPrivate *parent_priv; + + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - header_view = modest_widget_factory_get_header_view (priv->widget_factory); + header_view = modest_widget_factory_get_header_view (parent_priv->widget_factory); modest_header_view_set_style (header_view, MODEST_HEADER_VIEW_STYLE_DETAILS); return header_view; } @@ -196,10 +181,13 @@ restore_sizes (ModestMainWindow *self) { ModestConf *conf; ModestMainWindowPrivate *priv; + ModestWindowPrivate *parent_priv; priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); + conf = modest_tny_platform_factory_get_conf_instance - (MODEST_TNY_PLATFORM_FACTORY(priv->factory)); + (MODEST_TNY_PLATFORM_FACTORY(parent_priv->plat_factory)); modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned), "modest-folder-paned"); @@ -217,12 +205,15 @@ restore_sizes (ModestMainWindow *self) static void save_sizes (ModestMainWindow *self) { + ModestWindowPrivate *parent_priv; ModestMainWindowPrivate *priv; ModestConf *conf; priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); + conf = modest_tny_platform_factory_get_conf_instance - (MODEST_TNY_PLATFORM_FACTORY(priv->factory)); + (MODEST_TNY_PLATFORM_FACTORY(parent_priv->plat_factory)); modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window"); modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned), @@ -269,6 +260,7 @@ modest_main_window_new (ModestWidgetFactory *widget_factory, { GObject *obj; ModestMainWindowPrivate *priv; + ModestWindowPrivate *parent_priv; GtkWidget *main_vbox; GtkWidget *status_hbox; GtkWidget *header_win, *folder_win; @@ -279,12 +271,13 @@ modest_main_window_new (ModestWidgetFactory *widget_factory, obj = g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); + parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); - priv->widget_factory = g_object_ref (widget_factory); - priv->account_store = g_object_ref (account_store); + parent_priv->widget_factory = g_object_ref (widget_factory); + parent_priv->account_store = g_object_ref (account_store); /* ***************** */ - priv->ui_manager = gtk_ui_manager_new(); + parent_priv->ui_manager = gtk_ui_manager_new(); action_group = gtk_action_group_new ("ModestMainWindowActions"); /* Add common actions */ @@ -293,29 +286,28 @@ modest_main_window_new (ModestWidgetFactory *widget_factory, G_N_ELEMENTS (modest_action_entries), obj); - gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, 0); + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); g_object_unref (action_group); /* Load the UI definition */ - gtk_ui_manager_add_ui_from_file (priv->ui_manager, MODEST_UIDIR "modest-ui.xml", &error); + gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-ui.xml", &error); if (error != NULL) { g_warning ("Could not merge modest-ui.xml: %s", error->message); g_error_free (error); error = NULL; } /* *************** */ -/* priv->ui_manager = g_object_ref (ui_manager); */ /* Add accelerators */ gtk_window_add_accel_group (GTK_WINDOW (obj), - gtk_ui_manager_get_accel_group (priv->ui_manager)); + gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); /* Toolbar / Menubar */ - priv->toolbar = gtk_ui_manager_get_widget (priv->ui_manager, "/ToolBar"); - priv->menubar = gtk_ui_manager_get_widget (priv->ui_manager, "/MenuBar"); + parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); + parent_priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar"); - gtk_toolbar_set_tooltips (GTK_TOOLBAR (priv->toolbar), TRUE); + gtk_toolbar_set_tooltips (GTK_TOOLBAR (parent_priv->toolbar), TRUE); /* widgets from factory */ priv->folder_view = modest_widget_factory_get_folder_view (widget_factory); @@ -327,6 +319,25 @@ modest_main_window_new (ModestWidgetFactory *widget_factory, header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view), FALSE); + /* Connect platform specific signals */ + g_signal_connect (priv->header_view, + "button-press-event", + G_CALLBACK (on_header_view_button_press_event), + obj); + g_signal_connect (priv->header_view, + "popup-menu", + G_CALLBACK (on_header_view_button_press_event), + obj); + g_signal_connect (priv->folder_view, + "button-press-event", + G_CALLBACK (on_folder_view_button_press_event), + obj); + g_signal_connect (priv->folder_view, + "popup-menu", + G_CALLBACK (on_folder_view_button_press_event), + obj); + + /* paned */ priv->folder_paned = gtk_vpaned_new (); priv->msg_paned = gtk_vpaned_new (); @@ -355,8 +366,8 @@ modest_main_window_new (ModestWidgetFactory *widget_factory, /* putting it all together... */ main_vbox = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->menubar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->toolbar, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_paned, TRUE, TRUE,0); gtk_box_pack_start (GTK_BOX(main_vbox), status_hbox, FALSE, FALSE, 0); @@ -374,26 +385,84 @@ modest_main_window_new (ModestWidgetFactory *widget_factory, return (ModestWindow *) obj; } -ModestWidgetFactory * -modest_main_window_get_widget_factory (ModestMainWindow *main_window) +static gboolean +on_header_view_button_press_event (ModestHeaderView *header_view, + GdkEventButton *event, + ModestMainWindow *self) { - ModestMainWindowPrivate *priv; + if (event->type == GDK_BUTTON_PRESS && event->button == 3) { + GtkWidget *menu; + ModestWindowPrivate *parent_priv; - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL); + parent_priv = MODEST_WINDOW_GET_PRIVATE (self); + menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewContextMenu"); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); + return show_context_popup_menu (self, + GTK_TREE_VIEW (header_view), + event, + menu); + } - return g_object_ref (priv->widget_factory); + return FALSE; } -TnyAccountStore * -modest_main_window_get_account_store (ModestMainWindow *main_window) +static gboolean +on_folder_view_button_press_event (ModestFolderView *folder_view, + GdkEventButton *event, + ModestMainWindow *self) { - ModestMainWindowPrivate *priv; + if (event->type == GDK_BUTTON_PRESS && event->button == 3) { + GtkWidget *menu; + ModestWindowPrivate *parent_priv; - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (main_window), NULL); + parent_priv = MODEST_WINDOW_GET_PRIVATE (self); + menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewContextMenu"); + + return show_context_popup_menu (self, + GTK_TREE_VIEW (folder_view), + event, + menu); + } + + return FALSE; +} + + +static gboolean +show_context_popup_menu (ModestMainWindow *window, + GtkTreeView *tree_view, + GdkEventButton *event, + GtkWidget *menu) +{ + g_return_val_if_fail (menu, FALSE); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); + if (event != NULL) { + /* Ensure that the header is selected */ + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection (tree_view); + + if (gtk_tree_selection_count_selected_rows (selection) <= 1) { + GtkTreePath *path; + + /* Get tree path for row that was clicked */ + if (gtk_tree_view_get_path_at_pos (tree_view, + (gint) event->x, + (gint) event->y, + &path, + NULL, NULL, NULL)) { + gtk_tree_selection_unselect_all (selection); + gtk_tree_selection_select_path (selection, path); + gtk_tree_path_free (path); + } + } + + /* Show popup */ + if (gtk_tree_selection_count_selected_rows(selection) == 1) + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, + NULL, NULL, + event->button, event->time); + } - return g_object_ref (priv->account_store); + return TRUE; } diff --git a/src/gtk/ui/modest-ui.xml b/src/gtk/ui/modest-ui.xml index eb44df6..4abe8a4 100644 --- a/src/gtk/ui/modest-ui.xml +++ b/src/gtk/ui/modest-ui.xml @@ -59,6 +59,10 @@ + + + + @@ -88,4 +92,15 @@ + + + + + + + + + + + diff --git a/src/modest-mail-operation.h b/src/modest-mail-operation.h index 13129f2..99a72b4 100644 --- a/src/modest-mail-operation.h +++ b/src/modest-mail-operation.h @@ -31,6 +31,7 @@ #define __MODEST_MAIL_OPERATION_H__ #include +#include G_BEGIN_DECLS diff --git a/src/modest-ui-actions.h b/src/modest-ui-actions.h index 3bb9c38..edcdc25 100644 --- a/src/modest-ui-actions.h +++ b/src/modest-ui-actions.h @@ -100,5 +100,14 @@ void _modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, void _modest_ui_actions_on_send (GtkWidget *widget, ModestEditMsgWindow *edit_window); +void _modest_ui_actions_on_new_folder (GtkWidget *widget, + ModestMainWindow *main_window); + +void _modest_ui_actions_on_rename_folder (GtkWidget *widget, + ModestMainWindow *main_window); + +void _modest_ui_actions_on_delete_folder (GtkWidget *widget, + ModestMainWindow *main_window); + G_END_DECLS #endif /* __MODEST_UI_ACTIONS_H__ */ diff --git a/src/modest-ui.c b/src/modest-ui.c index 1216e9e..738f5e7 100644 --- a/src/modest-ui.c +++ b/src/modest-ui.c @@ -32,6 +32,7 @@ #endif /*HAVE_CONFIG_H*/ #include +#include #include "modest-ui-priv.h" #include "modest-ui.h" #include "modest-ui-actions.h" @@ -39,6 +40,7 @@ #include "modest-tny-platform-factory.h" #include "modest-account-view-window.h" #include "modest-main-window.h" +#include "modest-mail-operation.h" #include #include #include @@ -70,26 +72,30 @@ typedef struct _ReplyForwardHelper { static GObjectClass *parent_class = NULL; /* 'private'/'protected' functions */ -static void modest_ui_class_init (ModestUIClass *klass); -static void modest_ui_init (ModestUI *obj); -static void modest_ui_finalize (GObject *obj); - -static void register_stock_icons (); -static void connect_signals (ModestUI *self); -/* static GtkUIManager *create_ui_manager (); */ - -static void reply_forward_func (gpointer data, gpointer user_data); -static void read_msg_func (gpointer data, gpointer user_data); -static void get_msg_cb (TnyFolder *folder, - TnyMsg *msg, - GError **err, - gpointer user_data); - -static void reply_forward (GtkWidget *widget, - ReplyForwardAction action, - ModestMainWindow *main_window); - -static void _modest_ui_actions_on_password_requested (ModestTnyAccountStore *account_store, +static void modest_ui_class_init (ModestUIClass *klass); +static void modest_ui_init (ModestUI *obj); +static void modest_ui_finalize (GObject *obj); + +static void register_stock_icons (); +static void connect_signals (ModestUI *self); + +static void reply_forward_func (gpointer data, + gpointer user_data); +static void read_msg_func (gpointer data, + gpointer user_data); +static void get_msg_cb (TnyFolder *folder, + TnyMsg *msg, + GError **err, + gpointer user_data); + +static void reply_forward (GtkWidget *widget, + ReplyForwardAction action, + ModestMainWindow *main_window); + +static gchar* ask_for_folder_name (GtkWindow *parent_window, + const gchar *title); + +static void _modest_ui_actions_on_password_requested (ModestTnyAccountStore *account_store, const gchar* account_name, gchar **password, gboolean *cancel, @@ -406,7 +412,7 @@ connect_signals (ModestUI *self) /* ***************************************************************** */ /* M O D E S T U I A C T I O N S */ /* ***************************************************************** */ -void +void _modest_ui_actions_on_about (GtkWidget *widget, ModestMainWindow *main_window) { @@ -443,7 +449,7 @@ _modest_ui_actions_on_delete (GtkWidget *widget, TnyIterator *iter; GtkTreeModel *model; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); header_view = modest_widget_factory_get_header_view (widget_factory); header_list = modest_header_view_get_selected_headers (header_view); g_object_unref (G_OBJECT(widget_factory)); @@ -502,7 +508,7 @@ _modest_ui_actions_on_accounts (GtkWidget *widget, GtkWidget *account_win; ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); account_win = modest_account_view_window_new (widget_factory); g_object_unref (G_OBJECT(widget_factory)); @@ -520,8 +526,8 @@ _modest_ui_actions_on_new_msg (GtkWidget *widget, ModestWidgetFactory *widget_factory; TnyAccountStore *account_store; - widget_factory = modest_main_window_get_widget_factory (main_window); - account_store = modest_main_window_get_account_store (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); + account_store = modest_window_get_account_store (MODEST_WINDOW (main_window)); msg_win = modest_edit_msg_window_new (widget_factory, account_store, MODEST_EDIT_TYPE_NEW); @@ -540,7 +546,7 @@ reply_forward_func (gpointer data, gpointer user_data) TnyAccountStore *account_store; GetMsgAsyncHelper *helper; ReplyForwardHelper *rf_helper; - GtkWindow *msg_win; + ModestWindow *msg_win; ModestEditType edit_type; msg = TNY_MSG (data); @@ -576,8 +582,8 @@ reply_forward_func (gpointer data, gpointer user_data) g_object_unref (G_OBJECT (new_header)); /* Show edit window */ - widget_factory = modest_main_window_get_widget_factory (helper->main_window); - account_store = modest_main_window_get_account_store (helper->main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (helper->main_window)); + account_store = modest_window_get_account_store (MODEST_WINDOW (helper->main_window)); msg_win = modest_edit_msg_window_new (widget_factory, account_store, MODEST_EDIT_TYPE_NEW); @@ -625,7 +631,7 @@ reply_forward (GtkWidget *widget, g_free (key); /* Get the list of headers */ - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); header_view = modest_widget_factory_get_header_view (widget_factory); header_list = modest_header_view_get_selected_headers (header_view); g_object_unref (G_OBJECT(widget_factory)); @@ -691,7 +697,7 @@ _modest_ui_actions_on_next (GtkWidget *widget, ModestHeaderView *header_view; ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); header_view = modest_widget_factory_get_header_view (widget_factory); g_object_unref (G_OBJECT(widget_factory)); @@ -711,7 +717,7 @@ _modest_ui_actions_toggle_view (GtkWidget *widget, plat_factory = modest_tny_platform_factory_get_instance (); conf = modest_tny_platform_factory_get_conf_instance (MODEST_TNY_PLATFORM_FACTORY(plat_factory)); - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); header_view = modest_widget_factory_get_header_view (widget_factory); g_object_unref (G_OBJECT(widget_factory)); @@ -752,7 +758,7 @@ read_msg_func (gpointer data, gpointer user_data) g_object_unref (G_OBJECT (header)); /* Set message on msg view */ - widget_factory = modest_main_window_get_widget_factory (helper->main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (helper->main_window)); msg_view = modest_widget_factory_get_msg_preview (widget_factory); g_object_unref (G_OBJECT(widget_factory)); modest_msg_view_set_message (msg_view, msg); @@ -778,7 +784,7 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data) ModestHeaderView *header_view; ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (helper->main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (helper->main_window)); header_view = modest_widget_factory_get_header_view (widget_factory); g_object_unref (G_OBJECT (widget_factory)); _modest_ui_actions_on_item_not_found (header_view, @@ -821,7 +827,7 @@ _modest_ui_actions_on_header_selected (ModestHeaderView *folder_view, if (!header) { ModestMsgView *msg_view; ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); msg_view = modest_widget_factory_get_msg_preview (widget_factory); modest_msg_view_set_message (msg_view, NULL); return; @@ -860,7 +866,7 @@ _modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, ModestHeaderView *header_view; ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); folder_info_label = GTK_LABEL (modest_widget_factory_get_folder_info_label (widget_factory)); @@ -1019,7 +1025,7 @@ _modest_ui_actions_on_connection_changed (TnyDevice *device, ModestHeaderView *header_view; ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); header_view = modest_widget_factory_get_header_view (widget_factory); online_toggle = modest_widget_factory_get_online_toggle (widget_factory); @@ -1136,7 +1142,7 @@ _modest_ui_actions_on_header_status_update (ModestHeaderView *header_view, GtkWidget *progress_bar; ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); progress_bar = modest_widget_factory_get_progress_bar (widget_factory); if (total != 0) @@ -1160,7 +1166,7 @@ _modest_ui_actions_on_msg_link_hover (ModestMsgView *msgview, { ModestWidgetFactory *widget_factory; - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); statusbar_push (widget_factory, 0, link); g_object_unref (G_OBJECT (widget_factory)); @@ -1177,7 +1183,7 @@ _modest_ui_actions_on_msg_link_clicked (ModestMsgView *msgview, ModestWidgetFactory *widget_factory; msg = g_strdup_printf (_("Opening %s..."), link); - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); statusbar_push (widget_factory, 0, msg); g_object_unref (G_OBJECT (widget_factory)); @@ -1196,7 +1202,7 @@ _modest_ui_actions_on_msg_attachment_clicked (ModestMsgView *msgview, ModestWidgetFactory *widget_factory; msg = g_strdup_printf (_("Opening attachment %d..."), index); - widget_factory = modest_main_window_get_widget_factory (main_window); + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); statusbar_push (widget_factory, 0, msg); g_free (msg); @@ -1223,7 +1229,7 @@ _modest_ui_actions_on_send (GtkWidget *widget, TnyAccountStore *account_store; accounts = TNY_LIST(tny_simple_list_new ()); - account_store = modest_edit_msg_window_get_account_store (edit_window); + account_store = modest_window_get_account_store (MODEST_WINDOW (edit_window)); tny_account_store_get_accounts (account_store, accounts, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); g_object_unref (G_OBJECT (account_store)); @@ -1264,3 +1270,95 @@ _modest_ui_actions_on_send (GtkWidget *widget, /* save_settings (edit_window) */ gtk_widget_destroy (GTK_WIDGET (edit_window)); } + +/* + * Shows a dialog with an entry that asks for some text. The returned + * value must be freed by the caller. The dialog window title will be + * set to @title. + */ +static gchar * +ask_for_folder_name (GtkWindow *parent_window, + const gchar *title) +{ + GtkWidget *dialog, *entry; + gchar *folder_name = NULL; + + /* Ask for folder name */ + dialog = gtk_dialog_new_with_buttons (_("New Folder Name"), + parent_window, + GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + NULL); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), + gtk_label_new(title), + FALSE, FALSE, 0); + + entry = gtk_entry_new_with_max_length (40); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), + entry, + TRUE, FALSE, 0); + + gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); + + if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry))); + + gtk_widget_destroy (dialog); + + return folder_name; +} + +void +_modest_ui_actions_on_new_folder (GtkWidget *widget, + ModestMainWindow *main_window) +{ + TnyFolder *parent_folder; + ModestFolderView *folder_view; + ModestWidgetFactory *widget_factory; + + widget_factory = modest_window_get_widget_factory (MODEST_WINDOW (main_window)); + folder_view = modest_widget_factory_get_folder_view (widget_factory); + parent_folder = modest_folder_view_get_selected (folder_view); + + if (parent_folder) { + gchar *folder_name; + + folder_name = ask_for_folder_name (GTK_WINDOW (main_window), + _("Please enter a name for the new folder")); + + if (folder_name != NULL && strlen (folder_name) > 0) { + TnyFolder *new_folder; + ModestMailOperation *mail_op; + + mail_op = modest_mail_operation_new (); + new_folder = modest_mail_operation_create_folder (mail_op, + TNY_FOLDER_STORE (parent_folder), + (const gchar *) folder_name); + if (new_folder) { + /* Do anything more? The model + is automatically updated */ + g_object_unref (new_folder); + } + g_object_unref (mail_op); + } + g_object_unref (parent_folder); + } + g_object_unref (G_OBJECT (widget_factory)); +} + +void +_modest_ui_actions_on_rename_folder (GtkWidget *widget, + ModestMainWindow *main_window) +{ + g_print ("Rename Folder"); +} + +void +_modest_ui_actions_on_delete_folder (GtkWidget *widget, + ModestMainWindow *main_window) +{ + g_print ("Delete Folder"); +} diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am index 61a75ca..6214b2f 100644 --- a/src/widgets/Makefile.am +++ b/src/widgets/Makefile.am @@ -35,6 +35,7 @@ libmodest_widgets_la_SOURCES= \ modest-msg-view.h \ modest-tny-stream-gtkhtml.c \ modest-tny-stream-gtkhtml.h \ + modest-window.c \ modest-window.h LDADD = \ diff --git a/src/widgets/modest-edit-msg-window.h b/src/widgets/modest-edit-msg-window.h index bb1bb85..7922b9d 100644 --- a/src/widgets/modest-edit-msg-window.h +++ b/src/widgets/modest-edit-msg-window.h @@ -93,27 +93,6 @@ void modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, /** - * modest_edit_msg_window_get_widget_factory: - * @edit_window: a #ModestEditMsgWindow - * - * gets the #ModestWidgetFactory associated with the edit message window - * - * Returns: the widget factory - **/ -ModestWidgetFactory * modest_edit_msg_window_get_widget_factory (ModestEditMsgWindow *edit_window); - - -/** - * modest_edit_msg_window_get_account_store: - * @edit_window: a #ModestEditMsgWindow - * - * gets the account store associated with the edit message window - * - * Returns: the account store - **/ -TnyAccountStore * modest_edit_msg_window_get_account_store (ModestEditMsgWindow *edit_window); - -/** * modest_edit_msg_window_get_msg_data: * @edit_window: a #ModestEditMsgWindow * diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index eecc71a..e39a9da 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -581,3 +581,17 @@ modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *accoun return update_model (self, MODEST_TNY_ACCOUNT_STORE(account_store)); /* ugly */ } + +TnyFolder * +modest_folder_view_get_selected (ModestFolderView *self) +{ + ModestFolderViewPrivate *priv; + + g_return_val_if_fail (self, NULL); + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); + if (priv->cur_folder) + g_object_ref (priv->cur_folder); + + return priv->cur_folder; +} diff --git a/src/widgets/modest-folder-view.h b/src/widgets/modest-folder-view.h index 2ebec08..32f5de7 100644 --- a/src/widgets/modest-folder-view.h +++ b/src/widgets/modest-folder-view.h @@ -97,7 +97,19 @@ GtkWidget* modest_folder_view_new (ModestTnyAccountStore *account_store, * set the title for the folder view; if title is NULL, the title column * header will be hidden */ -void modest_folder_view_set_title (ModestFolderView *self, const gchar *title); +void modest_folder_view_set_title (ModestFolderView *self, + const gchar *title); + + +/** + * modest_folder_view_get_selected: + * @self: a #ModestFolderView + * + * returns a new reference to the #TnyFolder that is already selected + * + * Returns: the selected folder or NULL if none is selected + **/ +TnyFolder* modest_folder_view_get_selected (ModestFolderView *self); G_END_DECLS diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index d1b8a89..5c787b6 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -816,4 +816,3 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, return &iter1 - &iter2; /* oughhhh */ } } - diff --git a/src/widgets/modest-header-view.h b/src/widgets/modest-header-view.h index 3414017..2e8aeab 100644 --- a/src/widgets/modest-header-view.h +++ b/src/widgets/modest-header-view.h @@ -243,8 +243,7 @@ gboolean modest_header_view_is_empty (ModestHeaderView *self); * * Selects the header next to the current selected one **/ -void modest_header_view_select_next (ModestHeaderView *self); - +void modest_header_view_select_next (ModestHeaderView *self); /* PROTECTED method. It's useful when we want to force a given diff --git a/src/widgets/modest-main-window-ui.h b/src/widgets/modest-main-window-ui.h index 24d7f0a..9325f2e 100644 --- a/src/widgets/modest-main-window-ui.h +++ b/src/widgets/modest-main-window-ui.h @@ -75,6 +75,10 @@ static const GtkActionEntry modest_action_entries [] = { { "ActionsBounce", NULL, N_("_Bounce"), NULL, N_("Bounce a message"), NULL }, { "ActionsSendReceive", MODEST_STOCK_SEND_RECEIVE, N_("Send/Receive"), NULL, N_("Send and receive messages"), NULL }, { "ActionsDelete", MODEST_STOCK_DELETE, N_("Delete message"), NULL, N_("Delete messages"), G_CALLBACK (_modest_ui_actions_on_delete) }, + { "ActionsFolderNew", NULL, N_("New Folder"), NULL, N_("Create a new folder"), G_CALLBACK (_modest_ui_actions_on_new_folder) }, + { "ActionsFolderDelete", NULL, N_("Delete Folder"), NULL, N_("Delete the folder"), G_CALLBACK (_modest_ui_actions_on_delete_folder) }, + { "ActionsFolderRename", NULL, N_("Rename Folder"), NULL, N_("Rename the folder"), G_CALLBACK (_modest_ui_actions_on_rename_folder) }, + /* GOTO */ { "GotoPrevious", MODEST_STOCK_PREV, N_("Previous"), NULL, N_("Go to previous message"), NULL }, diff --git a/src/widgets/modest-main-window.h b/src/widgets/modest-main-window.h index aca4c33..83d4aa9 100644 --- a/src/widgets/modest-main-window.h +++ b/src/widgets/modest-main-window.h @@ -31,10 +31,6 @@ #ifndef __MODEST_MAIN_WINDOW_H__ #define __MODEST_MAIN_WINDOW_H__ -#ifdef HAVE_CONFIG_H -#include -#endif /*HAVE_CONFIG_H*/ - #include "modest-widget-factory.h" #include "modest-window.h" @@ -54,13 +50,10 @@ typedef struct _ModestMainWindowClass ModestMainWindowClass; struct _ModestMainWindow { ModestWindow parent; - /* insert public members, if any */ }; struct _ModestMainWindowClass { ModestWindowClass parent_class; - /* insert signal callback declarations, eg. */ - /* void (* my_event) (ModestMainWindow* obj); */ }; /* member functions */ @@ -70,27 +63,6 @@ GType modest_main_window_get_type (void) G_GNUC_CONST; ModestWindow* modest_main_window_new (ModestWidgetFactory *factory, TnyAccountStore *account_store); -/** - * modest_main_window_get_widget_factory: - * @edit_window: a #ModestMainWindow - * - * gets the #ModestWidgetFactory associated with the main window - * - * Returns: the widget factory - **/ -ModestWidgetFactory * modest_main_window_get_widget_factory (ModestMainWindow *main_window); - -/** - * modest_main_window_get_account_store: - * @edit_window: a #ModestMainWindow - * - * gets the account store associated with the main window - * - * Returns: the account store - **/ -TnyAccountStore * modest_main_window_get_account_store (ModestMainWindow *main_window); - - G_END_DECLS #endif /* __MODEST_MAIN_WINDOW_H__ */ diff --git a/src/widgets/modest-window-priv.h b/src/widgets/modest-window-priv.h new file mode 100644 index 0000000..32760b8 --- /dev/null +++ b/src/widgets/modest-window-priv.h @@ -0,0 +1,58 @@ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __MODEST_WINDOW_PRIV_H__ +#define __MODEST_WINDOW_PRIV_H__ + +#include +#include +#include "modest-tny-platform-factory.h" +#include "modest-widget-factory.h" + +G_BEGIN_DECLS + +typedef struct _ModestWindowPrivate ModestWindowPrivate; +struct _ModestWindowPrivate { + + ModestWidgetFactory *widget_factory; + TnyPlatformFactory *plat_factory; + + TnyAccountStore *account_store; + GtkUIManager *ui_manager; + + GtkWidget *toolbar; + GtkWidget *menubar; +}; + +#define MODEST_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ + MODEST_TYPE_WINDOW, \ + ModestWindowPrivate)) + +G_END_DECLS +#endif /* __MODEST_WINDOW_PRIV_H__ */ diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c new file mode 100644 index 0000000..daa61b0 --- /dev/null +++ b/src/widgets/modest-window.c @@ -0,0 +1,148 @@ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "modest-window.h" +#include "modest-window-priv.h" +#include "modest-tny-platform-factory.h" + +/* 'private'/'protected' functions */ +static void modest_window_class_init (ModestWindowClass *klass); +static void modest_window_init (ModestWindow *obj); +static void modest_window_finalize (GObject *obj); +/* list my signals */ +enum { + LAST_SIGNAL +}; + +/* globals */ +static GObjectClass *parent_class = NULL; + +/* uncomment the following if you have defined any signals */ +/* static guint signals[LAST_SIGNAL] = {0}; */ + +GType +modest_window_get_type (void) +{ + static GType my_type = 0; + static GType parent_type = 0; + if (!my_type) { + static const GTypeInfo my_info = { + sizeof(ModestWindowClass), + NULL, /* base init */ + NULL, /* base finalize */ + (GClassInitFunc) modest_window_class_init, + NULL, /* class finalize */ + NULL, /* class data */ + sizeof(ModestWindow), + 1, /* n_preallocs */ + (GInstanceInitFunc) modest_window_init, + NULL + }; +#if MODEST_PLATFORM_ID==1 /* gtk */ + parent_type = GTK_TYPE_WINDOW; +#elif MODEST_PLATFORM_ID==2 /* hildon (maemo) */ + parent_type = HILDON_TYPE_WINDOW; +#endif + my_type = g_type_register_static (parent_type, + "ModestWindow", + &my_info, + G_TYPE_FLAG_ABSTRACT); + } + return my_type; +} + +static void +modest_window_class_init (ModestWindowClass *klass) +{ + GObjectClass *gobject_class; + gobject_class = (GObjectClass*) klass; + + parent_class = g_type_class_peek_parent (klass); + gobject_class->finalize = modest_window_finalize; + + g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate)); +} + +static void +modest_window_init (ModestWindow *obj) +{ + ModestWindowPrivate *priv; + + priv = MODEST_WINDOW_GET_PRIVATE(obj); + + priv->plat_factory = modest_tny_platform_factory_get_instance (); + priv->ui_manager = NULL; + priv->account_store = NULL; + + priv->toolbar = NULL; + priv->menubar = NULL; +} + +static void +modest_window_finalize (GObject *obj) +{ + ModestWindowPrivate *priv; + + priv = MODEST_WINDOW_GET_PRIVATE(obj); + + if (priv->ui_manager) { + g_object_unref (G_OBJECT(priv->ui_manager)); + priv->ui_manager = NULL; + } + if (priv->account_store) { + g_object_unref (G_OBJECT(priv->account_store)); + priv->account_store = NULL; + } + + G_OBJECT_CLASS(parent_class)->finalize (obj); +} + +TnyAccountStore * +modest_window_get_account_store (ModestWindow *window) +{ + ModestWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_WINDOW (window), NULL); + + priv = MODEST_WINDOW_GET_PRIVATE (window); + + return g_object_ref (priv->account_store); +} + +ModestWidgetFactory * +modest_window_get_widget_factory (ModestWindow *window) +{ + ModestWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_WINDOW (window), NULL); + + priv = MODEST_WINDOW_GET_PRIVATE (window); + + return g_object_ref (priv->widget_factory); +} diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h index 3c663aa..fa574fe 100644 --- a/src/widgets/modest-window.h +++ b/src/widgets/modest-window.h @@ -27,25 +27,78 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #ifndef __MODEST_WINDOW_H__ #define __MODEST_WINDOW_H__ +#include +#include +#include "modest-widget-factory.h" + +G_BEGIN_DECLS + #ifdef HAVE_CONFIG_H #include #endif /*HAVE_CONFIG_H*/ -/* admittedly, the ifdefs for gtk and maemo are rather ugly; still this way - * is probably the easiest to maintain*/ +/* + * admittedly, the ifdefs for gtk and maemo are rather ugly; still + * this way is probably the easiest to maintain + */ #if MODEST_PLATFORM_ID==1 /* gtk */ #include -typedef GtkWindow ModestWindow; -typedef GtkWindowClass ModestWindowClass; +typedef GtkWindow ModestWindowParent; +typedef GtkWindowClass ModestWindowParentClass; #elif MODEST_PLATFORM_ID==2 /* hildon (maemo) */ #include -typedef HildonWindow ModestWindow; -typedef HildonWindowClass ModestWindowClass; +typedef HildonWindow ModestWindowParent; +typedef HildonWindowClass ModestWindowParentClass; #endif /*MODEST_PLATFORM_ID*/ -/************************************************/ -#endif /* MODEST_WINDOW_H__ */ +/* convenience macros */ +#define MODEST_TYPE_WINDOW (modest_window_get_type()) +#define MODEST_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_WINDOW,ModestWindow)) +#define MODEST_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_WINDOW,GObject)) +#define MODEST_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_WINDOW)) +#define MODEST_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_WINDOW)) +#define MODEST_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_WINDOW,ModestWindowClass)) + +typedef struct _ModestWindow ModestWindow; +typedef struct _ModestWindowClass ModestWindowClass; + +struct _ModestWindow { + ModestWindowParent parent; +}; + +struct _ModestWindowClass { + ModestWindowParentClass parent_class; +}; + +/* member functions */ +GType modest_window_get_type (void) G_GNUC_CONST; + +/** + * modest_window_get_account_store: + * @window: a #ModestWindow + * + * gets a new reference to the account store associated with the main + * window. The caller must free the returned instance + * + * Returns: the account store + **/ +TnyAccountStore* modest_window_get_account_store (ModestWindow *window); + +/** + * modest_window_get_widget_factory: + * @window: a #ModestWindow + * + * gets a reference to the #ModestWidgetFactory associated with the + * Modest Window. The caller must free the returned instance + * + * Returns: the widget factory + **/ +ModestWidgetFactory* modest_window_get_widget_factory (ModestWindow *window); + + +G_END_DECLS + +#endif /* __MODEST_WINDOW_H__ */ -- 1.7.9.5