aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/e-table/ChangeLog6
-rw-r--r--widgets/e-table/e-table-header-item.c13
-rw-r--r--widgets/e-table/e-table-item.c1
-rw-r--r--widgets/table/e-table-header-item.c13
-rw-r--r--widgets/table/e-table-item.c1
5 files changed, 34 insertions, 0 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index 56b3ef11f0..8d9d028ab5 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-27 Christopher James Lahey <clahey@helixcode.com>
+
+ * e-table-header-item.c: Added an unsort command.
+
+ * e-table-item.c: leave_edit when you loose the cursor.
+
2000-06-26 Christopher James Lahey <clahey@helixcode.com>
* Makefile.am: Added e-table-click-to-add.c,
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index 1ff89a306d..3ef0a80b35 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -1076,6 +1076,18 @@ ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
}
static void
+ethi_popup_unsort(GtkWidget *widget, EthiHeaderInfo *info)
+{
+ int length;
+ int i;
+ int found = FALSE;
+ ETableHeaderItem *ethi = info->ethi;
+
+ e_table_sort_info_grouping_truncate(ethi->sort_info, 0);
+ e_table_sort_info_sorting_truncate(ethi->sort_info, 0);
+}
+
+static void
ethi_popup_group_field(GtkWidget *widget, EthiHeaderInfo *info)
{
ETableCol *col;
@@ -1137,6 +1149,7 @@ ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info)
static EPopupMenu ethi_context_menu [] = {
{ "Sort Ascending", NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_ascending), 0},
{ "Sort Descending", NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_descending), 0},
+ { "Unsort", NULL, GTK_SIGNAL_FUNC(ethi_popup_unsort), 0},
{ "", NULL, GTK_SIGNAL_FUNC(NULL), 0},
{ "Group By This Field", NULL, GTK_SIGNAL_FUNC(ethi_popup_group_field), 0},
{ "Group By Box", NULL, GTK_SIGNAL_FUNC(ethi_popup_group_box), 1},
diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c
index 9df3b913db..9eca340472 100644
--- a/widgets/e-table/e-table-item.c
+++ b/widgets/e-table/e-table-item.c
@@ -1663,6 +1663,7 @@ eti_selection (GnomeCanvasItem *item, int flags, gpointer data)
eti_request_region_show (eti, col, view_row, col, view_row);
}
if ((cursored) && (flags & E_CANVAS_ITEM_SELECTION_CURSOR) == 0) {
+ e_table_item_leave_edit(eti);
eti->cursor_row = -1;
eti->cursor_col = -1;
}
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 1ff89a306d..3ef0a80b35 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1076,6 +1076,18 @@ ethi_popup_sort_descending(GtkWidget *widget, EthiHeaderInfo *info)
}
static void
+ethi_popup_unsort(GtkWidget *widget, EthiHeaderInfo *info)
+{
+ int length;
+ int i;
+ int found = FALSE;
+ ETableHeaderItem *ethi = info->ethi;
+
+ e_table_sort_info_grouping_truncate(ethi->sort_info, 0);
+ e_table_sort_info_sorting_truncate(ethi->sort_info, 0);
+}
+
+static void
ethi_popup_group_field(GtkWidget *widget, EthiHeaderInfo *info)
{
ETableCol *col;
@@ -1137,6 +1149,7 @@ ethi_popup_customize_view(GtkWidget *widget, EthiHeaderInfo *info)
static EPopupMenu ethi_context_menu [] = {
{ "Sort Ascending", NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_ascending), 0},
{ "Sort Descending", NULL, GTK_SIGNAL_FUNC(ethi_popup_sort_descending), 0},
+ { "Unsort", NULL, GTK_SIGNAL_FUNC(ethi_popup_unsort), 0},
{ "", NULL, GTK_SIGNAL_FUNC(NULL), 0},
{ "Group By This Field", NULL, GTK_SIGNAL_FUNC(ethi_popup_group_field), 0},
{ "Group By Box", NULL, GTK_SIGNAL_FUNC(ethi_popup_group_box), 1},
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 9df3b913db..9eca340472 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1663,6 +1663,7 @@ eti_selection (GnomeCanvasItem *item, int flags, gpointer data)
eti_request_region_show (eti, col, view_row, col, view_row);
}
if ((cursored) && (flags & E_CANVAS_ITEM_SELECTION_CURSOR) == 0) {
+ e_table_item_leave_edit(eti);
eti->cursor_row = -1;
eti->cursor_col = -1;
}