AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

filechooserwidget: Replace 'list' page with column view

Browse Source 
Replace the 'list' page of the main stack with another page, this
one containing a GtkColumnView. This, again, is the very minimal
code to achieve a column view - and validate the GListModel code
introduced in the previous commit - but there's a long way until
this column view covers the full range of features of the file
chooser.

The tree view still lives in an unused 'list2' page. From now on,
commits will "cannibalize" the treeview, each commit porting any
particular feature - be it a column, an event controller, etc -
to the column view, and dropping the corresponding feature from
the treeview.
This commit is contained in:
Georges Basile Stavracas Neto 2022-10-07 17:48:26 -03:00 committed by Matthias Clasen
parent f2559b1dbb
commit 6c84958b9f
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkfilechooserwidget.c
View File

@ -27,6 +27,7 @@
#include "deprecated/gtkcellrendererpixbuf.h" #include "deprecated/gtkcellrendererpixbuf.h"
#include "deprecated/gtkcellrenderertext.h" #include "deprecated/gtkcellrenderertext.h"
#include "gtkdropdown.h" #include "gtkdropdown.h"
#include "gtkcolumnview.h"
#include "gtkcssnumbervalueprivate.h" #include "gtkcssnumbervalueprivate.h"
#include "gtkdragsource.h" #include "gtkdragsource.h"
#include "gtkdroptarget.h" #include "gtkdroptarget.h"
@ -43,6 +44,7 @@
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
#include "gtkmountoperation.h" #include "gtkmountoperation.h"
#include "gtkmultiselection.h"
#include "gtkpaned.h" #include "gtkpaned.h"
#include "gtkpathbarprivate.h" #include "gtkpathbarprivate.h"
#include "gtkplacessidebarprivate.h" #include "gtkplacessidebarprivate.h"
@ -51,6 +53,7 @@
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtksearchentryprivate.h" #include "gtksearchentryprivate.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtksingleselection.h"
#include "gtksizegroup.h" #include "gtksizegroup.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkstack.h" #include "gtkstack.h"
@ -193,6 +196,7 @@ struct _GtkFileChooserWidget
GtkWidget *browse_files_stack; GtkWidget *browse_files_stack;
GtkWidget *browse_files_swin; GtkWidget *browse_files_swin;
GtkWidget *browse_files_tree_view; GtkWidget *browse_files_tree_view;
GtkWidget *browse_files_column_view;
GtkWidget *remote_warning_bar; GtkWidget *remote_warning_bar;
GtkWidget *browse_files_popover; GtkWidget *browse_files_popover;
@ -213,6 +217,8 @@ struct _GtkFileChooserWidget
GtkFileSystemModel *browse_files_model; GtkFileSystemModel *browse_files_model;
char *browse_files_last_selected_name; char *browse_files_last_selected_name;
GtkSelectionModel *browse_files_selection_model;
GtkWidget *places_sidebar; GtkWidget *places_sidebar;
GtkWidget *places_view; GtkWidget *places_view;
StartupMode startup_mode; StartupMode startup_mode;
@ -2676,6 +2682,14 @@ set_select_multiple (GtkFileChooserWidget *impl,
gtk_tree_view_set_rubber_banding (GTK_TREE_VIEW (impl->browse_files_tree_view), select_multiple); gtk_tree_view_set_rubber_banding (GTK_TREE_VIEW (impl->browse_files_tree_view), select_multiple);
g_clear_object (&impl->browse_files_selection_model);
impl->browse_files_selection_model = select_multiple
? GTK_SELECTION_MODEL (gtk_multi_selection_new (G_LIST_MODEL (impl->browse_files_model)))
: GTK_SELECTION_MODEL (gtk_single_selection_new (G_LIST_MODEL (impl->browse_files_model)));
gtk_column_view_set_model (GTK_COLUMN_VIEW (impl->browse_files_column_view),
GTK_SELECTION_MODEL (impl->browse_files_selection_model));
impl->select_multiple = select_multiple; impl->select_multiple = select_multiple;
g_object_notify (G_OBJECT (impl), "select-multiple"); g_object_notify (G_OBJECT (impl), "select-multiple");
} }
@ -4734,6 +4748,14 @@ set_list_model (GtkFileChooserWidget *impl,
_gtk_file_system_model_set_filter (impl->browse_files_model, impl->current_filter); _gtk_file_system_model_set_filter (impl->browse_files_model, impl->current_filter);
g_clear_object (&impl->browse_files_selection_model);
impl->browse_files_selection_model = impl->select_multiple
? GTK_SELECTION_MODEL (gtk_multi_selection_new (G_LIST_MODEL (impl->browse_files_model)))
: GTK_SELECTION_MODEL (gtk_single_selection_new (G_LIST_MODEL (impl->browse_files_model)));
gtk_column_view_set_model (GTK_COLUMN_VIEW (impl->browse_files_column_view),
GTK_SELECTION_MODEL (impl->browse_files_selection_model));
return TRUE; return TRUE;
} }
@ -7735,6 +7757,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_files_stack); gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_files_stack);
gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, places_sidebar); gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, places_sidebar);
gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, places_view); gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, places_view);
gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_files_column_view);
gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_files_tree_view); gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_files_tree_view);
gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_files_swin); gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_files_swin);
gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_header_revealer); gtk_widget_class_bind_template_child (widget_class, GtkFileChooserWidget, browse_header_revealer);

30
gtk/ui/gtkfilechooserwidget.ui
View File

@ -132,6 +132,36 @@
<child> <child>
<object class="GtkStackPage"> <object class="GtkStackPage">
<property name="name">list</property> <property name="name">list</property>
<property name="child">
<object class="GtkBox">
<property name="orientation">1</property>
<child>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">2</property>
<property name="vexpand">1</property>
<child>
<object class="GtkColumnView" id="browse_files_column_view">
</object>
</child>
</object>
</child>
<child>
<object class="GtkActionBar" id="remote_warning_bar2">
<property name="visible">0</property>
<child type="center">
<object class="GtkLabel">
<property name="label" translatable="yes">Remote location — only searching the current folder</property>
</object>
</child>
</object>
</child>
</object>
</property>
</object>
</child>
<child>
<object class="GtkStackPage">
<property name="name">list2</property>
<property name="child"> <property name="child">
<object class="GtkBox"> <object class="GtkBox">
<property name="orientation">1</property> <property name="orientation">1</property>