[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp lib/gtksheet/gtksheet.c lib/gtksheet/gtksh...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp lib/gtksheet/gtksheet.c lib/gtksheet/gtksh... |
|
Date: |
Wed, 18 Jul 2007 05:32:22 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/07/18 05:32:22
Modified files:
lib/gtksheet : gtksheet.c gtksheet.h
src/ui/gui : data-editor.c data-editor.h psppire-case-file.c
psppire-case-file.h psppire-data-store.c
Log message:
Added popup menus to column and row title areas in datasheet.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.h?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.h?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.h?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.49&r2=1.50
Patches:
Index: lib/gtksheet/gtksheet.c
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- lib/gtksheet/gtksheet.c 18 Jul 2007 04:27:29 -0000 1.26
+++ lib/gtksheet/gtksheet.c 18 Jul 2007 05:32:21 -0000 1.27
@@ -797,6 +797,8 @@
SELECT_COLUMN,
DOUBLE_CLICK_ROW,
DOUBLE_CLICK_COLUMN,
+ BUTTON_EVENT_ROW,
+ BUTTON_EVENT_COLUMN,
SELECT_RANGE,
CLIP_RANGE,
RESIZE_RANGE,
@@ -934,7 +936,7 @@
/**
- * GtkSheet::double - click - row
+ * GtkSheet::double-click-row
* @sheet: the sheet widget that emitted the signal
* @row: the row that was double clicked.
*
@@ -953,7 +955,7 @@
/**
- * GtkSheet::double - click - column
+ * GtkSheet::double-click-column
* @sheet: the sheet widget that emitted the signal
* @column: the column that was double clicked.
*
@@ -971,6 +973,48 @@
G_TYPE_INT);
+ /**
+ * GtkSheet::button-event-column
+ * @sheet: the sheet widget that emitted the signal
+ * @column: the column on which the event occured.
+ *
+ * A button event occured on a column title button
+ */
+ sheet_signals[BUTTON_EVENT_COLUMN] =
+ g_signal_new ("button-event-column",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtkextra_VOID__INT_POINTER,
+ G_TYPE_NONE,
+ 2,
+ G_TYPE_INT,
+ G_TYPE_POINTER
+ );
+
+
+ /**
+ * GtkSheet::button-event-row
+ * @sheet: the sheet widget that emitted the signal
+ * @column: the column on which the event occured.
+ *
+ * A button event occured on a row title button
+ */
+ sheet_signals[BUTTON_EVENT_ROW] =
+ g_signal_new ("button-event-row",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtkextra_VOID__INT_POINTER,
+ G_TYPE_NONE,
+ 2,
+ G_TYPE_INT,
+ G_TYPE_POINTER
+ );
+
+
sheet_signals[SELECT_RANGE] =
g_signal_new ("select-range",
G_TYPE_FROM_CLASS (object_class),
@@ -1209,7 +1253,7 @@
gdk_color_alloc (gdk_colormap_get_system (), &sheet->grid_color);
sheet->show_grid = TRUE;
- sheet->motion_events = 0;
+ sheet->motion_timer = 0;
}
@@ -4879,22 +4923,38 @@
sheet = GTK_SHEET (widget);
- if ( event->type == GDK_2BUTTON_PRESS)
+ /* Cancel any pending tooltips */
+ if (sheet->motion_timer)
{
+ g_source_remove (sheet->motion_timer);
+ sheet->motion_timer = 0;
+ }
+
gtk_widget_get_pointer (widget, &x, &y);
gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
+
if (event->window == sheet->column_title_window)
{
g_signal_emit (G_OBJECT (sheet),
+ sheet_signals[BUTTON_EVENT_COLUMN], 0,
+ column, event);
+
+ if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
+ g_signal_emit (G_OBJECT (sheet),
sheet_signals[DOUBLE_CLICK_COLUMN], 0, column);
+
}
else if (event->window == sheet->row_title_window)
{
g_signal_emit (G_OBJECT (sheet),
+ sheet_signals[BUTTON_EVENT_ROW], 0,
+ row, event);
+
+ if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
+ g_signal_emit (G_OBJECT (sheet),
sheet_signals[DOUBLE_CLICK_ROW], 0, row);
}
- }
gdk_window_get_pointer (widget->window, NULL, NULL, &mods);
@@ -5422,8 +5482,6 @@
motion_timeout_callback (gpointer data)
{
GtkSheet *sheet = GTK_SHEET (data);
- if ( --sheet->motion_events == 0 )
- {
gint x, y;
gint row, column;
gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
@@ -5456,7 +5514,6 @@
g_free (text);
}
}
- }
return FALSE;
}
@@ -5483,8 +5540,9 @@
if (!sheet->hover_window || ! GTK_WIDGET_VISIBLE
(sheet->hover_window->window))
{
- sheet->motion_events++;
- g_timeout_add (TIMEOUT_HOVER, motion_timeout_callback, sheet);
+ if ( sheet->motion_timer > 0 )
+ g_source_remove (sheet->motion_timer);
+ sheet->motion_timer = g_timeout_add (TIMEOUT_HOVER,
motion_timeout_callback, sheet);
}
else
{
Index: lib/gtksheet/gtksheet.h
===================================================================
RCS file: /sources/pspp/pspp/lib/gtksheet/gtksheet.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- lib/gtksheet/gtksheet.h 16 Jul 2007 11:18:09 -0000 1.14
+++ lib/gtksheet/gtksheet.h 18 Jul 2007 05:32:21 -0000 1.15
@@ -228,7 +228,7 @@
GtkSheetRange clip_range;
/* Used for the subtitle (popups) */
- gint motion_events;
+ gint motion_timer;
GtkSheetHoverTitle *hover_window;
};
Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/ui/gui/data-editor.c 18 Jul 2007 04:27:30 -0000 1.39
+++ src/ui/gui/data-editor.c 18 Jul 2007 05:32:22 -0000 1.40
@@ -51,6 +51,15 @@
#include "psppire-var-store.h"
+static void create_data_sheet_variable_popup_menu (struct data_editor *);
+static void create_data_sheet_cases_popup_menu (struct data_editor *);
+
+static void popup_variable_menu (GtkSheet *, gint,
+ GdkEventButton *, gpointer data);
+
+static void popup_cases_menu (GtkSheet *, gint,
+ GdkEventButton *, gpointer data);
+
/* Update the data_ref_entry with the reference of the active cell */
static gint update_data_ref_entry (const GtkSheet *sheet,
gint row, gint col, gpointer data);
@@ -609,6 +618,16 @@
G_CALLBACK (minimise_all_windows), NULL);
+ create_data_sheet_variable_popup_menu (de);
+ create_data_sheet_cases_popup_menu (de);
+
+ g_signal_connect (G_OBJECT (data_sheet), "button-event-column",
+ G_CALLBACK (popup_variable_menu), de);
+
+ g_signal_connect (G_OBJECT (data_sheet), "button-event-row",
+ G_CALLBACK (popup_cases_menu), de);
+
+
select_sheet (de, PAGE_DATA_SHEET);
return de;
@@ -1022,7 +1041,8 @@
{
gint i;
GString *text;
- const struct variable *const * split_vars = dict_get_split_vars
(dict->dict);
+ const struct variable *const * split_vars =
+ dict_get_split_vars (dict->dict);
text = g_string_new (_("Split by "));
@@ -1471,3 +1491,196 @@
return FALSE;
}
+
+
+
+
+
+static void
+do_sort (PsppireDataStore *ds, int var, gboolean descend)
+{
+ GString *string = g_string_new ("SORT CASES BY ");
+
+ const struct variable *v =
+ psppire_dict_get_variable (ds->dict, var);
+
+ g_string_append_printf (string, "%s", var_get_name (v));
+
+ if ( descend )
+ g_string_append (string, " (D)");
+
+ g_string_append (string, ".");
+
+ execute_syntax (create_syntax_string_source (string->str));
+
+ g_string_free (string, TRUE);
+}
+
+
+static void
+sort_up (GtkMenuItem *item, gpointer data)
+{
+ GtkSheet *sheet = data;
+ GtkSheetRange range;
+ gtk_sheet_get_selected_range (sheet, &range);
+
+ do_sort (PSPPIRE_DATA_STORE (gtk_sheet_get_model(sheet)),
+ range.col0, FALSE);
+
+}
+
+static void
+sort_down (GtkMenuItem *item, gpointer data)
+{
+ GtkSheet *sheet = data;
+ GtkSheetRange range;
+ gtk_sheet_get_selected_range (sheet, &range);
+
+ do_sort (PSPPIRE_DATA_STORE (gtk_sheet_get_model(sheet)),
+ range.col0, TRUE);
+}
+
+
+
+
+static void
+create_data_sheet_variable_popup_menu (struct data_editor *de)
+{
+ GtkSheet *sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+ GtkWidget *menu = gtk_menu_new ();
+
+ GtkWidget *sort_ascending =
+ gtk_menu_item_new_with_label (_("Sort Ascending"));
+
+ GtkWidget *sort_descending =
+ gtk_menu_item_new_with_label (_("Sort Descending"));
+
+
+ GtkWidget *insert_variable =
+ gtk_menu_item_new_with_label (_("Insert Variable"));
+
+ GtkWidget *clear_variable =
+ gtk_menu_item_new_with_label (_("Clear"));
+
+
+ gtk_action_connect_proxy (de->insert_variable,
+ insert_variable );
+
+
+ gtk_action_connect_proxy (de->delete_variables,
+ clear_variable );
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+ gtk_separator_menu_item_new ());
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), clear_variable);
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+ gtk_separator_menu_item_new ());
+
+
+ g_signal_connect (G_OBJECT (sort_ascending), "activate",
+ G_CALLBACK (sort_up), sheet);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_ascending);
+
+
+ g_signal_connect (G_OBJECT (sort_descending), "activate",
+ G_CALLBACK (sort_down), sheet);
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_descending);
+
+ gtk_widget_show_all (menu);
+
+
+ de->data_sheet_variable_popup_menu = GTK_MENU(menu);
+}
+
+
+static void
+create_data_sheet_cases_popup_menu (struct data_editor *de)
+{
+ GtkWidget *menu = gtk_menu_new ();
+
+ GtkWidget *insert_case =
+ gtk_menu_item_new_with_label (_("Insert Case"));
+
+ GtkWidget *delete_case =
+ gtk_menu_item_new_with_label (_("Clear"));
+
+
+ gtk_action_connect_proxy (de->insert_case,
+ insert_case);
+
+
+ gtk_action_connect_proxy (de->delete_cases,
+ delete_case);
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+ gtk_separator_menu_item_new ());
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_case);
+
+
+ gtk_widget_show_all (menu);
+
+
+ de->data_sheet_cases_popup_menu = GTK_MENU (menu);
+}
+
+
+static void
+popup_variable_menu (GtkSheet *sheet, gint column,
+ GdkEventButton *event, gpointer data)
+{
+ struct data_editor *de = data;
+
+ PsppireDataStore *data_store =
+ PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+
+ const struct variable *v =
+ psppire_dict_get_variable (data_store->dict, column);
+
+ if ( v && event->button == 3)
+ {
+
+ gtk_sheet_select_column (sheet, column);
+
+ gtk_menu_popup (GTK_MENU (de->data_sheet_variable_popup_menu),
+ NULL, NULL, NULL, NULL,
+ event->button, event->time);
+ }
+}
+
+
+static void
+popup_cases_menu (GtkSheet *sheet, gint row,
+ GdkEventButton *event, gpointer data)
+{
+ struct data_editor *de = data;
+
+ PsppireDataStore *data_store =
+ PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+
+ if ( row <= psppire_data_store_get_case_count (data_store) &&
+ event->button == 3)
+ {
+ gtk_sheet_select_row (sheet, row);
+
+ gtk_menu_popup (GTK_MENU (de->data_sheet_cases_popup_menu),
+ NULL, NULL, NULL, NULL,
+ event->button, event->time);
+ }
+}
Index: src/ui/gui/data-editor.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/ui/gui/data-editor.h 18 Jul 2007 04:27:30 -0000 1.16
+++ src/ui/gui/data-editor.h 18 Jul 2007 05:32:22 -0000 1.17
@@ -31,6 +31,7 @@
GtkAction *action_data_save_as;
GtkAction *action_data_save;
+ /* Actions which invoke dialog boxes */
GtkAction *invoke_weight_cases_dialog;
GtkAction *invoke_transpose_dialog;
GtkAction *invoke_split_file_dialog;
@@ -40,14 +41,18 @@
GtkAction *invoke_goto_dialog;
GtkAction *invoke_variable_info_dialog;
+ /* Actions which do things */
GtkAction *insert_variable;
GtkAction *insert_case;
-
GtkAction *delete_variables;
GtkAction *delete_cases;
GladeXML *xml;
+ GtkMenu *data_sheet_variable_popup_menu;
+ GtkMenu *data_sheet_cases_popup_menu;
+
+
gboolean save_as_portable;
/* Name of the file this data is associated with (ie, was loaded from or
Index: src/ui/gui/psppire-case-file.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/ui/gui/psppire-case-file.c 18 Jul 2007 04:27:30 -0000 1.27
+++ src/ui/gui/psppire-case-file.c 18 Jul 2007 05:32:22 -0000 1.28
@@ -169,6 +169,9 @@
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->datasheet, FALSE);
+ g_return_val_if_fail (first + n_cases <=
+ psppire_case_file_get_case_count (cf), FALSE);
+
datasheet_delete_rows (cf->datasheet, first, n_cases);
g_signal_emit (cf, signals [CASES_DELETED], 0, first, n_cases);
Index: src/ui/gui/psppire-case-file.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/ui/gui/psppire-case-file.h 18 Jul 2007 00:50:59 -0000 1.18
+++ src/ui/gui/psppire-case-file.h 18 Jul 2007 05:32:22 -0000 1.19
@@ -71,7 +71,7 @@
gboolean psppire_case_file_insert_case (PsppireCaseFile *cf, struct ccase *c,
casenumber row);
-casenumber psppire_case_file_get_case_count (const PsppireCaseFile *cf);
+inline casenumber psppire_case_file_get_case_count (const PsppireCaseFile *cf);
union value * psppire_case_file_get_value (const PsppireCaseFile *cf,
Index: src/ui/gui/psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/ui/gui/psppire-data-store.c 18 Jul 2007 00:50:59 -0000 1.49
+++ src/ui/gui/psppire-data-store.c 18 Jul 2007 05:32:22 -0000 1.50
@@ -482,6 +482,8 @@
g_return_val_if_fail (val_cnt > 0, FALSE);
+ g_return_val_if_fail (posn <= psppire_data_store_get_case_count (ds), FALSE);
+
case_create (&cc, val_cnt);
memset ( case_data_rw_idx (&cc, 0), 0, val_cnt * MAX_SHORT_STRING);