Removed folder view key press handler for collapse/decollapse as it's

[modest] / src / widgets / modest-window.c

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index dd30edb..dd7d9db 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -68,6 +68,19 @@ static void     modest_window_show_toolbar_default       (ModestWindow *window,
 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);
 
@@ -76,6 +89,10 @@ 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 {
@@ -113,7 +130,7 @@ modest_window_get_type (void)
                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",
@@ -139,8 +156,12 @@ modest_window_class_init (ModestWindowClass *klass)
        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));
 }
@@ -153,7 +174,7 @@ modest_window_init (ModestWindow *obj)
        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;
 
@@ -426,6 +447,38 @@ modest_window_add_toolbar (ModestWindow *window,
 }
 
 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);
@@ -484,6 +537,31 @@ modest_window_add_toolbar_default (ModestWindow *window,
 }
 
 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__);
@@ -532,10 +610,20 @@ on_key_pressed (GtkWidget *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;
        }
        
@@ -565,3 +653,24 @@ _make_zoom_buttons_grabeable (GtkWidget* widget)
                      XA_INTEGER, 32, PropModeReplace,
                      (unsigned char *) &val, 1);
 }
+
+static void 
+modest_window_pack_toolbar_not_implemented (ModestWindow *self,
+                                           GtkPackType pack_type,
+                                           GtkWidget *toolbar)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (self));
+
+       g_debug ("%s not implemented", __FUNCTION__);
+}
+
+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);
+}
+