From fd609b3ab4fea5d6682d6a1c06eee3509b4f2ad4 Mon Sep 17 00:00:00 2001 From: Morten Welinder Date: Tue, 15 May 2018 18:48:14 -0400 Subject: [PATCH] Compilation: don't compile dialogs separately. This makes more code available to introspection and allows more parallel compilation. --- Makefile.am | 1 - NEWS | 1 + configure.ac | 1 - src/Makefile.am | 111 ++++++++++++--- src/dialogs/.gitignore | 2 - src/dialogs/Makefile.am | 93 ------------- src/dialogs/dao-gui-utils.c | 13 +- src/dialogs/dao-gui-utils.h | 6 +- src/dialogs/dialog-advanced-filter.c | 12 +- src/dialogs/dialog-analysis-tool-chi-squared.c | 6 +- src/dialogs/dialog-analysis-tool-frequency.c | 6 +- src/dialogs/dialog-analysis-tool-kaplan-meier.c | 6 +- src/dialogs/dialog-analysis-tool-normality.c | 6 +- src/dialogs/dialog-analysis-tool-one-mean.c | 6 +- .../dialog-analysis-tool-principal-components.c | 12 +- src/dialogs/dialog-analysis-tool-sign-test.c | 14 +- .../dialog-analysis-tool-wilcoxon-mann-whitney.c | 10 +- src/dialogs/dialog-analysis-tools.c | 150 ++++++++++----------- src/dialogs/dialog-autofilter.c | 3 +- src/dialogs/dialog-autoformat.c | 2 +- src/dialogs/dialog-cell-format-cond.c | 3 +- src/dialogs/dialog-cell-format.c | 8 +- src/dialogs/dialog-cell-sort.c | 3 +- src/dialogs/dialog-col-row.c | 6 +- src/dialogs/dialog-col-width.c | 3 +- src/dialogs/dialog-consolidate.c | 6 +- src/dialogs/dialog-data-slicer.c | 2 +- src/dialogs/dialog-define-names.c | 2 +- src/dialogs/dialog-doc-metadata.c | 26 +--- src/dialogs/dialog-fill-series.c | 6 +- src/dialogs/dialog-goto-cell.c | 5 +- src/dialogs/dialog-printer-setup.c | 7 +- src/dialogs/dialog-random-generator-cor.c | 16 +-- src/dialogs/dialog-random-generator.c | 6 +- src/dialogs/dialog-row-height.c | 3 +- src/dialogs/dialog-scenarios.c | 9 +- src/dialogs/dialog-search-replace.c | 3 + src/dialogs/dialog-sheet-order.c | 3 +- src/dialogs/dialog-sheetobject-size.c | 3 +- src/dialogs/dialog-shuffle.c | 6 +- src/dialogs/dialog-simulation.c | 10 +- src/dialogs/dialog-solver.c | 6 +- src/dialogs/dialog-stf-csv-page.c | 4 +- src/dialogs/dialog-stf-export.c | 5 +- src/dialogs/dialog-stf-fixed-page.c | 4 +- src/dialogs/dialog-stf-format-page.c | 4 +- src/dialogs/dialog-stf-main-page.c | 2 +- src/dialogs/dialog-stf-preview.c | 26 ++-- src/dialogs/dialog-stf.c | 4 +- src/dialogs/dialog-view.c | 2 +- src/dialogs/dialog-workbook-attr.c | 2 +- src/dialogs/dialog-zoom.c | 3 +- src/dialogs/tool-dialogs.h | 12 +- 53 files changed, 315 insertions(+), 356 deletions(-) delete mode 100644 src/dialogs/Makefile.am diff --git a/Makefile.am b/Makefile.am index d990accc9..282181af5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,6 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - xmldocs.make \ libspreadsheet.pc.in \ omf.make \ $(DIST_SAMPLES) diff --git a/NEWS b/NEWS index 2b21967db..04eedf321 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ Morten: * Enable ssconvert --export-file-per-sheet for html, latex, and pdf. * Test suite improvements. * ssconvert improvements. + * Makefile improvements. -------------------------------------------------------------------------- Gnumeric 1.12.41 diff --git a/configure.ac b/configure.ac index 5d3a93a94..3413d3421 100644 --- a/configure.ac +++ b/configure.ac @@ -1191,7 +1191,6 @@ icons/256x256/Makefile icons/256x256/apps/Makefile introspection/Makefile src/Makefile -src/dialogs/Makefile src/widgets/Makefile src/tools/Makefile doc/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 0c1893a3c..570172264 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ noinst_PROGRAMS = sstest noinst_HEADERS = dead-kittens.h compilation.h gnm-i18n.h if WITH_GTK - SUBDIRS += dialogs widgets + SUBDIRS += widgets bin_PROGRAMS += gnumeric endif @@ -135,6 +135,86 @@ resource_ui_files = \ wilcoxon-mann-whitney.ui \ workbook-attr.ui +dialog_sources = \ + dialogs/dao-gui-utils.c \ + dialogs/dialog-about.c \ + dialogs/dialog-advanced-filter.c \ + dialogs/dialog-analysis-tools.c \ + dialogs/dialog-analysis-tool-chi-squared.c \ + dialogs/dialog-analysis-tool-frequency.c \ + dialogs/dialog-analysis-tool-kaplan-meier.c \ + dialogs/dialog-analysis-tool-normality.c \ + dialogs/dialog-analysis-tool-one-mean.c \ + dialogs/dialog-analysis-tool-principal-components.c \ + dialogs/dialog-analysis-tool-sign-test.c \ + dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c \ + dialogs/dialog-autofilter.c \ + dialogs/dialog-autoformat.c \ + dialogs/dialog-autosave.c \ + dialogs/dialog-cell-comment.c \ + dialogs/dialog-cell-format.c \ + dialogs/dialog-cell-format-cond.c \ + dialogs/dialog-cell-sort.c \ + dialogs/dialog-col-width.c \ + dialogs/dialog-col-row.c \ + dialogs/dialog-consolidate.c \ + dialogs/dialog-data-slicer.c \ + dialogs/dialog-data-table.c \ + dialogs/dialog-fill-series.c \ + dialogs/dialog-function-select.c \ + dialogs/dialog-formula-guru.c \ + dialogs/dialog-goal-seek.c \ + dialogs/dialog-goto-cell.c \ + dialogs/dialog-hyperlink.c \ + dialogs/dialog-insert-cells.c \ + dialogs/dialog-define-names.c \ + dialogs/dialog-delete-cells.c \ + dialogs/dialog-merge.c \ + dialogs/dialog-password.c \ + dialogs/dialog-paste-special.c \ + dialogs/dialog-plugin-manager.c \ + dialogs/dialog-preferences.c \ + dialogs/dialog-random-generator.c \ + dialogs/dialog-random-generator-cor.c \ + dialogs/dialog-recent.c \ + dialogs/dialog-row-height.c \ + dialogs/dialog-quit.c \ + dialogs/dialog-scenarios.c \ + dialogs/dialog-search.c \ + dialogs/dialog-search-replace.c \ + dialogs/dialog-sheet-compare.c \ + dialogs/dialog-sheet-order.c \ + dialogs/dialog-sheet-rename.c \ + dialogs/dialog-sheet-resize.c \ + dialogs/dialog-sheetobject-size.c \ + dialogs/dialog-shuffle.c \ + dialogs/dialog-simulation.c \ + dialogs/dialog-so-list.c \ + dialogs/dialog-so-styled.c \ + dialogs/dialog-solver.c \ + dialogs/dialog-stf.c \ + dialogs/dialog-stf-main-page.c \ + dialogs/dialog-stf-csv-page.c \ + dialogs/dialog-stf-fixed-page.c \ + dialogs/dialog-stf-format-page.c \ + dialogs/dialog-stf-preview.c \ + dialogs/dialog-stf-export.c \ + dialogs/dialog-tabulate.c \ + dialogs/dialog-doc-metadata.c \ + dialogs/dialog-view.c \ + dialogs/dialog-workbook-attr.c \ + dialogs/dialog-zoom.c \ + dialogs/dialog-printer-setup.c + +dialog_headers = \ + dialogs/help.h \ + dialogs/dao-gui-utils.h \ + dialogs/dialog-stf.h \ + dialogs/dialog-stf-preview.h \ + dialogs/dialog-stf-export.h \ + dialogs/dialogs.h \ + dialogs/tool-dialogs.h + # Another hint, see bugs #172211 and #172212: non-intermediate: gnm-marshalers.c gnmresources.c @@ -159,7 +239,7 @@ libspreadsheet_la_LIBADD = \ $(GNUMERIC_LIBS) \ $(INTLLIBS) -libspreadsheet_la_SOURCES = \ +libspreadsheet_la_SOURCES = \ go-val.h \ go-val.c \ \ @@ -302,7 +382,8 @@ libspreadsheet_la_SOURCES = \ workbook-view.c \ workbook.c \ xml-sax-read.c \ - xml-sax-write.c + xml-sax-write.c \ + $(dialog_sources) nodist_libspreadsheet_la_SOURCES = gnmresources.c gnmresources.h @@ -310,7 +391,7 @@ nodist_libspreadsheet_la_SOURCES = gnmresources.c gnmresources.h # libspreadsheet-ver/spreadsheet/header # doing it now would require massive cvs surgery. libspreadsheet_includedir = $(includedir)/libspreadsheet-@GNUMERIC_API_VER@/spreadsheet -libspreadsheet_include_HEADERS = \ +libspreadsheet_include_HEADERS = \ application.h \ auto-format.h \ cell-draw.h \ @@ -355,9 +436,9 @@ libspreadsheet_include_HEADERS = \ gnumeric-fwd.h \ gnumeric-simple-canvas.h \ gnumeric.h \ - go-data-cache-field.h \ - go-data-cache-source.h \ - go-data-cache.h \ + go-data-cache-field.h \ + go-data-cache-source.h \ + go-data-cache.h \ go-data-slicer-field.h \ go-data-slicer.h \ go-val.h \ @@ -401,9 +482,9 @@ libspreadsheet_include_HEADERS = \ sheet-autofill.h \ sheet-control-gui-priv.h \ sheet-control-gui.h \ - sheet-control-priv.h \ - sheet-control.h \ - sheet-diff.h \ + sheet-control-priv.h \ + sheet-control.h \ + sheet-diff.h \ sheet-filter-combo.h \ sheet-filter.h \ sheet-merge.h \ @@ -418,7 +499,7 @@ libspreadsheet_include_HEADERS = \ sheet-private.h \ sheet-style.h \ sheet-utils.h \ - sheet-view.h \ + sheet-view.h \ sheet.h \ sort.h \ stf-export.h \ @@ -436,13 +517,14 @@ libspreadsheet_include_HEADERS = \ wbc-gtk-impl.h \ wbc-gtk.h \ workbook-cmd-format.h \ - workbook-control-priv.h \ - workbook-control.h \ + workbook-control-priv.h \ + workbook-control.h \ workbook-priv.h \ workbook-view.h \ workbook.h \ xml-io-version.h \ - xml-sax.h + xml-sax.h \ + $(dialog_headers) gnumeric_SOURCES = \ io-context-gtk.c \ @@ -518,7 +600,6 @@ stamp-local.def: $(libspreadsheet_include_HEADERS) Makefile $(top_srcdir)/tools/ endif gnumeric_app_libs = \ - dialogs/libdialogs.la \ tools/libtools.la \ widgets/libwidgets.la diff --git a/src/dialogs/.gitignore b/src/dialogs/.gitignore index 312cbfddf..849f8df79 100644 --- a/src/dialogs/.gitignore +++ b/src/dialogs/.gitignore @@ -1,4 +1,2 @@ -Makefile.in -Makefile .deps *.bak diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am deleted file mode 100644 index 72cb8efa3..000000000 --- a/src/dialogs/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -# -# Keep this in sync with ../../icons/Makefile.am -# - -AM_CPPFLAGS = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGNUMERIC_DATADIR=\""$(gnumeric_datadir)"\" \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/tools \ - -DGNUMERIC_INTERNAL \ - $(GNUMERIC_CFLAGS) - -noinst_LTLIBRARIES = libdialogs.la - -libdialogs_la_SOURCES = \ - help.h \ - dao-gui-utils.c \ - dao-gui-utils.h \ - dialog-about.c \ - dialog-advanced-filter.c \ - dialog-analysis-tools.c \ - dialog-analysis-tool-chi-squared.c \ - dialog-analysis-tool-frequency.c \ - dialog-analysis-tool-kaplan-meier.c \ - dialog-analysis-tool-normality.c \ - dialog-analysis-tool-one-mean.c \ - dialog-analysis-tool-principal-components.c \ - dialog-analysis-tool-sign-test.c \ - dialog-analysis-tool-wilcoxon-mann-whitney.c \ - dialog-autofilter.c \ - dialog-autoformat.c \ - dialog-autosave.c \ - dialog-cell-comment.c \ - dialog-cell-format.c \ - dialog-cell-format-cond.c \ - dialog-cell-sort.c \ - dialog-col-width.c \ - dialog-col-row.c \ - dialog-consolidate.c \ - dialog-data-slicer.c \ - dialog-data-table.c \ - dialog-fill-series.c \ - dialog-function-select.c \ - dialog-formula-guru.c \ - dialog-goal-seek.c \ - dialog-goto-cell.c \ - dialog-hyperlink.c \ - dialog-insert-cells.c \ - dialog-define-names.c \ - dialog-delete-cells.c \ - dialog-merge.c \ - dialog-password.c \ - dialog-paste-special.c \ - dialog-plugin-manager.c \ - dialog-preferences.c \ - dialog-random-generator.c \ - dialog-random-generator-cor.c \ - dialog-recent.c \ - dialog-row-height.c \ - dialog-quit.c \ - dialog-scenarios.c \ - dialog-search.c \ - dialog-search-replace.c \ - dialog-sheet-compare.c \ - dialog-sheet-order.c \ - dialog-sheet-rename.c \ - dialog-sheet-resize.c \ - dialog-sheetobject-size.c \ - dialog-shuffle.c \ - dialog-simulation.c \ - dialog-so-list.c \ - dialog-so-styled.c \ - dialog-solver.c \ - dialog-stf.c \ - dialog-stf.h \ - dialog-stf-main-page.c \ - dialog-stf-csv-page.c \ - dialog-stf-fixed-page.c \ - dialog-stf-format-page.c \ - dialog-stf-preview.c \ - dialog-stf-preview.h \ - dialog-stf-export.c \ - dialog-stf-export.h \ - dialog-tabulate.c \ - dialog-doc-metadata.c \ - dialog-view.c \ - dialog-workbook-attr.c \ - dialog-zoom.c \ - dialogs.h \ - embedded-ui.h \ - tool-dialogs.h \ - dialog-printer-setup.c diff --git a/src/dialogs/dao-gui-utils.c b/src/dialogs/dao-gui-utils.c index 3cc155b6d..5d46a7dfa 100644 --- a/src/dialogs/dao-gui-utils.c +++ b/src/dialogs/dao-gui-utils.c @@ -44,7 +44,7 @@ **/ void -dialog_tool_preset_to_range (GenericToolState *state) +dialog_tool_preset_to_range (GnmGenericToolState *state) { GnmRange const *sel; GtkWidget *w; @@ -63,7 +63,7 @@ dialog_tool_preset_to_range (GenericToolState *state) /** - * dialog_tool_init_outputs: + * dialog_tool_init_outputs: (skip) * @state: * @sensitivity_cb: * @@ -71,7 +71,7 @@ dialog_tool_preset_to_range (GenericToolState *state) * **/ void -dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb) +dialog_tool_init_outputs (GnmGenericToolState *state, GCallback sensitivity_cb) { GtkWidget *dao_box; @@ -91,20 +91,17 @@ dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb) G_CALLBACK (sensitivity_cb), state); gnm_editable_enters (GTK_WINDOW (state->dialog), GTK_WIDGET (state->gdao)); - - return; } /** - * parse_output: - * + * parse_output: (skip) * @state: * @dao: * * fill dao with information from the standard output section of a dialog */ data_analysis_output_t * -parse_output (GenericToolState *state, data_analysis_output_t *dao) +parse_output (GnmGenericToolState *state, data_analysis_output_t *dao) { data_analysis_output_t *this_dao = dao; diff --git a/src/dialogs/dao-gui-utils.h b/src/dialogs/dao-gui-utils.h index bdfb88df7..f2e7633f0 100644 --- a/src/dialogs/dao-gui-utils.h +++ b/src/dialogs/dao-gui-utils.h @@ -34,9 +34,9 @@ #include "tools/dao.h" -void dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb); -data_analysis_output_t *parse_output (GenericToolState *state, data_analysis_output_t *dao); -void dialog_tool_preset_to_range (GenericToolState *state); +void dialog_tool_init_outputs (GnmGenericToolState *state, GCallback sensitivity_cb); +data_analysis_output_t *parse_output (GnmGenericToolState *state, data_analysis_output_t *dao); +void dialog_tool_preset_to_range (GnmGenericToolState *state); #endif diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c index 9fdb01689..2c93972ff 100644 --- a/src/dialogs/dialog-advanced-filter.c +++ b/src/dialogs/dialog-advanced-filter.c @@ -47,7 +47,7 @@ #define ADVANCED_FILTER_KEY "advanced-filter-dialog" -typedef GenericToolState AdvancedFilterState; +typedef GnmGenericToolState AdvancedFilterState; /** * advanced_filter_update_sensitivity_cb: @@ -122,7 +122,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, criteria = gnm_expr_entry_parse_as_value (state->input_entry_2, state->sheet); - dao = parse_output ((GenericToolState *) state, NULL); + dao = parse_output ((GnmGenericToolState *) state, NULL); w = go_gtk_builder_get_widget (state->gui, "unique-button"); unique = (1 == gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w))); @@ -158,7 +158,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, gtk_widget_destroy (state->dialog); break; case analysis_tools_invalid_field: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry_2), _("The given criteria are invalid.")); break; @@ -171,7 +171,7 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, default: text = g_strdup_printf (_("An unexpected error has occurred: " "%d."), err); - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), text); g_free (text); break; @@ -182,10 +182,8 @@ advanced_filter_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, /** * dialog_advanced_filter: * @wbcg: - * @sheet: * * Show the dialog (guru). - * **/ void dialog_advanced_filter (WBCGtk *wbcg) @@ -216,7 +214,7 @@ dialog_advanced_filter (WBCGtk *wbcg) gnm_dao_set_inplace (GNM_DAO (state->gdao), _("Filter _in-place")); gnm_dao_set_put (GNM_DAO (state->gdao), FALSE, FALSE); advanced_filter_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return; } diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c index a9d53c43d..fec085284 100644 --- a/src/dialogs/dialog-analysis-tool-chi-squared.c +++ b/src/dialogs/dialog-analysis-tool-chi-squared.c @@ -55,7 +55,7 @@ #define CHI_SQUARED_I_KEY "analysistools-chi-square-independence-dialog" typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *alpha_entry; GtkWidget *label; } ChiSquaredIToolState; @@ -78,7 +78,7 @@ chi_squared_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, analysis_tools_data_chi_squared_t *data; data = g_new0 (analysis_tools_data_chi_squared_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->input = gnm_expr_entry_parse_as_value (GNM_EXPR_ENTRY (state->base.input_entry), @@ -248,7 +248,7 @@ dialog_chi_square_tool (WBCGtk *wbcg, Sheet *sheet, gboolean independence) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); chi_squared_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c index 5c0eb553b..f3acc9113 100644 --- a/src/dialogs/dialog-analysis-tool-frequency.c +++ b/src/dialogs/dialog-analysis-tool-frequency.c @@ -68,7 +68,7 @@ static char const * const chart_group[] = { }; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *predetermined_button; GtkWidget *calculated_button; GtkEntry *n_entry; @@ -154,7 +154,7 @@ frequency_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, GtkWidget *w; data = g_new0 (analysis_tools_data_frequency_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -291,7 +291,7 @@ dialog_frequency_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); frequency_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); gtk_widget_set_sensitive (GTK_WIDGET (state->n_entry), FALSE); gtk_widget_set_sensitive (state->calculated_button, FALSE); diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c index 15cc4d994..55745dd34 100644 --- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c +++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c @@ -55,7 +55,7 @@ #define KAPLAN_MEIER_KEY "analysistools-kaplan-meier-dialog" typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *censorship_button; GtkWidget *censor_spin_from; GtkWidget *censor_spin_to; @@ -249,7 +249,7 @@ kaplan_meier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, analysis_tools_data_kaplan_meier_t *data; data = g_new0 (analysis_tools_data_kaplan_meier_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.wbc = GNM_WBC (state->base.wbcg); @@ -736,7 +736,7 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); kaplan_meier_tool_update_sensitivity_cb (NULL, state); kaplan_meier_tool_update_groups_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); gtk_widget_show_all (GTK_WIDGET (state->base.dialog)); /* And to hide the in-place button again */ diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c index 37e332e6d..dd849b96a 100644 --- a/src/dialogs/dialog-analysis-tool-normality.c +++ b/src/dialogs/dialog-analysis-tool-normality.c @@ -55,7 +55,7 @@ #define NORMALITY_KEY "analysistools-normality-dialog" typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *alpha_entry; } NormalityTestsToolState; @@ -144,7 +144,7 @@ normality_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, analysis_tools_data_normality_t *data; data = g_new0 (analysis_tools_data_normality_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -218,7 +218,7 @@ dialog_normality_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); normality_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c index 3bd338e56..17fd0cbd2 100644 --- a/src/dialogs/dialog-analysis-tool-one-mean.c +++ b/src/dialogs/dialog-analysis-tool-one-mean.c @@ -62,7 +62,7 @@ static char const * const grouped_by_group[] = { }; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *alpha_entry; GtkWidget *mean_entry; } OneeMeanTestToolState; @@ -137,7 +137,7 @@ one_mean_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, analysis_tools_data_one_mean_test_t *data; data = g_new0 (analysis_tools_data_one_mean_test_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -247,7 +247,7 @@ dialog_one_mean_test_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); one_mean_test_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c b/src/dialogs/dialog-analysis-tool-principal-components.c index 6b0e7941e..d5b74ac4d 100644 --- a/src/dialogs/dialog-analysis-tool-principal-components.c +++ b/src/dialogs/dialog-analysis-tool-principal-components.c @@ -63,7 +63,7 @@ static char const * const grouped_by_group[] = { static void principal_components_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy, - GenericToolState *state) + GnmGenericToolState *state) { GSList *input_range; @@ -101,7 +101,7 @@ principal_components_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy, **/ static void principal_components_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { data_analysis_output_t *dao; analysis_tools_data_generic_t *data; @@ -128,7 +128,7 @@ principal_components_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, char *text; text = g_strdup_printf ( _("An unexpected error has occurred.")); - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), text); g_free (text); } else @@ -149,7 +149,7 @@ principal_components_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, int dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet) { - GenericToolState *state; + GnmGenericToolState *state; char const * plugins[] = { "Gnumeric_fnstat", "Gnumeric_fnmath", "Gnumeric_fnlogical", @@ -163,7 +163,7 @@ dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet) if (gnm_dialog_raise_if_exists (wbcg, PRINCIPAL_COMPONENTS_KEY)) return 0; - state = g_new0 (GenericToolState, 1); + state = g_new0 (GnmGenericToolState, 1); if (dialog_tool_init (state, wbcg, sheet, GNUMERIC_HELP_LINK_PRINCIPAL_COMPONENTS, @@ -177,7 +177,7 @@ dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE); principal_components_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c index 8b32f4988..22e510ddf 100644 --- a/src/dialogs/dialog-analysis-tool-sign-test.c +++ b/src/dialogs/dialog-analysis-tool-sign-test.c @@ -64,7 +64,7 @@ static char const * const grouped_by_group[] = { }; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *alpha_entry; GtkWidget *median_entry; } SignTestToolState; @@ -118,7 +118,7 @@ sign_test_tool_update_common_sensitivity_cb (SignTestToolState *state) /** - * sign_test_tool_update_sensitivity_cb: + * sign_test_two_tool_update_sensitivity_cb: * @dummy: * @state: * @@ -126,7 +126,7 @@ sign_test_tool_update_common_sensitivity_cb (SignTestToolState *state) **/ static void sign_test_two_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy, - SignTestToolState *state) + SignTestToolState *state) { GnmValue *input_range; gint w, h; @@ -195,7 +195,7 @@ sign_test_two_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, analysis_tool_engine engine; data = g_new0 (analysis_tools_data_sign_test_two_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.range_1 = gnm_expr_entry_parse_as_value (GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -285,7 +285,7 @@ dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); sign_test_two_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; @@ -312,7 +312,7 @@ sign_test_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, analysis_tool_engine engine; data = g_new0 (analysis_tools_data_sign_test_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -433,7 +433,7 @@ dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); sign_test_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c index fd9fc91ee..58fce0a94 100644 --- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c +++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c @@ -63,7 +63,7 @@ static char const * const grouped_by_group[] = { static void wilcoxon_mann_whitney_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy, - GenericToolState *state) + GnmGenericToolState *state) { GnmValue *input_range; GnmValue *input_range_2; @@ -116,7 +116,7 @@ wilcoxon_mann_whitney_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy **/ static void wilcoxon_mann_whitney_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { data_analysis_output_t *dao; analysis_tools_data_generic_b_t *data; @@ -166,7 +166,7 @@ wilcoxon_mann_whitney_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, int dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet) { - GenericToolState *state; + GnmGenericToolState *state; char const * plugins[] = { "Gnumeric_fnstat", "Gnumeric_fnmath", "Gnumeric_fnlookup", @@ -180,7 +180,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet) if (gnm_dialog_raise_if_exists (wbcg, WILCOXON_MANN_WHITNEY_KEY)) return 0; - state = g_new0 (GenericToolState, 1); + state = g_new0 (GnmGenericToolState, 1); if (dialog_tool_init (state, wbcg, sheet, GNUMERIC_HELP_LINK_WILCOXON_MANN_WHITNEY, @@ -194,7 +194,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE); wilcoxon_mann_whitney_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c index ad0e3b582..4b0eace9f 100644 --- a/src/dialogs/dialog-analysis-tools.c +++ b/src/dialogs/dialog-analysis-tools.c @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * dialog-analysis-tools.c: * @@ -85,7 +84,7 @@ static char const * const grouped_by_group[] = { }; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *predetermined_button; GtkWidget *calculated_button; GtkEntry *n_entry; @@ -145,7 +144,7 @@ static char const * const exp_smoothing_group[] = { typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *summary_stats_button; GtkWidget *mean_stats_button; GtkWidget *kth_largest_button; @@ -157,7 +156,7 @@ typedef struct { } DescriptiveStatState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *paired_button; GtkWidget *unpaired_button; GtkWidget *known_button; @@ -178,7 +177,7 @@ typedef struct { } TTestState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *options_grid; GtkWidget *method_label; GtkWidget *periodic_button; @@ -196,7 +195,7 @@ typedef struct { } SamplingState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *interval_entry; GtkWidget *show_std_errors; GtkWidget *n_button; @@ -214,7 +213,7 @@ typedef struct { } AverageToolState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *damping_fact_entry; GtkWidget *g_damping_fact_entry; GtkWidget *s_damping_fact_entry; @@ -233,7 +232,7 @@ typedef struct { } ExpSmoothToolState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *confidence_entry; GtkWidget *simple_linear_regression_radio; GtkWidget *switch_variables_check; @@ -241,18 +240,18 @@ typedef struct { } RegressionToolState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *alpha_entry; } AnovaSingleToolState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *alpha_entry; GtkWidget *replication_entry; } AnovaTwoFactorToolState; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *alpha_entry; } FTestToolState; @@ -266,15 +265,14 @@ typedef struct { /** * error_in_entry: - * - * @wbcg: + * @state: * @entry: * @err_str: * * Show an error dialog and select corresponding entry */ void -error_in_entry (GenericToolState *state, GtkWidget *entry, char const *err_str) +error_in_entry (GnmGenericToolState *state, GtkWidget *entry, char const *err_str) { go_gtk_notice_nonmodal_dialog ((GtkWindow *) state->dialog, &(state->warning_dialog), @@ -288,7 +286,7 @@ error_in_entry (GenericToolState *state, GtkWidget *entry, char const *err_str) } static void -cb_tool_destroy (GenericToolState *state) +cb_tool_destroy (GnmGenericToolState *state) { if (state->gui != NULL) g_object_unref (state->gui); @@ -307,7 +305,7 @@ cb_tool_destroy (GenericToolState *state) **/ static void cb_tool_cancel_clicked (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { gtk_widget_destroy (state->dialog); return; @@ -324,7 +322,7 @@ cb_tool_cancel_clicked (G_GNUC_UNUSED GtkWidget *button, * **/ static void -dialog_tool_init_buttons (GenericToolState *state, +dialog_tool_init_buttons (GnmGenericToolState *state, GCallback ok_function, GCallback close_function) { @@ -357,7 +355,7 @@ dialog_tool_init_buttons (GenericToolState *state, /** - * dialog_tool_init: + * dialog_tool_init: (skip) * @state: * @gui_name: * @dialog_name: @@ -368,7 +366,7 @@ dialog_tool_init_buttons (GenericToolState *state, * **/ gboolean -dialog_tool_init (GenericToolState *state, +dialog_tool_init (GnmGenericToolState *state, WBCGtk *wbcg, Sheet *sheet, char const *help_file, @@ -509,7 +507,7 @@ dialog_tool_init (GenericToolState *state, * **/ void -tool_load_selection (GenericToolState *state, gboolean allow_multiple) +tool_load_selection (GnmGenericToolState *state, gboolean allow_multiple) { GnmRange const *first = selection_first_range (state->sv, NULL, NULL); @@ -532,9 +530,11 @@ tool_load_selection (GenericToolState *state, gboolean allow_multiple) } - +/** + * tool_setup_update: (skip) + */ GtkWidget * -tool_setup_update (GenericToolState* state, char const *name, GCallback cb, +tool_setup_update (GnmGenericToolState* state, char const *name, GCallback cb, gpointer closure) { GtkWidget *w = go_gtk_builder_get_widget (state->gui, name); @@ -578,7 +578,7 @@ tool_setup_update (GenericToolState* state, char const *name, GCallback cb, **/ static void tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy, - GenericToolState *state) + GnmGenericToolState *state) { GSList *input_range; @@ -624,7 +624,7 @@ tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy, **/ static void corr_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { data_analysis_output_t *dao; analysis_tools_data_generic_t *data; @@ -650,24 +650,24 @@ corr_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, switch (data->err - 1) { case GROUPED_BY_ROW: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), _("The selected input rows must have equal size!")); break; case GROUPED_BY_COL: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), _("The selected input columns must have equal size!")); break; case GROUPED_BY_AREA: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), _("The selected input areas must have equal size!")); break; default: text = g_strdup_printf ( _("An unexpected error has occurred: %d."), data->err); - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), text); g_free (text); break; @@ -693,7 +693,7 @@ corr_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, int dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet) { - GenericToolState *state; + GnmGenericToolState *state; char const * plugins[] = { "Gnumeric_fnstat", NULL}; @@ -705,7 +705,7 @@ dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet) if (gnm_dialog_raise_if_exists (wbcg, CORRELATION_KEY)) return 0; - state = g_new0 (GenericToolState, 1); + state = g_new0 (GnmGenericToolState, 1); if (dialog_tool_init (state, wbcg, sheet, GNUMERIC_HELP_LINK_CORRELATION, @@ -719,7 +719,7 @@ dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE); tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -744,7 +744,7 @@ dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet) **/ static void cov_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { data_analysis_output_t *dao; analysis_tools_data_generic_t *data; @@ -770,24 +770,24 @@ cov_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, switch (data->err - 1) { case GROUPED_BY_ROW: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), _("The selected input rows must have equal size!")); break; case GROUPED_BY_COL: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), _("The selected input columns must have equal size!")); break; case GROUPED_BY_AREA: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), _("The selected input areas must have equal size!")); break; default: text = g_strdup_printf ( _("An unexpected error has occurred: %d."), data->err); - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry), text); g_free (text); break; @@ -813,7 +813,7 @@ cov_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, int dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet) { - GenericToolState *state; + GnmGenericToolState *state; char const * plugins[] = { "Gnumeric_fnstat", NULL}; @@ -825,7 +825,7 @@ dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet) if (gnm_dialog_raise_if_exists (wbcg, COVARIANCE_KEY)) return 0; - state = g_new0 (GenericToolState, 1); + state = g_new0 (GnmGenericToolState, 1); if (dialog_tool_init (state, wbcg, sheet, GNUMERIC_HELP_LINK_COVARIANCE, @@ -839,7 +839,7 @@ dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE); tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -864,7 +864,7 @@ dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet) **/ static void rank_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { data_analysis_output_t *dao; analysis_tools_data_ranking_t *data; @@ -904,7 +904,7 @@ rank_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, int dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet) { - GenericToolState *state; + GnmGenericToolState *state; char const * plugins[] = { "Gnumeric_fnstat", "Gnumeric_fnlookup", NULL}; @@ -917,7 +917,7 @@ dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet) if (gnm_dialog_raise_if_exists (wbcg, RANK_PERCENTILE_KEY)) return 0; - state = g_new0 (GenericToolState, 1); + state = g_new0 (GnmGenericToolState, 1); if (dialog_tool_init (state, wbcg, sheet, GNUMERIC_HELP_LINK_RANKING, @@ -932,7 +932,7 @@ dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE); tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -956,7 +956,7 @@ dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet) **/ static void fourier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { data_analysis_output_t *dao; analysis_tools_data_fourier_t *data; @@ -997,7 +997,7 @@ fourier_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, int dialog_fourier_tool (WBCGtk *wbcg, Sheet *sheet) { - GenericToolState *state; + GnmGenericToolState *state; char const * plugins[] = { "Gnumeric_fnTimeSeriesAnalysis", "Gnumeric_fncomplex", NULL}; @@ -1010,7 +1010,7 @@ dialog_fourier_tool (WBCGtk *wbcg, Sheet *sheet) if (gnm_dialog_raise_if_exists (wbcg, FOURIER_KEY)) return 0; - state = g_new0 (GenericToolState, 1); + state = g_new0 (GnmGenericToolState, 1); if (dialog_tool_init (state, wbcg, sheet, GNUMERIC_HELP_LINK_FOURIER_ANALYSIS, @@ -1025,7 +1025,7 @@ dialog_fourier_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->gdao), TRUE, TRUE); tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -1057,7 +1057,7 @@ cb_desc_stat_tool_ok_clicked (G_GNUC_UNUSED GtkWidget *button, GtkWidget *w; data = g_new0 (analysis_tools_data_descriptive_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -1286,7 +1286,7 @@ dialog_descriptive_stat_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); desc_stat_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -1321,7 +1321,7 @@ ttest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, int err = 0; data = g_new0 (analysis_tools_data_ttests_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.wbc = GNM_WBC (state->base.wbcg); @@ -1376,7 +1376,7 @@ ttest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, case TTEST_ZTEST: err = entry_to_float (GTK_ENTRY (state->var1_variance), &data->var1, TRUE); if (err != 0 || data->var1 <= 0.0) { - error_in_entry ((GenericToolState *) state, GTK_WIDGET (state->var1_variance), + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->var1_variance), _("Please enter a valid\n" "population variance for variable 1.")); g_free (data); @@ -1385,7 +1385,7 @@ ttest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, } err = entry_to_float (GTK_ENTRY (state->var2_variance), &data->var2, TRUE); if (err != 0 || data->var2 <= 0.0) { - error_in_entry ((GenericToolState *) state, GTK_WIDGET (state->var2_variance), + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->var2_variance), _("Please enter a valid\n" "population variance for variable 2.")); g_free (data); @@ -1674,7 +1674,7 @@ dialog_ttest_tool (WBCGtk *wbcg, Sheet *sheet, ttest_type test) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); ttest_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, FALSE); + tool_load_selection ((GnmGenericToolState *)state, FALSE); return 0; } @@ -1708,7 +1708,7 @@ ftest_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, GtkWidget *w; data = g_new0 (analysis_tools_data_generic_b_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->wbc = GNM_WBC (state->base.wbcg); @@ -1823,7 +1823,7 @@ dialog_ftest_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); ftest_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, FALSE); + tool_load_selection ((GnmGenericToolState *)state, FALSE); return 0; } @@ -1933,7 +1933,7 @@ sampling_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, GtkWidget *w; data = g_new0 (analysis_tools_data_sampling_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.wbc = GNM_WBC (state->base.wbcg); @@ -2116,7 +2116,7 @@ dialog_sampling_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); sampling_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -2173,7 +2173,7 @@ regression_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, gtk_widget_destroy (state->base.warning_dialog); data = g_new0 (analysis_tools_data_regression_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.wbc = GNM_WBC (state->base.wbcg); @@ -2211,7 +2211,7 @@ regression_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, text = g_strdup_printf ( _("An unexpected error has occurred: %d."), data->base.err); - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->base.input_entry), text); g_free (text); @@ -2474,7 +2474,7 @@ dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); regression_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -2504,7 +2504,7 @@ exp_smoothing_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, GtkWidget *w; data = g_new0 (analysis_tools_data_exponential_smoothing_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -2818,7 +2818,7 @@ dialog_exp_smoothing_tool (WBCGtk *wbcg, Sheet *sheet) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->ses_h_button), TRUE); exp_smoothing_ses_h_cb (GTK_TOGGLE_BUTTON (state->ses_h_button), state); exp_smoothing_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -2851,7 +2851,7 @@ average_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, GtkWidget *w; data = g_new0 (analysis_tools_data_moving_average_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -3182,7 +3182,7 @@ dialog_average_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); average_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -3274,7 +3274,7 @@ histogram_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, GtkWidget *w; data = g_new0 (analysis_tools_data_histogram_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -3428,7 +3428,7 @@ dialog_histogram_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); histogram_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->calculated_button), TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->base.gui,"histogram-button")), TRUE); @@ -3464,7 +3464,7 @@ anova_single_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, analysis_tools_data_anova_single_t *data; data = g_new0 (analysis_tools_data_anova_single_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->base.input = gnm_expr_entry_parse_as_list ( GNM_EXPR_ENTRY (state->base.input_entry), state->base.sheet); @@ -3586,7 +3586,7 @@ dialog_anova_single_factor_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); anova_single_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return 0; } @@ -3622,7 +3622,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, gtk_widget_destroy (state->base.warning_dialog); data = g_new0 (analysis_tools_data_anova_two_factor_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->input = gnm_expr_entry_parse_as_value (GNM_EXPR_ENTRY (state->base.input_entry), @@ -3643,7 +3643,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, dao, data, analysis_tool_anova_two_factor_engine, FALSE)) { switch (data->err) { case analysis_tools_missing_data: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->base.input_entry), data->labels ? _("The given input range should contain at " "least two columns and two rows of data and the " @@ -3652,7 +3652,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, "least two columns and two rows of data.")); break; case analysis_tools_too_few_cols: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->base.input_entry), data->labels ? _("The given input range should contain at " "least two columns of data and the " @@ -3661,7 +3661,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, "least two columns of data.")); break; case analysis_tools_too_few_rows: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->base.input_entry), data->labels ? _("The given input range should contain at " "least two rows of data and the " @@ -3671,7 +3671,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, "data.")); break; case analysis_tools_replication_invalid: - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->base.input_entry), _("The number of data rows must be a " "multiple of the replication " @@ -3681,7 +3681,7 @@ anova_two_factor_tool_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, text = g_strdup_printf ( _("An unexpected error has occurred: %d."), data->err); - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->base.input_entry), text); g_free (text); @@ -3829,7 +3829,7 @@ dialog_anova_two_factor_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); anova_two_factor_tool_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, FALSE); + tool_load_selection ((GnmGenericToolState *)state, FALSE); return 0; } diff --git a/src/dialogs/dialog-autofilter.c b/src/dialogs/dialog-autofilter.c index b69b2660d..5b227b063 100644 --- a/src/dialogs/dialog-autofilter.c +++ b/src/dialogs/dialog-autofilter.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-autofilter.c: A pair of dialogs for autofilter conditions * * (c) Copyright 2002 Jody Goldberg diff --git a/src/dialogs/dialog-autoformat.c b/src/dialogs/dialog-autoformat.c index d10435ed4..c05eddc9b 100644 --- a/src/dialogs/dialog-autoformat.c +++ b/src/dialogs/dialog-autoformat.c @@ -499,7 +499,7 @@ cb_canvas_focus (GtkWidget *canvas, /** * dialog_autoformat: - * @wb: The Workbook + * @wbcg: the control that invoked this dialog * * This function will show the AutoFormatTemplate dialog and apply * the template the user chooses to the current selection in the active diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c index e562224cf..65b3e9ccc 100644 --- a/src/dialogs/dialog-cell-format-cond.c +++ b/src/dialogs/dialog-cell-format-cond.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-cell-format-cond.c: Implements a dialog to format cells. * * (c) Copyright 2010-2011 Andreas J. Guelzow diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c index 227c8e976..2d5f61844 100644 --- a/src/dialogs/dialog-cell-format.c +++ b/src/dialogs/dialog-cell-format.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-cell-format.c: Implements a dialog to format cells. * * Authors: @@ -2625,6 +2624,11 @@ dialog_cell_format (WBCGtk *wbcg, FormatDialogPosition_t pageno, gint pages) * - How to distinguish between auto & custom colors on extraction from styles. */ +/** + * dialog_cell_format_select_style: + * + * Returns: (transfer floating): a #GtkDialog. + */ GtkDialog * dialog_cell_format_select_style (WBCGtk *wbcg, gint pages, GtkWindow *w, diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c index 6c1eb705c..2af6f3888 100644 --- a/src/dialogs/dialog-cell-sort.c +++ b/src/dialogs/dialog-cell-sort.c @@ -609,8 +609,9 @@ dialog_load_selection (SortFlowState *state, gboolean *col_rb) } /** - * Refreshes the buttons on a row (un)selection + * cb_sort_selection_changed: * + * Refreshes the buttons on a row (un)selection */ static void cb_sort_selection_changed (SortFlowState *state) diff --git a/src/dialogs/dialog-col-row.c b/src/dialogs/dialog-col-row.c index 687de319b..0a49846a7 100644 --- a/src/dialogs/dialog-col-row.c +++ b/src/dialogs/dialog-col-row.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-col-row.c: group/ungroup dialog * * Author: @@ -74,6 +73,9 @@ cb_dialog_col_row_ok_clicked (G_GNUC_UNUSED GtkWidget *button, gtk_widget_destroy (state->dialog); } +/** + * dialog_col_row: (skip) + */ void dialog_col_row (WBCGtk *wbcg, char const *operation, ColRowCallback_t callback, diff --git a/src/dialogs/dialog-col-width.c b/src/dialogs/dialog-col-width.c index 457868488..cf579b3da 100644 --- a/src/dialogs/dialog-col-width.c +++ b/src/dialogs/dialog-col-width.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-col-width.c: Sets the magnification factor * * Author: diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c index d63683483..15f07b862 100644 --- a/src/dialogs/dialog-consolidate.c +++ b/src/dialogs/dialog-consolidate.c @@ -55,7 +55,7 @@ enum { }; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkComboBox *function; @@ -290,7 +290,7 @@ cb_consolidate_ok_clicked (GtkWidget *button, ConsolidateState *state) if (state->base.warning_dialog != NULL) gtk_widget_destroy (state->base.warning_dialog); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); cs = construct_consolidate (state, dao); /* @@ -543,7 +543,7 @@ dialog_consolidate (WBCGtk *wbcg) /* Primary static initialization */ state = g_new0 (ConsolidateState, 1); - if (dialog_tool_init ((GenericToolState *)state, wbcg, sheet, + if (dialog_tool_init ((GnmGenericToolState *)state, wbcg, sheet, GNUMERIC_HELP_LINK_CONSOLIDATE, "res:ui/consolidate.ui", "Consolidate", _("Could not create the Consolidate dialog."), diff --git a/src/dialogs/dialog-data-slicer.c b/src/dialogs/dialog-data-slicer.c index 95c3b0f0f..2a28f8de9 100644 --- a/src/dialogs/dialog-data-slicer.c +++ b/src/dialogs/dialog-data-slicer.c @@ -1,4 +1,4 @@ -/** +/* * dialog-data-slicer.c: Edit DataSlicers * * (c) Copyright 2008-2009 Jody Goldberg diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c index bc5f470e2..1e2524289 100644 --- a/src/dialogs/dialog-define-names.c +++ b/src/dialogs/dialog-define-names.c @@ -1265,7 +1265,7 @@ dialog_define_names (WBCGtk *wbcg) } /** - * dialog_define_names: + * dialog_paste_names: * @wbcg: * * Create and show the define names dialog. diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c index 699f886c5..987904d50 100644 --- a/src/dialogs/dialog-doc-metadata.c +++ b/src/dialogs/dialog-doc-metadata.c @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * dialog-doc-metadata.c: Edit document metadata * @@ -868,7 +867,6 @@ dialog_doc_metadata_set_gsf_prop_val (DialogDocMetaData *state, /** * dialog_doc_metadata_set_gsf_prop - * * @state: dialog main struct * @name: property name * @value: property value @@ -972,7 +970,6 @@ dialog_doc_metadata_set_gsf_prop (DialogDocMetaData *state, /** * dialog_doc_metadata_set_prop - * * @state: dialog main struct * @prop_name: property name * @prop_value: property value @@ -1063,9 +1060,9 @@ dialog_doc_metadata_set_prop (DialogDocMetaData *state, g_free (new_prop_value ); } -/** +/* * CALLBACKS for 'Description' page entries - **/ + */ static gboolean cb_dialog_doc_metadata_title_changed (GtkEntry *entry, G_GNUC_UNUSED GdkEventFocus *event, @@ -1162,7 +1159,6 @@ cb_dialog_doc_metadata_comments_changed (GtkTextView *view, /** * dialog_doc_metadata_init_description_page - * * @state: dialog main struct * * Initializes the widgets and signals for the 'Description' page. @@ -1321,7 +1317,6 @@ cb_dialog_doc_metadata_keyword_edited (G_GNUC_UNUSED GtkCellRendererText *render /** * dialog_doc_metadata_init_keywords_page - * * @state: dialog main struct * * Initializes the widgets and signals for the 'Description' page. @@ -1400,7 +1395,6 @@ cb_dialog_doc_metadata_value_edited (G_GNUC_UNUSED GtkCellRendererText *renderer /** * cb_dialog_doc_metadata_add_clicked - * * @w: widget * @state: dialog main struct * @@ -1435,7 +1429,6 @@ cb_dialog_doc_metadata_add_clicked (G_GNUC_UNUSED GtkWidget *w, /** * dialog_doc_metadata_update_prop - * * @state: dialog main struct * @prop_name: property name * @prop_value: property value @@ -1523,7 +1516,6 @@ dialog_doc_metadata_update_prop (DialogDocMetaData *state, /** * cb_dialog_doc_metadata_remove_clicked - * * @remove_bt: widget * @state: dialog main struct * @@ -1575,7 +1567,6 @@ cb_dialog_doc_metadata_remove_clicked (GtkWidget *remove_bt, /** * cb_dialog_doc_metadata_tree_prop_selected - * * @combo_box: widget * @state: dialog main struct * @@ -1639,8 +1630,8 @@ cb_dialog_doc_metadata_tree_prop_selected (GtkTreeSelection *selection, } /** - * dialog_doc_metadata_get_prop_val - * + * dialog_doc_metadata_get_prop_val: + * @state: * @prop_name: property name * @prop_value: property value * @@ -1671,7 +1662,6 @@ dialog_doc_metadata_get_prop_val (G_GNUC_UNUSED DialogDocMetaData *state, /** * dialog_doc_metadata_populate_tree_view - * * @name: property name * @prop: property stored in GsfDocMetaData * @state: dialog main struct @@ -1845,7 +1835,6 @@ cb_dialog_doc_metadata_ppt_name_changed (G_GNUC_UNUSED GtkEntry *entry, /** * dialog_doc_metadata_init_properties_page - * * @state: dialog main struct * * Initializes the widgets and signals for the 'Properties' page. @@ -1983,7 +1972,6 @@ dialog_doc_metadata_init_properties_page (DialogDocMetaData *state) /** * dialog_doc_metadata_init_statistics_page - * * @state: dialog main struct * * Initializes the widgets and signals for the 'Statistics' page. @@ -2045,7 +2033,6 @@ cb_dialog_doc_metadata_recalc_iteration_changed (G_GNUC_UNUSED GtkWidget *widget /** * dialog_doc_metadata_init_calculations_page - * * @state: dialog main struct * * Initializes the widgets and signals for the 'Calculations' page. @@ -2093,7 +2080,6 @@ dialog_doc_metadata_init_calculations_page (DialogDocMetaData *state) /** * dialog_doc_metadata_set_file_permissions - * * @state: dialog main struct * * Writes the new file permissions if there were any changes. @@ -2428,12 +2414,10 @@ dialog_doc_metadata_init (DialogDocMetaData *state, ******************************************************************************/ /** - * dialog_doc_metadata_new - * + * dialog_doc_metadata_new: * @wbcg: WBCGtk * * Creates a new instance of the dialog. - * **/ void dialog_doc_metadata_new (WBCGtk *wbcg, int page) diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c index 53fdb0168..dbbd24ac0 100644 --- a/src/dialogs/dialog-fill-series.c +++ b/src/dialogs/dialog-fill-series.c @@ -52,7 +52,7 @@ #define FILL_SERIES_KEY "fill-series-dialog" typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *start_entry; GtkWidget *stop_entry; GtkWidget *step_entry; @@ -92,7 +92,7 @@ cb_fill_series_ok_clicked (G_GNUC_UNUSED GtkWidget *button, data_analysis_output_t *dao; fs = g_new0 (fill_series_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); /* Read the `Series in' radio buttons. */ radio = go_gtk_builder_get_widget (state->base.gui, "series_in_rows"); @@ -247,7 +247,7 @@ dialog_fill_series (WBCGtk *wbcg) state = g_new (FillSeriesState, 1); - if (dialog_tool_init ((GenericToolState *)state, wbcg, sv_sheet (sv), + if (dialog_tool_init ((GnmGenericToolState *)state, wbcg, sv_sheet (sv), GNUMERIC_HELP_LINK_FILL_SERIES, "res:ui/fill-series.ui", "Fill_series", _("Could not create the Fill Series dialog."), diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c index 8298dc5b6..9fec0731b 100644 --- a/src/dialogs/dialog-goto-cell.c +++ b/src/dialogs/dialog-goto-cell.c @@ -1,4 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + /* * dialog-goto-cell.c: Implements the "goto cell/navigator" functionality * @@ -338,11 +338,10 @@ dialog_goto_load_selection (GotoState *state) } /** - * dialog_init: + * dialog_goto_init: * @state: * * Create the dialog (guru). - * **/ static gboolean dialog_goto_init (GotoState *state) diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c index 5719aadd8..f6a264491 100644 --- a/src/dialogs/dialog-printer-setup.c +++ b/src/dialogs/dialog-printer-setup.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-printer-setup.c: Printer setup dialog box * * Authors: @@ -764,7 +763,7 @@ unit_sort_func (GtkTreeModel *model, } -/** +/* * Header and footer are stored with Excel semantics, but displayed with * more natural semantics. In Excel, both top margin and header are measured * from top of sheet. The Gnumeric user interface presents header as the @@ -2888,7 +2887,7 @@ do_fetch_scale (PrinterSetupState *state) } } -/** +/* * Header and footer are stored with Excel semantics, but displayed with * more natural semantics. In Excel, both top margin and header are measured * from top of sheet. See illustration at start of src/print.c. The Gnumeric diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c index 12077838e..b4bd86d95 100644 --- a/src/dialogs/dialog-random-generator-cor.c +++ b/src/dialogs/dialog-random-generator-cor.c @@ -65,7 +65,7 @@ static char const * const matrix_group[] = { }; typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *count_entry; } RandomCorToolState; @@ -76,7 +76,7 @@ typedef struct { /** - * random_tool_update_sensitivity: + * random_cor_tool_update_sensitivity_cb: * @dummy: * @state: * @@ -85,7 +85,7 @@ typedef struct { **/ static void random_cor_tool_update_sensitivity_cb (G_GNUC_UNUSED GtkWidget *dummy, - RandomCorToolState *state) + RandomCorToolState *state) { GnmValue *input_range; gint height, width, count; @@ -148,7 +148,7 @@ random_cor_tool_ok_clicked_cb (GtkWidget *button, RandomCorToolState *state) data = g_new0 (tools_data_random_cor_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); err = entry_to_int (GTK_ENTRY (state->count_entry), &data->count, FALSE); data->matrix = gnm_expr_entry_parse_as_value (GNM_EXPR_ENTRY (state->base.input_entry), @@ -170,7 +170,7 @@ random_cor_tool_ok_clicked_cb (GtkWidget *button, RandomCorToolState *state) /** - * dialog_random_tool_init: + * dialog_random_cor_tool_init: * @state: * * Create the dialog (guru). @@ -190,7 +190,7 @@ dialog_random_cor_tool_init (RandomCorToolState *state) /** - * dialog_random_tool: + * dialog_random_cor_tool: * @wbcg: * @sheet: * @@ -214,7 +214,7 @@ dialog_random_cor_tool (WBCGtk *wbcg, Sheet *sheet) state = g_new (RandomCorToolState, 1); - if (dialog_tool_init ((GenericToolState *)state, wbcg, sheet, + if (dialog_tool_init ((GnmGenericToolState *)state, wbcg, sheet, GNUMERIC_HELP_LINK_RANDOM_GENERATOR_COR, "res:ui/random-generation-cor.ui", "CorRandom", _("Could not create the Correlated Random Tool dialog."), @@ -228,7 +228,7 @@ dialog_random_cor_tool (WBCGtk *wbcg, Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE); dialog_random_cor_tool_init (state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); gtk_widget_show_all (state->base.dialog); diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c index 39e6c7748..abd05328f 100644 --- a/src/dialogs/dialog-random-generator.c +++ b/src/dialogs/dialog-random-generator.c @@ -60,7 +60,7 @@ #define RANDOM_KEY "analysistools-random-dialog" typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *distribution_grid; GtkWidget *distribution_combo; GtkWidget *par1_label; @@ -533,7 +533,7 @@ random_tool_ok_clicked_cb (GtkWidget *button, RandomToolState *state) gint err; data = g_new0 (tools_data_random_t, 1); - dao = parse_output ((GenericToolState *)state, NULL); + dao = parse_output ((GnmGenericToolState *)state, NULL); data->wbc = GNM_WBC (state->base.wbcg); @@ -840,7 +840,7 @@ dialog_random_tool (WBCGtk *wbcg, Sheet *sheet) state = g_new (RandomToolState, 1); - if (dialog_tool_init ((GenericToolState *)state, wbcg, sheet, + if (dialog_tool_init ((GnmGenericToolState *)state, wbcg, sheet, GNUMERIC_HELP_LINK_RANDOM_GENERATOR, "res:ui/random-generation.ui", "Random", _("Could not create the Random Tool dialog."), diff --git a/src/dialogs/dialog-row-height.c b/src/dialogs/dialog-row-height.c index b7b480ade..888ecbc74 100644 --- a/src/dialogs/dialog-row-height.c +++ b/src/dialogs/dialog-row-height.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-row-height.c: Sets the magnification factor * * Author: diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c index 0c1b6b045..251a3f2bb 100644 --- a/src/dialogs/dialog-scenarios.c +++ b/src/dialogs/dialog-scenarios.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-scenarios.c: Create, edit, and view scenarios. * * Author: @@ -48,7 +47,7 @@ #define LIGHT_GRAY GO_COLOR_GREY(199) /* "gray78" */ typedef struct { - GenericToolState base; + GnmGenericToolState base; GtkWidget *show_button; GtkWidget *delete_button; @@ -272,7 +271,7 @@ check_name (const gchar *n) } /** - * scenarios_ok_clicked_cb: + * scenario_add_ok_clicked_cb: * @button: * @state: * @@ -427,7 +426,7 @@ dialog_scenario_add (WBCGtk *wbcg) gnm_editable_enters (GTK_WINDOW (state->base.dialog), GTK_WIDGET (state->name_entry)); scenario_add_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); } diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c index 6d2413cf1..387e79df0 100644 --- a/src/dialogs/dialog-search-replace.c +++ b/src/dialogs/dialog-search-replace.c @@ -225,6 +225,9 @@ range_focused (G_GNUC_UNUSED GtkWidget *widget, return FALSE; } +/** + * dialog_search_replace: (skip) + */ void dialog_search_replace (WBCGtk *wbcg, SearchDialogCallback cb) diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c index ead536f1b..45b659b6a 100644 --- a/src/dialogs/dialog-sheet-order.c +++ b/src/dialogs/dialog-sheet-order.c @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * dialog-sheet-order.c: Dialog to change the order of sheets in the Gnumeric * spreadsheet @@ -423,7 +422,7 @@ sheet_order_cnt_visible (SheetManager *state) return data; } -/** +/* * Refreshes the buttons on a row (un)selection and selects the chosen sheet * for this view. */ diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c index b96f7dfde..c8edf6c7e 100644 --- a/src/dialogs/dialog-sheetobject-size.c +++ b/src/dialogs/dialog-sheetobject-size.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-sheetobject-size.c: * * Author: diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c index af548893e..b2c486c20 100644 --- a/src/dialogs/dialog-shuffle.c +++ b/src/dialogs/dialog-shuffle.c @@ -46,7 +46,7 @@ #define SHUFFLE_KEY "shuffle-dialog" -typedef GenericToolState ShuffleState; +typedef GnmGenericToolState ShuffleState; static char const * const shuffle_by[] = { "shuffle_cols", @@ -122,10 +122,8 @@ shuffle_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, ShuffleState *state) /** * dialog_shuffle: * @wbcg: - * @sheet: * * Show the dialog (guru). - * **/ void dialog_shuffle (WBCGtk *wbcg) @@ -158,7 +156,7 @@ dialog_shuffle (WBCGtk *wbcg) shuffle_update_sensitivity_cb (NULL, state); state->gdao = NULL; - tool_load_selection ((GenericToolState *)state, FALSE); + tool_load_selection ((GnmGenericToolState *)state, FALSE); r = selection_first_range (state->sv, NULL, NULL); if (range_width (r) == 1) diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c index 285457f7c..53eb70881 100644 --- a/src/dialogs/dialog-simulation.c +++ b/src/dialogs/dialog-simulation.c @@ -42,7 +42,7 @@ #define SIMULATION_KEY "simulation-dialog" -typedef GenericToolState SimulationState; +typedef GnmGenericToolState SimulationState; static GtkTextBuffer *results_buffer; static int results_sim_index; @@ -310,7 +310,7 @@ simulation_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, sim.outputs = gnm_expr_entry_parse_as_value (state->input_entry_2, state->sheet); - parse_output ((GenericToolState *) state, &dao); + parse_output ((GnmGenericToolState *) state, &dao); if (prepare_ranges (&sim)) { err = (gchar *) N_("Invalid variable range was given"); @@ -358,7 +358,7 @@ simulation_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, value_release (sim.outputs); if (err != NULL) - error_in_entry ((GenericToolState *) state, + error_in_entry ((GnmGenericToolState *) state, GTK_WIDGET (state->input_entry_2), _(err)); return; } @@ -373,7 +373,7 @@ simulation_ok_clicked_cb (G_GNUC_UNUSED GtkWidget *button, **/ static void cb_tool_cancel_clicked (G_GNUC_UNUSED GtkWidget *button, - GenericToolState *state) + GnmGenericToolState *state) { simulation_tool_destroy (current_sim); gtk_widget_destroy (state->dialog); @@ -450,6 +450,6 @@ dialog_simulation (WBCGtk *wbcg, G_GNUC_UNUSED Sheet *sheet) gnm_dao_set_put (GNM_DAO (state->gdao), FALSE, FALSE); simulation_update_sensitivity_cb (NULL, state); - tool_load_selection ((GenericToolState *)state, TRUE); + tool_load_selection ((GnmGenericToolState *)state, TRUE); return; } diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c index dbdbfb35a..f22988e95 100644 --- a/src/dialogs/dialog-solver.c +++ b/src/dialogs/dialog-solver.c @@ -910,14 +910,14 @@ do { \ /** - * dialog_init: + * dialog_solver_init: * @state: * * Create the dialog (guru). * **/ static gboolean -dialog_init (SolverState *state) +dialog_solver_init (SolverState *state) { GtkGrid *grid; GnmSolverParameters *param; @@ -1261,7 +1261,7 @@ dialog_solver (WBCGtk *wbcg, Sheet *sheet) state->orig_params = gnm_solver_param_dup (sheet->solver_parameters, sheet); - if (dialog_init (state)) { + if (dialog_solver_init (state)) { go_gtk_notice_dialog (wbcg_toplevel (wbcg), GTK_MESSAGE_ERROR, _("Could not create the Solver dialog.")); unref_state (state); diff --git a/src/dialogs/dialog-stf-csv-page.c b/src/dialogs/dialog-stf-csv-page.c index 5be91bf07..165287aad 100644 --- a/src/dialogs/dialog-stf-csv-page.c +++ b/src/dialogs/dialog-stf-csv-page.c @@ -195,11 +195,9 @@ csv_page_parseoptions_to_gui (StfDialogData *pagedata) /** * stf_dialog_csv_page_prepare - * @data: mother struct + * @pagedata: mother struct * * Will prepare the csv page - * - * returns : nothing **/ void stf_dialog_csv_page_prepare (StfDialogData *pagedata) diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c index 2a64508ed..99e82d485 100644 --- a/src/dialogs/dialog-stf-export.c +++ b/src/dialogs/dialog-stf-export.c @@ -1,4 +1,3 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * dialog-stf-export.c : implementation of the STF export dialog * @@ -426,7 +425,7 @@ cb_sheet_select_none (TextExportState *state) set_sheet_selection_count (state, 0); } -/** +/* * Refreshes the buttons on a row (un)selection and selects the chosen sheet * for this view. */ @@ -695,7 +694,7 @@ cb_next_page (TextExportState *state) } /** - * stf_dialog + * stf_export_dialog: * @wbcg: #WBCGtk (can be NULL) * @stfe: An exporter to set up (and take defaults from) * @wb: The #Workbook to export diff --git a/src/dialogs/dialog-stf-fixed-page.c b/src/dialogs/dialog-stf-fixed-page.c index 8ff6c9c84..128f14c97 100644 --- a/src/dialogs/dialog-stf-fixed-page.c +++ b/src/dialogs/dialog-stf-fixed-page.c @@ -459,11 +459,9 @@ fixed_page_auto_clicked (G_GNUC_UNUSED GtkButton *button, /** * stf_dialog_fixed_page_prepare - * @data: mother struct + * @pagedata: mother struct * * Will prepare the fixed page - * - * returns : nothing **/ void stf_dialog_fixed_page_prepare (StfDialogData *pagedata) diff --git a/src/dialogs/dialog-stf-format-page.c b/src/dialogs/dialog-stf-format-page.c index fefcdb105..43cb2bf06 100644 --- a/src/dialogs/dialog-stf-format-page.c +++ b/src/dialogs/dialog-stf-format-page.c @@ -692,12 +692,10 @@ locale_changed_cb (GOLocaleSel *ls, char const *new_locale, /** * stf_dialog_format_page_prepare - * @data: mother struct + * @pagedata: mother struct * * This will prepare the widgets on the format page before * the page gets displayed - * - * returns : nothing **/ void stf_dialog_format_page_prepare (StfDialogData *data) diff --git a/src/dialogs/dialog-stf-main-page.c b/src/dialogs/dialog-stf-main-page.c index 0d9926d66..f5ef6605c 100644 --- a/src/dialogs/dialog-stf-main-page.c +++ b/src/dialogs/dialog-stf-main-page.c @@ -262,7 +262,7 @@ cb_line_breaks (G_GNUC_UNUSED GtkWidget *widget, /** * stf_dialog_main_page_prepare - * @data: mother struct + * @pagedata: mother struct * * This will prepare the widgets on the format page before * the page gets displayed diff --git a/src/dialogs/dialog-stf-preview.c b/src/dialogs/dialog-stf-preview.c index 907f78aa4..a130a008c 100644 --- a/src/dialogs/dialog-stf-preview.c +++ b/src/dialogs/dialog-stf-preview.c @@ -88,12 +88,12 @@ render_get_value (gint row, gint column, gpointer _rd, GValue *value) ******************************************************************************************************************/ /** - * stf_preview_new + * stf_preview_new: (skip) * @data_container: a container in which to put a treeview. * * returns : a new renderdata struct **/ -RenderData_t* +RenderData_t * stf_preview_new (GtkWidget *data_container, GODateConventions const *date_conv) { @@ -152,12 +152,10 @@ stf_preview_new (GtkWidget *data_container, } /** - * stf_preview_free - * @renderdata: a renderdata struct + * stf_preview_free: (skip) + * @data: a renderdata struct * * This will free the @renderdata - * - * returns : nothing **/ void stf_preview_free (RenderData_t *renderdata) @@ -174,6 +172,9 @@ stf_preview_free (RenderData_t *renderdata) g_free (renderdata); } +/** + * stf_preview_set_lines: (skip) + */ void stf_preview_set_lines (RenderData_t *renderdata, GStringChunk *lines_chunk, @@ -254,13 +255,11 @@ stf_preview_set_lines (RenderData_t *renderdata, } /** - * stf_preview_colformats_clear + * stf_preview_colformats_clear: (skip) * @renderdata: a struct containing rendering information * * This will clear the @renderdata->colformats array which contains the format of * each column. - * - * returns : nothing **/ void stf_preview_colformats_clear (RenderData_t *renderdata) @@ -275,7 +274,7 @@ stf_preview_colformats_clear (RenderData_t *renderdata) } /** - * stf_preview_colformats_add + * stf_preview_colformats_add: (skip) * @renderdata: a struct containing rendering information * @format: the format of the column * @@ -295,13 +294,18 @@ stf_preview_colformats_add (RenderData_t *renderdata, GOFormat *format) g_ptr_array_add (renderdata->colformats, go_format_ref (format)); } - +/** + * stf_preview_get_column: (skip) + */ GtkTreeViewColumn * stf_preview_get_column (RenderData_t *renderdata, int col) { return gtk_tree_view_get_column (renderdata->tree_view, col); } +/** + * stf_preview_get_cell_renderer: (skip) + */ GtkCellRenderer * stf_preview_get_cell_renderer (RenderData_t *renderdata, int col) { diff --git a/src/dialogs/dialog-stf.c b/src/dialogs/dialog-stf.c index e32427383..87bdf8641 100644 --- a/src/dialogs/dialog-stf.c +++ b/src/dialogs/dialog-stf.c @@ -234,8 +234,8 @@ stf_dialog_editables_enter (StfDialogData *pagedata) } /** - * stf_dialog - * @wbcg: a Commandcontext (can be NULL) + * stf_dialog: (skip) + * @wbcg: (nullable): * @source: name of the file we are importing (or data) in UTF-8 * @data: the data itself * diff --git a/src/dialogs/dialog-view.c b/src/dialogs/dialog-view.c index 5a63fab4e..04d384f40 100644 --- a/src/dialogs/dialog-view.c +++ b/src/dialogs/dialog-view.c @@ -1,4 +1,4 @@ -/** +/* * dialog-view.c: New view dialog. * * Author: diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c index cfd8ff14f..00a12308d 100644 --- a/src/dialogs/dialog-workbook-attr.c +++ b/src/dialogs/dialog-workbook-attr.c @@ -1,4 +1,4 @@ -/** +/* * dialog-workbook-attr.c: Implements a dialog to set workbook attributes. * * Author: diff --git a/src/dialogs/dialog-zoom.c b/src/dialogs/dialog-zoom.c index 8697e5ee4..f31df3a67 100644 --- a/src/dialogs/dialog-zoom.c +++ b/src/dialogs/dialog-zoom.c @@ -1,5 +1,4 @@ -/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/** +/* * dialog-zoom.c: Sets the magnification factor * * Author: diff --git a/src/dialogs/tool-dialogs.h b/src/dialogs/tool-dialogs.h index 9d9d7b2ea..aac0ad5c9 100644 --- a/src/dialogs/tool-dialogs.h +++ b/src/dialogs/tool-dialogs.h @@ -22,8 +22,8 @@ typedef struct _scenario_state scenario_state_t; -typedef struct _GenericToolState GenericToolState; -typedef void (*state_destroy_t) (GenericToolState *state); +typedef struct _GenericToolState GnmGenericToolState; +typedef void (*state_destroy_t) (GnmGenericToolState *state); struct _GenericToolState { GtkBuilder *gui; @@ -45,9 +45,9 @@ struct _GenericToolState { state_destroy_t state_destroy; } ; -void tool_load_selection (GenericToolState *state, gboolean allow_multiple); -void error_in_entry (GenericToolState *state, GtkWidget *entry, char const *err_str); -gboolean dialog_tool_init (GenericToolState *state, +void tool_load_selection (GnmGenericToolState *state, gboolean allow_multiple); +void error_in_entry (GnmGenericToolState *state, GtkWidget *entry, char const *err_str); +gboolean dialog_tool_init (GnmGenericToolState *state, WBCGtk *wbcg, Sheet *sheet, char const *help_file, @@ -60,7 +60,7 @@ gboolean dialog_tool_init (GenericToolState *state, GCallback sensitivity_cb, GnmExprEntryFlags flags); -GtkWidget *tool_setup_update (GenericToolState* state, +GtkWidget *tool_setup_update (GnmGenericToolState* state, char const *name, GCallback cb, gpointer closure); -- 2.11.4.GIT