Changeset 12

Timestamp:

10/29/07 23:13:29

Author:

pvanhoof

Message:

2007-10-29 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Restructured how the UI works (shell, child)
        
      • Introduced TMutShellWindow, TMutShellChild
        
      • Refactored all types to GtkWidgets? in stead of GtkWindows?
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src (modified) (1 prop)
• trunk/src/.svnignore (added)
• trunk/src/Makefile.am (modified) (2 diffs)
• trunk/src/tmut-folder-view.c (modified) (10 diffs)
• trunk/src/tmut-folder-view.h (modified) (1 diff)
• trunk/src/tmut-main.c (moved) (moved from trunk/src/main.c) (3 diffs)
• trunk/src/tmut-menu-view.c (modified) (10 diffs)
• trunk/src/tmut-msg-view.c (modified) (5 diffs)
• trunk/src/tmut-msg-view.h (modified) (3 diffs)
• trunk/src/tmut-shared.h (added)
• trunk/src/tmut-shell-child.c (added)
• trunk/src/tmut-shell-child.h (added)
• trunk/src/tmut-shell-window.c (added)
• trunk/src/tmut-shell-window.h (added)

trunk/ChangeLog

@@ +1 @@
+2007-10-29  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Restructured how the UI works (shell, child)
+        * Introduced TMutShellWindow, TMutShellChild
+        * Refactored all types to GtkWidgets in stead of GtkWindows
+
-2007-10-28  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/src/Makefile.am

@@ -3 +3 @@
-bin_PROGRAMS = tmut
-
-
+tmut-shared.h tmut-
-        tmut-platform-factory.c \
-        tmut-platform-factory.h \
@@ -13 +13 @@
-        tmut-msg-view.h \
-        tmut-ringtone-player.c \
-
+
+
+
+
+
-         
-

trunk/src/tmut-folder-view.c

@@ -21 +21 @@
-#include "tmut-msg-view.h"
-#include "tmut-ringtone-player.h"
+#include "tmut-shell-window.h"
+#include "tmut-shell-child.h"
-
-#include <tny-folder-monitor.h>
@@ -36 +38 @@
-        TnyFolder *folder;
-        TnyFolderObserver *ringtone_player;
+        TMutShellWindow *shell;
-};
-
@@ -58 +61 @@
-on_active_folder_got_set (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data)
-{
+        g_object_unref (user_data);
+
-        return;
-}
@@ -103 +108 @@
-
-        tny_folder_refresh_async (folder, on_active_folder_got_set, 
-self
+g_object_ref (self)
-
-        gtk_tree_view_set_model (priv->headers_treeview, model);
@@ -113 +118 @@
-tmut_folder_view_on_got_msg (TnyFolder *folder, gboolean canceled, TnyMsg *msg, GError *err, gpointer user_data)
-{
+        TMutFolderView *self = TMUT_FOLDER_VIEW (user_data);
+
-        if (!canceled && !err) {
-                TnyMsgView *view = tmut_msg_view_new ();
-                tny_msg_view_set_msg (view, msg);
-                gtk_widget_show (GTK_WIDGET (view));
-
+
+
+
+
+
+
+
+
-
-        return;
@@ -144 +158 @@
-                        if (folder) {
-                                tny_folder_get_msg_async (folder, header, 
-
+
+
+
-                                g_object_unref (folder);
-                        }
@@ -161 +177 @@
-        TMutFolderView *self = (TMutFolderView *) instance;
-        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
-        GtkWindow *window = GTK_WINDOW (self);
-        GtkCellRenderer *renderer;
-        GtkTreeViewColumn *column;
@@ -176 +191 @@
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
+
+
+
+
-        gtk_widget_show (sw);
-
@@ -250 +268 @@
-        return TMUT_FOLDER_VIEW (self);
-}
+
+
+TMutShellWindow* 
+tmut_folder_view_get_window (TMutShellChild *self)
+{
+        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
+        return priv->shell;
+}
+
+void 
+tmut_folder_view_set_window (TMutShellChild *self, TMutShellWindow *window)
+{
+        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
+        priv->shell = window;
+}
+
+static void
+tmut_shell_child_init (gpointer g, gpointer iface_data)
+{
+        TMutShellChildIface *klass = (TMutShellChildIface *)g;
+
+        klass->get_window_func = tmut_folder_view_get_window;
+        klass->set_window_func = tmut_folder_view_set_window;
+
+        return;
+}
+
-
-GType 
@@ -271 +316 @@
-                };
-
-
+
+
+
+
+
+
+
+
-                        "TMutFolderView",
-                        &info, 0);
+
+                g_type_add_interface_static (type, TMUT_TYPE_SHELL_CHILD, 
+                        &tmut_shell_child_info);
+
-        }
-

trunk/src/tmut-folder-view.h

@@ -40 +40 @@
-struct _TMutFolderView
-{
-Window
+VBox
-};
-
-struct _TMutFolderViewClass
-{
-Window
+VBox
-};
-

trunk/src/tmut-main.c

@@ -25 +25 @@
-#include "tmut-platform-factory.h"
-#include "tmut-menu-view.h"
+#include "tmut-shell-window.h"
-
-int 
@@ -34 +35 @@
-        TnyAccountStoreView *view;
-        GtkProgressBar *progressbar;
-        GtkWidget *box;
-
-        if (!g_thread_supported ()) 
@@ -44 +44 @@
-        gtk_init (&argc, &argv);
-
-        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_title (GTK_WINDOW (window), "TMut");
-
-        box = gtk_vbox_new (FALSE, 0);
-        gtk_widget_show (GTK_WIDGET (box));
-        progressbar = GTK_PROGRESS_BAR (gtk_progress_bar_new ());
-        gtk_widget_show (GTK_WIDGET (progressbar));
-
+
+
+
-
-        platfact = tmut_platform_factory_get_instance ();
-        account_store = tny_platform_factory_new_account_store (platfact);
-
-
+
+
-        gtk_widget_show (GTK_WIDGET (view));
-
+
+
+
+
-        tny_account_store_view_set_account_store (view, account_store);
-
-        gtk_container_add (GTK_CONTAINER (window), box);
-        g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), 0);
-

trunk/src/tmut-menu-view.c

@@ -20 +20 @@
-#include "tmut-menu-view.h"
-#include "tmut-folder-view.h"
+#include "tmut-shell-window.h"
+#include "tmut-shell-child.h"
-
-#include <tny-gtk-folder-store-tree-model.h>
@@ -34 +36 @@
-        GtkProgress *progress;
-        GtkComboBox *accounts_combo;
-FolderView *folder_view
+ShellWindow *shell
-};
-
@@ -103 +105 @@
-}
-
-static void 
-on_folder_view_destroy (GtkWidget *widget, gpointer user_data)
-{
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (user_data);
-        priv->folder_view = NULL;
-        return;
-}
-
-static void
@@ -131 +126 @@
-                {
-                        TnyFolder *folder;
+                        TMutFolderView *view;
-
-                        gtk_tree_model_get (model, &iter, 
@@ -136 +132 @@
-                                &folder, -1);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-                        g_object_unref (folder);
@@ -175 +170 @@
-
-        priv->progress = NULL;
-        priv->folder_view = NULL;
-
-        priv->accounts_combo = GTK_COMBO_BOX (gtk_combo_box_new ());
@@ -232 +226 @@
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (object);
-
-        if (priv->folder_view)
-                gtk_widget_destroy (GTK_WIDGET (priv->folder_view));
-
-        if (priv->progress)
-                g_object_unref (priv->progress);
-
-        (*parent_class->finalize) (object);
+        return;
+}
+
+TMutShellWindow* 
+tmut_menu_view_get_window (TMutShellChild *self)
+{
+        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
+        return priv->shell;
+}
+
+void 
+tmut_menu_view_set_window (TMutShellChild *self, TMutShellWindow *window)
+{
+        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
+        priv->shell = window;
+}
+
+static void
+tmut_shell_child_init (gpointer g, gpointer iface_data)
+{
+        TMutShellChildIface *klass = (TMutShellChildIface *)g;
+
+        klass->get_window_func = tmut_menu_view_get_window;
+        klass->set_window_func = tmut_menu_view_set_window;
+
-        return;
-}
@@ -304 +320 @@
-                };
-
-
-                static const GInterfaceInfo tny_account_store_view_info = 
-                {
@@ -312 +327 @@
-                };
-
+                static const GInterfaceInfo tmut_shell_child_info = 
+                {
+                  (GInterfaceInitFunc) tmut_shell_child_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                type = g_type_register_static (GTK_TYPE_VBOX,
-                        "TMutMenuView",
@@ -319 +341 @@
-                        &tny_account_store_view_info);
-
+                g_type_add_interface_static (type, TMUT_TYPE_SHELL_CHILD, 
+                        &tmut_shell_child_info);
+
+
-        }
-

trunk/src/tmut-msg-view.c

@@ -22 +22 @@
-
-#include "tmut-msg-view.h"
+#include "tmut-shell-window.h"
+#include "tmut-shell-child.h"
-
-#include <tny-gtk-msg-view.h>
@@ -29 +31 @@
-typedef struct _TMutMsgViewPriv TMutMsgViewPriv;
-
-
-
+ {
+
-};
-
@@ -57 +59 @@
-tmut_msg_view_instance_init (GTypeInstance *instance, gpointer g_class)
-{
-        tny_gtk_msg_window_set_view (TNY_GTK_MSG_WINDOW (instance), 
-                        tny_gtk_msg_view_new ());
-        return;
-}
@@ -70 +70 @@
-}
-
+
+TMutShellWindow* 
+tmut_msg_view_get_window (TMutShellChild *self)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+        return priv->shell;
+}
+
+void 
+tmut_msg_view_set_window (TMutShellChild *self, TMutShellWindow *window)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+        priv->shell = window;
+}
+
+static void
+tmut_shell_child_init (gpointer g, gpointer iface_data)
+{
+        TMutShellChildIface *klass = (TMutShellChildIface *)g;
+
+        klass->get_window_func = tmut_msg_view_get_window;
+        klass->set_window_func = tmut_msg_view_set_window;
+
+        return;
+}
-
-static void 
@@ -106 +131 @@
-                  NULL
-                };
-
+
+
+
+
+
+
+
+
+
-                        "TMutMsgView",
-                        &info, 0);
+
+                g_type_add_interface_static (type, TMUT_TYPE_SHELL_CHILD, 
+                        &tmut_shell_child_info);
+
-        }
-

trunk/src/tmut-msg-view.h

@@ -1 @@
-NY_TMUT
-NY_TMUT
+MUT_MSG
+MUT_MSG
-
-/* TMut
@@ -25 +25 @@
-#include <tny-shared.h>
-
-windo
+vie
-
-G_BEGIN_DECLS
@@ -41 +41 @@
-struct _TMutMsgView
-{
-Windo
+Vie
-};
-
-struct _TMutMsgViewClass
-{
-Windo
+Vie
-};
-