src/ui/gui/aggregate-dialog.h \
src/ui/gui/builder-wrapper.c \
src/ui/gui/builder-wrapper.h \
- src/ui/gui/checkbox-treeview.c \
- src/ui/gui/checkbox-treeview.h \
src/ui/gui/comments-dialog.c \
src/ui/gui/comments-dialog.h \
src/ui/gui/compute-dialog.c \
src/ui/gui/psppire.h \
src/ui/gui/psppire-acr.h \
src/ui/gui/psppire-buttonbox.h \
+ src/ui/gui/psppire-checkbox-treeview.c \
+ src/ui/gui/psppire-checkbox-treeview.h \
src/ui/gui/psppire-conf.c \
src/ui/gui/psppire-conf.h \
src/ui/gui/psppire-data-editor.c \
+++ /dev/null
-/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2012 Free Software Foundation
-
- 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/>. */
-
-#include <config.h>
-
-#include "checkbox-treeview.h"
-#include <gtk/gtk.h>
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-
-/* Callback for checkbox cells in the statistics tree view.
- Toggles the checkbox. */
-static void
-toggle (GtkCellRendererToggle *cell_renderer, gchar *path_str, gpointer data)
-{
- GtkTreeView *tv = GTK_TREE_VIEW (data);
- GtkTreeModel *model = gtk_tree_view_get_model (tv);
- GtkTreeIter iter;
- GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
- gboolean selected;
-
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_tree_model_get (model, &iter, CHECKBOX_COLUMN_SELECTED, &selected, -1);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, CHECKBOX_COLUMN_SELECTED,
- !selected, -1);
- gtk_tree_path_free (path);
-}
-
-
-static void
-treeview_create_checkbox_model (GtkTreeView *treeview,
- guint default_items,
- gint n_items,
- const struct checkbox_entry_item *items
- )
-{
- GtkListStore *list;
- size_t i;
-
- list = gtk_list_store_new (N_CHECKBOX_COLUMNS,
- G_TYPE_STRING, G_TYPE_BOOLEAN);
-
- for (i = 0; i < n_items; i++)
- {
- GtkTreeIter iter;
- gtk_list_store_append (list, &iter);
- gtk_list_store_set (list, &iter,
- CHECKBOX_COLUMN_LABEL, gettext (items[i].label),
- CHECKBOX_COLUMN_SELECTED,
- (default_items & (1u << i)) != 0,
- -1);
- }
-
- gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (list));
- g_object_unref (list);
-}
-
-static void
-treeview_checkbox_populate (GtkTreeView *treeview)
-{
- GtkTreeViewColumn *col;
- GtkCellRenderer *renderer;
-
- /* Checkbox column. */
- col = gtk_tree_view_column_new ();
- renderer = gtk_cell_renderer_toggle_new ();
-
- gtk_tree_view_column_pack_start (col, renderer, TRUE);
-
- gtk_tree_view_append_column (treeview, col);
-
- gtk_tree_view_column_add_attribute (col, renderer, "active", CHECKBOX_COLUMN_SELECTED);
-
- g_signal_connect (renderer, "toggled", G_CALLBACK (toggle), treeview);
-
- /* Label column. */
- col = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_title (col, _("Statistic"));
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start (col, renderer, TRUE);
-
- gtk_tree_view_column_add_attribute (col, renderer, "text", CHECKBOX_COLUMN_LABEL);
-
- g_object_set (renderer, "ellipsize-set", TRUE, NULL);
- g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- gtk_tree_view_column_set_min_width (col, 200);
- gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
- gtk_tree_view_column_set_resizable (col, TRUE);
- gtk_tree_view_append_column (treeview, col);
-}
-
-
-void
-put_checkbox_items_in_treeview (GtkTreeView *treeview,
- guint default_items,
- gint n_items,
- const struct checkbox_entry_item *items
- )
-{
- treeview_create_checkbox_model (treeview, default_items, n_items, items);
- treeview_checkbox_populate (treeview);
-}
+++ /dev/null
-/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
-
- 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 __CHECKBOX_TREEVIEW_H__
-#define __CHECKBOX_TREEVIEW_H__ 1
-
-
-#include <gtk/gtk.h>
-
-struct checkbox_entry_item
- {
- const char *name;
- const char *label;
- };
-
-enum
- {
- CHECKBOX_COLUMN_LABEL,
- CHECKBOX_COLUMN_SELECTED,
- N_CHECKBOX_COLUMNS
- };
-
-
-void put_checkbox_items_in_treeview (GtkTreeView *treeview,
- guint default_items,
- gint n_items,
- const struct checkbox_entry_item *items
- );
-#endif
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="cell-view">
+ <object class="PsppireCheckboxTreeview" id="cell-view">
<property name="visible">True</property>
<property name="headers_visible">False</property>
</object>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="stats-view">
+ <object class="PsppireCheckboxTreeview" id="stats-view">
<property name="width_request">128</property>
<property name="height_request">150</property>
<property name="visible">True</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
- <object class="GtkTreeView" id="statistics">
+ <object class="PsppireCheckboxTreeview" id="statistics">
<property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
- <object class="GtkTreeView" id="stats-treeview">
+ <object class="PsppireCheckboxTreeview" id="stats-treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--- /dev/null
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007, 2012, 2013 Free Software Foundation
+
+ 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/>. */
+
+
+/*
+ This module provides a subclass of GtkTreeView, designed for dialogs
+ which need lists of annotated checkbox items.
+ The object contains the necessary model and renderers, which means that
+ the user does not have to create these herself.
+ */
+
+#include <config.h>
+#include <gtk/gtk.h>
+
+#include "psppire-checkbox-treeview.h"
+
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+static void psppire_checkbox_treeview_init (PsppireCheckboxTreeview *cbtv);
+
+GType
+psppire_checkbox_treeview_get_type (void)
+{
+ static GType psppire_checkbox_treeview_type = 0;
+
+ if (!psppire_checkbox_treeview_type)
+ {
+ static const GTypeInfo psppire_checkbox_treeview_info =
+ {
+ sizeof (PsppireCheckboxTreeviewClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) NULL,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (PsppireCheckboxTreeview),
+ 0,
+ (GInstanceInitFunc) psppire_checkbox_treeview_init,
+ };
+
+ psppire_checkbox_treeview_type =
+ g_type_register_static (GTK_TYPE_TREE_VIEW, "PsppireCheckboxTreeview",
+ &psppire_checkbox_treeview_info, 0);
+ }
+
+ return psppire_checkbox_treeview_type;
+}
+
+
+
+/* Callback for checkbox cells in the statistics tree view.
+ Toggles the checkbox. */
+static void
+toggle (GtkCellRendererToggle *cell_renderer, const gchar *path_str, gpointer data)
+{
+ GtkTreeView *tv = GTK_TREE_VIEW (data);
+ GtkTreeModel *model = gtk_tree_view_get_model (tv);
+ GtkTreeIter iter;
+ GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
+ gboolean selected;
+
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_tree_model_get (model, &iter, CHECKBOX_COLUMN_SELECTED, &selected, -1);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, CHECKBOX_COLUMN_SELECTED,
+ !selected, -1);
+ gtk_tree_path_free (path);
+}
+
+/* Create the necessary columns and renderers and add them to the widget */
+static void
+treeview_checkbox_populate (GtkTreeView *treeview)
+{
+ /* Checkbox column. */
+ GtkTreeViewColumn *col = gtk_tree_view_column_new ();
+ GtkCellRenderer *renderer = gtk_cell_renderer_toggle_new ();
+
+ gtk_tree_view_column_pack_start (col, renderer, TRUE);
+
+ gtk_tree_view_append_column (treeview, col);
+
+ gtk_tree_view_column_add_attribute (col, renderer, "active", CHECKBOX_COLUMN_SELECTED);
+
+ g_signal_connect (renderer, "toggled", G_CALLBACK (toggle), treeview);
+
+ /* Label column. */
+ col = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_title (col, _("Statistic"));
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (col, renderer, TRUE);
+
+ gtk_tree_view_column_add_attribute (col, renderer, "text", CHECKBOX_COLUMN_LABEL);
+
+ g_object_set (renderer, "ellipsize-set", TRUE, NULL);
+ g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ gtk_tree_view_column_set_min_width (col, 200);
+ gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_column_set_resizable (col, TRUE);
+ gtk_tree_view_append_column (treeview, col);
+}
+
+static void
+psppire_checkbox_treeview_init (PsppireCheckboxTreeview *cbtv)
+{
+ cbtv->list = GTK_TREE_MODEL (gtk_list_store_new (N_CHECKBOX_COLUMNS,
+ G_TYPE_STRING,
+ G_TYPE_BOOLEAN));
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (cbtv), cbtv->list);
+ g_object_unref (cbtv->list);
+
+ treeview_checkbox_populate (GTK_TREE_VIEW (cbtv));
+}
+
+
+/*
+ Load the object's model from the array ITEMS.
+ N_ITEMS is the size of the array.
+ DEFAULT_ITEMS is a bitwise field indicating the initial state
+ of the items.
+*/
+void
+psppire_checkbox_treeview_populate (PsppireCheckboxTreeview *cbtv,
+ guint default_items,
+ gint n_items,
+ const struct checkbox_entry_item *items)
+{
+ size_t i;
+ for (i = 0; i < n_items; ++i)
+ {
+ GtkTreeIter iter;
+ gtk_list_store_append (GTK_LIST_STORE (cbtv->list), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (cbtv->list), &iter,
+ CHECKBOX_COLUMN_LABEL, gettext (items[i].label),
+ CHECKBOX_COLUMN_SELECTED,
+ (default_items & (1u << i)) != 0,
+ -1);
+ }
+
+}
--- /dev/null
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007, 2013 Free Software Foundation
+
+ 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 __PSPPIRE_CHECKBOX_TREEVIEW_H__
+#define __PSPPIRE_CHECKBOX_TREEVIEW_H__
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+
+#define PSPPIRE_TYPE_CHECKBOX_TREEVIEW (psppire_checkbox_treeview_get_type ())
+
+#define PSPPIRE_CHECKBOX_TREEVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ PSPPIRE_TYPE_CHECKBOX_TREEVIEW, PsppireCheckboxTreeview))
+
+#define PSPPIRE_CHECKBOX_TREEVIEW_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \
+ PSPPIRE_TYPE_CHECKBOX_TREEVIEW, PsppireCheckboxTreeviewClass))
+
+#define PSPPIRE_IS_CHECKBOX_TREEVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ PSPPIRE_TYPE_CHECKBOX_TREEVIEW))
+
+#define PSPPIRE_IS_CHECKBOX_TREEVIEW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \
+ PSPPIRE_TYPE_CHECKBOX_TREEVIEW))
+
+
+typedef struct _PsppireCheckboxTreeview PsppireCheckboxTreeview;
+typedef struct _PsppireCheckboxTreeviewClass PsppireCheckboxTreeviewClass;
+
+
+struct _PsppireCheckboxTreeview
+{
+ GtkTreeView parent;
+
+ /* <private> */
+ GtkTreeModel *list;
+};
+
+
+struct _PsppireCheckboxTreeviewClass
+{
+ GtkTreeViewClass parent_class;
+};
+
+
+
+GType psppire_checkbox_treeview_get_type (void);
+GType psppire_checkbox_treeview_model_get_type (void);
+
+
+struct checkbox_entry_item
+ {
+ const char *name;
+ const char *label;
+ };
+
+enum
+ {
+ CHECKBOX_COLUMN_LABEL,
+ CHECKBOX_COLUMN_SELECTED,
+ N_CHECKBOX_COLUMNS
+ };
+
+void psppire_checkbox_treeview_populate (PsppireCheckboxTreeview *pctv,
+ guint default_items,
+ gint n_items,
+ const struct checkbox_entry_item *items);
+
+G_END_DECLS
+
+#endif /* __PSPPIRE_CHECKBOX_TREEVIEW_H__ */
#include "psppire-dialog.h"
#include "builder-wrapper.h"
-#include "checkbox-treeview.h"
+#include "psppire-checkbox-treeview.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
act->format_options_table = TRUE;
act->format_options_pivot = TRUE;
- put_checkbox_items_in_treeview (GTK_TREE_VIEW (act->cell_view),
- B_CS_CELL_DEFAULT,
- N_CROSSTABS_CELLS,
- cells
- );
+ psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->cell_view),
+ B_CS_CELL_DEFAULT,
+ N_CROSSTABS_CELLS,
+ cells);
act->cell = gtk_tree_view_get_model (GTK_TREE_VIEW (act->cell_view));
- put_checkbox_items_in_treeview (GTK_TREE_VIEW (act->stat_view),
- B_CS_STATS_DEFAULT,
- N_CROSSTABS_STATS,
- stats
- );
+ psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
+ B_CS_STATS_DEFAULT,
+ N_CROSSTABS_STATS,
+ stats);
act->stat = gtk_tree_view_get_model (GTK_TREE_VIEW (act->stat_view));
#include "psppire-dialog-action.h"
+/*
+ This module provides a subclass of GtkTreeView, designed for dialogs
+ which need lists of annotated checkbox items.
+ The object contains the necessary model and renderers, which means that
+ the user does not have to create these herself.
+ */
+
+
#ifndef __PSPPIRE_DIALOG_ACTION_CROSSTABS_H__
#define __PSPPIRE_DIALOG_ACTION_CROSSTABS_H__
#include "psppire-dialog-action-descriptives.h"
-#include "checkbox-treeview.h"
+#include "psppire-checkbox-treeview.h"
#include "psppire-var-view.h"
#include "psppire-dict.h"
g_object_set (pda->source, "model", pda->dict,
"predicate", var_is_numeric, NULL);
- put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
- B_DS_DEFAULT,
- N_DESCRIPTIVE_STATS, stats);
+ psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
+ B_DS_DEFAULT,
+ N_DESCRIPTIVE_STATS, stats);
act->stat_vars = GTK_TREE_VIEW (act->variables);
act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
#include "psppire-dialog.h"
#include "builder-wrapper.h"
-#include "checkbox-treeview.h"
+#include "psppire-checkbox-treeview.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
act->stat_vars = get_widget_assert (xml, "var-treeview");
- put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
+ psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (stats_treeview),
B_FS_DEFAULT, N_FREQUENCY_STATS, stats);
act->stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
#include "psppire-dialog.h"
#include "builder-wrapper.h"
-#include "checkbox-treeview.h"
+#include "psppire-checkbox-treeview.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
g_object_unref (xml);
- put_checkbox_items_in_treeview (GTK_TREE_VIEW (act->stat_view),
- B_RG_STATS_DEFAULT,
- N_REGRESSION_STATS,
- stats);
+ psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
+ B_RG_STATS_DEFAULT,
+ N_REGRESSION_STATS,
+ stats);
psppire_dialog_action_set_refresh (pda, refresh);
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">etched-in</property>
<child>
- <object class="GtkTreeView" id="stat-view">
+ <object class="PsppireCheckboxTreeview" id="stat-view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
#include "psppire-dictview.h"
#include "psppire-var-view.h"
#include "psppire-val-chooser.h"
+#include "psppire-checkbox-treeview.h"
#include "psppire-dialog-action-binomial.h"
#include "psppire-dialog-action-correlation.h"
psppire_dict_view_get_type ();
psppire_var_view_get_type ();
psppire_value_entry_get_type ();
+ psppire_checkbox_treeview_get_type ();
psppire_dialog_action_binomial_get_type ();
psppire_dialog_action_correlation_get_type ();
projects / pspp / commitdiff