aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--widgets/e-table/ChangeLog8
-rw-r--r--widgets/e-table/TODO2
-rw-r--r--widgets/e-table/e-table-header-item.c10
-rw-r--r--widgets/e-table/e-table-header.c7
-rw-r--r--widgets/e-table/e-table-header.h2
-rw-r--r--widgets/e-table/e-table.c5
-rw-r--r--widgets/e-table/test-table.c2
-rw-r--r--widgets/table/e-table-header-item.c10
-rw-r--r--widgets/table/e-table-header.c7
-rw-r--r--widgets/table/e-table-header.h2
-rw-r--r--widgets/table/e-table.c5
-rw-r--r--widgets/table/test-table.c2
12 files changed, 17 insertions, 45 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index 065671f853..621e0607bf 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-10 Miguel de Icaza <miguel@gnu.org>
+
+ * e-table-header-item.c (ethi_drag_motion): Drop frozen count
+ support from here.
+ (ethi_start_drag): ditto.
+
+ * e-table-header.h: Kill frozen_count.
+
2000-04-09 Matt Loper <matt@helixcode.com>
* e-table-col.c (e_table_col_new_with_pixbuf): ref etc->ecell,
diff --git a/widgets/e-table/TODO b/widgets/e-table/TODO
index fd7fe2b91a..43afc73f1e 100644
--- a/widgets/e-table/TODO
+++ b/widgets/e-table/TODO
@@ -2,7 +2,7 @@ Short Term TODO items:
Functionality:
- 1. Remove the internal XML API.
+# 1. Remove the internal XML API.
2. Implement GUI grouping.
3. Implement context menu on item-bars.
4. Implement config tool for the view.
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index 966ad257ad..9c76455d73 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -374,8 +374,6 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
int col;
col = ethi_find_col_by_x (ethi, x);
- if (col < ethi->eth->frozen_count)
- col = ethi->eth->frozen_count;
if (col != -1){
ethi_remove_destroy_marker (ethi);
@@ -430,8 +428,7 @@ ethi_drag_drop (GtkWidget *canvas,
int col;
col = ethi_find_col_by_x (ethi, x);
- if (col < ethi->eth->frozen_count)
- col = ethi->eth->frozen_count;
+
ethi_add_drop_marker (ethi, col);
if (col != -1) {
@@ -778,10 +775,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
GHashTable *arrows = g_hash_table_new (NULL, NULL);
ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
- if (ethi->drag_col < ethi->eth->frozen_count && ethi->drag_col >= 0){
- ethi->maybe_drag = FALSE;
- ethi->drag_col = -1;
- }
+
if (ethi->drag_col == -1)
return;
diff --git a/widgets/e-table/e-table-header.c b/widgets/e-table/e-table-header.c
index 5c5632cdc0..4e9bf278ee 100644
--- a/widgets/e-table/e-table-header.c
+++ b/widgets/e-table/e-table-header.c
@@ -95,7 +95,6 @@ e_table_header_new (void)
ETableHeader *eth;
eth = gtk_type_new (e_table_header_get_type ());
- eth->frozen_count = 0;
return eth;
}
@@ -345,12 +344,6 @@ e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col)
return total;
}
-void
-e_table_header_set_frozen_columns (ETableHeader *eth, int idx)
-{
- eth->frozen_count = idx;
-}
-
/* Forget model-view here. Really, this information belongs in the view anyway. */
#if 0
static void
diff --git a/widgets/e-table/e-table-header.h b/widgets/e-table/e-table-header.h
index 77293ed067..244de59982 100644
--- a/widgets/e-table/e-table-header.h
+++ b/widgets/e-table/e-table-header.h
@@ -30,7 +30,6 @@ struct _ETableHeader {
int col_count;
ETableCol **columns;
gboolean selectable;
- int frozen_count;
#if 0
ETableHeaderSortInfo sort_info;
@@ -82,7 +81,6 @@ void e_table_header_remove (ETableHeader *eth, int idx);
void e_table_header_set_size (ETableHeader *eth, int idx, int size);
void e_table_header_set_selection (ETableHeader *eth,
gboolean allow_selection);
-void e_table_header_set_frozen_columns (ETableHeader *eth, int idx);
int e_table_header_col_diff (ETableHeader *eth,
int start_col, int end_col);
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index 01042503b9..bf3f2127ba 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -715,8 +715,6 @@ et_xml_to_header (ETable *e_table, ETableHeader *full_header, xmlNode *xmlColumn
e_table_header_add_column (nh, e_table_header_get_column (full_header, col), -1);
}
- e_table_header_set_frozen_columns (nh, e_xml_get_integer_prop_by_name(xmlColumns, "frozen_columns"));
-
return nh;
}
@@ -864,8 +862,7 @@ et_build_column_spec (ETable *e_table)
xmlNewChild (columns_shown, NULL, "column", text);
g_free (text);
}
- if (e_table->header->frozen_count != 0)
- e_xml_set_integer_prop_by_name (columns_shown, "frozen_columns", e_table->header->frozen_count);
+
return columns_shown;
}
diff --git a/widgets/e-table/test-table.c b/widgets/e-table/test-table.c
index 2ff657c863..4f2abffb13 100644
--- a/widgets/e-table/test-table.c
+++ b/widgets/e-table/test-table.c
@@ -357,7 +357,7 @@ e_table_test (void)
load_data ();
if (1){/*getenv ("DO")){*/
- do_e_table_demo ("<ETableSpecification> <columns-shown frozen_columns=\"2\"> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
+ do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"1\"> <group column=\"4\" ascending=\"0\"> <leaf column=\"2\" ascending=\"1\"/> </group> </group> </grouping> </ETableSpecification>");
}
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"1\"> <leaf column=\"2\" ascending=\"1\"/> </group> </grouping> </ETableSpecification>");
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 966ad257ad..9c76455d73 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -374,8 +374,6 @@ ethi_drag_motion (GtkObject *canvas, GdkDragContext *context,
int col;
col = ethi_find_col_by_x (ethi, x);
- if (col < ethi->eth->frozen_count)
- col = ethi->eth->frozen_count;
if (col != -1){
ethi_remove_destroy_marker (ethi);
@@ -430,8 +428,7 @@ ethi_drag_drop (GtkWidget *canvas,
int col;
col = ethi_find_col_by_x (ethi, x);
- if (col < ethi->eth->frozen_count)
- col = ethi->eth->frozen_count;
+
ethi_add_drop_marker (ethi, col);
if (col != -1) {
@@ -778,10 +775,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
GHashTable *arrows = g_hash_table_new (NULL, NULL);
ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
- if (ethi->drag_col < ethi->eth->frozen_count && ethi->drag_col >= 0){
- ethi->maybe_drag = FALSE;
- ethi->drag_col = -1;
- }
+
if (ethi->drag_col == -1)
return;
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 5c5632cdc0..4e9bf278ee 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -95,7 +95,6 @@ e_table_header_new (void)
ETableHeader *eth;
eth = gtk_type_new (e_table_header_get_type ());
- eth->frozen_count = 0;
return eth;
}
@@ -345,12 +344,6 @@ e_table_header_col_diff (ETableHeader *eth, int start_col, int end_col)
return total;
}
-void
-e_table_header_set_frozen_columns (ETableHeader *eth, int idx)
-{
- eth->frozen_count = idx;
-}
-
/* Forget model-view here. Really, this information belongs in the view anyway. */
#if 0
static void
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index 77293ed067..244de59982 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -30,7 +30,6 @@ struct _ETableHeader {
int col_count;
ETableCol **columns;
gboolean selectable;
- int frozen_count;
#if 0
ETableHeaderSortInfo sort_info;
@@ -82,7 +81,6 @@ void e_table_header_remove (ETableHeader *eth, int idx);
void e_table_header_set_size (ETableHeader *eth, int idx, int size);
void e_table_header_set_selection (ETableHeader *eth,
gboolean allow_selection);
-void e_table_header_set_frozen_columns (ETableHeader *eth, int idx);
int e_table_header_col_diff (ETableHeader *eth,
int start_col, int end_col);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 01042503b9..bf3f2127ba 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -715,8 +715,6 @@ et_xml_to_header (ETable *e_table, ETableHeader *full_header, xmlNode *xmlColumn
e_table_header_add_column (nh, e_table_header_get_column (full_header, col), -1);
}
- e_table_header_set_frozen_columns (nh, e_xml_get_integer_prop_by_name(xmlColumns, "frozen_columns"));
-
return nh;
}
@@ -864,8 +862,7 @@ et_build_column_spec (ETable *e_table)
xmlNewChild (columns_shown, NULL, "column", text);
g_free (text);
}
- if (e_table->header->frozen_count != 0)
- e_xml_set_integer_prop_by_name (columns_shown, "frozen_columns", e_table->header->frozen_count);
+
return columns_shown;
}
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 2ff657c863..4f2abffb13 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -357,7 +357,7 @@ e_table_test (void)
load_data ();
if (1){/*getenv ("DO")){*/
- do_e_table_demo ("<ETableSpecification> <columns-shown frozen_columns=\"2\"> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
+ do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <leaf column=\"3\" ascending=\"1\"/> </grouping> </ETableSpecification>");
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"3\" ascending=\"1\"> <group column=\"4\" ascending=\"0\"> <leaf column=\"2\" ascending=\"1\"/> </group> </group> </grouping> </ETableSpecification>");
}
do_e_table_demo ("<ETableSpecification> <columns-shown> <column> 0 </column> <column> 1 </column> <column> 2 </column> <column> 3 </column> <column> 4 </column> </columns-shown> <grouping> <group column=\"4\" ascending=\"1\"> <leaf column=\"2\" ascending=\"1\"/> </group> </grouping> </ETableSpecification>");
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 09:44:08 +0800