* 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 SETTINGS_KEY_SORT_ORDER "sort-order"
#define SETTINGS_KEY_WINDOW_POSITION "window-position"
#define SETTINGS_KEY_WINDOW_SIZE "window-size"
+#define SETTINGS_KEY_SIDEBAR_WIDTH "sidebar-width"
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,
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);
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)
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
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));
- impl->browse_files_popup_menu_copy_file_location_item = file_list_add_image_menu_item (impl, GTK_STOCK_COPY, _("_Copy file's location"),
+ 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"),
/* 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);
gboolean show_size_column;
gint sort_column;
GtkSortType sort_order;
+ gint sidebar_width;
settings_ensure (impl);
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);
+ sidebar_width = g_settings_get_int (impl->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.
*/
+
+ gtk_paned_set_position (GTK_PANED (impl->browse_widgets_hpaned), sidebar_width);
}
static void
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);
+ g_settings_set_int (impl->settings, SETTINGS_KEY_SIDEBAR_WIDTH,
+ gtk_paned_get_position (GTK_PANED (impl->browse_widgets_hpaned)));
save_dialog_geometry (impl);
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);
{
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);
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;
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");
}
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);
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);
}
projects / ~andy / gtk / blobdiff