static void modest_window_disconnect_signals_default (ModestWindow *self);
+static void modest_window_show_progress_default (ModestWindow *self,
+ gboolean show);
+
static void modest_window_show_toolbar_default (ModestWindow *window,
gboolean show_toolbar);
+static void modest_window_add_toolbar_default (ModestWindow *window,
+ GtkToolbar *toolbar);
+
+static void modest_window_add_to_menu_default (ModestWindow *self,
+ const gchar *label,
+ const gchar *accelerator,
+ ModestWindowMenuCallback callback,
+ ModestDimmingCallback dimming_callback);
+
+static void modest_window_add_item_to_menu_default (ModestWindow *self,
+ GtkWidget *item,
+ ModestDimmingCallback dimming_callback);
+
+static void modest_window_set_title_default (ModestWindow *window,
+ const gchar *title);
+
static void modest_window_set_zoom_default (ModestWindow *window,
gdouble zoom);
static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data);
-static void _make_zoom_buttons_grabeable (GtkWidget* widget);
-static gboolean _modest_window_map_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer userdata);
+static void modest_window_pack_toolbar_not_implemented (ModestWindow *self,
+ GtkPackType pack_type,
+ GtkWidget *toolbar);
/* list my signals */
enum {
LAST_SIGNAL
parent_type = HILDON_TYPE_WINDOW;
#endif
#else
- parent_type = GTK_TYPE_WINDOW;
+ parent_type = GTK_TYPE_VBOX;
#endif
my_type = g_type_register_static (parent_type,
"ModestWindow",
klass->zoom_plus_func = modest_window_zoom_plus_default;
klass->zoom_minus_func = modest_window_zoom_minus_default;
klass->show_toolbar_func = modest_window_show_toolbar_default;
+ klass->add_toolbar_func = modest_window_add_toolbar_default;
+ klass->add_to_menu_func = modest_window_add_to_menu_default;
+ klass->add_item_to_menu_func = modest_window_add_item_to_menu_default;
+ klass->set_title_func = modest_window_set_title_default;
klass->disconnect_signals_func = modest_window_disconnect_signals_default;
+ klass->show_progress_func = modest_window_show_progress_default;
+ klass->pack_toolbar_func = modest_window_pack_toolbar_not_implemented;
g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate));
}
priv = MODEST_WINDOW_GET_PRIVATE(obj);
priv->ui_manager = NULL;
- priv->ui_dimming_manager = NULL;
+ priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
priv->toolbar = NULL;
priv->menubar = NULL;
g_signal_connect (G_OBJECT (obj),
"key-press-event",
G_CALLBACK (on_key_pressed), NULL);
- g_signal_connect (G_OBJECT (obj), "map-event",
- G_CALLBACK (_modest_window_map_event),
- G_OBJECT (obj));
}
static void
}
void
+modest_window_add_toolbar (ModestWindow *window,
+ GtkToolbar *toolbar)
+{
+ MODEST_WINDOW_GET_CLASS (window)->add_toolbar_func (window,
+ toolbar);
+}
+
+void
+modest_window_add_to_menu (ModestWindow *window,
+ const gchar *label,
+ const gchar *accelerator,
+ ModestWindowMenuCallback callback,
+ ModestDimmingCallback dimming_callback)
+{
+ MODEST_WINDOW_GET_CLASS (window)->add_to_menu_func (window,
+ label,
+ accelerator,
+ callback,
+ dimming_callback);
+}
+
+void
+modest_window_add_item_to_menu (ModestWindow *window,
+ GtkWidget *item,
+ ModestDimmingCallback dimming_callback)
+{
+ MODEST_WINDOW_GET_CLASS (window)->add_item_to_menu_func (window,
+ item,
+ dimming_callback);
+}
+
+void
+modest_window_set_title (ModestWindow *window,
+ const gchar *title)
+{
+ MODEST_WINDOW_GET_CLASS (window)->set_title_func (window,
+ title);
+}
+
+void
modest_window_disconnect_signals (ModestWindow *window)
{
MODEST_WINDOW_GET_CLASS (window)->disconnect_signals_func (window);
}
+void
+modest_window_show_progress (ModestWindow *window, gboolean show)
+{
+ MODEST_WINDOW_GET_CLASS (window)->show_progress_func (window, show);
+}
+
/* Default implementations */
}
static void
+modest_window_add_toolbar_default (ModestWindow *window,
+ GtkToolbar *toolbar)
+{
+ g_warning ("modest: You should implement %s", __FUNCTION__);
+}
+
+static void
+modest_window_add_to_menu_default (ModestWindow *window,
+ const gchar *label,
+ const gchar *accelerator,
+ ModestWindowMenuCallback callback,
+ ModestDimmingCallback dimming_callback)
+{
+ g_warning ("modest: You should implement %s", __FUNCTION__);
+}
+
+static void
+modest_window_add_item_to_menu_default (ModestWindow *window,
+ GtkWidget *item,
+ ModestDimmingCallback dimming_callback)
+{
+ g_warning ("modest: You should implement %s", __FUNCTION__);
+}
+
+static void
+modest_window_set_title_default (ModestWindow *window,
+ const gchar *title)
+{
+ g_warning ("modest: You should implement %s", __FUNCTION__);
+}
+
+static void
modest_window_disconnect_signals_default (ModestWindow *self)
{
g_warning ("modest: You should implement %s", __FUNCTION__);
}
+static void
+modest_window_show_progress_default (ModestWindow *self, gboolean show)
+{
+ g_warning ("modest: You should implement %s", __FUNCTION__);
+}
+
void
modest_window_save_state (ModestWindow *window)
{
modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
return TRUE;
#ifdef MODEST_TOOLKIT_HILDON2
- case HILDON_HARDKEY_INCREASE:
- modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
- return TRUE;
- case HILDON_HARDKEY_DECREASE:
- modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
- return TRUE;
+ case HILDON_HARDKEY_INCREASE:
+ if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+ modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
+ return TRUE;
+ }
+ break;
+ case HILDON_HARDKEY_DECREASE:
+ if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+ modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
+ return TRUE;
+ }
+ break;
#else
case GDK_F7:
modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
return TRUE;
#endif
case GDK_Escape:
- if (modest_window_mgr_get_fullscreen_mode (mgr))
+ if (modest_window_mgr_get_fullscreen_mode (mgr)) {
modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
- else if (MODEST_IS_MSG_VIEW_WINDOW (self))
+ return TRUE;
+ } else {
+#ifdef MODEST_TOOLKIT_HILDON2
+ if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+ modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
+ return TRUE;
+ }
+#else
modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
+ return TRUE;
+#endif
+ }
break;
}
-
+
return FALSE;
}
-static gboolean
-_modest_window_map_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer userdata)
+static void
+modest_window_pack_toolbar_not_implemented (ModestWindow *self,
+ GtkPackType pack_type,
+ GtkWidget *toolbar)
{
- _make_zoom_buttons_grabeable (GTK_WIDGET (widget));
- return FALSE;
+ g_return_if_fail (MODEST_IS_WINDOW (self));
+
+ g_debug ("%s not implemented", __FUNCTION__);
}
-static void
-_make_zoom_buttons_grabeable (GtkWidget* widget)
-{
- GdkDisplay *display;
- Atom atom;
- unsigned long val = 1;
-
- display = gdk_drawable_get_display (widget->window);
- atom = gdk_x11_get_xatom_by_name_for_display (display, "_HILDON_ZOOM_KEY_ATOM");
- XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XID (widget->window), atom,
- XA_INTEGER, 32, PropModeReplace,
- (unsigned char *) &val, 1);
+void
+modest_window_pack_toolbar (ModestWindow *self,
+ GtkPackType pack_type,
+ GtkWidget *toolbar)
+{
+ g_return_if_fail (MODEST_IS_WINDOW (self));
+
+ MODEST_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar);
}
projects / modest / blobdiff