Commit e6983567 authored by Michael Natterer's avatar Michael Natterer 😴
Browse files

app: add GimpContainerIconView, a new GimpContainerView based on GtkIconView

This is supposed to finally replace GimpContainerGridView along with
GtkWrapBox. The code is experimental and currently even crashes
without a modified GTK+, so it's disabled. Keeping it in GIT makes
developing easier though.
parent a3b93151
......@@ -79,6 +79,8 @@ libappwidgets_a_sources = \
gimpcontainerentry.h \
gimpcontainergridview.c \
gimpcontainergridview.h \
gimpcontainericonview.c \
gimpcontainericonview.h \
gimpcontainerpopup.c \
gimpcontainerpopup.h \
gimpcontainertreestore.c \
......
......@@ -32,6 +32,7 @@
#include "gimpcontainereditor.h"
#include "gimpcontainergridview.h"
#include "gimpcontainericonview.h"
#include "gimpcontainertreeview.h"
#include "gimpcontainerview.h"
#include "gimpdocked.h"
......@@ -130,11 +131,19 @@ gimp_container_editor_construct (GimpContainerEditor *editor,
switch (view_type)
{
case GIMP_VIEW_TYPE_GRID:
#if 0
editor->view =
GIMP_CONTAINER_VIEW (gimp_container_icon_view_new (container,
context,
view_size,
view_border_width));
#else
editor->view =
GIMP_CONTAINER_VIEW (gimp_container_grid_view_new (container,
context,
view_size,
view_border_width));
#endif
break;
case GIMP_VIEW_TYPE_LIST:
......
This diff is collapsed.
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpcontainericonview.h
* Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_CONTAINER_ICON_VIEW_H__
#define __GIMP_CONTAINER_ICON_VIEW_H__
#include "gimpcontainerbox.h"
#define GIMP_TYPE_CONTAINER_ICON_VIEW (gimp_container_icon_view_get_type ())
#define GIMP_CONTAINER_ICON_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_ICON_VIEW, GimpContainerIconView))
#define GIMP_CONTAINER_ICON_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_ICON_VIEW, GimpContainerIconViewClass))
#define GIMP_IS_CONTAINER_ICON_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CONTAINER_ICON_VIEW))
#define GIMP_IS_CONTAINER_ICON_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CONTAINER_ICON_VIEW))
#define GIMP_CONTAINER_ICON_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONTAINER_ICON_VIEW, GimpContainerIconViewClass))
typedef struct _GimpContainerIconViewClass GimpContainerIconViewClass;
typedef struct _GimpContainerIconViewPriv GimpContainerIconViewPriv;
struct _GimpContainerIconView
{
GimpContainerBox parent_instance;
GtkTreeModel *model;
gint n_model_columns;
GType model_columns[16];
GtkIconView *view;
GtkCellRenderer *renderer_cell;
Gimp *dnd_gimp; /* eek */
GimpContainerIconViewPriv *priv;
};
struct _GimpContainerIconViewClass
{
GimpContainerBoxClass parent_class;
};
GType gimp_container_icon_view_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_container_icon_view_new (GimpContainer *container,
GimpContext *context,
gint view_size,
gint view_border_width);
#endif /* __GIMP_CONTAINER_ICON_VIEW_H__ */
......@@ -83,6 +83,7 @@ typedef struct _GimpContainerBox GimpContainerBox;
typedef struct _GimpContainerComboBox GimpContainerComboBox;
typedef struct _GimpContainerEntry GimpContainerEntry;
typedef struct _GimpContainerGridView GimpContainerGridView;
typedef struct _GimpContainerIconView GimpContainerIconView;
typedef struct _GimpContainerTreeStore GimpContainerTreeStore;
typedef struct _GimpContainerTreeView GimpContainerTreeView;
typedef struct _GimpItemTreeView GimpItemTreeView;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment