X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserprivate.h;h=96329ad7ded84b644c1892b5d88f3b0cb5233f26;hb=f2d6def72eb9951d0c04bfc6fb6add0439c6f74f;hp=7a1522bd8e924e832e4648db0be40b3010861175;hpb=7bb7cfb29328264a5cb876aa5bdcc404946d6014;p=~andy%2Fgtk diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index 7a1522bd8..96329ad7d 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -13,9 +13,7 @@ * 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 . */ #ifndef __GTK_FILE_CHOOSER_PRIVATE_H__ @@ -28,14 +26,23 @@ #include "gtkrecentmanager.h" #include "gtksearchengine.h" #include "gtkquery.h" -#include "gtktooltips.h" +#include "gtksizegroup.h" #include "gtktreemodelsort.h" #include "gtktreestore.h" #include "gtktreeview.h" -#include "gtkvbox.h" +#include "gtkbox.h" G_BEGIN_DECLS +#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" +#define SETTINGS_KEY_SIDEBAR_WIDTH "sidebar-width" + #define GTK_FILE_CHOOSER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_FILE_CHOOSER, GtkFileChooserIface)) typedef struct _GtkFileChooserIface GtkFileChooserIface; @@ -47,20 +54,20 @@ struct _GtkFileChooserIface /* Methods */ gboolean (*set_current_folder) (GtkFileChooser *chooser, - const GtkFilePath *path, + GFile *file, GError **error); - GtkFilePath * (*get_current_folder) (GtkFileChooser *chooser); + GFile * (*get_current_folder) (GtkFileChooser *chooser); void (*set_current_name) (GtkFileChooser *chooser, const gchar *name); - gboolean (*select_path) (GtkFileChooser *chooser, - const GtkFilePath *path, + gboolean (*select_file) (GtkFileChooser *chooser, + GFile *file, GError **error); - void (*unselect_path) (GtkFileChooser *chooser, - const GtkFilePath *path); + void (*unselect_file) (GtkFileChooser *chooser, + GFile *file); void (*select_all) (GtkFileChooser *chooser); void (*unselect_all) (GtkFileChooser *chooser); - GSList * (*get_paths) (GtkFileChooser *chooser); - GtkFilePath * (*get_preview_path) (GtkFileChooser *chooser); + GSList * (*get_files) (GtkFileChooser *chooser); + GFile * (*get_preview_file) (GtkFileChooser *chooser); GtkFileSystem *(*get_file_system) (GtkFileChooser *chooser); void (*add_filter) (GtkFileChooser *chooser, GtkFileFilter *filter); @@ -68,10 +75,10 @@ struct _GtkFileChooserIface GtkFileFilter *filter); GSList * (*list_filters) (GtkFileChooser *chooser); gboolean (*add_shortcut_folder) (GtkFileChooser *chooser, - const GtkFilePath *path, + GFile *file, GError **error); gboolean (*remove_shortcut_folder) (GtkFileChooser *chooser, - const GtkFilePath *path, + GFile *file, GError **error); GSList * (*list_shortcut_folders) (GtkFileChooser *chooser); @@ -85,23 +92,13 @@ struct _GtkFileChooserIface }; GtkFileSystem *_gtk_file_chooser_get_file_system (GtkFileChooser *chooser); -gboolean _gtk_file_chooser_set_current_folder_path (GtkFileChooser *chooser, - const GtkFilePath *path, - GError **error); -GtkFilePath * _gtk_file_chooser_get_current_folder_path (GtkFileChooser *chooser); -gboolean _gtk_file_chooser_select_path (GtkFileChooser *chooser, - const GtkFilePath *path, - GError **error); -void _gtk_file_chooser_unselect_path (GtkFileChooser *chooser, - const GtkFilePath *path); -GSList * _gtk_file_chooser_get_paths (GtkFileChooser *chooser); -GtkFilePath * _gtk_file_chooser_get_preview_path (GtkFileChooser *chooser); gboolean _gtk_file_chooser_add_shortcut_folder (GtkFileChooser *chooser, - const GtkFilePath *path, + GFile *folder, GError **error); gboolean _gtk_file_chooser_remove_shortcut_folder (GtkFileChooser *chooser, - const GtkFilePath *path, + GFile *folder, GError **error); +GSList * _gtk_file_chooser_list_shortcut_folder_files (GtkFileChooser *chooser); /* GtkFileChooserDialog private */ @@ -137,8 +134,7 @@ typedef enum { typedef enum { RELOAD_EMPTY, /* No folder has been set */ - RELOAD_HAS_FOLDER, /* We have a folder, although it may not be completely loaded yet; no need to reload */ - RELOAD_WAS_UNMAPPED /* We had a folder but got unmapped; reload is needed */ + RELOAD_HAS_FOLDER /* We have a folder, although it may not be completely loaded yet; no need to reload */ } ReloadState; typedef enum { @@ -154,7 +150,7 @@ typedef enum { struct _GtkFileChooserDefault { - GtkVBox parent_instance; + GtkBox parent_instance; GtkFileChooserAction action; @@ -162,13 +158,14 @@ struct _GtkFileChooserDefault /* Save mode widgets */ GtkWidget *save_widgets; + GtkWidget *save_widgets_table; GtkWidget *save_folder_label; - GtkWidget *save_folder_combo; - GtkWidget *save_expander; /* The file browsing widgets */ - GtkWidget *browse_widgets; + GtkWidget *browse_widgets_box; + GtkWidget *browse_widgets_hpaned; + GtkWidget *browse_header_box; GtkWidget *browse_shortcuts_tree_view; GtkWidget *browse_shortcuts_add_button; GtkWidget *browse_shortcuts_remove_button; @@ -179,9 +176,18 @@ struct _GtkFileChooserDefault GtkWidget *browse_files_popup_menu; GtkWidget *browse_files_popup_menu_add_shortcut_item; GtkWidget *browse_files_popup_menu_hidden_files_item; + GtkWidget *browse_files_popup_menu_size_column_item; + GtkWidget *browse_files_popup_menu_copy_file_location_item; + GtkWidget *browse_files_popup_menu_visit_file_item; GtkWidget *browse_new_folder_button; GtkWidget *browse_path_bar_hbox; + GtkSizeGroup *browse_path_bar_size_group; GtkWidget *browse_path_bar; + GtkWidget *browse_special_mode_icon; + GtkWidget *browse_special_mode_label; + GtkWidget *browse_select_a_folder_info_bar; + GtkWidget *browse_select_a_folder_label; + GtkWidget *browse_select_a_folder_icon; GtkFileSystemModel *browse_files_model; char *browse_files_last_selected_name; @@ -191,16 +197,12 @@ struct _GtkFileChooserDefault GtkWidget *search_entry; GtkSearchEngine *search_engine; GtkQuery *search_query; - GtkListStore *search_model; - GtkTreeModelFilter *search_model_filter; - GtkTreeModelSort *search_model_sort; + GtkFileSystemModel *search_model; /* OPERATION_MODE_RECENT */ GtkRecentManager *recent_manager; - GtkListStore *recent_model; + GtkFileSystemModel *recent_model; guint load_recent_id; - GtkTreeModelFilter *recent_model_filter; - GtkTreeModelSort *recent_model_sort; GtkWidget *filter_combo_hbox; GtkWidget *filter_combo; @@ -223,24 +225,15 @@ struct _GtkFileChooserDefault */ GtkTreeModel *shortcuts_pane_filter_model; - /* Filter for the "Save in folder" combo. We filter out the Search row and - * its separator. - */ - GtkTreeModel *shortcuts_combo_filter_model; - - GtkTreeModelSort *sort_model; - /* Handles */ GSList *loading_shortcuts; - GSList *reload_icon_handles; - GtkFileSystemHandle *file_list_drag_data_received_handle; - GtkFileSystemHandle *update_current_folder_handle; - GtkFileSystemHandle *show_and_select_paths_handle; - GtkFileSystemHandle *should_respond_get_info_handle; - GtkFileSystemHandle *file_exists_get_info_handle; - GtkFileSystemHandle *update_from_entry_handle; - GtkFileSystemHandle *shortcuts_activate_iter_handle; - GSList *pending_handles; + GSList *reload_icon_cancellables; + GCancellable *file_list_drag_data_received_cancellable; + GCancellable *update_current_folder_cancellable; + GCancellable *should_respond_get_info_cancellable; + GCancellable *file_exists_get_info_cancellable; + GCancellable *update_from_entry_cancellable; + GCancellable *shortcuts_activate_iter_cancellable; LoadState load_state; ReloadState reload_state; @@ -248,13 +241,11 @@ struct _GtkFileChooserDefault OperationMode operation_mode; - GSList *pending_select_paths; + GSList *pending_select_files; GtkFileFilter *current_filter; GSList *filters; - GtkTooltips *tooltips; - int num_volumes; int num_shortcuts; int num_bookmarks; @@ -262,14 +253,15 @@ struct _GtkFileChooserDefault gulong volumes_changed_id; gulong bookmarks_changed_id; - GtkFilePath *current_volume_path; - GtkFilePath *current_folder; - GtkFilePath *preview_path; + GFile *current_volume_file; + GFile *current_folder; + GFile *preview_file; char *preview_display_name; GtkTreeViewColumn *list_name_column; GtkCellRenderer *list_name_renderer; GtkTreeViewColumn *list_mtime_column; + GtkTreeViewColumn *list_size_column; GSource *edited_idle; char *edited_new_text; @@ -277,17 +269,19 @@ struct _GtkFileChooserDefault gulong settings_signal_id; int icon_size; + GSource *focus_entry_idle; + gulong toplevel_set_focus_id; GtkWidget *toplevel_last_focus_widget; + gint sort_column; + GtkSortType sort_order; + #if 0 GdkDragContext *shortcuts_drag_context; GSource *shortcuts_drag_outside_idle; #endif - gint default_width; - gint default_height; - /* Flags */ guint local_only : 1; @@ -299,11 +293,12 @@ struct _GtkFileChooserDefault guint list_sort_ascending : 1; guint changing_folder : 1; guint shortcuts_current_folder_active : 1; - guint expand_folders : 1; guint has_home : 1; guint has_desktop : 1; guint has_search : 1; - guint has_recent : 1; + guint has_recent: 1; + guint show_size_column : 1; + guint create_folders : 1; #if 0 guint shortcuts_drag_outside : 1; @@ -311,63 +306,6 @@ struct _GtkFileChooserDefault }; -/* GtkFileSystemModel private */ - -typedef struct _FileModelNode FileModelNode; - -struct _GtkFileSystemModel -{ - GObject parent_instance; - - GtkFileSystem *file_system; - GtkFileInfoType types; - FileModelNode *roots; - GtkFileFolder *root_folder; - GtkFilePath *root_path; - - GtkFileSystemModelFilter filter_func; - gpointer filter_data; - - GSList *idle_clears; - GSource *idle_clear_source; - - gushort max_depth; - - GSList *pending_handles; - - guint show_hidden : 1; - guint show_folders : 1; - guint show_files : 1; - guint folders_only : 1; - guint has_editable : 1; -}; - -struct _FileModelNode -{ - GtkFilePath *path; - FileModelNode *next; - - GtkFileInfo *info; - GtkFileFolder *folder; - - FileModelNode *children; - FileModelNode *parent; - GtkFileSystemModel *model; - - guint ref_count; - guint n_referenced_children; - - gushort depth; - - guint has_dummy : 1; - guint is_dummy : 1; - guint is_visible : 1; - guint loaded : 1; - guint idle_clear : 1; - guint load_pending : 1; -}; - - G_END_DECLS #endif /* __GTK_FILE_CHOOSER_PRIVATE_H__ */