diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-07-03 07:47:50 -0700 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-07-04 00:29:26 -0400 |
| commit | 17a860cea23cefdd4b1ec7dbe9b2a8f25fd77c08 (patch) | |
| tree | 329f0e7514d773ce983c42eaae2e3d5a686c535c | |
| parent | c7bc90209322576732d4b51478874962d407a46f (diff) | |
| download | gtk+-17a860cea23cefdd4b1ec7dbe9b2a8f25fd77c08.tar.gz | |
file chooser: Don't show Enter Location in sidebar
Following the file chooser mockups.
| -rw-r--r-- | gtk/gtkfilechooserwidget.c | 11 | ||||
| -rw-r--r-- | gtk/ui/gtkfilechooserwidget.ui | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 3060f162db..ba65dbf0c0 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -2415,14 +2415,6 @@ location_mode_set (GtkFileChooserWidget *impl, g_object_notify (G_OBJECT (impl), "subtitle"); } -/* Callback used when the places sidebar needs us to enter a location */ -static void -places_sidebar_show_enter_location_cb (GtkPlacesSidebar *sidebar, - GtkFileChooserWidget *impl) -{ - operation_mode_set (impl, OPERATION_MODE_ENTER_LOCATION); -} - static void location_toggle_popup_handler (GtkFileChooserWidget *impl) { @@ -2810,7 +2802,6 @@ update_appearance (GtkFileChooserWidget *impl) priv->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) { save_widgets_create (impl); - gtk_places_sidebar_set_show_enter_location (GTK_PLACES_SIDEBAR (priv->places_sidebar), FALSE); gtk_places_sidebar_set_show_recent (GTK_PLACES_SIDEBAR (priv->places_sidebar), FALSE); if (priv->select_multiple) @@ -2825,7 +2816,6 @@ update_appearance (GtkFileChooserWidget *impl) priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) { save_widgets_destroy (impl); - gtk_places_sidebar_set_show_enter_location (GTK_PLACES_SIDEBAR (priv->places_sidebar), TRUE); gtk_places_sidebar_set_show_recent (GTK_PLACES_SIDEBAR (priv->places_sidebar), recent_files_setting_is_enabled (impl)); location_mode_set (impl, priv->location_mode); } @@ -7969,7 +7959,6 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class) gtk_widget_class_bind_template_callback (widget_class, path_bar_clicked); gtk_widget_class_bind_template_callback (widget_class, places_sidebar_open_location_cb); gtk_widget_class_bind_template_callback (widget_class, places_sidebar_show_error_message_cb); - gtk_widget_class_bind_template_callback (widget_class, places_sidebar_show_enter_location_cb); gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb); gtk_widget_class_bind_template_callback (widget_class, search_entry_stop_cb); gtk_widget_class_bind_template_callback (widget_class, new_folder_popover_active); diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui index 5b76f81542..33ed215eea 100644 --- a/gtk/ui/gtkfilechooserwidget.ui +++ b/gtk/ui/gtkfilechooserwidget.ui @@ -17,13 +17,11 @@ <property name="can_focus">False</property> <property name="hscrollbar_policy">never</property> <property name="local_only">True</property> - <property name="show_enter_location">True</property> <style> <class name="sidebar"/> </style> <signal name="open-location" handler="places_sidebar_open_location_cb" swapped="no"/> <signal name="show-error-message" handler="places_sidebar_show_error_message_cb" swapped="no"/> - <signal name="show-enter-location" handler="places_sidebar_show_enter_location_cb" swapped="no"/> </object> <packing> <property name="resize">False</property> |