Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 585092 | Differences between
and this patch

Collapse All | Expand All

(-)a/gtk/gtkfilechooserwidget.c (-14 / +10 lines)
Lines 1391-1396 Link Here
1391
  GtkFileChooserWidget *impl = (GtkFileChooserWidget *) widget;
1391
  GtkFileChooserWidget *impl = (GtkFileChooserWidget *) widget;
1392
  GtkFileChooserWidgetPrivate *priv = impl->priv;
1392
  GtkFileChooserWidgetPrivate *priv = impl->priv;
1393
1393
1394
  if (!event->is_modifier) {
1395
    gtk_widget_grab_focus (priv->browse_files_tree_view);
1396
    gboolean ret;
1397
    g_signal_emit_by_name (priv->browse_files_tree_view, "key-press-event", event, &ret);
1398
  }
1399
1394
  if (should_trigger_location_entry (impl, event))
1400
  if (should_trigger_location_entry (impl, event))
1395
    {
1401
    {
1396
      if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
1402
      if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
Lines 1400-1411 Link Here
1400
          return TRUE;
1406
          return TRUE;
1401
        }
1407
        }
1402
    }
1408
    }
1403
  else if (gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event))
1404
    {
1405
      if (priv->operation_mode != OPERATION_MODE_SEARCH)
1406
        operation_mode_set (impl, OPERATION_MODE_SEARCH);
1407
      return TRUE;
1408
    }
1409
1409
1410
  if (GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->key_press_event (widget, event))
1410
  if (GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->key_press_event (widget, event))
1411
    return TRUE;
1411
    return TRUE;
Lines 2477-2483 Link Here
2477
{
2477
{
2478
  GtkFileChooserWidgetPrivate *priv = impl->priv;
2478
  GtkFileChooserWidgetPrivate *priv = impl->priv;
2479
2479
2480
  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
2480
  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), MODEL_COL_NAME);
2481
2481
2482
  gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
2482
  gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
2483
  gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
2483
  gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
Lines 4391-4396 Link Here
4391
  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
4391
  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
4392
                           GTK_TREE_MODEL (priv->browse_files_model));
4392
                           GTK_TREE_MODEL (priv->browse_files_model));
4393
  update_columns (impl, FALSE, _("Modified"));
4393
  update_columns (impl, FALSE, _("Modified"));
4394
  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->browse_files_tree_view), TRUE);
4394
  file_list_set_sort_column_ids (impl);
4395
  file_list_set_sort_column_ids (impl);
4395
  set_sort_column (impl);
4396
  set_sort_column (impl);
4396
  profile_msg ("    gtk_tree_view_set_model end", NULL);
4397
  profile_msg ("    gtk_tree_view_set_model end", NULL);
Lines 7151-7160 Link Here
7151
{
7152
{
7152
  GList *l, *files, *files_with_info, *infos;
7153
  GList *l, *files, *files_with_info, *infos;
7153
  GFile *file;
7154
  GFile *file;
7154
  gboolean select = FALSE;
7155
7156
  if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (impl->priv->search_model), NULL) == 0)
7157
    select = TRUE;
7158
7155
7159
  files = NULL;
7156
  files = NULL;
7160
  files_with_info = NULL;
7157
  files_with_info = NULL;
Lines 7182-7189 Link Here
7182
  g_list_free_full (infos, g_object_unref);
7179
  g_list_free_full (infos, g_object_unref);
7183
7180
7184
  gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list");
7181
  gtk_stack_set_visible_child_name (GTK_STACK (impl->priv->browse_files_stack), "list");
7185
  if (select)
7186
    gtk_widget_grab_focus (impl->priv->browse_files_tree_view);
7187
}
7182
}
7188
7183
7189
/* Callback used from GtkSearchEngine when the query is done running */
7184
/* Callback used from GtkSearchEngine when the query is done running */
Lines 7480-7485 Link Here
7480
  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model),
7475
  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model),
7481
                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
7476
                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
7482
                                        GTK_SORT_DESCENDING);
7477
                                        GTK_SORT_DESCENDING);
7478
  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->browse_files_tree_view), TRUE);
7483
}
7479
}
7484
7480
7485
typedef struct
7481
typedef struct
Lines 7497-7503 Link Here
7497
7493
7498
  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
7494
  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
7499
                           GTK_TREE_MODEL (priv->recent_model));
7495
                           GTK_TREE_MODEL (priv->recent_model));
7500
  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), -1);
7496
  gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->browse_files_tree_view), MODEL_COL_NAME);
7501
7497
7502
  gtk_tree_view_column_set_sort_column_id (priv->list_name_column, -1);
7498
  gtk_tree_view_column_set_sort_column_id (priv->list_name_column, -1);
7503
  gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);
7499
  gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);

Return to bug 585092