From: Dirk-Jan C. Binnema Date: Wed, 5 Jul 2006 09:16:55 +0000 (+0000) Subject: * remove old stuff X-Git-Tag: git_migration_finished~4526 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=394786fafbc8ec42548ac91a7ba6fa0246583373 * remove old stuff pmo-trunk-r349 --- diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am deleted file mode 100644 index e6866cf..0000000 --- a/src/gtk/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# -# Makefile.am -# Time-stamp: <2006-04-24 00:08:56 (djcb)> -# -# -# use Automake 'trick' ==> convenience static libraries, which -# won't be installed, just for linking -# -INCLUDES=\ - $(MODEST_GSTUFF_CFLAGS) \ - $(MODEST_GTK_CFLAGS) \ - $(MODEST_TINYMAIL_CFLAGS) - -noinst_LTLIBRARIES=\ - libmodest-ui.la - -libmodest_ui_la_SOURCES=\ - modest-ui.c\ - modest-main-window.h\ - modest-main-window.c\ - modest-edit-window.h\ - modest-edit-window.c - -LDADD = \ - $(MODEST_GSTUFF_LIBS) \ - $(MODEST_GTK_LIBS) \ - $(MODEST_TINYMAIL_LIBS) diff --git a/src/gtk/modest-edit-window.c b/src/gtk/modest-edit-window.c deleted file mode 100644 index 42538f1..0000000 --- a/src/gtk/modest-edit-window.c +++ /dev/null @@ -1,309 +0,0 @@ -/* modest-edit-window.c */ - -/* insert (c)/licensing information) */ - -#include -#include -#include "modest-edit-window.h" - - -#ifdef HAVE_CONFIG_H -#include -#endif /*HAVE_CONFIG_H*/ - -#include - -/* include other impl specific header files */ - -/* 'private'/'protected' functions */ -static void modest_edit_window_class_init (ModestEditWindowClass *klass); -static void modest_edit_window_init (ModestEditWindow *obj); -static void modest_edit_window_finalize (GObject *obj); - - -static GtkWidget* modest_edit_window_toolbar (void); - -static void on_send_clicked (GtkToolButton *button, gpointer data); -static void on_cut_clicked (GtkToolButton *button, gpointer data); -static void on_copy_clicked (GtkToolButton *button, gpointer data); -static void on_paste_clicked (GtkToolButton *button, gpointer data); -static void on_quit_clicked (GtkToolButton *button, gpointer data); -static void on_save_clicked (GtkToolButton *button, gpointer data); - - - -/* list my signals */ -enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ - LAST_SIGNAL -}; - -typedef struct _ModestEditWindowPrivate ModestEditWindowPrivate; -struct _ModestEditWindowPrivate { - - GtkEntry *to_entry; - GtkEntry *cc_entry; - GtkEntry *bcc_entry; - GtkEntry *subject_entry; - - GtkTextView *body_text; - GtkStatusbar *status_bar; - -}; -#define MODEST_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ - MODEST_TYPE_EDIT_WINDOW, \ - ModestEditWindowPrivate)) -/* globals */ -static GtkWindowClass *parent_class = NULL; - -/* uncomment the following if you have defined any signals */ -/* static guint signals[LAST_SIGNAL] = {0}; */ - -GType -modest_edit_window_get_type (void) -{ - static GType my_type = 0; - if (!my_type) { - static const GTypeInfo my_info = { - sizeof(ModestEditWindowClass), - NULL, /* base init */ - NULL, /* base finalize */ - (GClassInitFunc) modest_edit_window_class_init, - NULL, /* class finalize */ - NULL, /* class data */ - sizeof(ModestEditWindow), - 1, /* n_preallocs */ - (GInstanceInitFunc) modest_edit_window_init, - }; - my_type = g_type_register_static (GTK_TYPE_WINDOW, - "ModestEditWindow", - &my_info, 0); - } - return my_type; -} - -static void -modest_edit_window_class_init (ModestEditWindowClass *klass) -{ - GObjectClass *gobject_class; - gobject_class = (GObjectClass*) klass; - - parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = modest_edit_window_finalize; - - g_type_class_add_private (gobject_class, sizeof(ModestEditWindowPrivate)); - - /* 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 -modest_edit_window_init (ModestEditWindow *self) -{ - ModestEditWindowPrivate *priv; - GtkWidget *vbox; - GtkWidget *to_button, *cc_button, *bcc_button; - GtkWidget *subject_label; - GtkWidget *table; - GtkWidget *scrolled_win; - GtkWidget *toolbar; - - priv = MODEST_EDIT_WINDOW_GET_PRIVATE(self); - - priv->to_entry = GTK_ENTRY(gtk_entry_new_with_max_length (255)); - priv->cc_entry = GTK_ENTRY(gtk_entry_new_with_max_length (255)); - priv->bcc_entry = GTK_ENTRY(gtk_entry_new_with_max_length (255)); - priv->subject_entry = GTK_ENTRY(gtk_entry_new_with_max_length (255)); - priv->status_bar = GTK_STATUSBAR(gtk_statusbar_new ()); - - toolbar = modest_edit_window_toolbar (); - - to_button = gtk_button_new_with_label (_("To...")); - cc_button = gtk_button_new_with_label (_("Cc...")); - bcc_button = gtk_button_new_with_label (_("Bcc..")); - - scrolled_win = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolled_win), - GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_win), - GTK_SHADOW_IN); - - subject_label = gtk_label_new ("Subject:"); - - table = gtk_table_new (4, 2, FALSE); - - gtk_table_attach (GTK_TABLE(table), to_button, - 0, 1, 0, 1, 0, 0, 0, 0); - gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->to_entry), - 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); - - gtk_table_attach (GTK_TABLE(table), cc_button, - 0, 1, 1, 2, 0, 0, 0, 0); - gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->cc_entry), - 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); - - gtk_table_attach (GTK_TABLE(table), bcc_button, - 0, 1, 2, 3, 0, 0, 0, 0); - gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->bcc_entry), - 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); - - gtk_table_attach (GTK_TABLE(table), subject_label, - 0, 1, 3, 4, 0, 0, 0, 0); - gtk_table_attach (GTK_TABLE(table), GTK_WIDGET(priv->subject_entry), - 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, 0, 0, 0); - - priv->body_text = GTK_TEXT_VIEW(gtk_text_view_new ()); - - gtk_container_add (GTK_CONTAINER(scrolled_win), GTK_WIDGET(priv->body_text)); - - vbox = gtk_vbox_new (FALSE, 5); - - gtk_box_pack_start (GTK_BOX(vbox), toolbar, FALSE, TRUE,2); - gtk_box_pack_start (GTK_BOX(vbox), table, FALSE, TRUE,2); - gtk_box_pack_start (GTK_BOX(vbox), scrolled_win, TRUE, TRUE, 2); - gtk_box_pack_start (GTK_BOX(vbox), GTK_WIDGET(priv->status_bar), - FALSE, TRUE, 2); - - /* make everything but the top level container visible, - * so gtk_widget_show will work */ - gtk_widget_show_all (vbox); - gtk_container_add (GTK_CONTAINER(self), vbox); - -} - -static void -modest_edit_window_finalize (GObject *obj) -{ -/* free/unref instance resources here */ -} - - -GtkWidget* -modest_edit_window_new (const gchar *to, const gchar *cc, - const gchar *bcc, const gchar *subject, - const gchar *body, const GSList *attachments) -{ - - ModestEditWindowPrivate *priv; - GObject *obj = g_object_new(MODEST_TYPE_EDIT_WINDOW, NULL); - - priv = MODEST_EDIT_WINDOW_GET_PRIVATE(obj); - - /* FIXME: valid utf-8 */ - - if (to) - gtk_entry_set_text (priv->to_entry, to); - if (cc) - gtk_entry_set_text (priv->cc_entry, cc); - if (bcc) - gtk_entry_set_text (priv->bcc_entry,bcc); - - if (subject) - gtk_entry_set_text (priv->subject_entry, subject); - - if (body) - gtk_text_buffer_insert (gtk_text_view_get_buffer(priv->body_text), - NULL, body, strlen(body)); - - /* FIXME: attachments */ - - return GTK_WIDGET(obj); -} - - - - -static GtkWidget* -modest_edit_window_toolbar (void) -{ - GtkWidget *toolbar; - GtkToolItem *send, *save, *cut, *copy, *paste, *quit; - - toolbar = gtk_toolbar_new (); - - /* FIXME: get a better icon */ - send = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_PLAY); - - save = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE); - cut = gtk_tool_button_new_from_stock (GTK_STOCK_CUT); - copy = gtk_tool_button_new_from_stock (GTK_STOCK_COPY); - paste = gtk_tool_button_new_from_stock (GTK_STOCK_PASTE); - quit = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT); - - g_signal_connect (send, "clicked", G_CALLBACK(on_send_clicked), - "send"); - g_signal_connect (save, "clicked", G_CALLBACK(on_save_clicked), - "save"); - g_signal_connect (cut, "clicked", G_CALLBACK(on_cut_clicked), - "cut"); - g_signal_connect (copy, "clicked", G_CALLBACK(on_copy_clicked), - "copy"); - g_signal_connect (paste, "clicked", G_CALLBACK(on_paste_clicked), - "send"); - g_signal_connect (quit, "clicked", G_CALLBACK(on_quit_clicked), - "quit"); - - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(send), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), - GTK_TOOL_ITEM(gtk_separator_tool_item_new()), - -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(save), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), - GTK_TOOL_ITEM(gtk_separator_tool_item_new()), - -1); - - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(cut), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(copy), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(paste), -1); - - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), - GTK_TOOL_ITEM(gtk_separator_tool_item_new()), - -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(quit), -1); - - return toolbar; -} - - -static void -on_send_clicked (GtkToolButton *button, gpointer data) -{ - g_warning ("clicked: %s", (gchar *)data); -} - -static void -on_cut_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} -static void -on_copy_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} -static void -on_paste_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} - -static void -on_save_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} - - - -static void -on_quit_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} - - diff --git a/src/gtk/modest-edit-window.h b/src/gtk/modest-edit-window.h deleted file mode 100644 index c048d09..0000000 --- a/src/gtk/modest-edit-window.h +++ /dev/null @@ -1,51 +0,0 @@ -/* modest-edit-window.h */ -/* insert (c)/licensing information) */ - -#ifndef __MODEST_EDIT_WINDOW_H__ -#define __MODEST_EDIT_WINDOW_H__ - -#include -/* other include files */ - -G_BEGIN_DECLS - -/* convenience macros */ -#define MODEST_TYPE_EDIT_WINDOW (modest_edit_window_get_type()) -#define MODEST_EDIT_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_EDIT_WINDOW,ModestEditWindow)) -#define MODEST_EDIT_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_EDIT_WINDOW,GtkWindow)) -#define MODEST_IS_EDIT_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_EDIT_WINDOW)) -#define MODEST_IS_EDIT_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_EDIT_WINDOW)) -#define MODEST_EDIT_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_EDIT_WINDOW,ModestEditWindowClass)) - -typedef struct _ModestEditWindow ModestEditWindow; -typedef struct _ModestEditWindowClass ModestEditWindowClass; - -struct _ModestEditWindow { - GtkWindow parent; -}; - -struct _ModestEditWindowClass { - GtkWindowClass parent_class; - /* insert signal callback declarations, eg. */ - /* void (* my_event) (ModestEditWindow* obj); */ -}; - -/* member functions */ -GType modest_edit_window_get_type (void) G_GNUC_CONST; - - -GtkWidget* modest_edit_window_new (const gchar *to, - const gchar *cc, - const gchar *bcc, - const gchar *subject, - const gchar *body, - const GSList *attachments); -/* fill in other public functions, eg.: */ -/* void modest_edit_window_do_something (ModestEditWindow *self, const gchar* param); */ -/* gboolean modest_edit_window_has_foo (ModestEditWindow *self, gint value); */ - - -G_END_DECLS - -#endif /* __MODEST_EDIT_WINDOW_H__ */ - diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c deleted file mode 100644 index e0a2730..0000000 --- a/src/gtk/modest-main-window.c +++ /dev/null @@ -1,532 +0,0 @@ -/* modest-main-window.c */ - -/* insert (c)/licensing information) */ -#include -#include - - -#ifdef HAVE_CONFIG_H -#include -#endif /*HAVE_CONFIG_H*/ - -#include -#include "modest-main-window.h" - - - -#include "../modest-tny-account-store.h" -#include "../modest-tny-folder-tree-view.h" -#include "../modest-tny-header-tree-view.h" -#include "../modest-tny-msg-view.h" - - - -/* 'private'/'protected' functions */ -static void modest_main_window_class_init (ModestMainWindowClass *klass); -static void modest_main_window_init (ModestMainWindow *obj, - ModestConf *conf, - ModestAccountMgr *modest_acc_mgr); -static void modest_main_window_finalize (GObject *obj); - - -static GtkWidget* modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr); -static GtkWidget* modest_main_window_header_tree (TnyMsgFolderIface *folder); - -static GtkWidget* modest_main_window_toolbar (void); -static GtkWidget* modest_main_window_favorite_folder_list (void); -static GtkWidget* modest_main_window_message_preview (void); -static GtkWidget * modest_main_window_get_ui (ModestTnyFolderTreeView *folder_view, - ModestTnyHeaderTreeView *header_view, - ModestTnyMsgView *message_view); -static void on_newmail_clicked (GtkToolButton *button, gpointer data); -static void on_refresh_clicked (GtkToolButton *button, gpointer data); -static void on_reply_clicked (GtkToolButton *button, gpointer data); -static void on_forward_clicked (GtkToolButton *button, gpointer data); -static void on_delmail_clicked (GtkToolButton *button, gpointer data); -static void on_cut_clicked (GtkToolButton *button, gpointer data); -static void on_copy_clicked (GtkToolButton *button, gpointer data); -static void on_paste_clicked (GtkToolButton *button, gpointer data); -static void on_quit_clicked (GtkToolButton *button, gpointer data); - -static void on_folder_clicked (ModestTnyFolderTreeView *self, - TnyMsgFolderIface *folder, - gpointer data); -static void on_message_clicked (ModestTnyFolderTreeView *folder_tree, - TnyMsgIface *message, - gpointer data); - - - -/* list my signals */ -enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ - LAST_SIGNAL -}; - -typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate; -struct _ModestMainWindowPrivate { - - ModestConf *modest_conf; - ModestAccountMgr *modest_acc_mgr; - - ModestTnyFolderTreeView *folder_view; - ModestTnyHeaderTreeView *header_view; - ModestTnyMsgView *message_view; -}; -#define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ - MODEST_TYPE_MAIN_WINDOW, \ - ModestMainWindowPrivate)) -/* globals */ -static GtkWidgetClass *parent_class = NULL; - -/* uncomment the following if you have defined any signals */ -/* static guint signals[LAST_SIGNAL] = {0}; */ - -GType -modest_main_window_get_type (void) -{ - static GType my_type = 0; - if (!my_type) { - static const GTypeInfo my_info = { - sizeof(ModestMainWindowClass), - NULL, /* base init */ - NULL, /* base finalize */ - (GClassInitFunc) modest_main_window_class_init, - NULL, /* class finalize */ - NULL, /* class data */ - sizeof(ModestMainWindow), - 1, /* n_preallocs */ - (GInstanceInitFunc) modest_main_window_init, - }; - my_type = g_type_register_static (GTK_TYPE_WINDOW, - "ModestMainWindow", - &my_info, 0); - } - return my_type; -} - -static void -modest_main_window_class_init (ModestMainWindowClass *klass) -{ - GObjectClass *gobject_class; - gobject_class = (GObjectClass*) klass; - - parent_class = g_type_class_peek_parent (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 GtkWidget* -wrapped_in_scrolled_win (GtkWidget *child) -{ - GtkWidget *scrolled_win; - - scrolled_win = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolled_win), - GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_win), - GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER(scrolled_win), child); - return scrolled_win; -} - - - -static void -modest_main_window_init (ModestMainWindow *obj, ModestConf *modest_conf, - ModestAccountMgr *modest_acc_mgr) -{ -} - - - - - -static void -modest_main_window_finalize (GObject *obj) -{ - ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (obj); - - priv->modest_conf = NULL; - priv->modest_acc_mgr = NULL; -} - - - -GtkWidget* -modest_main_window_new (ModestConf *modest_conf, ModestAccountMgr *modest_acc_mgr) -{ - - GtkWidget *ui; - ModestMainWindow *self = - MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL)); - ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); - - priv->modest_conf = modest_conf; - priv->modest_acc_mgr = modest_acc_mgr; - - priv->header_view = MODEST_TNY_HEADER_TREE_VIEW(modest_main_window_header_tree (NULL)); - g_signal_connect (priv->header_view, "message_selected", - G_CALLBACK(on_message_clicked), - self); - - priv->folder_view = MODEST_TNY_FOLDER_TREE_VIEW(modest_main_window_folder_tree - (modest_acc_mgr)); - g_signal_connect (priv->folder_view, "folder_selected", - G_CALLBACK(on_folder_clicked), - self); - - priv->message_view = MODEST_TNY_MSG_VIEW (modest_main_window_message_preview()); - - ui = modest_main_window_get_ui(priv->folder_view, - priv->header_view, - priv->message_view); - gtk_container_add (GTK_CONTAINER(self), ui); - - return GTK_WIDGET(self); -} - - - - -static GtkWidget * -modest_main_window_get_ui (ModestTnyFolderTreeView *folder_view, - ModestTnyHeaderTreeView *header_view, - ModestTnyMsgView *message_view) - -{ - GtkWidget *vbox; - GtkWidget *msg_vpaned,*folder_vpaned, *folder_msg_hpaned; - GtkWidget *toolbar, *fav_folder_list; - GtkWidget *status_bar; - GtkWidget *swin_msg_list,*swin_folder_list, *swin_favfolder_list; - GtkWidget *folder_label, *message_label; - GtkWidget *folder_vbox, *message_vbox; - - toolbar = modest_main_window_toolbar (); - fav_folder_list = modest_main_window_favorite_folder_list (); - vbox = gtk_vbox_new (FALSE,2); - - folder_vbox = gtk_vbox_new (FALSE,2); - message_vbox = gtk_vbox_new (FALSE,2); - - msg_vpaned = gtk_vpaned_new (); - folder_vpaned = gtk_vpaned_new (); - folder_msg_hpaned = gtk_hpaned_new (); - - swin_msg_list = wrapped_in_scrolled_win (GTK_WIDGET(header_view)); - swin_folder_list = wrapped_in_scrolled_win (GTK_WIDGET(folder_view)); - swin_favfolder_list = wrapped_in_scrolled_win (fav_folder_list); - - folder_label = gtk_label_new (_("Folders")); - gtk_label_set_justify (GTK_LABEL(folder_label), GTK_JUSTIFY_LEFT); - - gtk_paned_add1 (GTK_PANED(folder_vpaned), swin_favfolder_list); - gtk_paned_add2 (GTK_PANED(folder_vpaned), swin_folder_list); - gtk_box_pack_start (GTK_BOX(folder_vbox), folder_label, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX(folder_vbox), folder_vpaned, TRUE, TRUE, 0); - - message_label= gtk_label_new (_("Inbox")); - gtk_label_set_justify (GTK_LABEL(message_label), GTK_JUSTIFY_LEFT); - gtk_paned_add1 (GTK_PANED(msg_vpaned), swin_msg_list); - gtk_paned_add2 (GTK_PANED(msg_vpaned), GTK_WIDGET(message_view)); - gtk_box_pack_start (GTK_BOX(message_vbox), message_label, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX(message_vbox), msg_vpaned, TRUE, TRUE, 0); - - - gtk_paned_add1 (GTK_PANED(folder_msg_hpaned), folder_vbox); - gtk_paned_add2 (GTK_PANED(folder_msg_hpaned), message_vbox); - - gtk_box_pack_start (GTK_BOX(vbox), toolbar, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX(vbox), folder_msg_hpaned, TRUE, TRUE, 0); - - status_bar = gtk_statusbar_new (); - gtk_box_pack_start (GTK_BOX(vbox), status_bar, FALSE, FALSE, 0); - - gtk_widget_show_all (GTK_WIDGET(vbox)); - return vbox; -} - - - -static GtkWidget* -modest_main_window_header_tree (TnyMsgFolderIface *folder) -{ -int i; - GSList *columns = NULL; - GtkWidget *header_tree; - ModestTnyHeaderTreeViewColumn cols[] = { - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM, - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO, - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT, - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SENT_DATE, - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE, - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE, - MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH - }; - - for (i = 0 ; i != sizeof(cols)/sizeof(ModestTnyHeaderTreeViewColumn); ++i) - columns = g_slist_append (columns, GINT_TO_POINTER(cols[i])); - - header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder, columns, - MODEST_TNY_HEADER_TREE_VIEW_STYLE_NORMAL)); - g_slist_free (columns); - - if (!header_tree) { - g_warning ("could not create header tree"); - return NULL; - } - - return GTK_WIDGET(header_tree); -} - - - -static GtkWidget* -modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr) -{ - GtkTreeViewColumn *column; - GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); - GtkWidget *folder_tree; - TnyAccountStoreIface *account_store_iface = - TNY_ACCOUNT_STORE_IFACE(modest_tny_account_store_new (modest_acc_mgr)); - if (!account_store_iface) { - g_warning ("could not initialze ModestTnyAccountStore"); - return NULL; - } - - folder_tree = modest_tny_folder_tree_view_new (account_store_iface); - if (!folder_tree) { - g_warning ("could not create folder list"); - return NULL; - } - - column = gtk_tree_view_column_new_with_attributes(_("All Mail Folders"), - renderer,"text", - TNY_ACCOUNT_TREE_MODEL_NAME_COLUMN, - NULL); - gtk_tree_view_column_set_resizable (column, TRUE); - gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column); - - column = gtk_tree_view_column_new_with_attributes(_("Unread"), - renderer, "text", - TNY_ACCOUNT_TREE_MODEL_UNREAD_COLUMN, - NULL); - gtk_tree_view_column_set_resizable (column, TRUE); - gtk_tree_view_append_column (GTK_TREE_VIEW(folder_tree), column); - - - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(folder_tree), TRUE); - gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(folder_tree), TRUE); - - return folder_tree; -} - - -static GtkWidget* -modest_main_window_favorite_folder_list (void) -{ - GtkWidget *folder_list; - GtkListStore *folder_store; - GtkTreeIter iter; - GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); - - folder_store = gtk_list_store_new (1, G_TYPE_STRING); - folder_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL(folder_store)); - - renderer = gtk_cell_renderer_text_new(); - - gtk_tree_view_insert_column (GTK_TREE_VIEW(folder_list), - gtk_tree_view_column_new_with_attributes(_("Favorite Folders"), - renderer, - "text", 0, - NULL), - 0); - gtk_list_store_insert_with_values (GTK_LIST_STORE(folder_store), - &iter, -1, 0, _("Stuff"), -1); - return folder_list; -} - - -static GtkWidget* -modest_main_window_toolbar (void) -{ - GtkWidget *toolbar; - GtkToolItem *newmail, *refresh, *reply, *forward, - *cut, *copy, *paste, *delmail, *quit; - - gpointer modest_ui = NULL; /* FIXME */ - - toolbar = gtk_toolbar_new (); - - newmail = gtk_tool_button_new_from_stock (GTK_STOCK_NEW); - delmail = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE); - - reply = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_PLAY); - forward = gtk_tool_button_new_from_stock (GTK_STOCK_MEDIA_FORWARD); - - refresh = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH); - - cut = gtk_tool_button_new_from_stock (GTK_STOCK_CUT); - copy = gtk_tool_button_new_from_stock (GTK_STOCK_COPY); - paste = gtk_tool_button_new_from_stock (GTK_STOCK_PASTE); - - quit = gtk_tool_button_new_from_stock (GTK_STOCK_QUIT); - - g_signal_connect (newmail, "clicked", G_CALLBACK(on_newmail_clicked), - modest_ui); - g_signal_connect (refresh, "clicked", G_CALLBACK(on_refresh_clicked), - modest_ui); - g_signal_connect (reply, "clicked", G_CALLBACK(on_reply_clicked), - modest_ui); - g_signal_connect (forward, "clicked", G_CALLBACK(on_forward_clicked), - modest_ui); - g_signal_connect (cut, "clicked", G_CALLBACK(on_cut_clicked), - modest_ui); - g_signal_connect (copy, "clicked", G_CALLBACK(on_copy_clicked), - modest_ui); - g_signal_connect (paste, "clicked", G_CALLBACK(on_paste_clicked), - modest_ui); - g_signal_connect (delmail, "clicked", G_CALLBACK(on_delmail_clicked), - modest_ui); - g_signal_connect (quit, "clicked", G_CALLBACK(on_quit_clicked), - modest_ui); - - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(newmail), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), - GTK_TOOL_ITEM(gtk_separator_tool_item_new()), - -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(refresh), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), - GTK_TOOL_ITEM(gtk_separator_tool_item_new()), - -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(reply), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(forward), -1); - - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), - GTK_TOOL_ITEM(gtk_separator_tool_item_new()), - -1); - - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(cut), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(copy), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(paste), -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(delmail), -1); - - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), - GTK_TOOL_ITEM(gtk_separator_tool_item_new()), - -1); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(quit), -1); - - return toolbar; -} - - -static GtkWidget* -modest_main_window_message_preview () -{ - ModestTnyMsgView *msg_view; - - msg_view = MODEST_TNY_MSG_VIEW(modest_tny_msg_view_new (NULL)); - - return GTK_WIDGET(msg_view); -} - - -static void -on_newmail_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} - -static void -on_refresh_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} -static void -on_reply_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} -static void -on_forward_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} -static void -on_delmail_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} - -static void -on_cut_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); - -} -static void -on_copy_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); - -} -static void -on_paste_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} - - -static void -on_quit_clicked (GtkToolButton *button, gpointer data) -{ - g_warning (__FUNCTION__); -} - - - -static void on_folder_clicked (ModestTnyFolderTreeView *folder_tree, - TnyMsgFolderIface *folder, - gpointer data) -{ - ModestMainWindow *self; - ModestMainWindowPrivate *priv; - - g_return_if_fail (folder); - g_return_if_fail (data); - - self = MODEST_MAIN_WINDOW(data); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); - - modest_tny_header_tree_view_set_folder (priv->header_view, - folder); -} - - - -static void on_message_clicked (ModestTnyFolderTreeView *folder_tree, - TnyMsgIface *message, - gpointer data) -{ - ModestMainWindow *self; - ModestMainWindowPrivate *priv; - - g_return_if_fail (message); - g_return_if_fail (data); - - self = MODEST_MAIN_WINDOW(data); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); - - modest_tny_msg_view_set_message (priv->message_view, - message); -} diff --git a/src/gtk/modest-main-window.h b/src/gtk/modest-main-window.h deleted file mode 100644 index e8ce12a..0000000 --- a/src/gtk/modest-main-window.h +++ /dev/null @@ -1,58 +0,0 @@ -/* modest-main-window.h */ -/* insert (c)/licensing information) */ - -#ifndef __MODEST_MAIN_WINDOW_H__ -#define __MODEST_MAIN_WINDOW_H__ - - -#include -#include "../modest-conf.h" -#include "../modest-account-mgr.h" - -/* other include files */ - -G_BEGIN_DECLS - -/* convenience macros */ -#define MODEST_TYPE_MAIN_WINDOW (modest_main_window_get_type()) -#define MODEST_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_MAIN_WINDOW,ModestMainWindow)) -#define MODEST_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_MAIN_WINDOW,GtkWidget)) -#define MODEST_IS_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_MAIN_WINDOW)) -#define MODEST_IS_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_MAIN_WINDOW)) -#define MODEST_MAIN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_MAIN_WINDOW,ModestMainWindowClass)) - -typedef struct _ModestMainWindow ModestMainWindow; -typedef struct _ModestMainWindowClass ModestMainWindowClass; - - -struct _ModestMainWindow { - GtkWindow parent; - /* insert public members, if any */ -}; - -struct _ModestMainWindowClass { - GtkWindowClass parent_class; - /* insert signal callback declarations, eg. */ - /* void (* my_event) (ModestMainWindow* obj); */ -}; - - - -/* member functions */ -GType modest_main_window_get_type (void) G_GNUC_CONST; - -/* typical parameter-less _new function */ -/* if this is a kind of GtkWidget, it should probably return at GtkWidget*, */ -/* otherwise probably a GObject*. */ -GtkWidget* modest_main_window_new (ModestConf *modest_conf, - ModestAccountMgr *modest_acc_mgr); - -/* fill in other public functions, eg.: */ -/* void modest_main_window_do_something (ModestMainWindow *self, const gchar* param); */ -/* gboolean modest_main_window_has_foo (ModestMainWindow *self, gint value); */ - - -G_END_DECLS - -#endif /* __MODEST_MAIN_WINDOW_H__ */ - diff --git a/src/gtk/modest-ui.c b/src/gtk/modest-ui.c deleted file mode 100644 index 4146aa6..0000000 --- a/src/gtk/modest-ui.c +++ /dev/null @@ -1,250 +0,0 @@ -/* modest-ui.c */ - -/* insert (c)/licensing information) */ - -#include - -#ifdef HAVE_CONFIG_H -#include -#endif /*HAVE_CONFIG_H*/ - -#include "modest-main-window.h" -#include "modest-edit-window.h" - -#include "../modest-ui.h" -#include "../modest-window-mgr.h" -#include "../modest-account-mgr.h" - - -/* include other impl specific header files */ - -/* '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 modest_ui_window_destroy (GtkWidget *win, gpointer data); -static void modest_ui_last_window_closed (GObject *obj, gpointer data); - - - -/* list my signals */ -enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ - LAST_SIGNAL -}; - - -typedef struct _ModestUIPrivate ModestUIPrivate; -struct _ModestUIPrivate { - - ModestConf *modest_conf; - ModestAccountMgr *modest_acc_mgr; - ModestWindowMgr *modest_window_mgr; - - GtkWindow *main_window; - GSList* *edit_window_list; - -}; -#define MODEST_UI_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ - MODEST_TYPE_UI, \ - ModestUIPrivate)) -/* globals */ -static GObjectClass *parent_class = NULL; - -/* uncomment the following if you have defined any signals */ -/* static guint signals[LAST_SIGNAL] = {0}; */ - -GType -modest_ui_get_type (void) -{ - static GType my_type = 0; - if (!my_type) { - static const GTypeInfo my_info = { - sizeof(ModestUIClass), - NULL, /* base init */ - NULL, /* base finalize */ - (GClassInitFunc) modest_ui_class_init, - NULL, /* class finalize */ - NULL, /* class data */ - sizeof(ModestUI), - 1, /* n_preallocs */ - (GInstanceInitFunc) modest_ui_init, - }; - my_type = g_type_register_static (G_TYPE_OBJECT, - "ModestUI", - &my_info, 0); - } - return my_type; -} - -static void -modest_ui_class_init (ModestUIClass *klass) -{ - GObjectClass *gobject_class; - gobject_class = (GObjectClass*) klass; - - parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = modest_ui_finalize; - - g_type_class_add_private (gobject_class, sizeof(ModestUIPrivate)); - - /* 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 -modest_ui_init (ModestUI *obj) -{ - ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj); - - priv->modest_acc_mgr = NULL; - priv->modest_conf = NULL; - priv->modest_window_mgr = NULL; - -} - -static void -modest_ui_finalize (GObject *obj) -{ - ModestUIPrivate *priv = MODEST_UI_GET_PRIVATE(obj); - - if (priv->modest_acc_mgr) - g_object_unref (priv->modest_acc_mgr); - priv->modest_acc_mgr = NULL; - - if (priv->modest_conf) - g_object_unref (priv->modest_conf); - priv->modest_conf = NULL; - - if (priv->modest_window_mgr) - g_object_unref (priv->modest_window_mgr); - priv->modest_window_mgr = NULL; -} - -GObject* -modest_ui_new (ModestConf *modest_conf) -{ - GObject *obj; - ModestUIPrivate *priv; - ModestAccountMgr *modest_acc_mgr; - - g_return_val_if_fail (modest_conf, NULL); - - obj = g_object_new(MODEST_TYPE_UI, NULL); - priv = MODEST_UI_GET_PRIVATE(obj); - - modest_acc_mgr = MODEST_ACCOUNT_MGR(modest_account_mgr_new (modest_conf)); - if (!modest_acc_mgr) { - g_warning ("could not create ModestAccountMgr instance"); - g_object_unref (obj); - return NULL; - } - - priv->modest_acc_mgr = modest_acc_mgr; - g_object_ref (priv->modest_conf = modest_conf); - - priv->modest_window_mgr = MODEST_WINDOW_MGR(modest_window_mgr_new()); - g_signal_connect (priv->modest_window_mgr, "last_window_closed", - G_CALLBACK(modest_ui_last_window_closed), - NULL); - return obj; -} - - -gboolean -modest_ui_show_main_window (ModestUI *modest_ui) -{ - GtkWidget *win; - int height, width; - ModestUIPrivate *priv; - - priv = MODEST_UI_GET_PRIVATE(modest_ui); - - height = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_MAIN_WINDOW_HEIGHT,NULL); - width = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_MAIN_WINDOW_WIDTH,NULL); - - win = modest_main_window_new (priv->modest_conf, - priv->modest_acc_mgr); - if (!win) { - g_warning ("could not create main window"); - return FALSE; - } - - modest_window_mgr_register (priv->modest_window_mgr, - G_OBJECT(win), MODEST_MAIN_WINDOW, 0); - - g_signal_connect (win, "destroy", G_CALLBACK(modest_ui_window_destroy), - modest_ui); - - gtk_widget_set_usize (GTK_WIDGET(win), height, width); - gtk_window_set_title (GTK_WINDOW(win), PACKAGE_STRING); - - gtk_widget_show (win); - return TRUE; -} - - -gboolean -modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to, - const gchar* cc, const gchar* bcc, - const gchar* subject, const gchar *body, - const GSList* att) -{ - GtkWidget *win; - ModestUIPrivate *priv; - - priv = MODEST_UI_GET_PRIVATE(modest_ui); - int height = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_EDIT_WINDOW_HEIGHT,NULL); - int width = modest_conf_get_int (priv->modest_conf, - MODEST_CONF_EDIT_WINDOW_WIDTH,NULL); - - win = modest_edit_window_new (to, cc, bcc, subject, body, att); - if (!win) { - g_warning ("could not create edit window"); - return FALSE; - } - - modest_window_mgr_register (priv->modest_window_mgr, - G_OBJECT(win), MODEST_EDIT_WINDOW, 0); - - g_signal_connect (win, "destroy", G_CALLBACK(modest_ui_window_destroy), - modest_ui); - - gtk_widget_set_usize (GTK_WIDGET(win), height, width); - gtk_window_set_title (GTK_WINDOW(win), - subject ? subject : "Untitled"); - - gtk_widget_show (win); - - return TRUE; -} - - -static void -modest_ui_window_destroy (GtkWidget *win, gpointer data) -{ - ModestUIPrivate *priv; - - g_return_if_fail (data); - - priv = MODEST_UI_GET_PRIVATE((ModestUI*)data); - if (!modest_window_mgr_unregister (priv->modest_window_mgr, G_OBJECT(win))) - g_warning ("modest window mgr: failed to unregister %p", - G_OBJECT(win)); -} - - -static void -modest_ui_last_window_closed (GObject *obj, gpointer data) -{ - gtk_main_quit (); -}