Drop frozen count support from here. (ethi_start_drag): ditto.
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. svn path=/trunk/; revision=2385
This commit is contained in:
Miguel de Icaza
committed by
Miguel de Icaza
Miguel de Icaza
parent
3a9e9c6546
commit
901f107f26
@ -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,
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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>");
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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>");
|
||||
|
||||
Reference in New Issue
Block a user