[maemo-commits] [maemo-commits] r16599 - projects/haf/branches/hildon-fm/fremantle/hildon-fm

[From: subversion at stage.maemo.org]

Author: rabinovich
Date: 2008-11-06 16:45:58 +0200 (Thu, 06 Nov 2008)
New Revision: 16599

Modified:
   projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c
Log:
replace list view with a dummy tree_view and try to never show it

Modified: projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c	2008-11-06 14:41:46 UTC (rev 16598)
+++ projects/haf/branches/hildon-fm/fremantle/hildon-fm/hildon-file-selection.c	2008-11-06 14:45:58 UTC (rev 16599)
@@ -305,7 +305,8 @@
 
   /* We have something => display normal view */
   if (gtk_tree_model_get_iter_first(model, &iter))
-    return priv->mode;
+      //    return priv->mode;
+      return HILDON_FILE_SELECTION_MODE_THUMBNAILS; //Fremantle
 
   /* We have currently nothing, check if we are loading or if we
      should offer the repair button. */
@@ -342,7 +343,7 @@
 static void rebind_models(HildonFileSelectionPrivate *priv)
 {
   GtkWidget *current_view = get_current_view(priv);
-
+#if 0 //Fremantle
   if (priv->view[0] == current_view)
   {
      gtk_tree_view_set_model(GTK_TREE_VIEW(priv->view[0]),
@@ -355,6 +356,13 @@
      gtk_tree_view_set_model(GTK_TREE_VIEW(priv->view[1]),
         priv->sort_model);
   }
+#endif
+  if (priv->view[1] == current_view || priv->view[0] == current_view)
+  {
+     gtk_tree_view_set_model(GTK_TREE_VIEW(priv->view[0]), NULL);
+     gtk_tree_view_set_model(GTK_TREE_VIEW(priv->view[1]),
+        priv->sort_model);
+  }
   else
   {
      gtk_tree_view_set_model(GTK_TREE_VIEW(priv->view[0]), NULL);
@@ -366,6 +374,7 @@
 static void hildon_file_selection_sync_selections(HildonFileSelectionPrivate *priv,
                                                   GtkWidget * source, GtkWidget * target)
 {
+#if 0 //Fremantle
     GtkTreeSelection *selection;
     GList *paths, *iter;
     GtkTreePath *path;
@@ -391,6 +400,7 @@
 
     g_list_foreach(paths, (GFunc) gtk_tree_path_free, NULL);
     g_list_free(paths);
+#endif
 }
 
 static gboolean expand_cursor_row(GtkTreeView *tree)
@@ -433,6 +443,9 @@
 
     current_page = priv->cur_view;
     target_page = get_view_to_be_displayed(priv);
+
+    target_page = target_page == 0 ? 1 : target_page; //Fremantle
+
     view = get_current_view (priv);
 
     if (current_page != target_page)
@@ -2038,6 +2051,7 @@
     g_free(title);
 }
 
+#if 0 //Fremantle
 static void list_date_data_func(GtkTreeViewColumn * tree_column,
                                 GtkCellRenderer * cell,
                                 GtkTreeModel * tree_model,
@@ -2106,6 +2120,7 @@
 
     g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
 }
+#endif
 
 static void hildon_file_selection_navigation_pane_context(GtkWidget *
                                                           widget,
@@ -2365,12 +2380,16 @@
 static void hildon_file_selection_create_list_view(HildonFileSelection *
                                                    self)
 {
+#if 0 //Fremantle
     GtkTreeSelection *selection;
     GtkTreeViewColumn *col;
     GtkCellRenderer *renderer;
     GtkTreeView *tree;
+#endif
 
     self->priv->view[0] = gtk_tree_view_new();
+    // creating empty dummy  tree view
+#if 0 //Fremantle
     tree = GTK_TREE_VIEW(self->priv->view[0]);
     gtk_tree_view_set_headers_visible(tree, FALSE);
     gtk_tree_view_set_rules_hint(tree, TRUE);
@@ -2483,6 +2502,7 @@
                      self, 0);
     g_signal_connect_object(tree, "notify::has-focus",
                      G_CALLBACK(content_pane_focus), self, 0);
+#endif
 }
 
 static void hildon_file_selection_create_dir_view(HildonFileSelection *
@@ -3315,7 +3335,7 @@
                                     HildonFileSelectionMode mode)
 {
     g_return_if_fail(HILDON_IS_FILE_SELECTION(self));
-    g_return_if_fail(mode == HILDON_FILE_SELECTION_MODE_LIST ||
+    g_return_if_fail(/* mode == HILDON_FILE_SELECTION_MODE_LIST || //Fremantle*/
                      mode == HILDON_FILE_SELECTION_MODE_THUMBNAILS);
 
     if (self->priv->mode != mode) {