modest-icon-names.h \
modest-gtk-window-mgr.h modest-gtk-window-mgr.c \
modest-platform.c \
- modest-shell.h modest-shell.c
+ modest-shell.h modest-shell.c \
+ modest-shell-window.h modest-shell-window.c
libmodest_ui_la_LIBADD = \
$(MODEST_GSTUFF_LIBS) \
static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
static void modest_shell_window_show_progress (ModestWindow *window,
gboolean show);
-static void setup_menu (ModestShellWindow *self);
-
static void modest_shell_window_show_toolbar (ModestWindow *self,
gboolean show_toolbar);
static void modest_shell_window_add_toolbar (ModestWindow *self,
static GtkWindowClass *parent_class = NULL;
/* uncomment the following if you have defined any signals */
-static guint signals[LAST_SIGNAL] = {0};
+/* static guint signals[LAST_SIGNAL] = {0}; */
/************************************************************************/
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
- HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = modest_shell_window_dispose;
ModestDimmingCallback dimming_callback)
{
ModestShellWindowPrivate *priv;
- GtkWidget *menu;
g_return_if_fail (MODEST_IS_SHELL_WINDOW(self));
g_return_if_fail (GTK_IS_BUTTON (button));
{
ModestShellWindowPrivate *priv = NULL;
GtkWidget *menu_item;
- GtkWidget *menu;
g_return_if_fail (MODEST_IS_SHELL_WINDOW(self));
g_return_if_fail (label && label[0] != '\0');
priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
menu_item = gtk_menu_item_new_with_label (label);
- g_signal_connect_after (G_OBJECT (button), "activate-item",
+ g_signal_connect_after (G_OBJECT (menu_item), "activate-item",
G_CALLBACK (callback), (gpointer) self);
if (accelerator != NULL) {
}
if (priv->menu) {
- gtk_menu_shell_append (GTK_MENU (priv->menu), menu_item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_item);
} else {
gtk_widget_destroy (menu_item);
}
static void
modest_shell_window_add_toolbar (ModestWindow *self,
- GtkToolbar *toolbar)
+ GtkToolbar *toolbar)
{
- gtk_box_pack_end (GTK_BOX (self), toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (self), GTK_WIDGET (toolbar), FALSE, FALSE, 0);
}
static void
modest_shell_window_show_progress (ModestWindow *self,
gboolean show)
{
+ ModestShellWindowPrivate *priv = NULL;
+
+ priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
modest_shell_show_progress (MODEST_SHELL (priv->shell),
self,
show);
#include <widgets/modest-window.h>
#include <widgets/modest-account-view.h>
#include <modest-dimming-rule.h>
+#include <modest-shell.h>
G_BEGIN_DECLS
#include <string.h>
#include <modest-shell.h>
+#include <modest-shell-window.h>
/* 'private'/'protected' functions */
static void modest_shell_class_init (ModestShellClass *klass);
}
void
-modest_shell_set_title (ModestShell *shell, ModestShellWindow *window, const gchar *title)
+modest_shell_set_title (ModestShell *shell, ModestWindow *window, const gchar *title)
{
ModestShellPrivate *priv;
}
void
-modest_shell_show_progress (ModestShell *shell, ModestShellWindow *window, gboolean show)
+modest_shell_show_progress (ModestShell *shell, ModestWindow *window, gboolean show)
{
}
void modest_shell_add_window (ModestShell *shell, ModestWindow *window);
gint modest_shell_count_windows (ModestShell *shell);
-void modest_shell_set_title (ModestShell *shell, ModestShellWindow *window, const gchar *title);
-void modest_shell_show_progress (ModestShell *shell, ModestShellWindow *window, gboolean show);
+void modest_shell_set_title (ModestShell *shell, ModestWindow *window, const gchar *title);
+void modest_shell_show_progress (ModestShell *shell, ModestWindow *window, gboolean show);
G_END_DECLS
#ifdef MODEST_TOOLKIT_HILDON2
MODEST_TYPE_HILDON2_WINDOW,
#else
- MODEST_TYPE_WINDOW,
+ MODEST_TYPE_SHELL_WINDOW,
#endif
"ModestAccountsWindow",
&my_info, 0);
#ifdef MODEST_TOOLKIT_HILDON2
#include <modest-hildon2-window.h>
+#else
+#include <modest-shell-window.h>
#endif
#include <widgets/modest-window.h>
#include <widgets/modest-account-view.h>
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2Window parent;
#else
- ModestWindow parent;
+ ModestShellWindow parent;
#endif
};
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2WindowClass parent_class;
#else
- ModestWindowClass parent_class;
+ ModestShellWindowClass parent_class;
#endif
};
#ifdef MODEST_TOOLKIT_HILDON2
MODEST_TYPE_HILDON2_WINDOW,
#else
- MODEST_TYPE_WINDOW,
+ MODEST_TYPE_SHELL_WINDOW,
#endif
"ModestFolderWindow",
&my_info, 0);
#ifdef MODEST_TOOLKIT_HILDON2
#include <modest-hildon2-window.h>
+#else
+#include <modest-shell-window.h>
#endif
#include <widgets/modest-window.h>
#include <widgets/modest-folder-view.h>
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2Window parent;
#else
- ModestWindow parent;
+ ModestShellWindow parent;
#endif
};
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2WindowClass parent_class;
#else
- ModestWindowClass parent_class;
+ ModestShellWindowClass parent_class;
#endif
};
#ifdef MODEST_TOOLKIT_HILDON2
MODEST_TYPE_HILDON2_WINDOW,
#else
- MODEST_TYPE_WINDOW,
+ MODEST_TYPE_SHELL_WINDOW,
#endif
"ModestHeaderWindow",
&my_info, 0);
#ifdef MODEST_TOOLKIT_HILDON2
#include <modest-hildon2-window.h>
+#else
+#include <modest-shell-window.h>
#endif
#include <widgets/modest-window.h>
#include <widgets/modest-header-view.h>
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2Window parent;
#else
- ModestWindow parent;
+ ModestShellWindow parent;
#endif
};
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2WindowClass parent_class;
#else
- ModestWindowClass parent_class;
+ ModestShellWindowClass parent_class;
#endif
};
#ifdef MODEST_TOOLKIT_HILDON2
MODEST_TYPE_HILDON2_WINDOW,
#else
- MODEST_TYPE_WINDOW,
+ MODEST_TYPE_SHELL_WINDOW,
#endif
"ModestMailboxesWindow",
&my_info, 0);
#ifdef MODEST_TOOLKIT_HILDON2
#include <modest-hildon2-window.h>
+#else
+#include <modest-shell-window.h>
#endif
#include <widgets/modest-window.h>
#include <widgets/modest-folder-view.h>
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2WindowClass parent_class;
#else
- ModestWindowClass parent_class;
+ ModestShellWindowClass parent_class;
#endif
};
#ifdef MODEST_TOOLKIT_HILDON2
MODEST_TYPE_HILDON2_WINDOW,
#else
- MODEST_TYPE_WINDOW,
+ MODEST_TYPE_SHELL_WINDOW,
#endif
"ModestMsgEditWindow",
&my_info, 0);
#include <tny-vfs-stream.h>
#ifdef MODEST_TOOLKIT_HILDON2
#include <modest-hildon2-window.h>
+#else
+#include <modest-shell-window.h>
#endif
#include <widgets/modest-window.h>
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2Window parent;
#else
- ModestWindow parent;
+ ModestShellWindow parent;
#endif
/* insert public members, if any */
};
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2WindowClass parent_class;
#else
- ModestWindowClass parent_class;
+ ModestShellWindowClass parent_class;
#endif
/* insert signal callback declarations, eg. */
/* void (* my_event) (ModestMsgEditWindow* obj); */
(GInstanceInitFunc) modest_msg_view_window_init,
NULL
};
-#ifdef MODEST_TOOLKIT_GTK
- my_type = g_type_register_static (MODEST_TYPE_WINDOW,
+#ifndef MODEST_TOOLKIT_HILDON2
+ my_type = g_type_register_static (MODEST_TYPE_SHELL_WINDOW,
"ModestMsgViewWindow",
&my_info, 0);
#else
#include <tny-folder.h>
#ifdef MODEST_TOOLKIT_HILDON2
#include <modest-hildon2-window.h>
+#else
+#include <modest-shell-window.h>
#endif
#include <widgets/modest-window.h>
#include <widgets/modest-header-view.h>
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2Window parent;
#else
- ModestWindow parent;
+ ModestShellWindow parent;
#endif
} ModestMsgViewWindow;
#ifdef MODEST_TOOLKIT_HILDON2
ModestHildon2WindowClass parent_class;
#else
- ModestWindowClass parent_class;
+ ModestShellWindowClass parent_class;
#endif
void (*msg_changed) (ModestMsgViewWindow *self,