This is a manual merge of branch drop split view intro trunk.

[modest] / src / widgets / modest-folder-view.h

diff --git a/src/widgets/modest-folder-view.h b/src/widgets/modest-folder-view.h
index 99e155b..13d5701 100644 (file)
--- a/src/widgets/modest-folder-view.h
+++ b/src/widgets/modest-folder-view.h
@@ -50,6 +50,11 @@ typedef enum _ModestFolderViewStyle {
        MODEST_FOLDER_VIEW_STYLE_SHOW_ONE
 } ModestFolderViewStyle;
 
+typedef enum _ModestFolderViewCellStyle {
+       MODEST_FOLDER_VIEW_CELL_STYLE_DEFAULT,
+       MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT
+} ModestFolderViewCellStyle;
+
 typedef struct _ModestFolderView      ModestFolderView;
 typedef struct _ModestFolderViewClass ModestFolderViewClass;
 
@@ -70,6 +75,10 @@ struct _ModestFolderViewClass {
        void     (*folder_display_name_changed) (ModestFolderView* self,
                                                 const gchar *display_name,
                                                 gpointer user_data);
+
+       void     (*folder_activated) (ModestFolderView *self,
+                                     TnyFolderStore *folder,
+                                     gpointer userdata);
 };
 
 /**
@@ -176,8 +185,7 @@ void         modest_folder_view_select_first_inbox_or_local  (ModestFolderView *
  * Stores a #TnyList of selected folders in the own clibpoard of 
  * @self folder view.
  **/
-void 
-modest_folder_view_copy_selection (ModestFolderView *folder_view);
+void modest_folder_view_copy_selection (ModestFolderView *folder_view);
 
 /**
  * modest_folder_view_cut_selection:
@@ -187,15 +195,14 @@ modest_folder_view_copy_selection (ModestFolderView *folder_view);
  * @self folder view and filter them into folders tree model to
  * hide these rows in treeview.
  **/
-void 
-modest_folder_view_cut_selection (ModestFolderView *folder_view);
+void modest_folder_view_cut_selection (ModestFolderView *folder_view);
 
 
 /**
  * modest_folder_view_select_folder
  * @self: a #ModestFolderView
  * @folder: a #TnyFolder
- * @after_change: should we select directly (TRUE), or after the first change to the view (FALSE)
+ * @after_change: should we select first change to the view (TRUE), or just now (FALSE)
  *
  * select the given TnyFolder in the folder;
  * return TRUE if it succeeded, FALSE otherwise.
@@ -210,10 +217,7 @@ gboolean modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *fo
  * 
  * Gets the selected folders to copy/cut.
  **/
-void
-modest_folder_view_paste_selection (ModestFolderView *folder_view,
-                                   TnyList **folders,
-                                   gboolean *delete);
+void modest_folder_view_paste_selection (ModestFolderView *folder_view, TnyList **folders, gboolean *delete);
 
 /*
  * modest_folder_view_show_non_move_folders:
@@ -222,9 +226,7 @@ modest_folder_view_paste_selection (ModestFolderView *folder_view,
  * 
  * Whether to show folders where no messages can be moved to 
  **/
-void
-modest_folder_view_show_non_move_folders (ModestFolderView *folder_view,
-                                   gboolean show);
+void modest_folder_view_show_non_move_folders (ModestFolderView *folder_view, gboolean show);
 
 /*
  * modest_folder_view_copy_model:
@@ -235,9 +237,29 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view,
  * #GtkTreeFilterModel object for that model. This copied
  * model will be asigned to @folder_view_dst. 
  **/
-void
-modest_folder_view_copy_model (ModestFolderView *folder_view_src,
-                              ModestFolderView *folder_view_dst);
+void modest_folder_view_copy_model (ModestFolderView *folder_view_src, ModestFolderView *folder_view_dst);
+
+/*
+ * modest_folder_disable_next_folder_selection:
+ * @folder_view: a #ModestFolderView
+ * 
+ * Checks if folder_to_select private field is set and 
+ * unref it in this case, assigning it to NULL to avoid 
+ * next call to on_row_inserted_maybe_select_folder does 
+ * not select any folder.
+ * 
+ **/
+void modest_folder_view_disable_next_folder_selection (ModestFolderView *self);
+
+/**
+ * modest_folder_view_set_cell_style:
+ * @self: a #ModestFolderView
+ * @cell_style: a #ModestFolderViewCellStyle
+ *
+ * Sets the way cells are shown
+ */
+void modest_folder_view_set_cell_style (ModestFolderView *self,
+                                       ModestFolderViewCellStyle cell_style);
 
 G_END_DECLS