[gtkmm: 1/2] Add Gtk::GridView

[Kjell Ahlstedt <kjellahl src gnome org>]

commit fad7e2443e8481a45112f8938c3d443fbb77f058
Author: Andreas Persson <andreasp56 outlook com>
Date:   Sun Sep 6 18:47:30 2020 +0200

    Add Gtk::GridView

 .gitignore                                |  2 +
 gtk/gtkmm.h                               |  1 +
 gtk/gtkmm/meson.build                     |  1 +
 gtk/src/columnview.hg                     |  6 +--
 gtk/src/filelist.am                       |  1 +
 gtk/src/gridview.ccg                      | 17 +++++++
 gtk/src/gridview.hg                       | 78 +++++++++++++++++++++++++++++++
 gtk/src/gtk_signals.defs                  | 69 +++++++++++++++++++++++++++
 tools/extra_defs_gen/generate_defs_gtk.cc |  1 +
 9 files changed, 172 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a1e3aa94..0eae73fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -355,6 +355,8 @@ gtk/gtkmm/gridlayout.cc
 gtk/gtkmm/gridlayout.h
 gtk/gtkmm/gridlayoutchild.cc
 gtk/gtkmm/gridlayoutchild.h
+gtk/gtkmm/gridview.cc
+gtk/gtkmm/gridview.h
 gtk/gtkmm/headerbar.cc
 gtk/gtkmm/headerbar.h
 gtk/gtkmm/iconpaintable.cc
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index 8984a0d8..8881ed42 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -181,6 +181,7 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/grid.h>
 #include <gtkmm/gridlayout.h>
 #include <gtkmm/gridlayoutchild.h>
+#include <gtkmm/gridview.h>
 #include <gtkmm/headerbar.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/iconview.h>
diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build
index c62e9e67..98ce3558 100644
--- a/gtk/gtkmm/meson.build
+++ b/gtk/gtkmm/meson.build
@@ -134,6 +134,7 @@ gtkmm_any_hg_ccg_basenames = [
   'grid',
   'gridlayout',
   'gridlayoutchild',
+  'gridview',
   'headerbar',
   'iconpaintable',
   'icontheme',
diff --git a/gtk/src/columnview.hg b/gtk/src/columnview.hg
index 1002391a..ab428d79 100644
--- a/gtk/src/columnview.hg
+++ b/gtk/src/columnview.hg
@@ -38,10 +38,8 @@ namespace Gtk
  * separators between the rows or columns.
  *
  * %Gtk::ColumnView allows the user to select items according to the selection
- * characteristics of the model. If the provided model is not a Gtk::SelectionModel,
- * %Gtk::ColumnView will wrap it in a Gtk::SingleSelection. For models that allow
- * multiple selected items, it is possible to turn on *rubberband selection*,
- * using set_enable_rubberband().
+ * characteristics of the model. For models that allow multiple selected items,
+ * it is possible to turn on *rubberband selection*, using set_enable_rubberband().
  *
  * The column view supports sorting that can be customized by the user by
  * clicking on column headers. To set this up, the Gtk::Sorter returned by
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index ed4435b2..587ed1e7 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -119,6 +119,7 @@ gtkmm_files_any_hg =                \
        grid.hg                 \
        gridlayout.hg \
        gridlayoutchild.hg \
+       gridview.hg \
        headerbar.hg    \
        iconpaintable.hg \
        icontheme.hg            \
diff --git a/gtk/src/gridview.ccg b/gtk/src/gridview.ccg
new file mode 100644
index 00000000..57b87fdc
--- /dev/null
+++ b/gtk/src/gridview.ccg
@@ -0,0 +1,17 @@
+/* Copyright (C) 2020 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtk/gtk.h>
diff --git a/gtk/src/gridview.hg b/gtk/src/gridview.hg
new file mode 100644
index 00000000..cf3369e6
--- /dev/null
+++ b/gtk/src/gridview.hg
@@ -0,0 +1,78 @@
+/* Copyright (C) 2020 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gtkmm/listbase.h>
+#include <gtkmm/selectionmodel.h>
+#include <gtkmm/listitemfactory.h>
+
+_DEFS(gtkmm,gtk)
+_PINCLUDE(gtkmm/private/listbase_p.h)
+
+namespace Gtk
+{
+
+/** A widget for displaying grids.
+ *
+ * %Gtk::GridView is a widget to present a view into a large dynamic grid of items.
+ *
+ * %Gtk::GridView uses its factory to generate one child widget for each visible item
+ * and shows them in a grid. The orientation of the grid view determines if the
+ * grid reflows vertically or horizontally.
+ *
+ * %Gtk::GridView allows the user to select items according to the selection
+ * characteristics of the model. For models that allow multiple selected items,
+ * it is possible to turn on _rubberband selection_, using set_enable_rubberband().
+ *
+ * @see Gtk::SelectionModel, Gtk::ListView, Gtk::ColumnView
+ *
+ * @ingroup Widgets
+ *
+ * @newin{3,98}
+ */
+class GTKMM_API GridView : public ListBase
+{
+  _CLASS_GTKOBJECT(GridView, GtkGridView, GTK_GRID_VIEW, ListBase, GtkListBase, , , GTKMM_API)
+
+public:
+  _WRAP_CTOR(GridView(const Glib::RefPtr<SelectionModel>& model = {}, const Glib::RefPtr<ListItemFactory>& 
factory = {}), gtk_grid_view_new)
+
+  _WRAP_METHOD(Glib::RefPtr<SelectionModel> get_model(), gtk_grid_view_get_model, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const SelectionModel> get_model() const, gtk_grid_view_get_model, refreturn, 
constversion)
+  _WRAP_METHOD(void set_model(const Glib::RefPtr<SelectionModel>& model), gtk_grid_view_set_model)
+  _WRAP_METHOD(void set_factory(const Glib::RefPtr<ListItemFactory>& factory), gtk_grid_view_set_factory)
+  _WRAP_METHOD(Glib::RefPtr<ListItemFactory> get_factory(), gtk_grid_view_get_factory, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const ListItemFactory> get_factory() const, gtk_grid_view_get_factory, 
refreturn, constversion)
+  _WRAP_METHOD(guint get_min_columns() const, gtk_grid_view_get_min_columns)
+  _WRAP_METHOD(void set_min_columns(guint min_columns), gtk_grid_view_set_min_columns)
+  _WRAP_METHOD(guint get_max_columns() const, gtk_grid_view_get_max_columns)
+  _WRAP_METHOD(void set_max_columns(guint max_columns), gtk_grid_view_set_max_columns)
+  _WRAP_METHOD(void set_enable_rubberband(bool enable_rubberband = true), 
gtk_grid_view_set_enable_rubberband)
+  _WRAP_METHOD(bool get_enable_rubberband() const, gtk_grid_view_get_enable_rubberband)
+  _WRAP_METHOD(void set_single_click_activate(bool single_click_activate = true), 
gtk_grid_view_set_single_click_activate)
+  _WRAP_METHOD(bool get_single_click_activate() const, gtk_grid_view_get_single_click_activate)
+
+  _WRAP_PROPERTY("factory", Glib::RefPtr<ListItemFactory>)
+  _WRAP_PROPERTY("max-columns", guint)
+  _WRAP_PROPERTY("min-columns", guint)
+  _WRAP_PROPERTY("model", Glib::RefPtr<SelectionModel>)
+  _WRAP_PROPERTY("single-click-activate", bool)
+  _WRAP_PROPERTY("enable-rubberband", bool)
+
+  // no_default_handler because GtkGridViewClass is private.
+  _WRAP_SIGNAL(void activate(guint position), "activate", no_default_handler)
+};
+
+} // namespace Gtk
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 557d8607..6f25ec52 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -5424,6 +5424,75 @@
   (default-value "1")
 )
 
+;; From GtkGridView
+
+(define-signal activate
+  (of-object "GtkGridView")
+  (return-type "void")
+  (flags "Run Last")
+  (parameters
+    '("guint" "p0")
+  )
+)
+
+(define-property factory
+  (of-object "GtkGridView")
+  (prop-type "GParamObject")
+  (docs "Factory for populating list items")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property max-columns
+  (of-object "GtkGridView")
+  (prop-type "GParamUInt")
+  (docs "Maximum number of columns per row")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "7")
+)
+
+(define-property min-columns
+  (of-object "GtkGridView")
+  (prop-type "GParamUInt")
+  (docs "Minimum number of columns per row")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "1")
+)
+
+(define-property model
+  (of-object "GtkGridView")
+  (prop-type "GParamObject")
+  (docs "Model for the items displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property single-click-activate
+  (of-object "GtkGridView")
+  (prop-type "GParamBoolean")
+  (docs "Activate rows on single click")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "FALSE")
+)
+
+(define-property enable-rubberband
+  (of-object "GtkGridView")
+  (prop-type "GParamBoolean")
+  (docs "Allow selecting items by dragging with the mouse")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+  (default-value "FALSE")
+)
+
 ;; From GtkHeaderBar
 
 (define-property title-widget
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 97d4ef3a..2d97b014 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -139,6 +139,7 @@ int main(int /* argc */, char** /* argv */)
             << get_defs( GTK_TYPE_GRID )
             << get_defs( GTK_TYPE_GRID_LAYOUT )
             << get_defs( GTK_TYPE_GRID_LAYOUT_CHILD )
+            << get_defs( GTK_TYPE_GRID_VIEW )
             << get_defs( GTK_TYPE_HEADER_BAR )
             << get_defs( GTK_TYPE_IMAGE )
             << get_defs( GTK_TYPE_INFO_BAR )