PROP_RESIZABLE,
PROP_WIDTH,
PROP_SPACING,
- PROP_SIZING,
PROP_FIXED_WIDTH,
PROP_MIN_WIDTH,
PROP_MAX_WIDTH,
PROP_REORDERABLE,
PROP_SORT_INDICATOR,
PROP_SORT_ORDER,
- PROP_SORT_COLUMN_ID
+ PROP_SORT_COLUMN_ID,
+ PROP_QUICK_EDIT
};
enum
{
CLICKED,
+ QUERY_TOOLTIP,
LAST_SIGNAL
};
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ tree_column_signals[QUERY_TOOLTIP] =
+ g_signal_new ("query-tooltip",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ g_signal_accumulator_true_handled, NULL,
+ psppire_marshal_BOOLEAN__OBJECT,
+ G_TYPE_BOOLEAN, 1,
+ GTK_TYPE_TOOLTIP);
+
g_object_class_install_property (object_class,
PROP_VISIBLE,
g_param_spec_boolean ("visible",
G_MAXINT,
0,
GTK_PARAM_READWRITE));
- g_object_class_install_property (object_class,
- PROP_SIZING,
- g_param_spec_enum ("sizing",
- P_("Sizing"),
- P_("Resize mode of the column"),
- PSPP_TYPE_SHEET_VIEW_COLUMN_SIZING,
- PSPP_SHEET_VIEW_COLUMN_GROW_ONLY,
- GTK_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_FIXED_WIDTH,
P_("Current fixed width of the column"),
1,
G_MAXINT,
- 1, /* not useful */
+ 100,
GTK_PARAM_READWRITE));
g_object_class_install_property (object_class,
G_MAXINT,
-1,
GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (object_class,
+ PROP_QUICK_EDIT,
+ g_param_spec_boolean ("quick-edit",
+ P_("Quick edit"),
+ P_("If true, editing starts upon the first click in the column. If false, the first click selects the column and a second click is needed to begin editing. This has no effect on cells that are not editable."),
+ TRUE,
+ GTK_PARAM_READWRITE));
}
static void
tree_column->min_width = -1;
tree_column->max_width = -1;
tree_column->resized_width = 0;
- tree_column->column_type = PSPP_SHEET_VIEW_COLUMN_GROW_ONLY;
tree_column->visible = TRUE;
tree_column->resizable = FALSE;
tree_column->expand = FALSE;
tree_column->fixed_width = 1;
tree_column->use_resized_width = FALSE;
tree_column->title = g_strdup ("");
+ tree_column->quick_edit = TRUE;
}
static void
g_value_get_boolean (value));
break;
- case PROP_SIZING:
- pspp_sheet_view_column_set_sizing (tree_column,
- g_value_get_enum (value));
- break;
-
case PROP_FIXED_WIDTH:
pspp_sheet_view_column_set_fixed_width (tree_column,
g_value_get_int (value));
pspp_sheet_view_column_set_sort_column_id (tree_column,
g_value_get_int (value));
break;
-
+
+ case PROP_QUICK_EDIT:
+ pspp_sheet_view_column_set_quick_edit (tree_column,
+ g_value_get_boolean (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
pspp_sheet_view_column_get_spacing (tree_column));
break;
- case PROP_SIZING:
- g_value_set_enum (value,
- pspp_sheet_view_column_get_sizing (tree_column));
- break;
-
case PROP_FIXED_WIDTH:
g_value_set_int (value,
pspp_sheet_view_column_get_fixed_width (tree_column));
g_value_set_int (value,
pspp_sheet_view_column_get_sort_column_id (tree_column));
break;
-
+
+ case PROP_QUICK_EDIT:
+ g_value_set_boolean (value,
+ pspp_sheet_view_column_get_quick_edit (tree_column));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
info->attributes = g_slist_prepend (info->attributes, g_strdup (attribute));
if (tree_column->tree_view)
- _pspp_sheet_view_column_cell_set_dirty (tree_column, TRUE);
+ _pspp_sheet_view_column_cell_set_dirty (tree_column);
}
static void
info->destroy = destroy;
if (column->tree_view)
- _pspp_sheet_view_column_cell_set_dirty (column, TRUE);
+ _pspp_sheet_view_column_cell_set_dirty (column);
}
static void
info->attributes = NULL;
if (tree_column->tree_view)
- _pspp_sheet_view_column_cell_set_dirty (tree_column, TRUE);
+ _pspp_sheet_view_column_cell_set_dirty (tree_column);
+}
+
+static gboolean
+on_query_tooltip (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip,
+ gpointer user_data)
+{
+ PsppSheetViewColumn *tree_column = user_data;
+ gboolean handled;
+
+ g_signal_emit (tree_column, tree_column_signals[QUERY_TOOLTIP], 0,
+ tooltip, &handled);
+ return handled;
}
/* Helper functions
G_CALLBACK (pspp_sheet_view_column_button_clicked),
tree_column);
+ g_signal_connect (tree_column->button, "query-tooltip",
+ G_CALLBACK (on_query_tooltip), tree_column);
+ g_object_set (tree_column->button, "has-tooltip", TRUE, NULL);
+
tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
hbox = gtk_hbox_new (FALSE, 2);
tree_column->spacing = spacing;
if (tree_column->tree_view)
- _pspp_sheet_view_column_cell_set_dirty (tree_column, TRUE);
+ _pspp_sheet_view_column_cell_set_dirty (tree_column);
}
/**
tree_column->visible = visible;
if (tree_column->visible)
- _pspp_sheet_view_column_cell_set_dirty (tree_column, TRUE);
+ _pspp_sheet_view_column_cell_set_dirty (tree_column);
pspp_sheet_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "visible");
* @resizable: %TRUE, if the column can be resized
*
* If @resizable is %TRUE, then the user can explicitly resize the column by
- * grabbing the outer edge of the column button. If resizable is %TRUE and
- * sizing mode of the column is #PSPP_SHEET_VIEW_COLUMN_AUTOSIZE, then the sizing
- * mode is changed to #PSPP_SHEET_VIEW_COLUMN_GROW_ONLY.
+ * grabbing the outer edge of the column button.
**/
void
pspp_sheet_view_column_set_resizable (PsppSheetViewColumn *tree_column,
tree_column->resizable = resizable;
- if (resizable && tree_column->column_type == PSPP_SHEET_VIEW_COLUMN_AUTOSIZE)
- pspp_sheet_view_column_set_sizing (tree_column, PSPP_SHEET_VIEW_COLUMN_GROW_ONLY);
-
pspp_sheet_view_column_update_button (tree_column);
g_object_notify (G_OBJECT (tree_column), "resizable");
}
-/**
- * pspp_sheet_view_column_set_sizing:
- * @tree_column: A #PsppSheetViewColumn.
- * @type: The #PsppSheetViewColumnSizing.
- *
- * Sets the growth behavior of @tree_column to @type.
- **/
-void
-pspp_sheet_view_column_set_sizing (PsppSheetViewColumn *tree_column,
- PsppSheetViewColumnSizing type)
-{
- g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
-
- if (type == tree_column->column_type)
- return;
-
- if (type == PSPP_SHEET_VIEW_COLUMN_AUTOSIZE)
- pspp_sheet_view_column_set_resizable (tree_column, FALSE);
-
-#if 0
- /* I was clearly on crack when I wrote this. I'm not sure what's supposed to
- * be below so I'll leave it until I figure it out.
- */
- if (tree_column->column_type == PSPP_SHEET_VIEW_COLUMN_AUTOSIZE &&
- tree_column->requested_width != -1)
- {
- pspp_sheet_view_column_set_sizing (tree_column, tree_column->requested_width);
- }
-#endif
- tree_column->column_type = type;
-
- pspp_sheet_view_column_update_button (tree_column);
-
- g_object_notify (G_OBJECT (tree_column), "sizing");
-}
-
-/**
- * pspp_sheet_view_column_get_sizing:
- * @tree_column: A #PsppSheetViewColumn.
- *
- * Returns the current type of @tree_column.
- *
- * Return value: The type of @tree_column.
- **/
-PsppSheetViewColumnSizing
-pspp_sheet_view_column_get_sizing (PsppSheetViewColumn *tree_column)
-{
- g_return_val_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column), 0);
-
- return tree_column->column_type;
-}
-
/**
* pspp_sheet_view_column_get_width:
* @tree_column: A #PsppSheetViewColumn.
* @tree_column: A #PsppSheetViewColumn.
* @fixed_width: The size to set @tree_column to. Must be greater than 0.
*
- * Sets the size of the column in pixels. This is meaningful only if the sizing
- * type is #PSPP_SHEET_VIEW_COLUMN_FIXED. The size of the column is clamped to
+ * Sets the size of the column in pixels. The size of the column is clamped to
* the min/max width for the column. Please note that the min/max width of the
* column doesn't actually affect the "fixed_width" property of the widget, just
* the actual size when displayed.
tree_column->use_resized_width = FALSE;
if (tree_column->tree_view &&
- gtk_widget_get_realized (tree_column->tree_view) &&
- tree_column->column_type == PSPP_SHEET_VIEW_COLUMN_FIXED)
+ gtk_widget_get_realized (tree_column->tree_view))
{
gtk_widget_queue_resize (tree_column->tree_view);
}
}
g_object_notify (G_OBJECT (tree_column), "min-width");
g_object_thaw_notify (G_OBJECT (tree_column));
-
- if (tree_column->column_type == PSPP_SHEET_VIEW_COLUMN_AUTOSIZE)
- _pspp_sheet_view_column_autosize (PSPP_SHEET_VIEW (tree_column->tree_view),
- tree_column);
}
/**
}
g_object_notify (G_OBJECT (tree_column), "max-width");
g_object_thaw_notify (G_OBJECT (tree_column));
-
- if (tree_column->column_type == PSPP_SHEET_VIEW_COLUMN_AUTOSIZE)
- _pspp_sheet_view_column_autosize (PSPP_SHEET_VIEW (tree_column->tree_view),
- tree_column);
}
/**
return tree_column->reorderable;
}
+/**
+ * pspp_sheet_view_column_set_quick_edit:
+ * @tree_column: A #PsppSheetViewColumn
+ * @quick_edit: If true, editing starts upon the first click in the column. If
+ * false, the first click selects the column and a second click is needed to
+ * begin editing. This has no effect on cells that are not editable.
+ **/
+void
+pspp_sheet_view_column_set_quick_edit (PsppSheetViewColumn *tree_column,
+ gboolean quick_edit)
+{
+ g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
+
+ quick_edit = !!quick_edit;
+ if (tree_column->quick_edit != quick_edit)
+ {
+ tree_column->quick_edit = (quick_edit?TRUE:FALSE);
+ g_object_notify (G_OBJECT (tree_column), "quick-edit");
+ }
+}
+
+/**
+ * pspp_sheet_view_column_get_quick_edit:
+ * @tree_column: A #PsppSheetViewColumn
+ *
+ * Returns %TRUE if editing starts upon the first click in the column. Returns
+ * %FALSE, the first click selects the column and a second click is needed to
+ * begin editing. This is not meaningful for cells that are not editable.
+ *
+ * Return value: %TRUE if editing starts upon the first click.
+ **/
+gboolean
+pspp_sheet_view_column_get_quick_edit (PsppSheetViewColumn *tree_column)
+{
+ g_return_val_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column), FALSE);
+
+ return tree_column->quick_edit;
+}
+
/**
* pspp_sheet_view_column_set_sort_column_id:
* @tree_column: A #PsppSheetViewColumn.
* @tree_model: The #GtkTreeModel to to get the cell renderers attributes from.
* @iter: The #GtkTreeIter to to get the cell renderer's attributes from.
- * @is_expander: %TRUE, if the row has children
- * @is_expanded: %TRUE, if the row has visible children
*
* Sets the cell renderer based on the @tree_model and @iter. That is, for
* every attribute mapping in @tree_column, it will get a value from the set
void
pspp_sheet_view_column_cell_set_cell_data (PsppSheetViewColumn *tree_column,
GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gboolean is_expander,
- gboolean is_expanded)
+ GtkTreeIter *iter)
{
GSList *list;
GValue value = { 0, };
g_object_freeze_notify (cell);
- if (info->cell->is_expander != is_expander)
- g_object_set (cell, "is-expander", is_expander, NULL);
-
- if (info->cell->is_expanded != is_expanded)
- g_object_set (cell, "is-expanded", is_expanded, NULL);
-
while (list && list->next)
{
gtk_tree_model_get_value (tree_model, iter,
}
void
-_pspp_sheet_view_column_cell_set_dirty (PsppSheetViewColumn *tree_column,
- gboolean install_handler)
+_pspp_sheet_view_column_cell_set_dirty (PsppSheetViewColumn *tree_column)
{
GList *list;
if (tree_column->tree_view &&
gtk_widget_get_realized (tree_column->tree_view))
{
- if (install_handler)
- _pspp_sheet_view_install_mark_rows_col_dirty (PSPP_SHEET_VIEW (tree_column->tree_view));
- else
- PSPP_SHEET_VIEW (tree_column->tree_view)->priv->mark_rows_col_dirty = TRUE;
+ _pspp_sheet_view_install_mark_rows_col_dirty (PSPP_SHEET_VIEW (tree_column->tree_view));
gtk_widget_queue_resize (tree_column->tree_view);
}
}
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
if (tree_column->tree_view)
- _pspp_sheet_view_column_cell_set_dirty (tree_column, TRUE);
+ _pspp_sheet_view_column_cell_set_dirty (tree_column);
}
/**
g_return_if_fail (iface->pack_start != NULL);
iface->pack_start (GTK_CELL_LAYOUT (buildable), GTK_CELL_RENDERER (child), FALSE);
}
-
-GType
-pspp_sheet_view_column_sizing_get_type (void)
-{
- static GType etype = 0;
- if (G_UNLIKELY(etype == 0)) {
- static const GEnumValue values[] = {
- { PSPP_SHEET_VIEW_COLUMN_GROW_ONLY, "PSPP_SHEET_VIEW_COLUMN_GROW_ONLY", "grow-only" },
- { PSPP_SHEET_VIEW_COLUMN_AUTOSIZE, "PSPP_SHEET_VIEW_COLUMN_AUTOSIZE", "autosize" },
- { PSPP_SHEET_VIEW_COLUMN_FIXED, "PSPP_SHEET_VIEW_COLUMN_FIXED", "fixed" },
- { 0, NULL, NULL }
- };
- etype = g_enum_register_static (g_intern_static_string ("PsppSheetViewColumnSizing"), values);
- }
- return etype;
-}
projects / pspp / blobdiff