* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
#include "gtkframe.h"
-#include "gtkpaned.h"
+#include "gtkgrid.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimage.h"
#include "gtkmarshalers.h"
#include "gtkmessagedialog.h"
#include "gtkmountoperation.h"
+#include "gtkpaned.h"
#include "gtkpathbar.h"
#include "gtkprivate.h"
#include "gtkradiobutton.h"
#include "gtkrecentmanager.h"
#include "gtkscrolledwindow.h"
#include "gtkseparatormenuitem.h"
+#include "gtksettings.h"
#include "gtksizegroup.h"
#include "gtksizerequest.h"
#include "gtkstock.h"
-#include "gtkgrid.h"
#include "gtktoolbar.h"
#include "gtktoolbutton.h"
#include "gtktooltip.h"
MODEL_COL_FILE,
MODEL_COL_NAME_COLLATED,
MODEL_COL_IS_FOLDER,
+ MODEL_COL_IS_SENSITIVE,
MODEL_COL_PIXBUF,
MODEL_COL_SIZE_TEXT,
MODEL_COL_MTIME_TEXT,
G_TYPE_FILE, /* MODEL_COL_FILE */ \
G_TYPE_STRING, /* MODEL_COL_NAME_COLLATED */ \
G_TYPE_BOOLEAN, /* MODEL_COL_IS_FOLDER */ \
+ G_TYPE_BOOLEAN, /* MODEL_COL_IS_SENSITIVE */ \
GDK_TYPE_PIXBUF, /* MODEL_COL_PIXBUF */ \
G_TYPE_STRING, /* MODEL_COL_SIZE_TEXT */ \
G_TYPE_STRING, /* MODEL_COL_MTIME_TEXT */ \
#define NUM_LINES 45
#define NUM_CHARS 60
-#define SETTINGS_KEY_LAST_FOLDER_URI "last-folder-uri"
-#define SETTINGS_KEY_LOCATION_MODE "location-mode"
-#define SETTINGS_KEY_SHOW_HIDDEN "show-hidden"
-#define SETTINGS_KEY_SHOW_SIZE_COLUMN "show-size-column"
-#define SETTINGS_KEY_SORT_COLUMN "sort-column"
-#define SETTINGS_KEY_SORT_ORDER "sort-order"
-#define SETTINGS_KEY_WINDOW_POSITION "window-position"
-#define SETTINGS_KEY_WINDOW_SIZE "window-size"
-
static void gtk_file_chooser_default_iface_init (GtkFileChooserIface *iface);
static void gtk_file_chooser_embed_default_iface_init (GtkFileChooserEmbedIface *iface);
static void shortcuts_pane_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface);
+GType _shortcuts_pane_model_filter_get_type (void);
+
G_DEFINE_TYPE_WITH_CODE (ShortcutsPaneModelFilter,
_shortcuts_pane_model_filter,
GTK_TYPE_TREE_MODEL_FILTER,
GDK_KEY_v, GDK_CONTROL_MASK,
"location-popup-on-paste",
0);
- gtk_binding_entry_add_signal (binding_set,
- GDK_KEY_BackSpace, 0,
- "up-folder",
- 0);
add_normal_and_shifted_binding (binding_set,
GDK_KEY_Up, GDK_MOD1_MASK,
static void
pending_select_files_free (GtkFileChooserDefault *impl)
{
- g_slist_foreach (impl->pending_select_files, (GFunc) g_object_unref, NULL);
- g_slist_free (impl->pending_select_files);
+ g_slist_free_full (impl->pending_select_files, g_object_unref);
impl->pending_select_files = NULL;
}
static gboolean
edited_idle_cb (GtkFileChooserDefault *impl)
{
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
g_source_destroy (impl->edited_idle);
impl->edited_idle = NULL;
impl->edited_new_text = NULL;
}
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return FALSE;
}
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_shortcuts_popup_menu), item);
- item = gtk_menu_item_new_with_label (_("Rename..."));
+ item = gtk_menu_item_new_with_label (_("Rename…"));
impl->browse_shortcuts_popup_menu_rename_item = item;
g_signal_connect (item, "activate",
G_CALLBACK (rename_shortcut_cb), impl);
if (in_press)
return FALSE;
- if (event->button != 3)
+ if (!gdk_event_triggers_context_menu ((GdkEvent *) event))
return FALSE;
in_press = TRUE;
/* Box for buttons */
toolbar = gtk_toolbar_new ();
+ gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
context = gtk_widget_get_style_context (toolbar);
gpointer data)
{
GtkFileChooserDefault *impl;
- int modifiers;
+ GdkModifierType no_text_input_mask;
impl = (GtkFileChooserDefault *) data;
- modifiers = gtk_accelerator_get_default_mod_mask ();
+ no_text_input_mask =
+ gtk_widget_get_modifier_mask (widget, GDK_MODIFIER_INTENT_NO_TEXT_INPUT);
if ((event->keyval == GDK_KEY_slash
|| event->keyval == GDK_KEY_KP_Divide
#ifdef G_OS_UNIX
|| event->keyval == GDK_KEY_asciitilde
#endif
- ) && ! (event->state & (~GDK_SHIFT_MASK & modifiers)))
+ ) && !(event->state & no_text_input_mask))
{
location_popup_handler (impl, event->string);
return TRUE;
|| event->keyval == GDK_KEY_KP_Enter
|| event->keyval == GDK_KEY_space
|| event->keyval == GDK_KEY_KP_Space)
- && ((event->state & modifiers) == 0)
+ && !(event->state & gtk_accelerator_get_default_mod_mask ())
&& !(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
{
g_slist_free (selected_files);
}
-/* Callback used when the "Copy file's location" menu item is activated */
+/* Callback used when the "Copy file’s location" menu item is activated */
static void
copy_file_location_cb (GtkMenuItem *item,
GtkFileChooserDefault *impl)
}
}
-/* Callback used when the "Show Hidden Files" menu item is toggled */
+/* Callback used when the "Visit this file" menu item is activated */
+static void
+visit_file_cb (GtkMenuItem *item,
+ GtkFileChooserDefault *impl)
+{
+ GSList *files;
+
+ files = search_get_selected_files (impl);
+
+ /* Sigh, just use the first one */
+ if (files)
+ {
+ GFile *file = files->data;
+
+ gtk_file_chooser_default_select_file (GTK_FILE_CHOOSER (impl), file, NULL); /* NULL-GError */
+ }
+
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
+}
+
+/* callback used when the "Show Hidden Files" menu item is toggled */
static void
show_hidden_toggled_cb (GtkCheckMenuItem *item,
GtkFileChooserDefault *impl)
return TRUE;
}
-/* Sensitizes the "Copy file's location" context menu item if there is actually
+/* Sensitizes the "Copy file’s location" context menu item if there is actually
* a selection active.
*/
static void
gtk_widget_set_sensitive (impl->browse_files_popup_menu_copy_file_location_item, active);
}
+static GtkWidget *
+file_list_add_image_menu_item (GtkFileChooserDefault *impl,
+ const char *stock_name,
+ const char *mnemonic_label,
+ GCallback callback)
+{
+ GtkWidget *item;
+
+ item = gtk_image_menu_item_new_with_mnemonic (mnemonic_label);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+ gtk_image_new_from_stock (stock_name, GTK_ICON_SIZE_MENU));
+ g_signal_connect (item, "activate", callback, impl);
+ gtk_widget_show (item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+
+ return item;
+}
+
+static GtkWidget *
+file_list_add_check_menu_item (GtkFileChooserDefault *impl,
+ const char *mnemonic_label,
+ GCallback callback)
+{
+ GtkWidget *item;
+
+ item = gtk_check_menu_item_new_with_mnemonic (mnemonic_label);
+ g_signal_connect (item, "toggled", callback, impl);
+ gtk_widget_show (item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+
+ return item;
+}
+
/* Constructs the popup menu for the file list if needed */
static void
file_list_build_popup_menu (GtkFileChooserDefault *impl)
impl->browse_files_tree_view,
popup_menu_detach_cb);
- item = gtk_image_menu_item_new_with_mnemonic (_("_Copy file's location"));
- impl->browse_files_popup_menu_copy_file_location_item = item;
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU));
- g_signal_connect (item, "activate",
- G_CALLBACK (copy_file_location_cb), impl);
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+ impl->browse_files_popup_menu_visit_file_item = file_list_add_image_menu_item (impl, GTK_STOCK_DIRECTORY, _("_Visit this file"),
+ G_CALLBACK (visit_file_cb));
- item = gtk_image_menu_item_new_with_mnemonic (_("_Add to Bookmarks"));
- impl->browse_files_popup_menu_add_shortcut_item = item;
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
- g_signal_connect (item, "activate",
- G_CALLBACK (add_to_shortcuts_cb), impl);
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+ impl->browse_files_popup_menu_copy_file_location_item = file_list_add_image_menu_item (impl, GTK_STOCK_COPY, _("_Copy file’s location"),
+ G_CALLBACK (copy_file_location_cb));
+
+ impl->browse_files_popup_menu_add_shortcut_item = file_list_add_image_menu_item (impl, GTK_STOCK_ADD, _("_Add to Bookmarks"),
+ G_CALLBACK (add_to_shortcuts_cb));
item = gtk_separator_menu_item_new ();
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
- item = gtk_check_menu_item_new_with_mnemonic (_("Show _Hidden Files"));
- impl->browse_files_popup_menu_hidden_files_item = item;
- g_signal_connect (item, "toggled",
- G_CALLBACK (show_hidden_toggled_cb), impl);
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+ impl->browse_files_popup_menu_hidden_files_item = file_list_add_check_menu_item (impl, _("Show _Hidden Files"),
+ G_CALLBACK (show_hidden_toggled_cb));
- item = gtk_check_menu_item_new_with_mnemonic (_("Show _Size Column"));
- impl->browse_files_popup_menu_size_column_item = item;
- g_signal_connect (item, "toggled",
- G_CALLBACK (show_size_column_toggled_cb), impl);
- gtk_widget_show (item);
- gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+ impl->browse_files_popup_menu_size_column_item = file_list_add_check_menu_item (impl, _("Show _Size Column"),
+ G_CALLBACK (show_size_column_toggled_cb));
bookmarks_check_add_sensitivity (impl);
check_copy_file_location_sensitivity (impl);
{
file_list_build_popup_menu (impl);
- /* FIXME - handle OPERATION_MODE_SEARCH and OPERATION_MODE_RECENT */
-
/* The sensitivity of the Add to Bookmarks item is set in
* bookmarks_check_add_sensitivity()
*/
+ /* 'Visit this file' */
+ gtk_widget_set_visible (impl->browse_files_popup_menu_visit_file_item, (impl->operation_mode != OPERATION_MODE_BROWSE));
+
/* 'Show Hidden Files' */
g_signal_handlers_block_by_func (impl->browse_files_popup_menu_hidden_files_item,
G_CALLBACK (show_hidden_toggled_cb), impl);
monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
gtk_menu_set_monitor (menu, monitor_num);
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+ gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
*x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width));
*y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height));
if (in_press)
return FALSE;
- if (event->button != 3)
+ if (!gdk_event_triggers_context_menu ((GdkEvent *) event))
return FALSE;
in_press = TRUE;
if (!impl->location_entry)
impl->location_entry = _gtk_file_chooser_entry_new (TRUE);
- _gtk_file_chooser_entry_set_file_system (GTK_FILE_CHOOSER_ENTRY (impl->location_entry),
- impl->file_system);
_gtk_file_chooser_entry_set_local_only (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->local_only);
_gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);
gtk_entry_set_width_chars (GTK_ENTRY (impl->location_entry), 45);
impl->operation_mode == OPERATION_MODE_RECENT)
return;
- if (impl->location_entry)
- {
- gtk_widget_destroy (impl->location_entry);
- impl->location_entry = NULL;
- }
-
/* Box */
gtk_widget_show (impl->location_entry_box);
/* Entry */
- location_entry_create (impl);
- gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_entry, TRUE, TRUE, 0);
- gtk_label_set_mnemonic_widget (GTK_LABEL (impl->location_label), impl->location_entry);
+ if (!impl->location_entry)
+ {
+ location_entry_create (impl);
+ gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_entry, TRUE, TRUE, 0);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (impl->location_label), impl->location_entry);
+ }
/* Configure the entry */
/* Paned widget */
- hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+ hpaned = impl->browse_widgets_hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show (hpaned);
gtk_box_pack_start (GTK_BOX (impl->browse_widgets_box), hpaned, TRUE, TRUE, 0);
gtk_paned_pack1 (GTK_PANED (hpaned), widget, FALSE, FALSE);
widget = file_pane_create (impl, size_group);
gtk_paned_pack2 (GTK_PANED (hpaned), widget, TRUE, FALSE);
- gtk_paned_set_position (GTK_PANED (hpaned), 148);
g_object_unref (size_group);
}
if (select_multiple == impl->select_multiple)
return;
- mode = select_multiple ? GTK_SELECTION_MULTIPLE : GTK_SELECTION_BROWSE;
+ mode = select_multiple ? GTK_SELECTION_MULTIPLE : GTK_SELECTION_SINGLE;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
gtk_tree_selection_set_mode (selection, mode);
gtk_tree_model_get (GTK_TREE_MODEL (impl->recent_model), iter,
MODEL_COL_FILE, &file,
-1);
- _gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), file, FALSE, NULL); /* NULL-GError */
+ _gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), file, FALSE);
g_object_unref (file);
}
impl->sort_order);
}
-static void
-settings_ensure (GtkFileChooserDefault *impl)
-{
- if (impl->settings != NULL)
- return;
-
- impl->settings = g_settings_new_with_path ("org.gtk.Settings.FileChooser",
- "/org/gtk/settings/file-chooser/");
- g_settings_delay (impl->settings);
-}
-
static void
settings_load (GtkFileChooserDefault *impl)
{
gboolean show_size_column;
gint sort_column;
GtkSortType sort_order;
+ gint sidebar_width;
+ GSettings *settings;
- settings_ensure (impl);
+ settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (impl));
- location_mode = g_settings_get_enum (impl->settings, SETTINGS_KEY_LOCATION_MODE);
- show_hidden = g_settings_get_boolean (impl->settings, SETTINGS_KEY_SHOW_HIDDEN);
- show_size_column = g_settings_get_boolean (impl->settings, SETTINGS_KEY_SHOW_SIZE_COLUMN);
- sort_column = g_settings_get_enum (impl->settings, SETTINGS_KEY_SORT_COLUMN);
- sort_order = g_settings_get_enum (impl->settings, SETTINGS_KEY_SORT_ORDER);
+ location_mode = g_settings_get_enum (settings, SETTINGS_KEY_LOCATION_MODE);
+ show_hidden = g_settings_get_boolean (settings, SETTINGS_KEY_SHOW_HIDDEN);
+ show_size_column = g_settings_get_boolean (settings, SETTINGS_KEY_SHOW_SIZE_COLUMN);
+ sort_column = g_settings_get_enum (settings, SETTINGS_KEY_SORT_COLUMN);
+ sort_order = g_settings_get_enum (settings, SETTINGS_KEY_SORT_ORDER);
+ sidebar_width = g_settings_get_int (settings, SETTINGS_KEY_SIDEBAR_WIDTH);
location_mode_set (impl, location_mode, TRUE);
* created yet. The individual functions that create and set the models will
* call set_sort_column() themselves.
*/
-}
-static void
-save_dialog_geometry (GtkFileChooserDefault *impl)
-{
- GtkWindow *toplevel;
- int x, y, width, height;
-
- toplevel = get_toplevel (GTK_WIDGET (impl));
-
- if (!(toplevel && GTK_IS_FILE_CHOOSER_DIALOG (toplevel)))
- return;
-
- gtk_window_get_position (toplevel, &x, &y);
- gtk_window_get_size (toplevel, &width, &height);
-
- g_settings_set (impl->settings, "window-position", "(ii)", x, y);
- g_settings_set (impl->settings, "window-size", "(ii)", width, height);
+ gtk_paned_set_position (GTK_PANED (impl->browse_widgets_hpaned), sidebar_width);
}
static void
settings_save (GtkFileChooserDefault *impl)
{
- char *current_folder_uri;
-
- settings_ensure (impl);
-
- /* Current folder */
+ GSettings *settings;
- if (impl->current_folder)
- current_folder_uri = g_file_get_uri (impl->current_folder);
- else
- current_folder_uri = "";
-
- g_settings_set_string (impl->settings, SETTINGS_KEY_LAST_FOLDER_URI, current_folder_uri);
-
- if (impl->current_folder)
- g_free (current_folder_uri);
+ settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (impl));
/* All the other state */
- g_settings_set_enum (impl->settings, SETTINGS_KEY_LOCATION_MODE, impl->location_mode);
- g_settings_set_boolean (impl->settings, SETTINGS_KEY_SHOW_HIDDEN,
+ g_settings_set_enum (settings, SETTINGS_KEY_LOCATION_MODE, impl->location_mode);
+ g_settings_set_boolean (settings, SETTINGS_KEY_SHOW_HIDDEN,
gtk_file_chooser_get_show_hidden (GTK_FILE_CHOOSER (impl)));
- g_settings_set_boolean (impl->settings, SETTINGS_KEY_SHOW_SIZE_COLUMN, impl->show_size_column);
- g_settings_set_enum (impl->settings, SETTINGS_KEY_SORT_COLUMN, impl->sort_column);
- g_settings_set_enum (impl->settings, SETTINGS_KEY_SORT_ORDER, impl->sort_order);
-
- save_dialog_geometry (impl);
+ g_settings_set_boolean (settings, SETTINGS_KEY_SHOW_SIZE_COLUMN, impl->show_size_column);
+ g_settings_set_enum (settings, SETTINGS_KEY_SORT_COLUMN, impl->sort_column);
+ g_settings_set_enum (settings, SETTINGS_KEY_SORT_ORDER, impl->sort_order);
+ g_settings_set_int (settings, SETTINGS_KEY_SIDEBAR_WIDTH,
+ gtk_paned_get_position (GTK_PANED (impl->browse_widgets_hpaned)));
/* Now apply the settings */
- g_settings_apply (impl->settings);
-
- g_object_unref (impl->settings);
- impl->settings = NULL;
+ g_settings_apply (settings);
}
/* GtkWidget::realize method */
emit_default_size_changed (impl);
}
-static GFile *
-get_file_for_last_folder_opened (GtkFileChooserDefault *impl)
-{
- char *last_folder_uri;
- GFile *file;
-
- settings_ensure (impl);
-
- last_folder_uri = g_settings_get_string (impl->settings, SETTINGS_KEY_LAST_FOLDER_URI);
-
- /* If no last folder is set, we use the user's home directory, since
- * this is the starting point for most documents.
- */
- if (last_folder_uri[0] == '\0')
- file = g_file_new_for_path (g_get_home_dir ());
- else
- file = g_file_new_for_uri (last_folder_uri);
-
- g_free (last_folder_uri);
-
- return file;
-}
-
/* GtkWidget::map method */
static void
gtk_file_chooser_default_map (GtkWidget *widget)
GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->unmap (widget);
}
-static void
-install_list_model_filter (GtkFileChooserDefault *impl)
-{
- _gtk_file_system_model_set_filter (impl->browse_files_model,
- impl->current_filter);
-}
-
#define COMPARE_DIRECTORIES \
GtkFileChooserDefault *impl = user_data; \
GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model); \
if (queried == NULL)
return;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
/* now we know model is valid */
/* file was deleted */
if (!_gtk_file_system_model_get_iter_for_file (model, &iter, file))
{
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return;
}
copy_attribute (info, queried, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED);
copy_attribute (info, queried, G_FILE_ATTRIBUTE_STANDARD_ICON);
- _gtk_file_system_model_update_file (model, file, info, FALSE);
+ _gtk_file_system_model_update_file (model, file, info);
g_object_unref (info);
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
}
static gboolean
case MODEL_COL_IS_FOLDER:
g_value_set_boolean (value, info == NULL || _gtk_file_info_consider_as_directory (info));
break;
+ case MODEL_COL_IS_SENSITIVE:
+ if (info)
+ {
+ gboolean sensitive = TRUE;
+
+ if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+ || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
+ {
+ sensitive = TRUE; /* for file modes... */
+ }
+ else if (!_gtk_file_info_consider_as_directory (info))
+ {
+ sensitive = FALSE; /* for folder modes, files are not sensitive... */
+ }
+ else
+ {
+ /* ... and for folder modes, folders are sensitive only if the filter says so */
+ GtkTreeIter iter;
+ if (!_gtk_file_system_model_get_iter_for_file (model, &iter, file))
+ g_assert_not_reached ();
+ sensitive = !_gtk_file_system_model_iter_is_filtered_out (model, &iter);
+ }
+
+ g_value_set_boolean (value, sensitive);
+ }
+ else
+ g_value_set_boolean (value, TRUE);
+ break;
case MODEL_COL_PIXBUF:
if (info)
{
g_signal_connect (impl->browse_files_model, "finished-loading",
G_CALLBACK (browse_files_model_finished_loading_cb), impl);
- install_list_model_filter (impl);
+ _gtk_file_system_model_set_filter (impl->browse_files_model, impl->current_filter);
profile_end ("end", NULL);
if (change_entry)
{
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->browse_files_last_selected_name);
+ gtk_entry_set_text (GTK_ENTRY (impl->location_entry), impl->browse_files_last_selected_name);
if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
_gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (impl->location_entry));
g_free (impl->browse_files_last_selected_name);
impl->browse_files_last_selected_name = NULL;
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
+ gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
return;
}
clear_entry = FALSE;
if (clear_entry)
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
+ gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
}
}
if (! _gtk_file_info_consider_as_directory (info))
goto out;
- if (!_gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), data->file, data->keep_trail, NULL))
- goto out;
+ _gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), data->file, data->keep_trail);
if (impl->current_folder != data->file)
{
impl->current_folder);
if (data->clear_entry)
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
+ gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
}
/* Create a new list model. This is slightly evil; we store the result value
impl->operation_mode == OPERATION_MODE_RECENT)
return NULL;
- if (impl->reload_state == RELOAD_EMPTY)
- {
- /* We are unmapped, or we had an error while loading the last folder.
- * We'll return the folder used by the last invocation of the file chooser
- * since once we get (re)mapped, we'll load *that* folder anyway unless
- * the caller explicitly calls set_current_folder() on us.
- */
- return get_file_for_last_folder_opened (impl);
- }
-
if (impl->current_folder)
return g_object_ref (impl->current_folder);
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
pending_select_files_free (impl);
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), name);
+ gtk_entry_set_text (GTK_ENTRY (impl->location_entry), name);
}
static gboolean
{
GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (data);
GtkTreeSelection *selection;
+ gboolean is_sensitive;
gboolean is_folder;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
gtk_tree_model_get (model, iter,
MODEL_COL_IS_FOLDER, &is_folder,
+ MODEL_COL_IS_SENSITIVE, &is_sensitive,
-1);
- if ((is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) ||
- (!is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN))
+ if (is_sensitive &&
+ ((is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) ||
+ (!is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)))
gtk_tree_selection_select_iter (selection, iter);
else
gtk_tree_selection_unselect_iter (selection, iter);
if (!file_part || file_part[0] == '\0')
{
- *file_ret = g_object_ref (current_folder);
+ *file_ret = current_folder;
*is_well_formed_ret = TRUE;
*is_file_part_empty_ret = TRUE;
*is_folder = TRUE;
error = NULL;
file = g_file_get_child_for_display_name (current_folder, file_part, &error);
+ g_object_unref (current_folder);
if (!file)
{
shortcuts_insert_file (data->impl, pos, SHORTCUT_TYPE_FILE, NULL, data->file, NULL, FALSE, SHORTCUTS_SHORTCUTS);
+ /* need to call shortcuts_add_bookmarks to flush out any duplicates bug #577806 */
+ shortcuts_add_bookmarks (data->impl);
+
out:
g_object_unref (data->impl);
g_object_unref (data->file);
{
GtkStyleContext *context;
GtkStateFlags state;
- int font_size;
+ double font_size;
GdkScreen *screen;
double resolution;
else
resolution = 96.0; /* wheeee */
- font_size = pango_font_description_get_size (gtk_style_context_get_font (context, state));
- font_size = PANGO_PIXELS (font_size) * resolution / 72.0;
+ gtk_style_context_get (context, state, "font-size", &font_size, NULL);
+ font_size = font_size * resolution / 72.0 + 0.5;
*width = font_size * NUM_CHARS;
*height = font_size * NUM_LINES;
GtkFileChooserDefault *impl;
GtkRequisition req;
int x, y, width, height;
+ GSettings *settings;
impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
- settings_ensure (impl);
+ settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (impl));
- g_settings_get (impl->settings, SETTINGS_KEY_WINDOW_POSITION, "(ii)", &x, &y);
- g_settings_get (impl->settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", &width, &height);
+ g_settings_get (settings, SETTINGS_KEY_WINDOW_POSITION, "(ii)", &x, &y);
+ g_settings_get (settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", &width, &height);
if (x >= 0 && y >= 0 && width > 0 && height > 0)
{
data = g_new0 (struct FileExistsData, 1);
data->impl = g_object_ref (impl);
data->file = g_object_ref (file);
- data->parent_file = g_object_ref (_gtk_file_chooser_entry_get_current_folder (entry));
+ data->parent_file = _gtk_file_chooser_entry_get_current_folder (entry);
if (impl->file_exists_get_info_cancellable)
g_cancellable_cancel (impl->file_exists_get_info_cancellable);
if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
{
- if (impl->location_mode == LOCATION_MODE_PATH_BAR)
+ if (impl->location_mode == LOCATION_MODE_PATH_BAR
+ || impl->operation_mode == OPERATION_MODE_RECENT)
widget = impl->browse_files_tree_view;
else
widget = impl->location_entry;
static gboolean
focus_entry_idle_cb (GtkFileChooserDefault *impl)
{
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
g_source_destroy (impl->focus_entry_idle);
impl->focus_entry_idle = NULL;
if (impl->search_entry)
gtk_widget_grab_focus (impl->search_entry);
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return FALSE;
}
filter_index);
if (impl->browse_files_model)
- install_list_model_filter (impl);
+ {
+ _gtk_file_system_model_set_filter (impl->browse_files_model, impl->current_filter);
+ _gtk_file_system_model_clear_cache (impl->browse_files_model, MODEL_COL_IS_SENSITIVE);
+ }
if (impl->search_model)
- _gtk_file_system_model_set_filter (impl->search_model, filter);
+ {
+ _gtk_file_system_model_set_filter (impl->search_model, filter);
+ _gtk_file_system_model_clear_cache (impl->search_model, MODEL_COL_IS_SENSITIVE);
+ }
if (impl->recent_model)
- _gtk_file_system_model_set_filter (impl->recent_model, filter);
+ {
+ _gtk_file_system_model_set_filter (impl->recent_model, filter);
+ _gtk_file_system_model_clear_cache (impl->recent_model, MODEL_COL_IS_SENSITIVE);
+ }
g_object_notify (G_OBJECT (impl), "filter");
}
if (impl->location_entry
&& !(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
+ gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), iter,
SHORTCUTS_COL_DATA, &col_data,
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
{
GtkTreeIter iter;
+ gboolean is_sensitive;
gboolean is_folder;
if (!gtk_tree_model_get_iter (model, &iter, path))
return FALSE;
gtk_tree_model_get (model, &iter,
+ MODEL_COL_IS_SENSITIVE, &is_sensitive,
MODEL_COL_IS_FOLDER, &is_folder,
-1);
- if (!is_folder)
+ if (!is_sensitive || !is_folder)
return FALSE;
}
GtkTreeIter iter;
GtkTreeModel *model;
gboolean is_folder;
+ gboolean is_sensitive;
model = gtk_tree_view_get_model (tree_view);
gtk_tree_model_get (model, &iter,
MODEL_COL_FILE, &file,
MODEL_COL_IS_FOLDER, &is_folder,
+ MODEL_COL_IS_SENSITIVE, &is_sensitive,
-1);
- if (is_folder && file)
+ if (is_sensitive && is_folder && file)
{
change_folder_and_display_error (impl, file, FALSE);
- g_object_unref (file);
goto out;
}
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GList *walk, *list;
- gboolean always_sensitive;
-
- always_sensitive = impl->action != GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
- impl->action != GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER;
/* Keep the following column numbers in sync with create_file_list() */
"ellipsize", MODEL_COL_ELLIPSIZE,
NULL);
}
- if (always_sensitive)
- g_object_set (renderer, "sensitive", TRUE, NULL);
- else
- gtk_tree_view_column_add_attribute (column, renderer, "sensitive", MODEL_COL_IS_FOLDER);
+
+ gtk_tree_view_column_add_attribute (column, renderer, "sensitive", MODEL_COL_IS_SENSITIVE);
}
g_list_free (list);
gtk_tree_view_column_set_attributes (column, renderer,
"text", MODEL_COL_SIZE_TEXT,
NULL);
- if (always_sensitive)
- g_object_set (renderer, "sensitive", TRUE, NULL);
- else
- gtk_tree_view_column_add_attribute (column, renderer, "sensitive", MODEL_COL_IS_FOLDER);
+
+ gtk_tree_view_column_add_attribute (column, renderer, "sensitive", MODEL_COL_IS_SENSITIVE);
g_list_free (list);
/* mtime */
gtk_tree_view_column_set_attributes (column, renderer,
"text", MODEL_COL_MTIME_TEXT,
NULL);
- if (always_sensitive)
- g_object_set (renderer, "sensitive", TRUE, NULL);
- else
- gtk_tree_view_column_add_attribute (column, renderer, "sensitive", MODEL_COL_IS_FOLDER);
+ gtk_tree_view_column_add_attribute (column, renderer, "sensitive", MODEL_COL_IS_SENSITIVE);
g_list_free (list);
}
location_set_user_text (GtkFileChooserDefault *impl,
const gchar *path)
{
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), path);
+ gtk_entry_set_text (GTK_ENTRY (impl->location_entry), path);
gtk_editable_set_position (GTK_EDITABLE (impl->location_entry), -1);
}