diff options
author | Christopher James Lahey <clahey@helixcode.com> | 2001-01-12 11:57:32 +0800 |
---|---|---|
committer | Chris Lahey <clahey@src.gnome.org> | 2001-01-12 11:57:32 +0800 |
commit | 36c2e495136a79067158d6c08b418bcb7d511657 (patch) | |
tree | 836fe9469f52f093bde82ed6a3349b56be4d8059 /widgets | |
parent | 01a5bc2c2c4ff45929078632294d53660d6263ee (diff) | |
download | gsoc2013-evolution-36c2e495136a79067158d6c08b418bcb7d511657.tar.gz gsoc2013-evolution-36c2e495136a79067158d6c08b418bcb7d511657.tar.zst gsoc2013-evolution-36c2e495136a79067158d6c08b418bcb7d511657.zip |
Added selection_mode argument.
2001-01-11 Christopher James Lahey <clahey@helixcode.com>
* e-table-selection-model.c, e-table-selection-model.h: Added
selection_mode argument.
* e-table-specification.c, e-table-specification.h: Added a
selection_mode field that is set based on the selection-mode
attribute in the ETableSpecification element.
* e-table.c (et_real_construct): Set the selection model's
selection mode based on the ETableSpecification.
svn path=/trunk/; revision=7427
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/table/e-table-selection-model.c | 147 | ||||
-rw-r--r-- | widgets/table/e-table-selection-model.h | 2 | ||||
-rw-r--r-- | widgets/table/e-table-specification.c | 12 | ||||
-rw-r--r-- | widgets/table/e-table-specification.h | 1 | ||||
-rw-r--r-- | widgets/table/e-table.c | 4 |
5 files changed, 114 insertions, 52 deletions
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index d39e7b3c14..05f549c92a 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -40,6 +40,7 @@ enum { ARG_SORTER, ARG_CURSOR_ROW, ARG_CURSOR_COL, + ARG_SELECTION_MODE, }; static void @@ -204,6 +205,10 @@ etsm_get_arg (GtkObject *o, GtkArg *arg, guint arg_id) case ARG_CURSOR_COL: GTK_VALUE_INT(*arg) = etsm->cursor_col; break; + + case ARG_SELECTION_MODE: + GTK_VALUE_ENUM(*arg) = etsm->mode; + break; } } @@ -230,6 +235,13 @@ etsm_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) case ARG_CURSOR_COL: e_table_selection_model_do_something(etsm, etsm->cursor_row, GTK_VALUE_INT(*arg), 0); break; + + case ARG_SELECTION_MODE: + etsm->mode = GTK_VALUE_ENUM(*arg); + if (etsm->mode == GTK_SELECTION_SINGLE) { + e_table_selection_model_do_something(etsm, etsm->cursor_row, etsm->cursor_col, 0); + } + break; } } @@ -242,6 +254,7 @@ e_table_selection_model_init (ETableSelectionModel *selection) selection->selection_start_row = 0; selection->cursor_row = -1; selection->cursor_col = -1; + selection->mode = GTK_SELECTION_MULTIPLE; } static void @@ -286,6 +299,8 @@ e_table_selection_model_class_init (ETableSelectionModelClass *klass) GTK_ARG_READWRITE, ARG_CURSOR_ROW); gtk_object_add_arg_type ("ETableSelectionModel::cursor_col", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_CURSOR_COL); + gtk_object_add_arg_type ("ETableSelectionModel::selection_mode", GTK_TYPE_ENUM, + GTK_ARG_READWRITE, ARG_SELECTION_MODE); } E_MAKE_TYPE(e_table_selection_model, "ETableSelectionModel", ETableSelectionModel, @@ -368,6 +383,70 @@ change_selection(ETableSelectionModel *selection, int start, int end, gboolean g } } +static void +etsm_select_single_row (ETableSelectionModel *selection, int row) +{ + int i; + for (i = 0; i < ((selection->row_count + 31) / 32); i++) { + if (!((i == BOX(row) && selection->selection[i] == BITMASK(row)) || + (i != BOX(row) && selection->selection[i] == 0))) { + g_free(selection->selection); + selection->selection = g_new0(gint, (selection->row_count + 31) / 32); + selection->selection[BOX(row)] = BITMASK(row); + + gtk_signal_emit(GTK_OBJECT(selection), + e_table_selection_model_signals [SELECTION_CHANGED]); + break; + } + } +} + +static void +etsm_toggle_single_row (ETableSelectionModel *selection, int row) +{ + if (selection->selection[BOX(row)] & BITMASK(row)) + selection->selection[BOX(row)] &= ~BITMASK(row); + else + selection->selection[BOX(row)] |= BITMASK(row); + gtk_signal_emit(GTK_OBJECT(selection), + e_table_selection_model_signals [SELECTION_CHANGED]); +} + +static void +etsm_move_selection_end (ETableSelectionModel *selection, int row) +{ + int old_start; + int old_end; + int new_start; + int new_end; + if (selection->sorter && e_table_sorter_needs_sorting(selection->sorter)) { + old_start = MIN (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), + e_table_sorter_model_to_sorted(selection->sorter, selection->cursor_row)); + old_end = MAX (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), + e_table_sorter_model_to_sorted(selection->sorter, selection->cursor_row)) + 1; + new_start = MIN (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), + e_table_sorter_model_to_sorted(selection->sorter, row)); + new_end = MAX (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), + e_table_sorter_model_to_sorted(selection->sorter, row)) + 1; + } else { + old_start = MIN (selection->selection_start_row, selection->cursor_row); + old_end = MAX (selection->selection_start_row, selection->cursor_row) + 1; + new_start = MIN (selection->selection_start_row, row); + new_end = MAX (selection->selection_start_row, row) + 1; + } + /* This wouldn't work nearly so smoothly if one end of the selection weren'theld in place. */ + if (old_start < new_start) + change_selection(selection, old_start, new_start, FALSE); + if (new_start < old_start) + change_selection(selection, new_start, old_start, TRUE); + if (old_end < new_end) + change_selection(selection, old_end, new_end, TRUE); + if (new_end < old_end) + change_selection(selection, new_end, old_end, FALSE); + gtk_signal_emit(GTK_OBJECT(selection), + e_table_selection_model_signals [SELECTION_CHANGED]); +} + void e_table_selection_model_do_something (ETableSelectionModel *selection, guint row, guint col, @@ -383,61 +462,25 @@ void e_table_selection_model_do_something (ETableSelectionModel } } if (selection->row_count >= 0 && row < selection->row_count) { - if (shift_p) { - int old_start; - int old_end; - int new_start; - int new_end; - if (selection->sorter && e_table_sorter_needs_sorting(selection->sorter)) { - old_start = MIN (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), - e_table_sorter_model_to_sorted(selection->sorter, selection->cursor_row)); - old_end = MAX (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), - e_table_sorter_model_to_sorted(selection->sorter, selection->cursor_row)) + 1; - new_start = MIN (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), - e_table_sorter_model_to_sorted(selection->sorter, row)); - new_end = MAX (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row), - e_table_sorter_model_to_sorted(selection->sorter, row)) + 1; - } else { - old_start = MIN (selection->selection_start_row, selection->cursor_row); - old_end = MAX (selection->selection_start_row, selection->cursor_row) + 1; - new_start = MIN (selection->selection_start_row, row); - new_end = MAX (selection->selection_start_row, row) + 1; - } - /* This wouldn't work nearly so smoothly if one end of the selection held in place. */ - if (old_start < new_start) - change_selection(selection, old_start, new_start, FALSE); - if (new_start < old_start) - change_selection(selection, new_start, old_start, TRUE); - if (old_end < new_end) - change_selection(selection, old_end, new_end, TRUE); - if (new_end < old_end) - change_selection(selection, new_end, old_end, FALSE); - gtk_signal_emit(GTK_OBJECT(selection), - e_table_selection_model_signals [SELECTION_CHANGED]); - } else { - if (ctrl_p) { - if (selection->selection[BOX(row)] & BITMASK(row)) - selection->selection[BOX(row)] &= ~BITMASK(row); - else - selection->selection[BOX(row)] |= BITMASK(row); - gtk_signal_emit(GTK_OBJECT(selection), - e_table_selection_model_signals [SELECTION_CHANGED]); + switch (selection->mode) { + case GTK_SELECTION_SINGLE: + etsm_select_single_row (selection, row); + selection->selection_start_row = row; + break; + case GTK_SELECTION_BROWSE: + case GTK_SELECTION_MULTIPLE: + case GTK_SELECTION_EXTENDED: + if (shift_p) { + etsm_move_selection_end (selection, row); } else { - int i; - for (i = 0; i < ((selection->row_count + 31) / 32); i++) { - if (!((i == BOX(row) && selection->selection[i] == BITMASK(row)) || - (i != BOX(row) && selection->selection[i] == 0))) { - g_free(selection->selection); - selection->selection = g_new0(gint, (selection->row_count + 31) / 32); - selection->selection[BOX(row)] = BITMASK(row); - - gtk_signal_emit(GTK_OBJECT(selection), - e_table_selection_model_signals [SELECTION_CHANGED]); - break; - } + if (ctrl_p) { + etsm_toggle_single_row (selection, row); + } else { + etsm_select_single_row (selection, row); } + selection->selection_start_row = row; } - selection->selection_start_row = row; + break; } if (selection->cursor_row != row || selection->cursor_col != col) { diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index 2646189e2c..0178ecd64b 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -32,6 +32,8 @@ typedef struct { guint frozen : 1; guint selection_model_changed : 1; guint group_info_changed : 1; + + GtkSelectionMode mode; } ETableSelectionModel; typedef struct { diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index f44212755b..e562f85ccb 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -62,6 +62,7 @@ etsp_init (ETableSpecification *etsp) etsp->click_to_add = FALSE; etsp->draw_grid = FALSE; etsp->cursor_mode = E_TABLE_CURSOR_SIMPLE; + etsp->selection_mode = GTK_SELECTION_MULTIPLE; etsp->click_to_add_message_ = NULL; } @@ -117,6 +118,17 @@ e_table_specification_load_from_node (ETableSpecification *specification, specification->click_to_add = e_xml_get_bool_prop_by_name(node, "click-to-add"); specification->draw_grid = e_xml_get_bool_prop_by_name(node, "draw-grid"); + specification->selection_mode = GTK_SELECTION_MULTIPLE; + temp = e_xml_get_string_prop_by_name(node, "selection-mode"); + if (temp && !strcasecmp(temp, "single")) { + specification->selection_mode = GTK_SELECTION_SINGLE; + } else if (temp && !strcasecmp(temp, "browse")) { + specification->selection_mode = GTK_SELECTION_BROWSE; + } else if (temp && !strcasecmp(temp, "extended")) { + specification->selection_mode = GTK_SELECTION_EXTENDED; + } + g_free(temp); + specification->cursor_mode = E_TABLE_CURSOR_SIMPLE; temp = e_xml_get_string_prop_by_name(node, "cursor-mode"); if (temp && !strcasecmp(temp, "line")) { diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index 51adc0d66e..64e784733a 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -23,6 +23,7 @@ typedef struct { guint no_headers : 1; guint click_to_add : 1; guint draw_grid : 1; + GtkSelectionMode selection_mode; ETableCursorMode cursor_mode; char *click_to_add_message_; } ETableSpecification; diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 4311005107..2d2303def1 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -891,6 +891,10 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, e_table->cursor_mode = specification->cursor_mode; e_table->full_header = et_spec_to_full_header(e_table, specification, ete); + gtk_object_set(GTK_OBJECT(e_table->selection), + "selection_mode", specification->selection_mode, + NULL); + e_table->model = etm; gtk_object_ref (GTK_OBJECT (etm)); |