[gnumeric] Namespace
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Namespace
- Date: Mon, 2 Mar 2015 18:35:06 +0000 (UTC)
commit f49154227a0b21c112675ac2ef7dbb391bd55a68
Author: Morten Welinder <terra gnome org>
Date: Mon Mar 2 13:34:29 2015 -0500
Namespace
plugins/gda/plugin-gda.c | 2 +-
plugins/gnome-db/plugin-gnomedb.c | 2 +-
plugins/perl-loader/perl-loader.c | 2 +-
plugins/python-loader/boot.c | 2 +-
plugins/python-loader/python-loader.c | 4 +-
plugins/uihello/uihello.c | 2 +-
src/dialogs/dao-gui-utils.c | 2 +-
src/dialogs/dialog-about.c | 4 +-
src/dialogs/dialog-advanced-filter.c | 2 +-
src/dialogs/dialog-analysis-tool-chi-squared.c | 2 +-
src/dialogs/dialog-analysis-tool-frequency.c | 2 +-
src/dialogs/dialog-analysis-tool-kaplan-meier.c | 4 +-
src/dialogs/dialog-analysis-tool-normality.c | 2 +-
src/dialogs/dialog-analysis-tool-one-mean.c | 2 +-
.../dialog-analysis-tool-principal-components.c | 2 +-
src/dialogs/dialog-analysis-tool-sign-test.c | 4 +-
.../dialog-analysis-tool-wilcoxon-mann-whitney.c | 2 +-
src/dialogs/dialog-analysis-tools.c | 78 +++++++++---------
src/dialogs/dialog-autofilter.c | 14 ++--
src/dialogs/dialog-autoformat.c | 4 +-
src/dialogs/dialog-autosave.c | 8 +-
src/dialogs/dialog-cell-comment.c | 6 +-
src/dialogs/dialog-cell-format-cond.c | 4 +-
src/dialogs/dialog-cell-format.c | 20 +++---
src/dialogs/dialog-cell-sort.c | 18 ++--
src/dialogs/dialog-col-row.c | 6 +-
src/dialogs/dialog-col-width.c | 6 +-
src/dialogs/dialog-consolidate.c | 2 +-
src/dialogs/dialog-data-slicer.c | 6 +-
src/dialogs/dialog-data-table.c | 6 +-
src/dialogs/dialog-define-names.c | 8 +-
src/dialogs/dialog-delete-cells.c | 6 +-
src/dialogs/dialog-doc-metadata.c | 6 +-
src/dialogs/dialog-fill-series.c | 2 +-
src/dialogs/dialog-formula-guru.c | 6 +-
src/dialogs/dialog-function-select.c | 8 +-
src/dialogs/dialog-goal-seek.c | 10 +-
src/dialogs/dialog-goto-cell.c | 6 +-
src/dialogs/dialog-hyperlink.c | 6 +-
src/dialogs/dialog-insert-cells.c | 6 +-
src/dialogs/dialog-merge.c | 8 +-
src/dialogs/dialog-paste-special.c | 6 +-
src/dialogs/dialog-plugin-manager.c | 8 +-
src/dialogs/dialog-preferences.c | 2 +-
src/dialogs/dialog-printer-setup.c | 22 +++---
src/dialogs/dialog-random-generator-cor.c | 4 +-
src/dialogs/dialog-random-generator.c | 12 ++--
src/dialogs/dialog-recent.c | 2 +-
src/dialogs/dialog-row-height.c | 6 +-
src/dialogs/dialog-scenarios.c | 4 +-
src/dialogs/dialog-search-replace.c | 10 +-
src/dialogs/dialog-search.c | 6 +-
src/dialogs/dialog-sheet-order.c | 8 +-
src/dialogs/dialog-sheet-rename.c | 6 +-
src/dialogs/dialog-sheet-resize.c | 4 +-
src/dialogs/dialog-sheetobject-size.c | 6 +-
src/dialogs/dialog-shuffle.c | 2 +-
src/dialogs/dialog-simulation.c | 2 +-
src/dialogs/dialog-so-list.c | 6 +-
src/dialogs/dialog-so-styled.c | 6 +-
src/dialogs/dialog-solver.c | 10 +-
src/dialogs/dialog-stf-export.c | 8 +-
src/dialogs/dialog-stf-fixed-page.c | 6 +-
src/dialogs/dialog-stf.c | 8 +-
src/dialogs/dialog-tabulate.c | 6 +-
src/dialogs/dialog-view.c | 8 +-
src/dialogs/dialog-workbook-attr.c | 6 +-
src/dialogs/dialog-zoom.c | 8 +-
src/gnm-graph-window.h | 1 -
src/gnm-pane.c | 8 +-
src/gnm-plugin.c | 50 ++++++------
src/gnm-plugin.h | 30 ++++----
src/gnm-sheet-slicer.c | 10 +-
src/gnm-sheet-slicer.h | 8 +-
src/gui-file.c | 2 +-
src/gui-file.h | 2 +-
src/gui-util.c | 86 ++++++++-----------
src/gui-util.h | 42 +++++-----
src/io-context-gtk.c | 4 +-
src/item-bar.c | 4 +-
src/item-cursor.c | 10 +-
src/item-grid.c | 2 +-
src/libgnumeric.c | 6 +-
src/sheet-control-gui.c | 10 +-
src/sheet-object-graph.c | 4 +-
src/sheet-object-widget.c | 56 +++++++-------
src/wbc-gtk-edit.c | 2 +-
src/wbc-gtk.c | 12 ++--
src/widgets/gnumeric-expr-entry.c | 4 +-
src/widgets/gnumeric-text-view.c | 2 +-
90 files changed, 406 insertions(+), 423 deletions(-)
---
diff --git a/plugins/gda/plugin-gda.c b/plugins/gda/plugin-gda.c
index aa300b4..ba3ced7 100644
--- a/plugins/gda/plugin-gda.c
+++ b/plugins/gda/plugin-gda.c
@@ -547,7 +547,7 @@ go_plugin_shutdown (GOPlugin *plugin, GOCmdContext *cc)
cnc_hash = NULL;
}
-ModulePluginUIActions const gdaif_ui_actions[] = {
+GnmModulePluginUIActions const gdaif_ui_actions[] = {
{"ViewDataSources", view_data_sources},
{NULL}
};
diff --git a/plugins/gnome-db/plugin-gnomedb.c b/plugins/gnome-db/plugin-gnomedb.c
index 0016674..119e2a0 100644
--- a/plugins/gnome-db/plugin-gnomedb.c
+++ b/plugins/gnome-db/plugin-gnomedb.c
@@ -25,7 +25,7 @@ view_data_sources (GnmAction const *action, WorkbookControl *wbc)
}
}
-ModulePluginUIActions const gnome_db_ui_actions[] = {
+GnmModulePluginUIActions const gnome_db_ui_actions[] = {
{"ViewDataSources", view_data_sources},
{NULL}
};
diff --git a/plugins/perl-loader/perl-loader.c b/plugins/perl-loader/perl-loader.c
index 49a38ab..b0bf8cc 100644
--- a/plugins/perl-loader/perl-loader.c
+++ b/plugins/perl-loader/perl-loader.c
@@ -317,7 +317,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
GOPluginService *service,
GOErrorInfo **ret_error)
{
- PluginServiceFunctionGroupCallbacks *cbs;
+ GnmPluginServiceFunctionGroupCallbacks *cbs;
g_return_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service));
diff --git a/plugins/python-loader/boot.c b/plugins/python-loader/boot.c
index 616c4ae..788f2bb 100644
--- a/plugins/python-loader/boot.c
+++ b/plugins/python-loader/boot.c
@@ -24,7 +24,7 @@ python_get_loader_type (GOErrorInfo **ret_error)
return TYPE_GNM_PYTHON_PLUGIN_LOADER;
}
-ModulePluginUIActions const console_ui_actions[] = {
+GnmModulePluginUIActions const console_ui_actions[] = {
{ "ShowConsole", show_python_console },
{ NULL }
};
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index c4cc56f..dbd7e23 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -723,7 +723,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
fn_info_dict_name);
gnm_python_clear_error_if_needed (loader_python->py_object);
if (python_fn_info_dict != NULL && PyDict_Check (python_fn_info_dict)) {
- PluginServiceFunctionGroupCallbacks *cbs;
+ GnmPluginServiceFunctionGroupCallbacks *cbs;
ServiceLoaderDataFunctionGroup *loader_data;
cbs = go_plugin_service_get_cbs (service);
@@ -835,7 +835,7 @@ gplp_load_service_ui (GOPluginLoader *loader,
ui_action_names);
gnm_python_clear_error_if_needed (loader_python->py_object);
if (ui_actions != NULL && PyDict_Check (ui_actions)) {
- PluginServiceUICallbacks *cbs;
+ GnmPluginServiceUICallbacks *cbs;
ServiceLoaderDataUI *loader_data;
cbs = go_plugin_service_get_cbs (service);
diff --git a/plugins/uihello/uihello.c b/plugins/uihello/uihello.c
index 6c482db..33f44f4 100644
--- a/plugins/uihello/uihello.c
+++ b/plugins/uihello/uihello.c
@@ -36,7 +36,7 @@ hello_message (GnmAction const *action, WorkbookControl *wbc)
g_free (msg);
}
-ModulePluginUIActions const hello_ui_actions[] = {
+GnmModulePluginUIActions const hello_ui_actions[] = {
{ "HelloMenu", NULL },
{ "HelloWorld", hello_message },
{ NULL }
diff --git a/src/dialogs/dao-gui-utils.c b/src/dialogs/dao-gui-utils.c
index c2258ea..1a28da1 100644
--- a/src/dialogs/dao-gui-utils.c
+++ b/src/dialogs/dao-gui-utils.c
@@ -90,7 +90,7 @@ dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb)
g_signal_connect_after (G_OBJECT (state->gdao),
"readiness-changed",
G_CALLBACK (sensitivity_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->gdao));
return;
diff --git a/src/dialogs/dialog-about.c b/src/dialogs/dialog-about.c
index 0915e82..69730d7 100644
--- a/src/dialogs/dialog-about.c
+++ b/src/dialogs/dialog-about.c
@@ -533,7 +533,7 @@ dialog_about (WBCGtk *wbcg)
GList *children;
AboutState *state;
- if (gnumeric_dialog_raise_if_exists (wbcg, ABOUT_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, ABOUT_KEY))
return;
state = g_new0 (AboutState, 1);
@@ -580,6 +580,6 @@ dialog_about (WBCGtk *wbcg)
}
g_list_free (children);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (w), ABOUT_KEY);
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (w), ABOUT_KEY);
gtk_widget_show_all (w);
}
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index 91acce6..9ecc25e 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -199,7 +199,7 @@ dialog_advanced_filter (WBCGtk *wbcg)
wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, ADVANCED_FILTER_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, ADVANCED_FILTER_KEY))
return;
state = g_new (AdvancedFilterState, 1);
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index 73e101b..951cafb 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -207,7 +207,7 @@ dialog_chi_square_tool (WBCGtk *wbcg, Sheet *sheet, gboolean independence)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, CHI_SQUARED_I_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, CHI_SQUARED_I_KEY))
return 0;
state = g_new0 (ChiSquaredIToolState, 1);
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index 7b385dd..823e57b 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -248,7 +248,7 @@ dialog_frequency_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, FREQUENCY_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, FREQUENCY_KEY))
return 0;
state = g_new0 (FrequencyToolState, 1);
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 7e224b4..3e9b510 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -616,7 +616,7 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, KAPLAN_MEIER_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, KAPLAN_MEIER_KEY))
return 0;
state = g_new0 (KaplanMeierToolState, 1);
@@ -726,7 +726,7 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet)
"focus-in-event",
G_CALLBACK (kaplan_meier_tool_set_groups_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->groups_input));
widget = go_gtk_builder_get_widget (state->base.gui, "groups-label");
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index f804857..7d857dc 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -191,7 +191,7 @@ dialog_normality_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, NORMALITY_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, NORMALITY_KEY))
return 0;
state = g_new0 (NormalityTestsToolState, 1);
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index 1fe996a..9b20641 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -214,7 +214,7 @@ dialog_one_mean_test_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, ONE_MEAN_TEST_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, ONE_MEAN_TEST_KEY))
return 0;
state = g_new0 (OneeMeanTestToolState, 1);
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c
b/src/dialogs/dialog-analysis-tool-principal-components.c
index 1850dc8..234acaf 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -161,7 +161,7 @@ dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, PRINCIPAL_COMPONENTS_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, PRINCIPAL_COMPONENTS_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index d9397d6..d24ed2f 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -247,7 +247,7 @@ dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_TWO))
+ if (gnm_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_TWO))
return 0;
state = g_new0 (SignTestToolState, 1);
@@ -395,7 +395,7 @@ dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_ONE))
+ if (gnm_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_ONE))
return 0;
state = g_new0 (SignTestToolState, 1);
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index 4b85557..a5ee216 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -178,7 +178,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, WILCOXON_MANN_WHITNEY_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, WILCOXON_MANN_WHITNEY_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 67ba3b0..4e5a9db 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -352,7 +352,7 @@ dialog_tool_init_buttons (GenericToolState *state,
G_CALLBACK (ok_function), state);
state->help_button = go_gtk_builder_get_widget (state->gui, "helpbutton");
if (state->help_button != NULL )
- gnumeric_init_help_button (state->help_button,
+ gnm_init_help_button (state->help_button,
state->help_link);
}
@@ -431,7 +431,7 @@ dialog_tool_init (GenericToolState *state,
g_signal_connect_after (G_OBJECT (state->input_entry),
"changed",
G_CALLBACK (sensitivity_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->input_entry));
gtk_label_set_mnemonic_widget (GTK_LABEL (widget),
GTK_WIDGET (state->input_entry));
@@ -469,7 +469,7 @@ dialog_tool_init (GenericToolState *state,
g_signal_connect_after (G_OBJECT (state->input_entry_2),
"changed",
G_CALLBACK (sensitivity_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->input_entry_2));
gtk_label_set_mnemonic_widget (GTK_LABEL (widget),
GTK_WIDGET (state->input_entry_2));
@@ -484,7 +484,7 @@ dialog_tool_init (GenericToolState *state,
dialog_tool_init_outputs (state, sensitivity_cb);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog), key);
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog), key);
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog),
state->wbcg,
@@ -541,10 +541,10 @@ tool_setup_update (GenericToolState* state, char const *name, GCallback cb,
GtkWidget *w = go_gtk_builder_get_widget (state->gui, name);
if (GTK_IS_SPIN_BUTTON (w)) {
g_signal_connect_after (w, "value-changed", cb, closure);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog), w);
+ gnm_editable_enters (GTK_WINDOW (state->dialog), w);
} else if (GTK_IS_ENTRY (w)) {
g_signal_connect_after (w, "changed", cb, closure);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog), w);
+ gnm_editable_enters (GTK_WINDOW (state->dialog), w);
} else if (GTK_IS_TOGGLE_BUTTON (w))
g_signal_connect_after (w, "toggled", cb, closure);
else
@@ -703,7 +703,7 @@ dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, CORRELATION_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, CORRELATION_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
@@ -823,7 +823,7 @@ dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, COVARIANCE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, COVARIANCE_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
@@ -915,7 +915,7 @@ dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, RANK_PERCENTILE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, RANK_PERCENTILE_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
@@ -1008,7 +1008,7 @@ dialog_fourier_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, FOURIER_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, FOURIER_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
@@ -1220,7 +1220,7 @@ dialog_descriptive_stat_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, DESCRIPTIVE_STATS_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, DESCRIPTIVE_STATS_KEY))
return 0;
state = g_new0 (DescriptiveStatState, 1);
@@ -1278,11 +1278,11 @@ dialog_descriptive_stat_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->s_entry),
"changed",
G_CALLBACK (desc_stat_tool_update_sensitivity_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->c_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->l_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->s_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
@@ -1600,7 +1600,7 @@ dialog_ttest_tool (WBCGtk *wbcg, Sheet *sheet, ttest_type test)
return 1;
/* Only pop up one copy per workbook */
- dialog = gnumeric_dialog_raise_if_exists (wbcg, TTEST_KEY);
+ dialog = gnm_dialog_raise_if_exists (wbcg, TTEST_KEY);
if (dialog) {
state = g_object_get_data (G_OBJECT (dialog), "state");
state->invocation = test;
@@ -1664,13 +1664,13 @@ dialog_ttest_tool (WBCGtk *wbcg, Sheet *sheet, ttest_type test)
g_signal_connect (G_OBJECT (state->base.dialog),
"realize",
G_CALLBACK (dialog_ttest_realized), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->var1_variance));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->var2_variance));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->mean_diff_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
@@ -1796,7 +1796,7 @@ dialog_ftest_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, FTEST_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, FTEST_KEY))
return 0;
state = g_new0 (FTestToolState, 1);
@@ -1816,7 +1816,7 @@ dialog_ftest_tool (WBCGtk *wbcg, Sheet *sheet)
state->alpha_entry = go_gtk_builder_get_widget (state->base.gui, "one_alpha");
float_to_entry (GTK_ENTRY (state->alpha_entry), 0.05);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
g_signal_connect_after (G_OBJECT (state->alpha_entry),
"changed",
@@ -2053,7 +2053,7 @@ dialog_sampling_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SAMPLING_KEY)) {
+ if (gnm_dialog_raise_if_exists (wbcg, SAMPLING_KEY)) {
return 0;
}
@@ -2108,11 +2108,11 @@ dialog_sampling_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->number_entry),
"changed",
G_CALLBACK (sampling_tool_update_sensitivity_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->period_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->random_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->number_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
@@ -2416,7 +2416,7 @@ dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, REGRESSION_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, REGRESSION_KEY))
return 0;
state = g_new0 (RegressionToolState, 1);
@@ -2439,7 +2439,7 @@ dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->confidence_entry),
"changed",
G_CALLBACK (regression_tool_update_sensitivity_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->confidence_entry));
state->simple_linear_regression_radio
@@ -2726,7 +2726,7 @@ dialog_exp_smoothing_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, EXP_SMOOTHING_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, EXP_SMOOTHING_KEY))
return 0;
state = g_new0 (ExpSmoothToolState, 1);
@@ -2808,11 +2808,11 @@ dialog_exp_smoothing_tool (WBCGtk *wbcg, Sheet *sheet)
"toggled",
G_CALLBACK (exp_smoothing_tes_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->damping_fact_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->g_damping_fact_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->s_damping_fact_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
@@ -3100,7 +3100,7 @@ dialog_average_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, AVERAGE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, AVERAGE_KEY))
return 0;
state = g_new0 (AverageToolState, 1);
@@ -3178,7 +3178,7 @@ dialog_average_tool (WBCGtk *wbcg, Sheet *sheet)
"changed",
G_CALLBACK (average_tool_interval_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->interval_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
@@ -3372,7 +3372,7 @@ dialog_histogram_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, HISTOGRAM_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, HISTOGRAM_KEY))
return 0;
state = g_new0 (HistogramToolState, 1);
@@ -3552,7 +3552,7 @@ dialog_anova_single_factor_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, ANOVA_SINGLE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, ANOVA_SINGLE_KEY))
return 0;
state = g_new0 (AnovaSingleToolState, 1);
@@ -3578,7 +3578,7 @@ dialog_anova_single_factor_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->alpha_entry),
"changed",
G_CALLBACK (anova_single_tool_update_sensitivity_cb), state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
@@ -3784,7 +3784,7 @@ dialog_anova_two_factor_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, ANOVA_TWO_FACTOR_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, ANOVA_TWO_FACTOR_KEY))
return 0;
state = g_new0 (AnovaTwoFactorToolState, 1);
@@ -3819,9 +3819,9 @@ dialog_anova_two_factor_tool (WBCGtk *wbcg, Sheet *sheet)
"changed",
G_CALLBACK (anova_two_factor_tool_update_sensitivity_cb),
state);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->replication_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
diff --git a/src/dialogs/dialog-autofilter.c b/src/dialogs/dialog-autofilter.c
index 8c3947e..b277e57 100644
--- a/src/dialogs/dialog-autofilter.c
+++ b/src/dialogs/dialog-autofilter.c
@@ -331,7 +331,7 @@ init_operator (AutoFilterState *state, GnmFilterOp op, GnmValue const *v,
gtk_combo_box_set_active (GTK_COMBO_BOX (w), i);
w = go_gtk_builder_get_widget (state->gui, val_widget);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog), w);
+ gnm_editable_enters (GTK_WINDOW (state->dialog), w);
if (v != NULL)
gtk_entry_set_text (GTK_ENTRY (w), content ? content : str);
@@ -368,7 +368,7 @@ dialog_auto_filter_expression (WBCGtk *wbcg,
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists
+ if (gnm_dialog_raise_if_exists
(wbcg, DIALOG_KEY_EXPRESSION))
return;
gui = gnm_gtk_builder_load ("autofilter-expression.ui",
@@ -431,7 +431,7 @@ dialog_auto_filter_expression (WBCGtk *wbcg,
G_CALLBACK (cb_autofilter_cancel), state);
/* a candidate for merging into attach guru */
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_AUTOFILTER_CUSTOM);
@@ -443,7 +443,7 @@ dialog_auto_filter_expression (WBCGtk *wbcg,
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)cb_autofilter_destroy);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
DIALOG_KEY_EXPRESSION);
gtk_widget_show (state->dialog);
}
@@ -469,7 +469,7 @@ dialog_auto_filter (WBCGtk *wbcg,
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("autofilter-top10.ui",
NULL, GO_CMD_CONTEXT (wbcg));
@@ -561,7 +561,7 @@ dialog_auto_filter (WBCGtk *wbcg,
G_CALLBACK (cb_autofilter_cancel), state);
/* a candidate for merging into attach guru */
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_AUTOFILTER_TOP_TEN);
@@ -573,7 +573,7 @@ dialog_auto_filter (WBCGtk *wbcg,
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)cb_autofilter_destroy);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
DIALOG_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-autoformat.c b/src/dialogs/dialog-autoformat.c
index 106b0b8..da3d1c0 100644
--- a/src/dialogs/dialog-autoformat.c
+++ b/src/dialogs/dialog-autoformat.c
@@ -411,7 +411,7 @@ cb_canvas_button_press (GocCanvas *canvas,
state->selected_template = ft;
gtk_entry_set_text (state->info_name, _(ft->name));
gtk_entry_set_text (state->info_author, ft->author);
- gnumeric_textview_set_text (GTK_TEXT_VIEW (state->info_descr),
+ gnm_textview_set_text (GTK_TEXT_VIEW (state->info_descr),
_(ft->description));
gtk_entry_set_text (state->info_cat, _(ft->category->name));
@@ -642,7 +642,7 @@ dialog_autoformat (WBCGtk *wbcg)
gtk_widget_show_all (GTK_WIDGET (state->category));
}
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_AUTOFORMAT);
diff --git a/src/dialogs/dialog-autosave.c b/src/dialogs/dialog-autosave.c
index 5f6fadb..fec9dfa 100644
--- a/src/dialogs/dialog-autosave.c
+++ b/src/dialogs/dialog-autosave.c
@@ -122,7 +122,7 @@ dialog_autosave (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, AUTOSAVE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, AUTOSAVE_KEY))
return;
gui = gnm_gtk_builder_load ("autosave.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -155,7 +155,7 @@ dialog_autosave (WBCGtk *wbcg)
float_to_entry (GTK_ENTRY (state->minutes_entry),
secs / 60);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
state->minutes_entry);
g_signal_connect (G_OBJECT (state->autosave_on_off),
@@ -173,7 +173,7 @@ dialog_autosave (WBCGtk *wbcg)
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)g_free);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "button3"),
GNUMERIC_HELP_LINK_AUTOSAVE);
@@ -183,7 +183,7 @@ dialog_autosave (WBCGtk *wbcg)
prompt);
autosave_set_sensitivity (NULL, state);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
AUTOSAVE_KEY);
gtk_widget_show (state->dialog);
diff --git a/src/dialogs/dialog-cell-comment.c b/src/dialogs/dialog-cell-comment.c
index 6b427b1..1ddae4e 100644
--- a/src/dialogs/dialog-cell-comment.c
+++ b/src/dialogs/dialog-cell-comment.c
@@ -106,7 +106,7 @@ dialog_cell_comment (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
g_return_if_fail (sheet != NULL);
g_return_if_fail (pos != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, COMMENT_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, COMMENT_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("cell-comment.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -189,7 +189,7 @@ dialog_cell_comment (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
G_CALLBACK (cb_wrap_toggled), state->gtv);
cb_wrap_toggled (GTK_TOGGLE_BUTTON (check), G_OBJECT (state->gtv));
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_CELL_COMMENT);
@@ -200,7 +200,7 @@ dialog_cell_comment (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog), state->wbcg,
GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
COMMENT_DIALOG_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index 23ca628..6e5ce87 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -1325,7 +1325,7 @@ dialog_cell_format_cond (WBCGtk *wbcg)
c_fmt_dialog_load (state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "helpbutton"),
GNUMERIC_HELP_LINK_CELL_FORMAT_COND);
@@ -1344,7 +1344,7 @@ dialog_cell_format_cond (WBCGtk *wbcg)
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (cb_dialog_destroy), NULL);
- gnumeric_restore_window_geometry (GTK_WINDOW (state->dialog),
+ gnm_restore_window_geometry (GTK_WINDOW (state->dialog),
CELL_FORMAT_KEY);
go_gtk_nonmodal_dialog (wbcg_toplevel (state->wbcg),
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 65f574e..af943ed 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -652,7 +652,7 @@ fmt_dialog_init_align_page (FormatState *state)
G_CALLBACK (cb_indent_changed), state);
/* Catch <return> in the spin box */
- gnumeric_editable_enters (
+ gnm_editable_enters (
GTK_WINDOW (state->dialog),
GTK_WIDGET (w));
@@ -1616,7 +1616,7 @@ validation_rebuild_validation (FormatState *state)
ValidationStyle style = gtk_combo_box_get_active (state->validation.error.action);
ValidationOp op = gtk_combo_box_get_active (state->validation.op);
char *title = gtk_editable_get_chars (GTK_EDITABLE (state->validation.error.title), 0, -1);
- char *msg = gnumeric_textview_get_text (state->validation.error.msg);
+ char *msg = gnm_textview_get_text (state->validation.error.msg);
GnmExprTop const *texpr0 =
validation_entry_to_expr (state->sheet,
state->validation.expr0.entry);
@@ -1801,7 +1801,7 @@ fmt_dialog_init_validation_expr_entry (FormatState *state, ExprEntry *entry,
gtk_grid_attach (state->validation.criteria_grid,
GTK_WIDGET (entry->entry), 1, 3+i, 3, 1);
gtk_widget_show (GTK_WIDGET (entry->entry));
- gnumeric_editable_enters (
+ gnm_editable_enters (
GTK_WINDOW (state->dialog),
GTK_WIDGET (entry->entry));
gnm_expr_entry_set_flags (entry->entry, GNM_EE_FORCE_ABS_REF | GNM_EE_SHEET_OPTIONAL, GNM_EE_MASK);
@@ -1890,7 +1890,7 @@ fmt_dialog_init_validation_page (FormatState *state)
state->validation.error.msg = GTK_TEXT_VIEW (go_gtk_builder_get_widget (state->gui,
"validation_error_msg"));
state->validation.error.image = GTK_IMAGE (go_gtk_builder_get_widget (state->gui,
"validation_error_image"));
- gnumeric_editable_enters (
+ gnm_editable_enters (
GTK_WINDOW (state->dialog),
GTK_WIDGET (state->validation.error.title));
@@ -1933,7 +1933,7 @@ fmt_dialog_init_validation_page (FormatState *state)
gtk_entry_set_text (GTK_ENTRY (state->validation.error.title),
(v->title != NULL) ? v->title->str : "");
if (v->msg != NULL)
- gnumeric_textview_set_text (GTK_TEXT_VIEW (state->validation.error.msg),
+ gnm_textview_set_text (GTK_TEXT_VIEW (state->validation.error.msg),
v->msg->str);
gtk_toggle_button_set_active (state->validation.allow_blank, v->allow_blank);
gtk_toggle_button_set_active (state->validation.use_dropdown, v->use_dropdown);
@@ -1956,7 +1956,7 @@ static void
input_msg_rebuild_input_msg (FormatState *state)
{
GnmInputMsg *im;
- char *msg = gnumeric_textview_get_text (state->input_msg.msg);
+ char *msg = gnm_textview_get_text (state->input_msg.msg);
char const *title = gtk_entry_get_text (state->input_msg.title);
im = gnm_input_msg_new (msg, title);
@@ -2011,12 +2011,12 @@ fmt_dialog_init_input_msg_page (FormatState *state)
if (im) {
gtk_entry_set_text (state->input_msg.title,
gnm_input_msg_get_title (im));
- gnumeric_textview_set_text (state->input_msg.msg,
+ gnm_textview_set_text (state->input_msg.msg,
gnm_input_msg_get_msg (im));
}
gtk_toggle_button_set_active (state->input_msg.flag, im != NULL);
- gnumeric_editable_enters (
+ gnm_editable_enters (
GTK_WINDOW (state->dialog),
GTK_WIDGET (state->input_msg.title));
@@ -2416,7 +2416,7 @@ fmt_dialog_impl (FormatState *state, FormatDialogPosition_t pageno, gint pages)
draw_border_preview (state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "helpbutton"),
GNUMERIC_HELP_LINK_CELL_FORMAT);
@@ -2473,7 +2473,7 @@ fmt_dialog_impl (FormatState *state, FormatDialogPosition_t pageno, gint pages)
}
- gnumeric_restore_window_geometry (GTK_WINDOW (state->dialog),
+ gnm_restore_window_geometry (GTK_WINDOW (state->dialog),
CELL_FORMAT_KEY);
}
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index fec2049..609329b 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -628,7 +628,7 @@ cb_sort_selection_changed (SortFlowState *state)
test = iter;
gtk_widget_set_sensitive
(state->up_button,
- gnm_tree_model_iter_prev (GTK_TREE_MODEL (state->model),
+ gtk_tree_model_iter_previous (GTK_TREE_MODEL (state->model),
&test));
test = iter;
@@ -682,7 +682,7 @@ move_cb (SortFlowState *state,
static void
cb_up (SortFlowState *state)
{
- move_cb (state, gnm_tree_model_iter_prev);
+ move_cb (state, gtk_tree_model_iter_previous);
}
static void
@@ -704,7 +704,7 @@ cb_delete_clicked (G_GNUC_UNUSED GtkWidget *w, SortFlowState *state)
ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (state->model), &iter2);
if (!ok) {
iter2 = iter;
- ok = gnm_tree_model_iter_prev (GTK_TREE_MODEL (state->model), &iter2);
+ ok = gtk_tree_model_iter_previous (GTK_TREE_MODEL (state->model), &iter2);
}
if (ok)
@@ -874,7 +874,7 @@ cb_treeview_keypress (G_GNUC_UNUSED GtkWidget *w, GdkEventKey *event,
}
if (gtk_tree_selection_get_selected (state->selection, NULL, &iter) &&
- gnm_tree_model_iter_prev (GTK_TREE_MODEL (state->model), &iter))
+ gtk_tree_model_iter_previous (GTK_TREE_MODEL (state->model), &iter))
gtk_tree_selection_select_iter (state->selection,
&iter);
return TRUE;
@@ -962,7 +962,7 @@ dialog_init (SortFlowState *state)
gtk_widget_set_hexpand (GTK_WIDGET (state->range_entry), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (state->range_entry),
1, 1, 2, 1);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->range_entry));
gnm_expr_entry_set_update_policy (state->range_entry, GNM_UPDATE_DISCONTINUOUS);
gtk_widget_show (GTK_WIDGET (state->range_entry));
@@ -985,7 +985,7 @@ dialog_init (SortFlowState *state)
gtk_widget_set_hexpand (GTK_WIDGET (state->add_entry), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (state->add_entry),
0, 5, 1, 1);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->add_entry));
gtk_widget_show (GTK_WIDGET (state->add_entry));
@@ -1112,7 +1112,7 @@ dialog_init (SortFlowState *state)
gtk_button_set_alignment (GTK_BUTTON (state->add_button), 0., .5);
gtk_button_set_alignment (GTK_BUTTON (state->delete_button), 0., .5);
gtk_button_set_alignment (GTK_BUTTON (state->clear_button), 0., .5);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_CELL_SORT);
@@ -1151,7 +1151,7 @@ dialog_cell_sort (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, CELL_SORT_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, CELL_SORT_KEY))
return;
gui = gnm_gtk_builder_load ("cell-sort.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -1179,7 +1179,7 @@ dialog_cell_sort (WBCGtk *wbcg)
GTK_ICON_SIZE_LARGE_TOOLBAR);
dialog_init (state);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
CELL_SORT_KEY);
gtk_widget_show (state->dialog);
diff --git a/src/dialogs/dialog-col-row.c b/src/dialogs/dialog-col-row.c
index bbdab7f..061808a 100644
--- a/src/dialogs/dialog-col-row.c
+++ b/src/dialogs/dialog-col-row.c
@@ -85,7 +85,7 @@ dialog_col_row (WBCGtk *wbcg, char const *operation,
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, COL_ROW_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, COL_ROW_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("colrow.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -109,7 +109,7 @@ dialog_col_row (WBCGtk *wbcg, char const *operation,
"clicked",
G_CALLBACK (cb_dialog_col_row_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_GROUP_UNGROUP);
@@ -119,7 +119,7 @@ dialog_col_row (WBCGtk *wbcg, char const *operation,
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify) cb_dialog_col_row_destroy);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
COL_ROW_DIALOG_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-col-width.c b/src/dialogs/dialog-col-width.c
index 6938dbb..5a904d4 100644
--- a/src/dialogs/dialog-col-width.c
+++ b/src/dialogs/dialog-col-width.c
@@ -244,7 +244,7 @@ dialog_col_width (WBCGtk *wbcg, gboolean use_default)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, COL_WIDTH_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, COL_WIDTH_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("col-width.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -286,7 +286,7 @@ dialog_col_width (WBCGtk *wbcg, gboolean use_default)
"clicked",
G_CALLBACK (cb_dialog_col_width_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_COL_WIDTH);
@@ -300,7 +300,7 @@ dialog_col_width (WBCGtk *wbcg, gboolean use_default)
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)g_free);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
COL_WIDTH_DIALOG_KEY);
gtk_widget_show (state->dialog);
g_object_unref (gui);
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index b013be7..e19c756 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -537,7 +537,7 @@ dialog_consolidate (WBCGtk *wbcg)
sheet = sv_sheet (sv);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, CONSOLIDATE_KEY)) {
+ if (gnm_dialog_raise_if_exists (wbcg, CONSOLIDATE_KEY)) {
return;
}
diff --git a/src/dialogs/dialog-data-slicer.c b/src/dialogs/dialog-data-slicer.c
index 486c09b..a51c1c8 100644
--- a/src/dialogs/dialog-data-slicer.c
+++ b/src/dialogs/dialog-data-slicer.c
@@ -224,7 +224,7 @@ dialog_data_slicer (WBCGtk *wbcg, gboolean create)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("data-slicer.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -287,12 +287,12 @@ dialog_data_slicer (WBCGtk *wbcg, gboolean create)
gtk_notebook_set_current_page (GTK_NOTEBOOK (state->notebook), create ? 0 : 1);
/* a candidate for merging into attach guru */
- gnumeric_init_help_button (go_gtk_builder_get_widget (gui, "help_button"),
+ gnm_init_help_button (go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_DATA_SLICER);
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)cb_dialog_data_slicer_destroy);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog), DIALOG_KEY);
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog), DIALOG_KEY);
gtk_widget_show (state->dialog);
g_object_unref (gui);
}
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index 222536c..a2098c8 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -106,12 +106,12 @@ data_table_init (GnmDialogDataTable *state, WBCGtk *wbcg)
g_signal_connect (G_OBJECT (state->dialog), "response",
G_CALLBACK (cb_data_table_response), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help"),
GNUMERIC_HELP_LINK_DATA_TABLE);
/* a candidate for merging into attach guru */
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
DIALOG_DATA_TABLE_KEY);
go_gtk_nonmodal_dialog (wbcg_toplevel (state->wbcg),
GTK_WINDOW (state->dialog));
@@ -137,7 +137,7 @@ dialog_data_table (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
if (wbc_gtk_get_guru (wbcg) ||
- gnumeric_dialog_raise_if_exists (wbcg, DIALOG_DATA_TABLE_KEY))
+ gnm_dialog_raise_if_exists (wbcg, DIALOG_DATA_TABLE_KEY))
return;
sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index ad03bfe..03fb90c 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -1208,13 +1208,13 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
name_guru_populate_list (state);
name_guru_update_sensitivity (selection, state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
is_paste_dialog ? GNUMERIC_HELP_LINK_PASTE_NAMES
: GNUMERIC_HELP_LINK_DEFINE_NAMES);
/* a candidate for merging into attach guru */
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
is_paste_dialog ? PASTE_NAMES_KEY
: DEFINE_NAMES_KEY);
go_gtk_nonmodal_dialog (wbcg_toplevel (state->wbcg),
@@ -1253,7 +1253,7 @@ dialog_define_names (WBCGtk *wbcg)
return;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, DEFINE_NAMES_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, DEFINE_NAMES_KEY))
return;
state = g_new0 (NameGuruState, 1);
@@ -1283,7 +1283,7 @@ dialog_paste_names (WBCGtk *wbcg)
return;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, PASTE_NAMES_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, PASTE_NAMES_KEY))
return;
state = g_new0 (NameGuruState, 1);
diff --git a/src/dialogs/dialog-delete-cells.c b/src/dialogs/dialog-delete-cells.c
index e95bd72..5292487 100644
--- a/src/dialogs/dialog-delete-cells.c
+++ b/src/dialogs/dialog-delete-cells.c
@@ -135,7 +135,7 @@ dialog_delete_cells (WBCGtk *wbcg)
return;
}
- if (gnumeric_dialog_raise_if_exists (wbcg, DELETE_CELL_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, DELETE_CELL_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("delete-cells.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -166,7 +166,7 @@ dialog_delete_cells (WBCGtk *wbcg)
state->wbcg,
GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "helpbutton"),
GNUMERIC_HELP_LINK_DELETE_CELLS);
@@ -180,7 +180,7 @@ dialog_delete_cells (WBCGtk *wbcg)
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify) cb_delete_cell_destroy);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
DELETE_CELL_DIALOG_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index c1801f4..85527ec 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -2395,7 +2395,7 @@ dialog_doc_metadata_init (DialogDocMetaData *state,
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (state->store), ITEM_NAME,
GTK_SORT_ASCENDING);
/* A candidate for merging into attach guru */
- gnumeric_keyed_dialog (state->wbcg,
+ gnm_keyed_dialog (state->wbcg,
GTK_WINDOW (state->dialog),
DOC_METADATA_KEY);
@@ -2408,7 +2408,7 @@ dialog_doc_metadata_init (DialogDocMetaData *state,
state, (GDestroyNotify) dialog_doc_metadata_free);
/* Help and Close buttons */
- gnumeric_init_help_button (GTK_WIDGET (state->help_button),
+ gnm_init_help_button (GTK_WIDGET (state->help_button),
GNUMERIC_HELP_LINK_METADATA);
g_signal_connect_swapped (G_OBJECT (state->close_button),
@@ -2445,7 +2445,7 @@ dialog_doc_metadata_new (WBCGtk *wbcg, int page)
return;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, DOC_METADATA_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, DOC_METADATA_KEY))
return;
state = g_new0 (DialogDocMetaData, 1);
diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c
index 35ecd5b..ca71f94 100644
--- a/src/dialogs/dialog-fill-series.c
+++ b/src/dialogs/dialog-fill-series.c
@@ -242,7 +242,7 @@ dialog_fill_series (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, FILL_SERIES_KEY)) {
+ if (gnm_dialog_raise_if_exists (wbcg, FILL_SERIES_KEY)) {
return;
}
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index 89245b4..769427a 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -963,7 +963,7 @@ dialog_formula_guru_init (FormulaGuruState *state)
"clicked",
G_CALLBACK (cb_dialog_formula_guru_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_FORMULA_GURU);
@@ -1004,7 +1004,7 @@ dialog_formula_guru (WBCGtk *wbcg, GnmFunc *fd)
g_return_if_fail (wbcg != NULL);
- dialog = gnumeric_dialog_raise_if_exists (wbcg, FORMULA_GURU_KEY);
+ dialog = gnm_dialog_raise_if_exists (wbcg, FORMULA_GURU_KEY);
if (dialog) {
/* We already exist */
@@ -1095,7 +1095,7 @@ dialog_formula_guru (WBCGtk *wbcg, GnmFunc *fd)
return;
}
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
FORMULA_GURU_KEY);
gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (state->dialog)));
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index 95a71aa..211419b 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -320,7 +320,7 @@ static void
cb_dialog_function_select_destroy (FunctionSelectState *state)
{
if (state->formula_guru_key &&
- gnumeric_dialog_raise_if_exists (state->wbcg, state->formula_guru_key)) {
+ gnm_dialog_raise_if_exists (state->wbcg, state->formula_guru_key)) {
/* The formula guru is waiting for us.*/
state->formula_guru_key = NULL;
dialog_formula_guru (state->wbcg, NULL);
@@ -1327,7 +1327,7 @@ dialog_function_select_init (FunctionSelectState *state)
state->wbcg,
GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_FUNCTION_SELECT);
g_object_set_data_full
@@ -1373,7 +1373,7 @@ dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, key))
+ if (gnm_dialog_raise_if_exists (wbcg, key))
return;
gui = gnm_gtk_builder_load ("function-select.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -1406,7 +1406,7 @@ dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
state->paste.prefix = NULL;
dialog_function_select_init (state);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
key);
gtk_widget_show (state->dialog);
diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c
index 4063c26..003fb20 100644
--- a/src/dialogs/dialog-goal-seek.c
+++ b/src/dialogs/dialog-goal-seek.c
@@ -529,7 +529,7 @@ dialog_init (GoalSeekState *state)
"clicked",
G_CALLBACK (cb_dialog_apply_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "helpbutton"),
GNUMERIC_HELP_LINK_GOAL_SEEK);
@@ -555,7 +555,7 @@ dialog_init (GoalSeekState *state)
gtk_grid_attach (grid, GTK_WIDGET (state->set_cell_entry),
1, 0, 1, 1);
gtk_widget_set_hexpand (GTK_WIDGET (state->set_cell_entry), TRUE);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->set_cell_entry));
dialog_preload_selection (state, state->set_cell_entry);
gtk_widget_show (GTK_WIDGET (state->set_cell_entry));
@@ -568,7 +568,7 @@ dialog_init (GoalSeekState *state)
gtk_grid_attach (grid, GTK_WIDGET (state->change_cell_entry),
1, 2, 1, 1);
gtk_widget_set_hexpand (GTK_WIDGET (state->change_cell_entry), TRUE);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->change_cell_entry));
dialog_preload_selection (state, state->change_cell_entry);
gtk_widget_show (GTK_WIDGET (state->change_cell_entry));
@@ -684,7 +684,7 @@ dialog_goal_seek (WBCGtk *wbcg, Sheet *sheet)
g_return_if_fail (wbcg != NULL);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, GOALSEEK_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, GOALSEEK_KEY))
return;
gui = gnm_gtk_builder_load ("goalseek.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -705,7 +705,7 @@ dialog_goal_seek (WBCGtk *wbcg, Sheet *sheet)
return;
}
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
GOALSEEK_KEY);
gtk_widget_show (state->dialog);
diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c
index be4918a..bfcf98d 100644
--- a/src/dialogs/dialog-goto-cell.c
+++ b/src/dialogs/dialog-goto-cell.c
@@ -419,7 +419,7 @@ dialog_goto_init (GotoState *state)
G_CALLBACK (cb_dialog_goto_go_clicked), state);
gtk_window_set_default (GTK_WINDOW (state->dialog), state->go_button);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_GOTO_CELL);
@@ -441,7 +441,7 @@ dialog_goto_cell (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, GOTO_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, GOTO_KEY))
return;
gui = gnm_gtk_builder_load ("goto.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -460,7 +460,7 @@ dialog_goto_cell (WBCGtk *wbcg)
return;
}
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
GOTO_KEY);
gtk_widget_show_all (state->dialog);
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index c5213b2..d79eedf 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -513,7 +513,7 @@ dhl_init (HyperlinkState *state)
G_CALLBACK (dhl_cb_ok), state);
gtk_window_set_default (GTK_WINDOW (state->dialog), w);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_HYPERLINK);
@@ -580,7 +580,7 @@ dialog_hyperlink (WBCGtk *wbcg, SheetControl *sc)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("hyperlink.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -627,7 +627,7 @@ dialog_hyperlink (WBCGtk *wbcg, SheetControl *sc)
dhl_set_tip (state);
/* a candidate for merging into attach guru */
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
DIALOG_KEY);
go_gtk_nonmodal_dialog (wbcg_toplevel (state->wbcg),
GTK_WINDOW (state->dialog));
diff --git a/src/dialogs/dialog-insert-cells.c b/src/dialogs/dialog-insert-cells.c
index 72b8a7d..8666ed2 100644
--- a/src/dialogs/dialog-insert-cells.c
+++ b/src/dialogs/dialog-insert-cells.c
@@ -136,7 +136,7 @@ dialog_insert_cells (WBCGtk *wbcg)
return;
}
- if (gnumeric_dialog_raise_if_exists (wbcg, INSERT_CELL_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, INSERT_CELL_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("insert-cells.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -170,7 +170,7 @@ dialog_insert_cells (WBCGtk *wbcg)
"clicked",
G_CALLBACK (cb_insert_cell_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "helpbutton"),
GNUMERIC_HELP_LINK_INSERT_CELS);
gtk_toggle_button_set_active
@@ -183,7 +183,7 @@ dialog_insert_cells (WBCGtk *wbcg)
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify) cb_insert_cell_destroy);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
INSERT_CELL_DIALOG_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-merge.c b/src/dialogs/dialog-merge.c
index 89767c3..17c515e 100644
--- a/src/dialogs/dialog-merge.c
+++ b/src/dialogs/dialog-merge.c
@@ -320,7 +320,7 @@ dialog_merge (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, MERGE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, MERGE_KEY))
return;
gui = gnm_gtk_builder_load ("merge.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -347,7 +347,7 @@ dialog_merge (WBCGtk *wbcg)
grid = GTK_GRID (go_gtk_builder_get_widget (gui, "main-grid"));
state->zone = gnm_expr_entry_new (wbcg, TRUE);
gnm_expr_entry_set_flags (state->zone, GNM_EE_SINGLE_RANGE, GNM_EE_MASK);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->zone));
gtk_label_set_mnemonic_widget (GTK_LABEL (go_gtk_builder_get_widget (gui, "var1-label")),
GTK_WIDGET (state->zone));
@@ -429,11 +429,11 @@ dialog_merge (WBCGtk *wbcg)
state->wbcg,
GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_DATA_MERGE);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
MERGE_KEY);
/* a candidate for merging into attach guru */
diff --git a/src/dialogs/dialog-paste-special.c b/src/dialogs/dialog-paste-special.c
index d6648e0..476b38b 100644
--- a/src/dialogs/dialog-paste-special.c
+++ b/src/dialogs/dialog-paste-special.c
@@ -238,7 +238,7 @@ dialog_paste_special (WBCGtk *wbcg)
GtkBuilder *gui;
char const * const *group;
- if (gnumeric_dialog_raise_if_exists (wbcg, GNM_PASTE_SPECIAL_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, GNM_PASTE_SPECIAL_KEY))
return;
gui = gnm_gtk_builder_load ("paste-special.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -258,7 +258,7 @@ dialog_paste_special (WBCGtk *wbcg)
"clicked",
G_CALLBACK (cb_tool_paste_link_clicked), state);
state->help_button = go_gtk_builder_get_widget (state->gui, "help_button");
- gnumeric_init_help_button (state->help_button, GNUMERIC_HELP_LINK_PASTE_SPECIAL);
+ gnm_init_help_button (state->help_button, GNUMERIC_HELP_LINK_PASTE_SPECIAL);
state->cancel_button = go_gtk_builder_get_widget (state->gui, "cancel_button");
g_signal_connect (G_OBJECT (state->cancel_button),
"clicked",
@@ -289,7 +289,7 @@ dialog_paste_special (WBCGtk *wbcg)
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog), wbcg,
GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
GNM_PASTE_SPECIAL_KEY);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index eff9d7f..51f5dab 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -487,7 +487,7 @@ cb_pm_button_activate_all_clicked (G_GNUC_UNUSED GtkButton *button,
if (activation_error != NULL) {
error = go_error_info_new_str_with_details (
_("Errors while activating plugins"), activation_error);
- gnumeric_go_error_info_dialog_show (
+ gnm_go_error_info_dialog_show (
GTK_WINDOW (pm_gui->dialog_pm), error);
go_error_info_free (error);
}
@@ -650,7 +650,7 @@ dialog_plugin_manager (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
g_return_if_fail (GNM_IS_WBC_GTK (wbcg));
- if (gnumeric_dialog_raise_if_exists (wbcg, PLUGIN_MANAGER_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, PLUGIN_MANAGER_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("plugin-manager.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -763,14 +763,14 @@ dialog_plugin_manager (WBCGtk *wbcg)
pm_gui_load_directory_page (pm_gui);
pm_dialog_init (pm_gui);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_PLUGIN_MANAGER);
g_signal_connect_swapped (go_gtk_builder_get_widget (gui, "button_close_manager"),
"clicked",
G_CALLBACK (cb_pm_close_clicked), pm_gui);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (pm_gui->dialog_pm),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (pm_gui->dialog_pm),
PLUGIN_MANAGER_DIALOG_KEY);
gtk_widget_show (GTK_WIDGET (pm_gui->dialog_pm));
}
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index dc2136d..af490e1 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -1379,7 +1379,7 @@ dialog_preferences (WBCGtk *wbcg, gchar const *page)
"clicked",
G_CALLBACK (cb_close_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_PREFERENCES);
g_signal_connect_swapped (G_OBJECT (state->dialog),
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index ab0ef32..dc72652 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -1787,7 +1787,7 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
g_signal_connect_swapped (G_OBJECT (right_buffer),
"modified-changed", G_CALLBACK (cb_hf_changed), gui);
- gnumeric_init_help_button (go_gtk_builder_get_widget (gui, "help_button"),
+ gnm_init_help_button (go_gtk_builder_get_widget (gui, "help_button"),
header ? GNUMERIC_HELP_LINK_PRINTER_SETUP_HEADER_CUSTOMIZATION
: GNUMERIC_HELP_LINK_PRINTER_SETUP_FOOTER_CUSTOMIZATION);
@@ -1896,7 +1896,7 @@ do_hf_dt_format_customize (gboolean date, HFCustomizeState *hf_state)
g_object_set_data_full (G_OBJECT (dialog),
"hfdtstate", hf_dt_state, (GDestroyNotify) g_free);
- gnumeric_init_help_button (go_gtk_builder_get_widget (gui, "help_button"),
+ gnm_init_help_button (go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_PRINTER_SETUP_GENERAL);
grid = go_gtk_builder_get_widget (gui, "layout-grid");
@@ -2275,11 +2275,11 @@ do_setup_page_area (PrinterSetupState *state)
gtk_widget_show (GTK_WIDGET (state->left_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (gnm_expr_entry_get_entry (state->area_entry)));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (gnm_expr_entry_get_entry (state->top_entry)));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (gnm_expr_entry_get_entry (state->left_entry)));
gnm_expr_entry_load_from_text (state->top_entry,
@@ -2601,7 +2601,7 @@ do_setup_scale (PrinterSetupState *state)
scale_percent_spin = go_gtk_builder_get_widget (gui, "scale-percent-spin");
gtk_spin_button_set_value (
GTK_SPIN_BUTTON (scale_percent_spin), pi->scaling.percentage.x);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (scale_percent_spin));
scale_width_spin = go_gtk_builder_get_widget (gui, "scale-h-spin");
@@ -2610,7 +2610,7 @@ do_setup_scale (PrinterSetupState *state)
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui, "fit-h-check")),
pi->scaling.dim.cols > 0);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (scale_width_spin));
scale_height_spin = go_gtk_builder_get_widget (gui, "scale-v-spin");
@@ -2619,7 +2619,7 @@ do_setup_scale (PrinterSetupState *state)
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON (go_gtk_builder_get_widget (state->gui, "fit-v-check")),
pi->scaling.dim.rows > 0);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (scale_height_spin));
}
@@ -3016,7 +3016,7 @@ dialog_printer_setup (WBCGtk *wbcg, Sheet *sheet)
return;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, PRINTER_SETUP_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, PRINTER_SETUP_KEY))
return;
state = printer_setup_state_new (wbcg, sheet);
@@ -3027,10 +3027,10 @@ dialog_printer_setup (WBCGtk *wbcg, Sheet *sheet)
state->wbcg,
GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_PRINTER_SETUP_GENERAL);
- gnumeric_keyed_dialog (
+ gnm_keyed_dialog (
wbcg, GTK_WINDOW (state->dialog), PRINTER_SETUP_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index f188f33..3042850 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -182,7 +182,7 @@ dialog_random_cor_tool_init (RandomCorToolState *state)
{
state->count_entry = go_gtk_builder_get_widget (state->base.gui, "count_entry");
int_to_entry (GTK_ENTRY (state->count_entry), 2);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->count_entry));
g_signal_connect_after (G_OBJECT (state->count_entry),
"changed",
@@ -209,7 +209,7 @@ dialog_random_cor_tool (WBCGtk *wbcg, Sheet *sheet)
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, RANDOM_COR_KEY)) {
+ if (gnm_dialog_raise_if_exists (wbcg, RANDOM_COR_KEY)) {
return 0;
}
diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c
index cf29de3..b706cac 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -772,16 +772,16 @@ dialog_random_tool_init (RandomToolState *state)
GNM_EE_SINGLE_RANGE, GNM_EE_MASK);
gtk_widget_set_hexpand (state->par1_expr_entry, TRUE);
gtk_grid_attach (grid, state->par1_expr_entry, 1, 1, 1, 1);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->par1_expr_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->par1_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->par2_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->vars_entry));
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->count_entry));
g_signal_connect (G_OBJECT (state->base.dialog),
@@ -835,7 +835,7 @@ dialog_random_tool (WBCGtk *wbcg, Sheet *sheet)
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, RANDOM_KEY)) {
+ if (gnm_dialog_raise_if_exists (wbcg, RANDOM_KEY)) {
return 0;
}
diff --git a/src/dialogs/dialog-recent.c b/src/dialogs/dialog-recent.c
index 39d612e..b7b1d36 100644
--- a/src/dialogs/dialog-recent.c
+++ b/src/dialogs/dialog-recent.c
@@ -276,7 +276,7 @@ dialog_recent_used (WBCGtk *wbcg)
GtkDialog *dialog;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, RECENT_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, RECENT_KEY))
return;
gui = gnm_gtk_builder_load ("recent.ui", NULL, GO_CMD_CONTEXT (wbcg));
diff --git a/src/dialogs/dialog-row-height.c b/src/dialogs/dialog-row-height.c
index 13e0be1..dd43eef 100644
--- a/src/dialogs/dialog-row-height.c
+++ b/src/dialogs/dialog-row-height.c
@@ -247,7 +247,7 @@ dialog_row_height (WBCGtk *wbcg, gboolean use_default)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, ROW_HEIGHT_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, ROW_HEIGHT_DIALOG_KEY))
return;
state = g_new (RowHeightState, 1);
@@ -289,7 +289,7 @@ dialog_row_height (WBCGtk *wbcg, gboolean use_default)
"clicked",
G_CALLBACK (cb_dialog_row_height_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_ROW_HEIGHT);
g_object_set_data_full (G_OBJECT (state->dialog),
@@ -303,7 +303,7 @@ dialog_row_height (WBCGtk *wbcg, gboolean use_default)
dialog_row_height_load_value (state);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
ROW_HEIGHT_DIALOG_KEY);
gtk_widget_show (state->dialog);
}
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index d9d2686..71d70cc 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -386,7 +386,7 @@ dialog_scenario_add (WBCGtk *wbcg)
wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, "ScenarioAdd"))
+ if (gnm_dialog_raise_if_exists (wbcg, "ScenarioAdd"))
return;
state = g_new (ScenariosState, 1);
@@ -425,7 +425,7 @@ dialog_scenario_add (WBCGtk *wbcg)
wbcg,
GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
+ 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);
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index 6e15118..48642d8 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -242,7 +242,7 @@ dialog_search_replace (WBCGtk *wbcg,
if (wbc_gtk_get_guru (wbcg))
return;
- if (gnumeric_dialog_raise_if_exists (wbcg, SEARCH_REPLACE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SEARCH_REPLACE_KEY))
return;
gui = gnm_gtk_builder_load ("search-replace.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -264,13 +264,13 @@ dialog_search_replace (WBCGtk *wbcg,
dd->search_text = GTK_ENTRY (gtk_entry_new ());
gtk_widget_set_hexpand (GTK_WIDGET (dd->search_text), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (dd->search_text), 1, 1, 2, 1);
- gnumeric_editable_enters (GTK_WINDOW (dialog),
+ gnm_editable_enters (GTK_WINDOW (dialog),
GTK_WIDGET (dd->search_text));
dd->replace_text = GTK_ENTRY (gtk_entry_new ());
gtk_widget_set_hexpand (GTK_WIDGET (dd->replace_text), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (dd->replace_text), 1, 2, 2, 1);
- gnumeric_editable_enters (GTK_WINDOW (dialog),
+ gnm_editable_enters (GTK_WINDOW (dialog),
GTK_WIDGET (dd->replace_text));
dd->rangetext = gnm_expr_entry_new (wbcg, TRUE);
@@ -331,7 +331,7 @@ dialog_search_replace (WBCGtk *wbcg,
"focus-in-event",
G_CALLBACK (range_focused), dd);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_SEARCH_REPLACE);
g_object_set_data_full (G_OBJECT (dialog),
@@ -345,7 +345,7 @@ dialog_search_replace (WBCGtk *wbcg,
wbc_gtk_attach_guru (wbcg, GTK_WIDGET (dialog));
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (dialog), SEARCH_REPLACE_KEY);
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (dialog), SEARCH_REPLACE_KEY);
gtk_widget_show (GTK_WIDGET (dialog));
}
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index a26c5be..3702246 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -535,7 +535,7 @@ dialog_search (WBCGtk *wbcg)
gtk_widget_set_hexpand (GTK_WIDGET (dd->gentry), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (dd->gentry), 1, 0, 1, 1);
gtk_widget_grab_focus (GTK_WIDGET (dd->gentry));
- gnumeric_editable_enters (GTK_WINDOW (dialog), GTK_WIDGET (dd->gentry));
+ gnm_editable_enters (GTK_WINDOW (dialog), GTK_WIDGET (dd->gentry));
dd->matches_table = make_matches_table (dd);
@@ -607,10 +607,10 @@ dialog_search (WBCGtk *wbcg)
"state", dd, (GDestroyNotify) free_state);
gnm_dialog_setup_destroy_handlers (dialog, wbcg,
GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_SEARCH);
- gnumeric_restore_window_geometry (GTK_WINDOW (dialog), SEARCH_KEY);
+ gnm_restore_window_geometry (GTK_WINDOW (dialog), SEARCH_KEY);
go_gtk_nonmodal_dialog (wbcg_toplevel (wbcg), GTK_WINDOW (dialog));
gtk_widget_show_all (GTK_WIDGET (dialog));
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index ad1982c..996926d 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -904,13 +904,13 @@ cb_item_move (SheetManager *state, gnm_iter_search_t iter_search)
static void
cb_up (G_GNUC_UNUSED GtkWidget *w, SheetManager *state)
{
- cb_item_move (state, gnm_tree_model_iter_prev);
+ cb_item_move (state, gtk_tree_model_iter_previous);
}
static void
cb_down (G_GNUC_UNUSED GtkWidget *w, SheetManager *state)
{
- cb_item_move (state, gnm_tree_model_iter_next);
+ cb_item_move (state, gtk_tree_model_iter_next);
}
static void
@@ -1540,7 +1540,7 @@ dialog_sheet_order (WBCGtk *wbcg)
cb_adv_check_toggled (NULL, state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_SHEET_MANAGER);
@@ -1553,7 +1553,7 @@ dialog_sheet_order (WBCGtk *wbcg)
"state", state, (GDestroyNotify) cb_sheet_order_destroy);
g_signal_connect (G_OBJECT (state->dialog), "destroy", G_CALLBACK (destroy_cb), NULL);
- gnumeric_restore_window_geometry (GTK_WINDOW (state->dialog),
+ gnm_restore_window_geometry (GTK_WINDOW (state->dialog),
SHEET_ORDER_KEY);
go_gtk_nonmodal_dialog (wbcg_toplevel (state->wbcg),
diff --git a/src/dialogs/dialog-sheet-rename.c b/src/dialogs/dialog-sheet-rename.c
index 0b262c3..75ee777 100644
--- a/src/dialogs/dialog-sheet-rename.c
+++ b/src/dialogs/dialog-sheet-rename.c
@@ -74,7 +74,7 @@ dialog_sheet_rename (WBCGtk *wbcg, Sheet *sheet)
GtkBuilder *gui;
RenameState *state;
- if (gnumeric_dialog_raise_if_exists (wbcg, RENAME_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, RENAME_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("sheet-rename.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -96,7 +96,7 @@ dialog_sheet_rename (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect (state->new_name,
"changed", G_CALLBACK (cb_name_changed),
state);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog), state->new_name);
+ gnm_editable_enters (GTK_WINDOW (state->dialog), state->new_name);
state->ok_button = go_gtk_builder_get_widget (gui, "ok_button");
g_signal_connect_swapped (G_OBJECT (state->ok_button),
@@ -111,7 +111,7 @@ dialog_sheet_rename (WBCGtk *wbcg, Sheet *sheet)
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog), wbcg,
GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
RENAME_DIALOG_KEY);
g_object_set_data_full (G_OBJECT (state->dialog),
diff --git a/src/dialogs/dialog-sheet-resize.c b/src/dialogs/dialog-sheet-resize.c
index fedd3dd..f6fa6c8 100644
--- a/src/dialogs/dialog-sheet-resize.c
+++ b/src/dialogs/dialog-sheet-resize.c
@@ -161,7 +161,7 @@ dialog_sheet_resize (WBCGtk *wbcg)
ResizeState *state;
int slider_width;
- if (gnumeric_dialog_raise_if_exists (wbcg, RESIZE_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, RESIZE_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("sheet-resize.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -215,7 +215,7 @@ dialog_sheet_resize (WBCGtk *wbcg)
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog), wbcg,
GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
RESIZE_DIALOG_KEY);
g_object_set_data_full (G_OBJECT (state->dialog),
diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c
index 476e90e..d083356 100644
--- a/src/dialogs/dialog-sheetobject-size.c
+++ b/src/dialogs/dialog-sheetobject-size.c
@@ -311,7 +311,7 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, SO_SIZE_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SO_SIZE_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("sheetobject-size.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -418,7 +418,7 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
"clicked",
G_CALLBACK (cb_dialog_so_size_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_SO_SIZE);
@@ -430,7 +430,7 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify) cb_dialog_so_size_destroy);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
SO_SIZE_DIALOG_KEY);
dialog_so_size_button_sensitivity (state);
gtk_widget_show (state->dialog);
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index ad903d4..bd9f6d0 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -142,7 +142,7 @@ dialog_shuffle (WBCGtk *wbcg)
wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SHUFFLE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SHUFFLE_KEY))
return;
state = g_new (ShuffleState, 1);
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index 7ac38b4..cc3cd84 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -413,7 +413,7 @@ dialog_simulation (WBCGtk *wbcg, G_GNUC_UNUSED Sheet *sheet)
wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SIMULATION_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SIMULATION_KEY))
return;
state = g_new (SimulationState, 1);
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index cb25aa6..c3e9940 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -129,12 +129,12 @@ so_list_init (GnmDialogSOList *state, WBCGtk *wbcg, SheetObject *so)
g_signal_connect (G_OBJECT (state->dialog), "response",
G_CALLBACK (cb_so_list_response), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help"),
GNUMERIC_HELP_LINK_SO_LIST);
/* a candidate for merging into attach guru */
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
DIALOG_SO_LIST_KEY);
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, g_free);
@@ -155,7 +155,7 @@ dialog_so_list (WBCGtk *wbcg, GObject *so)
g_return_if_fail (wbcg != NULL);
if (wbc_gtk_get_guru (wbcg) ||
- gnumeric_dialog_raise_if_exists (wbcg, DIALOG_SO_LIST_KEY))
+ gnm_dialog_raise_if_exists (wbcg, DIALOG_SO_LIST_KEY))
return;
state = g_new0 (GnmDialogSOList, 1);
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 38db38b..776ed37 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -176,7 +176,7 @@ dialog_so_styled (WBCGtk *wbcg, GObject *so, GOStyle *default_style,
GOStyle *style;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, GNM_SO_STYLED_KEY)) {
+ if (gnm_dialog_raise_if_exists (wbcg, GNM_SO_STYLED_KEY)) {
g_object_unref (default_style);
return;
}
@@ -200,7 +200,7 @@ dialog_so_styled (WBCGtk *wbcg, GObject *so, GOStyle *default_style,
help = gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_HELP, GTK_RESPONSE_HELP);
- gnumeric_init_help_button (help, "sect-graphics-drawings");
+ gnm_init_help_button (help, "sect-graphics-drawings");
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -252,7 +252,7 @@ dialog_so_styled (WBCGtk *wbcg, GObject *so, GOStyle *default_style,
g_signal_connect (G_OBJECT (dialog), "response",
G_CALLBACK (cb_dialog_so_styled_response), state);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (dialog),
GNM_SO_STYLED_KEY);
g_object_set_data_full (G_OBJECT (dialog),
"state", state, (GDestroyNotify) dialog_so_styled_free);
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 8729ad4..a1485f7 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -991,7 +991,7 @@ dialog_init (SolverState *state)
g_signal_connect (G_OBJECT (state->close_button), "clicked",
G_CALLBACK (cb_dialog_close_clicked), state);
- gnumeric_init_help_button (go_gtk_builder_get_widget (state->gui,
+ gnm_init_help_button (go_gtk_builder_get_widget (state->gui,
"helpbutton"),
GNUMERIC_HELP_LINK_SOLVER);
@@ -1021,7 +1021,7 @@ dialog_init (SolverState *state)
GNM_EE_SHEET_OPTIONAL, GNM_EE_MASK);
gtk_widget_set_hexpand (GTK_WIDGET (state->target_entry), TRUE);
gtk_grid_attach (grid, GTK_WIDGET (state->target_entry), 1, 0, 2, 1);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->target_entry));
gtk_widget_show (GTK_WIDGET (state->target_entry));
g_signal_connect_after (G_OBJECT (state->target_entry), "changed",
@@ -1037,7 +1037,7 @@ dialog_init (SolverState *state)
gtk_widget_set_hexpand (GTK_WIDGET (state->change_cell_entry), TRUE);
gtk_grid_attach (grid,
GTK_WIDGET (state->change_cell_entry), 1, 2, 2, 1);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->change_cell_entry));
gtk_widget_show (GTK_WIDGET (state->change_cell_entry));
g_signal_connect_after (G_OBJECT (state->change_cell_entry), "changed",
@@ -1251,7 +1251,7 @@ dialog_solver (WBCGtk *wbcg, Sheet *sheet)
int pass;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SOLVER_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SOLVER_KEY))
return;
/*
@@ -1294,7 +1294,7 @@ dialog_solver (WBCGtk *wbcg, Sheet *sheet)
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog), wbcg,
GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
SOLVER_KEY);
gtk_widget_show (state->dialog);
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index 1a78fdf..c100649 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -248,8 +248,8 @@ stf_export_dialog_format_page_init (TextExportState *state)
gtk_combo_box_set_active (state->format.transliterate, i);
}
- gnumeric_editable_enters (state->window, state->format.custom);
- gnumeric_editable_enters (state->window,
+ gnm_editable_enters (state->window, state->format.custom);
+ gnm_editable_enters (state->window,
gtk_bin_get_child (GTK_BIN (state->format.quotechar)));
grid = go_gtk_builder_get_widget (state->gui, "format-grid");
@@ -490,13 +490,13 @@ move_element (TextExportState *state, gnm_iter_search_t iter_search)
static void
cb_sheet_up (TextExportState *state)
{
- move_element (state, gnm_tree_model_iter_prev);
+ move_element (state, gtk_tree_model_iter_previous);
}
static void
cb_sheet_down (TextExportState *state)
{
- move_element (state, gnm_tree_model_iter_next);
+ move_element (state, gtk_tree_model_iter_next);
}
static void
diff --git a/src/dialogs/dialog-stf-fixed-page.c b/src/dialogs/dialog-stf-fixed-page.c
index 0a5e1ec..d4c4054 100644
--- a/src/dialogs/dialog-stf-fixed-page.c
+++ b/src/dialogs/dialog-stf-fixed-page.c
@@ -64,7 +64,7 @@ enum {
CONTEXT_STF_IMPORT_NARROW = 5
};
-static GnumericPopupMenuElement const popup_elements[] = {
+static GnmPopupMenuElement const popup_elements[] = {
{ N_("Merge with column on _left"), GTK_STOCK_REMOVE,
0, 1 << CONTEXT_STF_IMPORT_MERGE_LEFT, CONTEXT_STF_IMPORT_MERGE_LEFT },
{ N_("Merge with column on _right"), GTK_STOCK_REMOVE,
@@ -211,7 +211,7 @@ select_column (StfDialogData *pagedata, int col)
}
static void
-fixed_context_menu_handler (GnumericPopupMenuElement const *element,
+fixed_context_menu_handler (GnmPopupMenuElement const *element,
gpointer user_data)
{
StfDialogData *pagedata = user_data;
@@ -259,7 +259,7 @@ fixed_context_menu (StfDialogData *pagedata, GdkEventButton *event,
sensitivity_filter |= (1 << CONTEXT_STF_IMPORT_NARROW);
select_column (pagedata, col);
- gnumeric_create_popup_menu (popup_elements, &fixed_context_menu_handler,
+ gnm_create_popup_menu (popup_elements, &fixed_context_menu_handler,
pagedata, 0,
sensitivity_filter,
(GdkEvent*)event);
diff --git a/src/dialogs/dialog-stf.c b/src/dialogs/dialog-stf.c
index 30f5e56..3186bb8 100644
--- a/src/dialogs/dialog-stf.c
+++ b/src/dialogs/dialog-stf.c
@@ -213,19 +213,19 @@ static void
stf_dialog_editables_enter (StfDialogData *pagedata)
{
#if 0
- gnumeric_editable_enters
+ gnm_editable_enters
(pagedata->window,
GTK_WIDGET (&pagedata->main.main_startrow->entry));
- gnumeric_editable_enters
+ gnm_editable_enters
(pagedata->window,
GTK_WIDGET (&pagedata->main.main_stoprow->entry));
- gnumeric_editable_enters
+ gnm_editable_enters
(pagedata->window,
GTK_WIDGET (pagedata->csv.csv_customseparator));
gnumeric_combo_enters
(pagedata->window,
pagedata->csv.csv_textindicator);
- gnumeric_editable_enters
+ gnm_editable_enters
(pagedata->window,
GTK_WIDGET (&pagedata->fixed.fixed_colend->entry));
go_format_sel_editable_enters
diff --git a/src/dialogs/dialog-tabulate.c b/src/dialogs/dialog-tabulate.c
index 83090a9..7d22add 100644
--- a/src/dialogs/dialog-tabulate.c
+++ b/src/dialogs/dialog-tabulate.c
@@ -84,7 +84,7 @@ non_model_dialog (WBCGtk *wbcg,
GtkDialog *dialog,
const char *key)
{
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (dialog), key);
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (dialog), key);
gtk_widget_show (GTK_WIDGET (dialog));
}
@@ -299,7 +299,7 @@ dialog_tabulate (WBCGtk *wbcg, Sheet *sheet)
if (wbc_gtk_get_guru (wbcg))
return;
- if (gnumeric_dialog_raise_if_exists (wbcg, TABULATE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, TABULATE_KEY))
return;
gui = gnm_gtk_builder_load ("tabulate.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -342,7 +342,7 @@ dialog_tabulate (WBCGtk *wbcg, Sheet *sheet)
"clicked",
G_CALLBACK (cancel_clicked), dd);
/* FIXME: Add correct helpfile address */
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_TABULATE);
g_object_set_data_full (G_OBJECT (dialog),
diff --git a/src/dialogs/dialog-view.c b/src/dialogs/dialog-view.c
index 2fa58a0..4db3be7 100644
--- a/src/dialogs/dialog-view.c
+++ b/src/dialogs/dialog-view.c
@@ -128,7 +128,7 @@ dialog_new_view (WBCGtk *wbcg)
ViewState *state;
GtkBuilder *gui;
- if (gnumeric_dialog_raise_if_exists (wbcg, VIEW_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, VIEW_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("view.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -184,13 +184,13 @@ dialog_new_view (WBCGtk *wbcg)
gnm_link_button_and_entry (GTK_WIDGET (state->location_elsewhere),
GTK_WIDGET (state->location_display_name));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->location_display_name));
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_VIEW);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
VIEW_DIALOG_KEY);
g_object_set_data_full (G_OBJECT (state->dialog),
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index 8fe3dc7..c5514e1 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -311,7 +311,7 @@ attr_dialog_impl (AttrState *state)
"clicked",
G_CALLBACK (cb_attr_dialog_dialog_close), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_WORKBOOK_ATTRIBUTE);
@@ -319,7 +319,7 @@ attr_dialog_impl (AttrState *state)
g_object_set_data_full (G_OBJECT (dialog),
"state", state, (GDestroyNotify) cb_attr_dialog_dialog_destroy);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
WORKBOOK_ATTRIBUTE_KEY);
gtk_widget_show (state->dialog);
}
@@ -332,7 +332,7 @@ dialog_workbook_attr (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, WORKBOOK_ATTRIBUTE_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, WORKBOOK_ATTRIBUTE_KEY))
return;
gui = gnm_gtk_builder_load ("workbook-attr.ui", NULL, GO_CMD_CONTEXT (wbcg));
diff --git a/src/dialogs/dialog-zoom.c b/src/dialogs/dialog-zoom.c
index 1b3466b..ffe4422 100644
--- a/src/dialogs/dialog-zoom.c
+++ b/src/dialogs/dialog-zoom.c
@@ -173,7 +173,7 @@ dialog_zoom (WBCGtk *wbcg, Sheet *sheet)
g_return_if_fail (wbcg != NULL);
g_return_if_fail (sheet != NULL);
- if (gnumeric_dialog_raise_if_exists (wbcg, ZOOM_DIALOG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, ZOOM_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("dialog-zoom.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
@@ -270,17 +270,17 @@ dialog_zoom (WBCGtk *wbcg, Sheet *sheet)
"clicked",
G_CALLBACK (cb_zoom_cancel_clicked), state);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (&state->zoom->entry));
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_ZOOM);
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog), wbcg,
GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
ZOOM_DIALOG_KEY);
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify) cb_zoom_destroy);
diff --git a/src/gnm-graph-window.h b/src/gnm-graph-window.h
index 3dfe365..248d061 100644
--- a/src/gnm-graph-window.h
+++ b/src/gnm-graph-window.h
@@ -10,7 +10,6 @@ G_BEGIN_DECLS
#define GNM_TYPE_GRAPH_WINDOW (gnm_graph_window_get_type ())
#define GNM_GRAPH_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNM_TYPE_GRAPH_WINDOW,
GnmGraphWindow))
#define GNM_IS_GRAPH_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNM_TYPE_GRAPH_WINDOW))
-#define GNM_GRAPH_WINDOW_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), GNM_TYPE_GRAPH_WINDOW,
GnmGraphWindowClass))
typedef struct _GnmGraphWindow GnmGraphWindow;
typedef struct _GnmGraphWindowClass GnmGraphWindowClass;
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 57454b2..7038719 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -163,7 +163,7 @@ gnm_pane_key_mode_sheet (GnmPane *pane, GdkEventKey *kevent,
GdkModifierType event_state;
(void)gdk_event_get_state (event, &event_state);
- state = gnumeric_filter_modifiers (event_state);
+ state = gnm_filter_modifiers (event_state);
jump_to_bounds = (event_state & GDK_CONTROL_MASK) != 0;
/* Update end-mode for magic end key stuff. */
@@ -232,7 +232,7 @@ gnm_pane_key_mode_sheet (GnmPane *pane, GdkEventKey *kevent,
case GDK_KEY_KP_Down:
case GDK_KEY_Down:
- if (gnumeric_filter_modifiers (event_state) == GDK_MOD1_MASK) {
+ if (gnm_filter_modifiers (event_state) == GDK_MOD1_MASK) {
/* 1) Any in cell combos ? */
SheetObject *so = sv_wbv (sv)->in_cell_combo;
@@ -408,7 +408,7 @@ gnm_pane_key_mode_sheet (GnmPane *pane, GdkEventKey *kevent,
if (wbcg_is_editing (wbcg) &&
(state == GDK_CONTROL_MASK ||
state == (GDK_CONTROL_MASK|GDK_SHIFT_MASK) ||
- gnumeric_filter_modifiers (event_state) == GDK_MOD1_MASK))
+ gnm_filter_modifiers (event_state) == GDK_MOD1_MASK))
/* Forward the keystroke to the input line */
return gtk_widget_event (
wbcg_get_entry_underlying (wbcg), (GdkEvent *) event);
@@ -2013,7 +2013,7 @@ gnm_pane_display_obj_size_tip (GnmPane *pane, GocItem *ctrl_pt)
return;
}
- pane->size_tip = gnumeric_create_tooltip (cw);
+ pane->size_tip = gnm_create_tooltip (cw);
top = gtk_widget_get_toplevel (pane->size_tip);
gnm_canvas_get_screen_position (ctrl_pt->canvas,
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index 57f54ac..d3c6a05 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -32,22 +32,22 @@ xml2c (xmlChar *src)
return dst;
}
-typedef GOPluginServiceSimpleClass PluginServiceFunctionGroupClass;
-struct _PluginServiceFunctionGroup {
+typedef GOPluginServiceSimpleClass GnmPluginServiceFunctionGroupClass;
+struct GnmPluginServiceFunctionGroup_ {
GOPluginServiceSimple base;
gchar *category_name, *translated_category_name;
GSList *function_name_list;
GnmFuncGroup *func_group;
- PluginServiceFunctionGroupCallbacks cbs;
+ GnmPluginServiceFunctionGroupCallbacks cbs;
char *textdomain;
};
static void
plugin_service_function_group_finalize (GObject *obj)
{
- PluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (obj);
+ GnmPluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (obj);
GObjectClass *parent_class;
g_free (sfg->category_name);
@@ -116,7 +116,7 @@ plugin_service_function_group_read_xml (GOPluginService *service, xmlNode *tree,
GO_SLIST_REVERSE (function_name_list);
}
if (category_name != NULL && function_name_list != NULL) {
- PluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
+ GnmPluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
sfg->category_name = category_name;
sfg->translated_category_name = translated_category_name;
@@ -149,7 +149,7 @@ plugin_service_function_group_func_desc_load (GnmFunc const *fn_def,
GnmFuncDescriptor *res)
{
GOPluginService *service = gnm_func_get_user_data (fn_def);
- PluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
+ GnmPluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
GOErrorInfo *error = NULL;
g_return_val_if_fail (fn_def != NULL, FALSE);
@@ -199,7 +199,7 @@ delayed_ref_notify (GOPlugin *plugin, GnmFunc *fd)
static void
plugin_service_function_group_activate (GOPluginService *service, GOErrorInfo **ret_error)
{
- PluginServiceFunctionGroup *sfg =
+ GnmPluginServiceFunctionGroup *sfg =
GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
GO_INIT_RET_ERROR_INFO (ret_error);
@@ -241,7 +241,7 @@ plugin_service_function_group_activate (GOPluginService *service, GOErrorInfo **
static void
plugin_service_function_group_deactivate (GOPluginService *service, GOErrorInfo **ret_error)
{
- PluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
+ GnmPluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
if (gnm_debug_flag ("plugin-func"))
g_printerr ("Deactivating group %s\n", sfg->category_name);
@@ -256,7 +256,7 @@ plugin_service_function_group_deactivate (GOPluginService *service, GOErrorInfo
static char *
plugin_service_function_group_get_description (GOPluginService *service)
{
- PluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
+ GnmPluginServiceFunctionGroup *sfg = GNM_PLUGIN_SERVICE_FUNCTION_GROUP (service);
int n_functions;
char const *category_name;
@@ -273,7 +273,7 @@ plugin_service_function_group_get_description (GOPluginService *service)
}
static void
-plugin_service_function_group_init (PluginServiceFunctionGroup *s)
+plugin_service_function_group_init (GnmPluginServiceFunctionGroup *s)
{
GO_PLUGIN_SERVICE (s)->cbs_ptr = &s->cbs;
s->category_name = NULL;
@@ -295,7 +295,7 @@ plugin_service_function_group_class_init (GObjectClass *gobject_class)
plugin_service_class->get_description = plugin_service_function_group_get_description;
}
-GSF_CLASS (PluginServiceFunctionGroup, plugin_service_function_group,
+GSF_CLASS (GnmPluginServiceFunctionGroup, gnm_plugin_service_function_group,
plugin_service_function_group_class_init, plugin_service_function_group_init,
GO_TYPE_PLUGIN_SERVICE_SIMPLE)
@@ -305,14 +305,14 @@ GSF_CLASS (PluginServiceFunctionGroup, plugin_service_function_group,
* PluginServiceUI
*/
typedef GOPluginServiceSimpleClass PluginServiceUIClass;
-struct _PluginServiceUI {
+struct GnmPluginServiceUI_ {
GOPluginServiceSimple base;
char *file_name;
GSList *actions;
gpointer layout_id;
- PluginServiceUICallbacks cbs;
+ GnmPluginServiceUICallbacks cbs;
};
static void
@@ -528,7 +528,7 @@ plugin_service_ui_class_init (GObjectClass *gobject_class)
plugin_service_class->get_description = plugin_service_ui_get_description;
}
-GSF_CLASS (PluginServiceUI, plugin_service_ui,
+GSF_CLASS (PluginServiceUI, gnm_plugin_service_ui,
plugin_service_ui_class_init, plugin_service_ui_init,
GO_TYPE_PLUGIN_SERVICE_SIMPLE)
@@ -538,12 +538,12 @@ GSF_CLASS (PluginServiceUI, plugin_service_ui,
* PluginServiceSolver
*/
typedef GOPluginServiceClass PluginServiceSolverClass;
-struct _PluginServiceSolver {
+struct GnmPluginServiceSolver_ {
GOPluginService base;
GnmSolverFactory *factory;
- PluginServiceSolverCallbacks cbs;
+ GnmPluginServiceSolverCallbacks cbs;
};
static GnmSolver *
@@ -710,7 +710,7 @@ plugin_service_solver_class_init (GObjectClass *gobject_class)
plugin_service_class->get_description = plugin_service_solver_get_description;
}
-GSF_CLASS (PluginServiceSolver, plugin_service_solver,
+GSF_CLASS (PluginServiceSolver, gnm_plugin_service_solver,
plugin_service_solver_class_init, plugin_service_solver_init,
GO_TYPE_PLUGIN_SERVICE)
@@ -773,7 +773,7 @@ gnm_plugin_loader_module_load_service_function_group (GOPluginLoader *loader,
go_plugin_service_get_id (service), "_functions", NULL);
g_module_symbol (loader_module->handle, fn_info_array_name, (gpointer) &module_fn_info_array);
if (module_fn_info_array != NULL) {
- PluginServiceFunctionGroupCallbacks *cbs;
+ GnmPluginServiceFunctionGroupCallbacks *cbs;
ServiceLoaderDataFunctionGroup *loader_data;
gint i;
@@ -807,7 +807,7 @@ gnm_plugin_loader_module_load_service_function_group (GOPluginLoader *loader,
*/
typedef struct {
- ModulePluginUIActions *module_ui_actions_array;
+ GnmModulePluginUIActions *module_ui_actions_array;
GHashTable *ui_actions_hash;
} ServiceLoaderDataUI;
@@ -851,8 +851,8 @@ gnm_plugin_loader_module_load_service_ui (GOPluginLoader *loader,
{
GnmPluginLoaderModule *loader_module = GNM_PLUGIN_LOADER_MODULE (loader);
char *ui_actions_array_name;
- ModulePluginUIActions *module_ui_actions_array = NULL;
- PluginServiceUICallbacks *cbs;
+ GnmModulePluginUIActions *module_ui_actions_array = NULL;
+ GnmPluginServiceUICallbacks *cbs;
ServiceLoaderDataUI *loader_data;
gint i;
@@ -894,7 +894,7 @@ gnm_plugin_loader_module_load_service_solver (GOPluginLoader *loader,
{
GnmPluginLoaderModule *loader_module =
GNM_PLUGIN_LOADER_MODULE (loader);
- PluginServiceSolverCallbacks *cbs;
+ GnmPluginServiceSolverCallbacks *cbs;
char *symname;
GnmSolverCreator creator;
GnmSolverFactoryFunctional functional;
@@ -944,13 +944,13 @@ static gboolean
gplm_service_unload (GOPluginLoader *l, GOPluginService *s, GOErrorInfo **err)
{
if (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (s)) {
- PluginServiceFunctionGroupCallbacks *cbs = go_plugin_service_get_cbs (s);
+ GnmPluginServiceFunctionGroupCallbacks *cbs = go_plugin_service_get_cbs (s);
cbs->func_desc_load = NULL;
} else if (GNM_IS_PLUGIN_SERVICE_UI (s)) {
- PluginServiceUICallbacks *cbs = go_plugin_service_get_cbs (s);
+ GnmPluginServiceUICallbacks *cbs = go_plugin_service_get_cbs (s);
cbs->plugin_func_exec_action = NULL;
} else if (GNM_IS_PLUGIN_SERVICE_SOLVER (s)) {
- PluginServiceSolverCallbacks *cbs =
+ GnmPluginServiceSolverCallbacks *cbs =
go_plugin_service_get_cbs (s);
cbs->creator = NULL;
cbs->functional = NULL;
diff --git a/src/gnm-plugin.h b/src/gnm-plugin.h
index d42b617..93ee6a4 100644
--- a/src/gnm-plugin.h
+++ b/src/gnm-plugin.h
@@ -14,48 +14,48 @@ G_BEGIN_DECLS
#define GNM_PLUGIN_LOADER_MODULE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_LOADER_MODULE_TYPE,
GnmPluginLoaderModule))
GType gnm_plugin_loader_module_get_type (void);
-#define GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE (plugin_service_function_group_get_type ())
-#define GNM_PLUGIN_SERVICE_FUNCTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE, PluginServiceFunctionGroup))
+#define GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE (gnm_plugin_service_function_group_get_type ())
+#define GNM_PLUGIN_SERVICE_FUNCTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o),
GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE, GnmPluginServiceFunctionGroup))
#define GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o),
GNM_PLUGIN_SERVICE_FUNCTION_GROUP_TYPE))
-GType plugin_service_function_group_get_type (void);
-typedef struct _PluginServiceFunctionGroup PluginServiceFunctionGroup;
+GType gnm_plugin_service_function_group_get_type (void);
+typedef struct GnmPluginServiceFunctionGroup_ GnmPluginServiceFunctionGroup;
typedef struct {
gboolean (*func_desc_load) (GOPluginService *service, char const *name,
GnmFuncDescriptor *res);
-} PluginServiceFunctionGroupCallbacks;
+} GnmPluginServiceFunctionGroupCallbacks;
-#define GNM_PLUGIN_SERVICE_UI_TYPE (plugin_service_ui_get_type ())
+#define GNM_PLUGIN_SERVICE_UI_TYPE (gnm_plugin_service_ui_get_type ())
#define GNM_PLUGIN_SERVICE_UI(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_SERVICE_UI_TYPE,
PluginServiceUI))
#define GNM_IS_PLUGIN_SERVICE_UI(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_PLUGIN_SERVICE_UI_TYPE))
-GType plugin_service_ui_get_type (void);
-typedef struct _PluginServiceUI PluginServiceUI;
+GType gnm_plugin_service_ui_get_type (void);
+typedef struct GnmPluginServiceUI_ PluginServiceUI;
typedef struct {
void (*plugin_func_exec_action) (
GOPluginService *service, GnmAction const *action,
WorkbookControl *wbc, GOErrorInfo **ret_error);
-} PluginServiceUICallbacks;
+} GnmPluginServiceUICallbacks;
/* This type is intended for use with "ui" service.
* Plugins should define arrays of structs of the form:
- * ModulePluginUIActions <service-id>_actions[] = { ... };
+ * GnmModulePluginUIActions <service-id>_actions[] = { ... };
*/
typedef struct {
char const *name;
void (*handler) (GnmAction const *action, WorkbookControl *wbc);
-} ModulePluginUIActions;
+} GnmModulePluginUIActions;
-#define GNM_PLUGIN_SERVICE_SOLVER_TYPE (plugin_service_solver_get_type ())
+#define GNM_PLUGIN_SERVICE_SOLVER_TYPE (gnm_plugin_service_solver_get_type ())
#define GNM_PLUGIN_SERVICE_SOLVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_PLUGIN_SERVICE_SOLVER_TYPE,
PluginServiceSolver))
#define GNM_IS_PLUGIN_SERVICE_SOLVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_PLUGIN_SERVICE_SOLVER_TYPE))
-GType plugin_service_solver_get_type (void);
-typedef struct _PluginServiceSolver PluginServiceSolver;
+GType gnm_plugin_service_solver_get_type (void);
+typedef struct GnmPluginServiceSolver_ PluginServiceSolver;
typedef struct {
GnmSolverCreator creator;
GnmSolverFactoryFunctional functional;
-} PluginServiceSolverCallbacks;
+} GnmPluginServiceSolverCallbacks;
/**************************************************************************/
#define GNM_PLUGIN_MODULE_HEADER \
diff --git a/src/gnm-sheet-slicer.c b/src/gnm-sheet-slicer.c
index 4212704..5dccf99 100644
--- a/src/gnm-sheet-slicer.c
+++ b/src/gnm-sheet-slicer.c
@@ -190,7 +190,7 @@ gnm_sheet_slicer_class_init (GnmSheetSlicerClass *klass)
GSF_PARAM_STATIC | G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_LAYOUT,
- g_param_spec_enum ("layout", NULL, NULL, gnm_sheet_slicer_layout_get_type (),
GSS_Layout_XL_outline,
+ g_param_spec_enum ("layout", NULL, NULL, gnm_sheet_slicer_layout_get_type (),
GSS_LAYOUT_XL_OUTLINE,
GSF_PARAM_STATIC | G_PARAM_READWRITE));
parent_klass = g_type_class_peek_parent (klass);
}
@@ -386,7 +386,7 @@ gnm_sheet_slicer_regenerate (GnmSheetSlicer *gss)
GnmSheetSlicerLayout
gnm_sheet_slicer_get_layout (GnmSheetSlicer const *gss)
{
- g_return_val_if_fail (GNM_IS_SHEET_SLICER (gss), GSS_Layout_XL_outline);
+ g_return_val_if_fail (GNM_IS_SHEET_SLICER (gss), GSS_LAYOUT_XL_OUTLINE);
return gss->layout;
}
@@ -403,9 +403,9 @@ gnm_sheet_slicer_layout_get_type (void)
static GType etype = 0;
if (etype == 0) {
static GEnumValue const values[] = {
- { GSS_Layout_XL_outline, "GSS_Layout_XL_outline", "xl-outline" },
- { GSS_Layout_XL_compact, "GSS_Layout_XL_compact", "xl-compact" },
- { GSS_Layout_XL_tabular, "GSS_Layout_XL_tabular", "xl-tabular" },
+ { GSS_LAYOUT_XL_OUTLINE, "GSS_LAYOUT_XL_OUTLINE", "xl-outline" },
+ { GSS_LAYOUT_XL_COMPACT, "GSS_LAYOUT_XL_COMPACT", "xl-compact" },
+ { GSS_LAYOUT_XL_TABULAR, "GSS_LAYOUT_XL_TABULAR", "xl-tabular" },
{ 0, NULL, NULL }
};
etype = g_enum_register_static ("GnmSheetSlicerLayout", values);
diff --git a/src/gnm-sheet-slicer.h b/src/gnm-sheet-slicer.h
index 18c1852..e73ab78 100644
--- a/src/gnm-sheet-slicer.h
+++ b/src/gnm-sheet-slicer.h
@@ -35,10 +35,10 @@ G_BEGIN_DECLS
GType gnm_sheet_slicer_get_type (void);
typedef enum {
- GSS_Layout_XL_outline = 0,
- GSS_Layout_XL_compact = 1,
- GSS_Layout_XL_tabular = 2,
- GSS_Layout_MAX
+ GSS_LAYOUT_XL_OUTLINE = 0,
+ GSS_LAYOUT_XL_COMPACT = 1,
+ GSS_LAYOUT_XL_TABULAR = 2,
+ GSS_LAYOUT_MAX
} GnmSheetSlicerLayout;
void gnm_sheet_slicer_set_sheet (GnmSheetSlicer *gss, Sheet *sheet);
diff --git a/src/gui-file.c b/src/gui-file.c
index 6fe93df..858c46c 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -139,7 +139,7 @@ gui_file_read (WBCGtk *wbcg, char const *uri,
}
gboolean
-gui_file_template (WBCGtk *wbcg, char const *uri)
+gnm_gui_file_template (WBCGtk *wbcg, char const *uri)
{
GOIOContext *io_context;
WorkbookView *wbv;
diff --git a/src/gui-file.h b/src/gui-file.h
index 4ef41e7..79c5424 100644
--- a/src/gui-file.h
+++ b/src/gui-file.h
@@ -27,7 +27,7 @@ void gui_wb_view_show (WBCGtk *wbcg, WorkbookView *wbv);
WorkbookView *gui_file_read (WBCGtk *wbcg, char const *file_name,
GOFileOpener const *optional_format,
gchar const *optional_encoding);
-gboolean gui_file_template (WBCGtk *wbcg, char const *uri);
+gboolean gnm_gui_file_template (WBCGtk *wbcg, char const *uri);
G_END_DECLS
diff --git a/src/gui-util.c b/src/gui-util.c
index 2fa266c..f2893c1 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -149,13 +149,13 @@ gnumeric_go_error_info_list_dialog_create (GSList *errs)
}
/**
- * gnumeric_go_error_info_dialog_create:
+ * gnm_go_error_info_dialog_create:
*
* SHOULD BE IN GOFFICE
* Returns: (transfer full): the newly allocated dialog.
*/
GtkWidget *
-gnumeric_go_error_info_dialog_create (GOErrorInfo *error)
+gnm_go_error_info_dialog_create (GOErrorInfo *error)
{
GSList *l = g_slist_append (NULL, error);
GtkWidget *w = gnumeric_go_error_info_list_dialog_create (l);
@@ -164,24 +164,24 @@ gnumeric_go_error_info_dialog_create (GOErrorInfo *error)
}
/**
- * gnumeric_go_error_info_dialog_show:
+ * gnm_go_error_info_dialog_show:
*
*/
void
-gnumeric_go_error_info_dialog_show (GtkWindow *parent, GOErrorInfo *error)
+gnm_go_error_info_dialog_show (GtkWindow *parent, GOErrorInfo *error)
{
- GtkWidget *dialog = gnumeric_go_error_info_dialog_create (error);
+ GtkWidget *dialog = gnm_go_error_info_dialog_create (error);
go_gtk_dialog_run (GTK_DIALOG (dialog), parent);
}
/**
- * gnumeric_go_error_info_list_dialog_show:
+ * gnm_go_error_info_list_dialog_show:
* @parent:
* @errs: (element-type GOErrorInfo):
*
*/
void
-gnumeric_go_error_info_list_dialog_show (GtkWindow *parent,
+gnm_go_error_info_list_dialog_show (GtkWindow *parent,
GSList *errs)
{
GtkWidget *dialog = gnumeric_go_error_info_list_dialog_create (errs);
@@ -268,7 +268,7 @@ cb_save_sizes (GtkWidget *dialog, const char *key)
}
void
-gnumeric_restore_window_geometry (GtkWindow *dialog, const char *key)
+gnm_restore_window_geometry (GtkWindow *dialog, const char *key)
{
GtkWidget *top = gtk_widget_get_toplevel (GTK_WIDGET (dialog));
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (dialog));
@@ -295,7 +295,7 @@ gnumeric_restore_window_geometry (GtkWindow *dialog, const char *key)
}
/**
- * gnumeric_keyed_dialog:
+ * gnm_keyed_dialog:
* @wbcg: A WBCGtk
* @dialog: A transient window
* @key: A key to identify the dialog
@@ -306,7 +306,7 @@ gnumeric_restore_window_geometry (GtkWindow *dialog, const char *key)
* the object data is managed here.
**/
void
-gnumeric_keyed_dialog (WBCGtk *wbcg, GtkWindow *dialog, char const *key)
+gnm_keyed_dialog (WBCGtk *wbcg, GtkWindow *dialog, char const *key)
{
KeyedDialogContext *ctxt;
@@ -332,11 +332,11 @@ gnumeric_keyed_dialog (WBCGtk *wbcg, GtkWindow *dialog, char const *key)
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (cb_keyed_dialog_destroy), NULL);
- gnumeric_restore_window_geometry (dialog, key);
+ gnm_restore_window_geometry (dialog, key);
}
/**
- * gnumeric_dialog_raise_if_exists:
+ * gnm_dialog_raise_if_exists:
* @wbcg: A WBCGtk
* @key: A key to identify the dialog
*
@@ -344,7 +344,7 @@ gnumeric_keyed_dialog (WBCGtk *wbcg, GtkWindow *dialog, char const *key)
* Returns: (transfer none): TRUE if dialog found, FALSE if not.
**/
gpointer
-gnumeric_dialog_raise_if_exists (WBCGtk *wbcg, char const *key)
+gnm_dialog_raise_if_exists (WBCGtk *wbcg, char const *key)
{
KeyedDialogContext *ctxt;
@@ -374,7 +374,7 @@ cb_activate_default (GtkWindow *window)
/**
- * gnumeric_editable_enters:
+ * gnm_editable_enters:
* @window: dialog to affect.
* @editable: Editable to affect.
*
@@ -391,7 +391,7 @@ cb_activate_default (GtkWindow *window)
*
**/
void
-gnumeric_editable_enters (GtkWindow *window, GtkWidget *w)
+gnm_editable_enters (GtkWindow *window, GtkWidget *w)
{
g_return_if_fail (GTK_IS_WINDOW(window));
@@ -505,14 +505,14 @@ gnumeric_tooltip_set_style (GtkWidget *widget)
}
/**
- * gnumeric_convert_to_tooltip:
+ * gnm_convert_to_tooltip:
* @ref_widget:
* @widget:
*
* Returns: (transfer none): @widget
**/
GtkWidget *
-gnumeric_convert_to_tooltip (GtkWidget *ref_widget, GtkWidget *widget)
+gnm_convert_to_tooltip (GtkWidget *ref_widget, GtkWidget *widget)
{
GtkWidget *tip, *frame;
GdkScreen *screen = gtk_widget_get_screen (ref_widget);
@@ -537,18 +537,18 @@ gnumeric_convert_to_tooltip (GtkWidget *ref_widget, GtkWidget *widget)
}
/**
- * gnumeric_create_tooltip:
+ * gnm_create_tooltip:
*
* Returns: (transfer full): the newly allocated #GtkWidget.
**/
GtkWidget *
-gnumeric_create_tooltip (GtkWidget *ref_widget)
+gnm_create_tooltip (GtkWidget *ref_widget)
{
- return gnumeric_convert_to_tooltip (ref_widget, gtk_label_new (""));
+ return gnm_convert_to_tooltip (ref_widget, gtk_label_new (""));
}
void
-gnumeric_position_tooltip (GtkWidget *tip, int px, int py, gboolean horizontal)
+gnm_position_tooltip (GtkWidget *tip, int px, int py, gboolean horizontal)
{
GtkRequisition req;
@@ -599,9 +599,9 @@ gnm_gtk_builder_load (char const *uifile, char const *domain, GOCmdContext *cc)
static void
popup_item_activate (GtkWidget *item, gpointer *user_data)
{
- GnumericPopupMenuElement const *elem =
+ GnmPopupMenuElement const *elem =
g_object_get_data (G_OBJECT (item), "descriptor");
- GnumericPopupMenuHandler handler =
+ GnmPopupMenuHandler handler =
g_object_get_data (G_OBJECT (item), "handler");
g_return_if_fail (elem != NULL);
@@ -611,7 +611,7 @@ popup_item_activate (GtkWidget *item, gpointer *user_data)
}
/**
- * gnumeric_create_popup_menu:
+ * gnm_create_popup_menu:
* @elements:
* @handler: (scope async):
* @user_data: user data to pass to @handler.
@@ -620,8 +620,8 @@ popup_item_activate (GtkWidget *item, gpointer *user_data)
* @event:
**/
void
-gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
- GnumericPopupMenuHandler handler,
+gnm_create_popup_menu (GnmPopupMenuElement const *elements,
+ GnmPopupMenuHandler handler,
gpointer user_data,
int display_filter, int sensitive_filter,
GdkEvent *event)
@@ -701,13 +701,13 @@ gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
}
void
-gnumeric_init_help_button (GtkWidget *w, char const *link)
+gnm_init_help_button (GtkWidget *w, char const *link)
{
go_gtk_help_button_init (w, gnm_sys_data_dir (), "gnumeric", link);
}
char *
-gnumeric_textbuffer_get_text (GtkTextBuffer *buf)
+gnm_textbuffer_get_text (GtkTextBuffer *buf)
{
GtkTextIter start, end;
@@ -720,14 +720,14 @@ gnumeric_textbuffer_get_text (GtkTextBuffer *buf)
}
char *
-gnumeric_textview_get_text (GtkTextView *text_view)
+gnm_textview_get_text (GtkTextView *text_view)
{
- return gnumeric_textbuffer_get_text
+ return gnm_textbuffer_get_text
(gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)));
}
void
-gnumeric_textview_set_text (GtkTextView *text_view, char const *txt)
+gnm_textview_set_text (GtkTextView *text_view, char const *txt)
{
gtk_text_buffer_set_text (
gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)),
@@ -804,7 +804,7 @@ gnm_get_pango_attributes_from_buffer (GtkTextBuffer *buffer)
{
PangoAttrList *list = pango_attr_list_new ();
GtkTextIter start;
- gchar *text = gnumeric_textbuffer_get_text (buffer);
+ gchar *text = gnm_textbuffer_get_text (buffer);
gtk_text_buffer_get_start_iter (buffer, &start);
@@ -997,7 +997,7 @@ gnm_widget_set_cursor_type (GtkWidget *w, GdkCursorType ct)
/* ------------------------------------------------------------------------- */
/**
- * gnumeric_message_dialog_create:
+ * gnm_message_dialog_create:
*
* A convenience fonction to build HIG compliant message dialogs.
*
@@ -1011,7 +1011,7 @@ gnm_widget_set_cursor_type (GtkWidget *w, GdkCursorType ct)
**/
GtkWidget *
-gnumeric_message_dialog_create (GtkWindow * parent,
+gnm_message_dialog_create (GtkWindow * parent,
GtkDialogFlags flags,
GtkMessageType type,
gchar const * primary_message,
@@ -1087,20 +1087,6 @@ gnumeric_message_dialog_create (GtkWindow * parent,
return dialog;
}
-gboolean
-gnm_tree_model_iter_prev (GtkTreeModel *model, GtkTreeIter* iter)
-{
- GtkTreePath *path = gtk_tree_model_get_path (model, iter);
-
- if (gtk_tree_path_prev (path) &&
- gtk_tree_model_get_iter (model, iter, path)) {
- gtk_tree_path_free (path);
- return TRUE;
- }
- gtk_tree_path_free (path);
- return FALSE;
-}
-
typedef struct {
GPtrArray *objects_signals;
} GnmDialogDestroySignals;
@@ -1246,7 +1232,7 @@ gnm_check_for_plugins_missing (char const **ids, GtkWindow *parent)
error = go_error_info_new_printf
(_("The plugin with id %s is required "
"but cannot be found."), *ids);
- gnumeric_go_error_info_dialog_show (parent,
+ gnm_go_error_info_dialog_show (parent,
error);
return TRUE;
} else if (!go_plugin_is_active (pi)) {
@@ -1255,7 +1241,7 @@ gnm_check_for_plugins_missing (char const **ids, GtkWindow *parent)
(_("The %s plugin is required "
"but is not loaded."),
go_plugin_get_name (pi));
- gnumeric_go_error_info_dialog_show (parent,
+ gnm_go_error_info_dialog_show (parent,
error);
return TRUE;
}
diff --git a/src/gui-util.h b/src/gui-util.h
index 5cb9cc2..8e953b8 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -12,19 +12,19 @@ G_BEGIN_DECLS
#define GNM_ACTION_DEF(name) \
void name (GtkAction *a, WBCGtk *wbcg)
-GtkWidget* gnumeric_go_error_info_dialog_create (GOErrorInfo *error);
-void gnumeric_go_error_info_dialog_show (GtkWindow *parent,
+GtkWidget* gnm_go_error_info_dialog_create (GOErrorInfo *error);
+void gnm_go_error_info_dialog_show (GtkWindow *parent,
GOErrorInfo *error);
-void gnumeric_go_error_info_list_dialog_show (GtkWindow *parent,
+void gnm_go_error_info_list_dialog_show (GtkWindow *parent,
GSList *errs);
-void gnumeric_restore_window_geometry (GtkWindow *dialog,
+void gnm_restore_window_geometry (GtkWindow *dialog,
const char *key);
-void gnumeric_keyed_dialog (WBCGtk *wbcg,
+void gnm_keyed_dialog (WBCGtk *wbcg,
GtkWindow *dialog,
char const *key);
-gpointer gnumeric_dialog_raise_if_exists (WBCGtk *wbcg,
+gpointer gnm_dialog_raise_if_exists (WBCGtk *wbcg,
char const *key);
-void gnumeric_editable_enters (GtkWindow *window, GtkWidget *editable);
+void gnm_editable_enters (GtkWindow *window, GtkWidget *editable);
/* Utility routine as Gtk does not have any decent routine to do this */
int gnm_gtk_radio_group_get_selected (GSList *radio_group);
@@ -37,10 +37,10 @@ void gnumeric_popup_menu (GtkMenu *menu, GdkEvent *event);
/*
* Pseudo-tooltip support code.
*/
-void gnumeric_position_tooltip (GtkWidget *tip, int px, int py,
+void gnm_position_tooltip (GtkWidget *tip, int px, int py,
gboolean horizontal);
-GtkWidget *gnumeric_create_tooltip (GtkWidget *ref_widget);
-GtkWidget *gnumeric_convert_to_tooltip (GtkWidget *ref_widget,
+GtkWidget *gnm_create_tooltip (GtkWidget *ref_widget);
+GtkWidget *gnm_convert_to_tooltip (GtkWidget *ref_widget,
GtkWidget *widget);
GtkBuilder *gnm_gtk_builder_load (char const *uifile, char const *domain,
@@ -55,25 +55,25 @@ typedef struct {
int index;
char *allocated_name;
-} GnumericPopupMenuElement;
+} GnmPopupMenuElement;
-typedef void (*GnumericPopupMenuHandler) (GnumericPopupMenuElement const *e,
+typedef void (*GnmPopupMenuHandler) (GnmPopupMenuElement const *e,
gpointer user_data);
-void gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
- GnumericPopupMenuHandler handler,
+void gnm_create_popup_menu (GnmPopupMenuElement const *elements,
+ GnmPopupMenuHandler handler,
gpointer user_data,
int display_filter,
int sensitive_filter,
GdkEvent *event);
-#define gnumeric_filter_modifiers(a) ((a) & (GDK_MODIFIER_MASK &
(~(GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD5_MASK))))
+#define gnm_filter_modifiers(a) ((a) & (GDK_MODIFIER_MASK & (~(GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD5_MASK))))
-void gnumeric_init_help_button (GtkWidget *w, char const *link);
+void gnm_init_help_button (GtkWidget *w, char const *link);
-char *gnumeric_textbuffer_get_text (GtkTextBuffer *buf);
-char *gnumeric_textview_get_text (GtkTextView *text_view);
-void gnumeric_textview_set_text (GtkTextView *text_view, char const *txt);
+char *gnm_textbuffer_get_text (GtkTextBuffer *buf);
+char *gnm_textview_get_text (GtkTextView *text_view);
+void gnm_textview_set_text (GtkTextView *text_view, char const *txt);
void gnm_load_pango_attributes_into_buffer (PangoAttrList *markup,
GtkTextBuffer *buffer,
gchar const *str);
@@ -105,15 +105,13 @@ void gnm_widget_set_cursor (GtkWidget *w, GdkCursor *ct);
int gnm_widget_measure_string (GtkWidget *w, const char *s);
-GtkWidget * gnumeric_message_dialog_create (GtkWindow * parent,
+GtkWidget * gnm_message_dialog_create (GtkWindow * parent,
GtkDialogFlags flags,
GtkMessageType type,
char const *primary_message,
char const *secondary_message);
typedef gboolean (*gnm_iter_search_t) (GtkTreeModel *model, GtkTreeIter* iter);
-#define gnm_tree_model_iter_next gtk_tree_model_iter_next
-gboolean gnm_tree_model_iter_prev (GtkTreeModel *model, GtkTreeIter* iter);
typedef enum {
GNM_DIALOG_DESTROY_SHEET_ADDED = 0x01,
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index cbd77fb..9034fd8 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -256,7 +256,7 @@ icg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
{
GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (cc);
if (icg->show_warnings) {
- GtkWidget *dialog = gnumeric_go_error_info_dialog_create (error);
+ GtkWidget *dialog = gnm_go_error_info_dialog_create (error);
gtk_widget_show_all (GTK_WIDGET (dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -268,7 +268,7 @@ icg_error_error_info_list (GOCmdContext *cc, GSList *error)
{
GnmIOContextGtk *icg = GNM_IO_CONTEXT_GTK (cc);
if (icg->show_warnings && error != NULL && error->data != NULL) {
- GtkWidget *dialog = gnumeric_go_error_info_dialog_create
+ GtkWidget *dialog = gnm_go_error_info_dialog_create
(error->data);
gtk_widget_show_all (GTK_WIDGET (dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
diff --git a/src/item-bar.c b/src/item-bar.c
index 7bbc60a..a1d7be4 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -976,7 +976,7 @@ item_bar_button_pressed (GocItem *item, int button, double x_, double y_)
if (ib->tip == NULL) {
GtkWidget *cw = GTK_WIDGET (canvas);
int wx, wy;
- ib->tip = gnumeric_create_tooltip (cw);
+ ib->tip = gnm_create_tooltip (cw);
colrow_tip_setlabel (ib, is_cols, ib->colrow_resize_size);
/* Position above the current point for both
* col and row headers. trying to put it
@@ -986,7 +986,7 @@ item_bar_button_pressed (GocItem *item, int button, double x_, double y_)
* different from X. */
gnm_canvas_get_position (canvas, &wx, &wy,x, y);
- gnumeric_position_tooltip (ib->tip,
+ gnm_position_tooltip (ib->tip,
wx, wy, TRUE);
gtk_widget_show_all (gtk_widget_get_toplevel (ib->tip));
}
diff --git a/src/item-cursor.c b/src/item-cursor.c
index 8ec4e9c..b8e11a4 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -810,7 +810,7 @@ item_cursor_do_action (GnmItemCursor *ic, ActionType action)
}
static void
-context_menu_hander (GnumericPopupMenuElement const *element,
+context_menu_hander (GnmPopupMenuElement const *element,
gpointer ic)
{
g_return_if_fail (element != NULL);
@@ -820,7 +820,7 @@ context_menu_hander (GnumericPopupMenuElement const *element,
static void
item_cursor_popup_menu (GnmItemCursor *ic, GdkEvent *event)
{
- static GnumericPopupMenuElement const popup_elements[] = {
+ static GnmPopupMenuElement const popup_elements[] = {
{ N_("_Move"), NULL,
0, 0, ACTION_MOVE_CELLS },
@@ -851,7 +851,7 @@ item_cursor_popup_menu (GnmItemCursor *ic, GdkEvent *event)
{ NULL, NULL, 0, 0, 0 }
};
- gnumeric_create_popup_menu (popup_elements,
+ gnm_create_popup_menu (popup_elements,
&context_menu_hander, ic,
0, 0, event);
}
@@ -889,10 +889,10 @@ item_cursor_tip_setlabel (GnmItemCursor *ic, char const *text)
if (ic->tip == NULL) {
GtkWidget *cw = GTK_WIDGET (GOC_ITEM (ic)->canvas);
int x, y;
- ic->tip = gnumeric_create_tooltip (cw);
+ ic->tip = gnm_create_tooltip (cw);
gnm_canvas_get_position (GOC_CANVAS (cw), &x, &y, ic->last_x, ic->last_y);
- gnumeric_position_tooltip (ic->tip, x, y, TRUE);
+ gnm_position_tooltip (ic->tip, x, y, TRUE);
gtk_widget_show_all (gtk_widget_get_toplevel (ic->tip));
}
diff --git a/src/item-grid.c b/src/item-grid.c
index 90da14f..4c8cb81 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -1088,7 +1088,7 @@ cb_cursor_come_to_rest (GnmItemGrid *ig)
gnm_canvas_get_position (canvas, &wx, &wy,
ig->last_x, ig->last_y);
- ig->tip = gnumeric_create_tooltip (cw);
+ ig->tip = gnm_create_tooltip (cw);
gtk_label_set_text (GTK_LABEL (ig->tip), tiptext);
/* moving the tip window some pixels from wx,wy in order to
* avoid a leave_notify event that would destroy the tip.
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 4d14cb2..c21d2bc 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -304,11 +304,11 @@ gnm_init (void)
}
gnm_register_ui_files ();
go_plugin_service_define ("function_group",
- &plugin_service_function_group_get_type);
+ &gnm_plugin_service_function_group_get_type);
go_plugin_service_define ("ui",
- &plugin_service_ui_get_type);
+ &gnm_plugin_service_ui_get_type);
go_plugin_service_define ("solver",
- &plugin_service_solver_get_type);
+ &gnm_plugin_service_solver_get_type);
go_plugin_loader_module_register_version ("gnumeric", GNM_VERSION_FULL);
g_object_new (GNM_APP_TYPE, NULL);
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 97e8a56..dd83c88 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -1961,7 +1961,7 @@ enum {
CONTEXT_DATA_SLICER_EDIT /* prop dialog */
};
static void
-context_menu_handler (GnumericPopupMenuElement const *element,
+context_menu_handler (GnmPopupMenuElement const *element,
gpointer user_data)
{
SheetControlGUI *scg = user_data;
@@ -2163,7 +2163,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
POPUPITEM_FORMAT
};
- static GnumericPopupMenuElement popup_elements[] = {
+ static GnmPopupMenuElement popup_elements[] = {
{ N_("Cu_t"), "edit-cut",
0, 0, CONTEXT_CUT, NULL },
{ N_("_Copy"), "edit-copy",
@@ -2454,7 +2454,7 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
}
- gnumeric_create_popup_menu (popup_elements, &context_menu_handler,
+ gnm_create_popup_menu (popup_elements, &context_menu_handler,
scg, display_filter,
sensitivity_filter, event);
}
@@ -3141,7 +3141,7 @@ scg_comment_display (SheetControlGUI *scg, GnmComment *cc,
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- gnumeric_convert_to_tooltip (GTK_WIDGET (scg->grid), box);
+ gnm_convert_to_tooltip (GTK_WIDGET (scg->grid), box);
scg->comment.item = gtk_widget_get_toplevel (box);
gtk_window_move (GTK_WINDOW (scg->comment.item),
@@ -3795,7 +3795,7 @@ scg_show_im_tooltip (SheetControl *sc, GnmInputMsg *im, GnmCellPos *pos)
if (len_title > 0)
gtk_box_set_spacing (GTK_BOX (box), 10);
}
- gnumeric_convert_to_tooltip (GTK_WIDGET (scg->grid), box);
+ gnm_convert_to_tooltip (GTK_WIDGET (scg->grid), box);
scg->im.item = gtk_widget_get_toplevel (box);
x = sheet_col_get_distance_pixels
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index 64b867c..6c18932 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -782,12 +782,12 @@ sheet_object_graph_guru (WBCGtk *wbcg, GogGraph *graph,
g_object_set_data (object, "data-closure", data);
g_object_set_data_full (G_OBJECT (custom), "data-closure", data, (GDestroyNotify)
cb_graph_data_closure_done);
}
- gnumeric_init_help_button (
+ gnm_init_help_button (
gog_guru_get_help_button (dialog),
"chapter-graphs");
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (dialog),
wbcg, GNM_DIALOG_DESTROY_SHEET_REMOVED);
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (dialog), "graph-guru");
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (dialog), "graph-guru");
g_object_set_data_full (G_OBJECT (dialog),
"guru", wbcg, (GDestroyNotify) cb_graph_guru_done);
wbc_gtk_attach_guru (wbcg, dialog);
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 9b3ae91..5d9c539 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -538,7 +538,7 @@ sheet_widget_frame_user_config (SheetObject *so, SheetControl *sc)
g_return_if_fail (swf != NULL);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
return;
gui = gnm_gtk_builder_load ("so-frame.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -555,7 +555,7 @@ sheet_widget_frame_user_config (SheetObject *so, SheetControl *sc)
state->label = go_gtk_builder_get_widget (gui, "entry");
gtk_entry_set_text (GTK_ENTRY(state->label), swf->label);
gtk_editable_select_region (GTK_EDITABLE(state->label), 0, -1);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->label));
g_signal_connect (G_OBJECT(state->label),
@@ -570,12 +570,12 @@ sheet_widget_frame_user_config (SheetObject *so, SheetControl *sc)
"clicked",
G_CALLBACK (cb_frame_config_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_SO_FRAME);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
SHEET_OBJECT_CONFIG_KEY);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
@@ -1063,7 +1063,7 @@ sheet_widget_button_user_config (SheetObject *so, SheetControl *sc)
g_return_if_fail (swb != NULL);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
return;
gui = gnm_gtk_builder_load ("so-button.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -1093,9 +1093,9 @@ sheet_widget_button_user_config (SheetObject *so, SheetControl *sc)
state->label = go_gtk_builder_get_widget (gui, "label_entry");
gtk_entry_set_text (GTK_ENTRY (state->label), swb->label);
gtk_editable_select_region (GTK_EDITABLE(state->label), 0, -1);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->expression));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->label));
g_signal_connect (G_OBJECT (state->label),
@@ -1108,11 +1108,11 @@ sheet_widget_button_user_config (SheetObject *so, SheetControl *sc)
"clicked",
G_CALLBACK (cb_button_config_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_SO_BUTTON);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
SHEET_OBJECT_CONFIG_KEY);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
@@ -1673,7 +1673,7 @@ sheet_widget_adjustment_user_config_impl (SheetObject *so, SheetControl *sc, cha
gboolean has_directions = swa_class->has_orientation;
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
return;
gui = gnm_gtk_builder_load ("so-scrollbar.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -1733,15 +1733,15 @@ sheet_widget_adjustment_user_config_impl (SheetObject *so, SheetControl *sc, cha
gtk_spin_button_set_value (GTK_SPIN_BUTTON (state->page),
gtk_adjustment_get_page_increment (swa->adjustment));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->expression));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->min));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->max));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->inc));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->page));
g_signal_connect (G_OBJECT (go_gtk_builder_get_widget (gui, "ok_button")),
"clicked",
@@ -1750,11 +1750,11 @@ sheet_widget_adjustment_user_config_impl (SheetObject *so, SheetControl *sc, cha
"clicked",
G_CALLBACK (cb_adjustment_config_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_SO_ADJUSTMENT);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
SHEET_OBJECT_CONFIG_KEY);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
@@ -2525,7 +2525,7 @@ sheet_widget_checkbox_user_config (SheetObject *so, SheetControl *sc)
g_return_if_fail (swc != NULL);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
return;
gui = gnm_gtk_builder_load ("so-checkbox.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -2555,9 +2555,9 @@ sheet_widget_checkbox_user_config (SheetObject *so, SheetControl *sc)
state->label = go_gtk_builder_get_widget (gui, "label_entry");
gtk_entry_set_text (GTK_ENTRY (state->label), swc->label);
gtk_editable_select_region (GTK_EDITABLE(state->label), 0, -1);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->expression));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->label));
g_signal_connect (G_OBJECT (state->label),
@@ -2570,11 +2570,11 @@ sheet_widget_checkbox_user_config (SheetObject *so, SheetControl *sc)
"clicked",
G_CALLBACK (cb_checkbox_config_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_SO_CHECKBOX);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
SHEET_OBJECT_CONFIG_KEY);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
@@ -3268,7 +3268,7 @@ sheet_widget_radio_button_user_config (SheetObject *so, SheetControl *sc)
g_return_if_fail (swrb != NULL);
/* Only pop up one copy per workbook */
- if (gnumeric_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
+ if (gnm_dialog_raise_if_exists (wbcg, SHEET_OBJECT_CONFIG_KEY))
return;
gui = gnm_gtk_builder_load ("so-radiobutton.ui", NULL, GO_CMD_CONTEXT (wbcg));
@@ -3306,11 +3306,11 @@ sheet_widget_radio_button_user_config (SheetObject *so, SheetControl *sc)
gtk_entry_set_text (GTK_ENTRY (state->value), valstr->str);
g_string_free (valstr, TRUE);
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->expression));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->label));
- gnumeric_editable_enters (GTK_WINDOW (state->dialog),
+ gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->value));
g_signal_connect (G_OBJECT (state->label),
@@ -3326,11 +3326,11 @@ sheet_widget_radio_button_user_config (SheetObject *so, SheetControl *sc)
"clicked",
G_CALLBACK (cb_radio_button_config_cancel_clicked), state);
- gnumeric_init_help_button (
+ gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_SO_RADIO_BUTTON);
- gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
+ gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
SHEET_OBJECT_CONFIG_KEY);
wbc_gtk_attach_guru (state->wbcg, state->dialog);
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 640fd7b..322e782 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -887,7 +887,7 @@ wbcg_edit_start (WBCGtk *wbcg,
GtkWidget *check;
GtkWidget *align;
- GtkWidget *d = gnumeric_message_dialog_create
+ GtkWidget *d = gnm_message_dialog_create
(wbcg_toplevel (wbcg),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 328b14b..b8a4a7e 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1770,7 +1770,7 @@ wbcg_show_save_dialog (WBCGtk *wbcg, Workbook *wb)
msg = g_strdup (_("Save changes to workbook before closing?"));
}
- d = gnumeric_message_dialog_create (wbcg_toplevel (wbcg),
+ d = gnm_message_dialog_create (wbcg_toplevel (wbcg),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
msg,
@@ -3649,7 +3649,7 @@ cb_font_name_vaction_clicked (GtkAction *act, WBCGtk *wbcg)
GtkFontChooser *font_dialog;
const char *key = "font-name-dialog";
- if (gnumeric_dialog_raise_if_exists (wbcg, key))
+ if (gnm_dialog_raise_if_exists (wbcg, key))
return;
font_dialog = g_object_new (GO_TYPE_FONT_SEL_DIALOG, NULL);
@@ -3661,7 +3661,7 @@ cb_font_name_vaction_clicked (GtkAction *act, WBCGtk *wbcg)
gtk_window_present (GTK_WINDOW (font_dialog));
- gnumeric_keyed_dialog (wbcg, GTK_WINDOW (font_dialog), key);
+ gnm_keyed_dialog (wbcg, GTK_WINDOW (font_dialog), key);
}
@@ -4898,7 +4898,7 @@ static void
cb_new_from_template (GObject *action, WBCGtk *wbcg)
{
const char *uri = g_object_get_data (action, "uri");
- gui_file_template (wbcg, uri);
+ gnm_gui_file_template (wbcg, uri);
}
static void
@@ -5495,14 +5495,14 @@ wbcg_error_error (GOCmdContext *cc, GError *err)
static void
wbcg_error_error_info (GOCmdContext *cc, GOErrorInfo *error)
{
- gnumeric_go_error_info_dialog_show (
+ gnm_go_error_info_dialog_show (
wbcg_toplevel (WBC_GTK (cc)), error);
}
static void
wbcg_error_error_info_list (GOCmdContext *cc, GSList *errs)
{
- gnumeric_go_error_info_list_dialog_show
+ gnm_go_error_info_list_dialog_show
(wbcg_toplevel (WBC_GTK (cc)), errs);
}
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 228220e..85e251d 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -785,7 +785,7 @@ gee_create_tooltip (GnmExprEntry *gee, gchar const *str,
(G_OBJECT (toplevel), "focus-out-event",
G_CALLBACK (cb_gee_focus_out_event), gee);
- label = gnumeric_convert_to_tooltip (toplevel, gtk_text_view_new ());
+ label = gnm_convert_to_tooltip (toplevel, gtk_text_view_new ());
tip = gtk_widget_get_toplevel (label);
gtk_style_context_add_class (gtk_widget_get_style_context (label),
@@ -1295,7 +1295,7 @@ cb_gee_key_press_event (GtkEntry *entry,
{
WBCGtk *wbcg = gee->wbcg;
gboolean is_enter = FALSE;
- int state = gnumeric_filter_modifiers (event->state);
+ int state = gnm_filter_modifiers (event->state);
switch (event->keyval) {
case GDK_KEY_Up: case GDK_KEY_KP_Up:
diff --git a/src/widgets/gnumeric-text-view.c b/src/widgets/gnumeric-text-view.c
index b77c129..44ae4a0 100644
--- a/src/widgets/gnumeric-text-view.c
+++ b/src/widgets/gnumeric-text-view.c
@@ -398,7 +398,7 @@ gtv_get_property (GObject *object,
case PROP_TEXT:
g_value_take_string
(value,
- gnumeric_textbuffer_get_text (gtv->buffer));
+ gnm_textbuffer_get_text (gtv->buffer));
break;
case PROP_WRAP:
g_value_set_enum (value,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
