Commit 2a05bbbb authored by Morten Welinder's avatar Morten Welinder

GUI: Move .ui files from goffice resources to glib resources

parent 762ef290
......@@ -47,6 +47,95 @@ BUILT_SOURCES = \
gnmresources.h \
gnumeric-paths.h
# These also need to occur in gnm.gresource.xml
resource_ui_files = \
advanced-filter.ui \
anova-one.ui \
anova-two.ui \
autofilter-expression.ui \
autofilter-top10.ui \
autoformat.ui \
autosave.ui \
cell-comment.ui \
cell-format-cond.ui \
cell-format.ui \
cell-sort.ui \
chi-squared.ui \
col-width.ui \
colrow.ui \
consolidate.ui \
correlation.ui \
covariance.ui \
dao.ui \
data-slicer.ui \
data-table.ui \
define-name.ui \
delete-cells.ui \
descriptive-stats.ui \
dialog-stf-export.ui \
dialog-stf.ui \
dialog-zoom.ui \
doc-meta-data.ui \
exp-smoothing.ui \
fill-series.ui \
formula-guru.ui \
fourier-analysis.ui \
frequency.ui \
function-select.ui \
goalseek.ui \
goto.ui \
hf-config.ui \
hf-dt-format.ui \
histogram.ui \
hyperlink.ui \
insert-cells.ui \
kaplan-meier.ui \
mean-tests.ui \
merge.ui \
moving-averages.ui \
normality-tests.ui \
one-mean-test.ui \
paste-special.ui \
plugin-manager.ui \
preferences.ui \
principal-components.ui \
print.ui \
quit.ui \
random-generation-cor.ui \
random-generation.ui \
rank.ui \
recent.ui \
regression.ui \
row-height.ui \
sampling.ui \
scenario-add.ui \
scenario-manager.ui \
search-replace.ui \
search.ui \
sheet-compare.ui \
sheet-order.ui \
sheet-rename.ui \
sheet-resize.ui \
sheetobject-size.ui \
shuffle.ui \
sign-test-two.ui \
sign-test.ui \
simulation.ui \
so-button.ui \
so-checkbox.ui \
so-frame.ui \
so-list.ui \
so-radiobutton.ui \
so-scrollbar.ui \
solver.ui \
tabulate.ui \
variance-tests.ui \
view.ui \
wbcg.ui \
wilcoxon-mann-whitney.ui \
workbook-attr.ui
# Another hint, see bugs #172211 and #172212:
non-intermediate: gnm-marshalers.c gnmresources.c
......@@ -527,7 +616,8 @@ EXTRA_DIST = \
gnm-marshalers.list \
README.gnm_float \
gnumeric.rc \
GNOME_Gnumeric-gtk.xml
GNOME_Gnumeric-gtk.xml \
$(resource_ui_files)
if HAVE_INTROSPECTION
......
......@@ -2,4 +2,3 @@ Makefile.in
Makefile
.deps
*.bak
embedded-ui.c
......@@ -2,8 +2,6 @@
# Keep this in sync with ../../icons/Makefile.am
#
nodist_libdialogs_la_SOURCES = embedded-ui.c
AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNUMERIC_DATADIR=\""$(gnumeric_datadir)"\" \
......@@ -93,108 +91,3 @@ libdialogs_la_SOURCES = \
embedded-ui.h \
tool-dialogs.h \
dialog-printer-setup.c
# uidir = $(gnumeric_datadir)/ui
# ui_DATA =
embedded_uis = \
advanced-filter.ui \
anova-one.ui \
anova-two.ui \
autofilter-expression.ui \
autofilter-top10.ui \
autoformat.ui \
autosave.ui \
cell-comment.ui \
cell-format-cond.ui \
cell-format.ui \
cell-sort.ui \
chi-squared.ui \
col-width.ui \
colrow.ui \
consolidate.ui \
correlation.ui \
covariance.ui \
dao.ui \
data-slicer.ui \
data-table.ui \
define-name.ui \
delete-cells.ui \
descriptive-stats.ui \
dialog-stf-export.ui \
dialog-stf.ui \
dialog-zoom.ui \
doc-meta-data.ui \
exp-smoothing.ui \
fill-series.ui \
formula-guru.ui \
fourier-analysis.ui \
frequency.ui \
function-select.ui \
goalseek.ui \
goto.ui \
hf-config.ui \
hf-dt-format.ui \
histogram.ui \
hyperlink.ui \
insert-cells.ui \
kaplan-meier.ui \
mean-tests.ui \
merge.ui \
moving-averages.ui \
normality-tests.ui \
one-mean-test.ui \
paste-special.ui \
plugin-manager.ui \
preferences.ui \
principal-components.ui \
print.ui \
quit.ui \
random-generation-cor.ui \
random-generation.ui \
rank.ui \
recent.ui \
regression.ui \
row-height.ui \
sampling.ui \
scenario-add.ui \
scenario-manager.ui \
search-replace.ui \
search.ui \
sheet-compare.ui \
sheet-order.ui \
sheet-rename.ui \
sheet-resize.ui \
sheetobject-size.ui \
shuffle.ui \
sign-test-two.ui \
sign-test.ui \
simulation.ui \
so-button.ui \
so-checkbox.ui \
so-frame.ui \
so-list.ui \
so-radiobutton.ui \
so-scrollbar.ui \
solver.ui \
tabulate.ui \
variance-tests.ui \
view.ui \
wbcg.ui \
wilcoxon-mann-whitney.ui \
workbook-attr.ui
BUILT_SOURCES = embedded-ui.c
embedded-ui.c: $(top_srcdir)/tools/embedder $(embedded_uis) Makefile
cd $(srcdir) && @PERL@ $(abs_top_srcdir)/tools/embedder \
--register-function=gnm_register_ui_files \
--register-file-function=go_rsm_register_file \
--id-prefix=gnm: \
--include '<goffice/goffice.h>' \
--include embedded-ui.h \
COMPRESS $(embedded_uis) >$(abs_builddir)/$@
EXTRA_DIST = $(ui_DATA) $(embedded_uis)
CLEANFILES = $(BUILT_SOURCES)
......@@ -205,7 +205,7 @@ dialog_advanced_filter (WBCGtk *wbcg)
if (dialog_tool_init (state, wbcg, wb_control_cur_sheet (wbc),
GNUMERIC_HELP_LINK_ADVANCED_FILTER,
"advanced-filter.ui", "Filter",
"res:ui/advanced-filter.ui", "Filter",
_("Could not create the Advanced Filter dialog."),
ADVANCED_FILTER_KEY,
G_CALLBACK (advanced_filter_ok_clicked_cb), NULL,
......
......@@ -213,7 +213,7 @@ dialog_chi_square_tool (WBCGtk *wbcg, Sheet *sheet, gboolean independence)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_CHI_SQUARED,
"chi-squared.ui", "Chi-Squared Tests",
"res:ui/chi-squared.ui", "Chi-Squared Tests",
_("Could not create the Chi Squared Tests "
"tool dialog."),
CHI_SQUARED_I_KEY,
......
......@@ -254,7 +254,7 @@ dialog_frequency_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_FREQUENCY,
"frequency.ui", "Frequency",
"res:ui/frequency.ui", "Frequency",
_("Could not create the Frequency Tool dialog."),
FREQUENCY_KEY,
G_CALLBACK (frequency_tool_ok_clicked_cb), NULL,
......
......@@ -622,7 +622,7 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_KAPLAN_MEIER,
"kaplan-meier.ui", "KaplanMeier",
"res:ui/kaplan-meier.ui", "KaplanMeier",
_("Could not create the Kaplan Meier Tool dialog."),
KAPLAN_MEIER_KEY,
G_CALLBACK (kaplan_meier_tool_ok_clicked_cb), NULL,
......
......@@ -197,7 +197,7 @@ dialog_normality_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_NORMALITY,
"normality-tests.ui", "Normality-Tests",
"res:ui/normality-tests.ui", "Normality-Tests",
_("Could not create the Normality Test Tool dialog."),
NORMALITY_KEY,
G_CALLBACK (normality_tool_ok_clicked_cb), NULL,
......
......@@ -220,7 +220,7 @@ dialog_one_mean_test_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_ONE_MEAN,
"one-mean-test.ui", "One-Mean-Test",
"res:ui/one-mean-test.ui", "One-Mean-Test",
_("Could not create the Student-t Test Tool dialog."),
ONE_MEAN_TEST_KEY,
G_CALLBACK (one_mean_test_tool_ok_clicked_cb),
......
......@@ -167,7 +167,7 @@ dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_PRINCIPAL_COMPONENTS,
"principal-components.ui", "PrincipalComponents",
"res:ui/principal-components.ui", "PrincipalComponents",
_("Could not create the Principal Components Analysis Tool dialog."),
PRINCIPAL_COMPONENTS_KEY,
G_CALLBACK (principal_components_tool_ok_clicked_cb), NULL,
......
......@@ -253,7 +253,7 @@ dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_SIGN_TEST_TWO,
"sign-test-two.ui", "Sign-Test",
"res:ui/sign-test-two.ui", "Sign-Test",
_("Could not create the Sign Test Tool dialog."),
SIGN_TEST_KEY_TWO,
G_CALLBACK (sign_test_two_tool_ok_clicked_cb),
......@@ -401,7 +401,7 @@ dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_SIGN_TEST,
"sign-test.ui", "Sign-Test",
"res:ui/sign-test.ui", "Sign-Test",
_("Could not create the Sign Test Tool dialog."),
SIGN_TEST_KEY_ONE,
G_CALLBACK (sign_test_tool_ok_clicked_cb),
......
......@@ -184,7 +184,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_WILCOXON_MANN_WHITNEY,
"wilcoxon-mann-whitney.ui", "WilcoxonMannWhitney",
"res:ui/wilcoxon-mann-whitney.ui", "WilcoxonMannWhitney",
_("Could not create the Wilcoxon-Mann-Whitney Analysis Tool dialog."),
WILCOXON_MANN_WHITNEY_KEY,
G_CALLBACK (wilcoxon_mann_whitney_tool_ok_clicked_cb), NULL,
......
......@@ -709,7 +709,7 @@ dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_CORRELATION,
"correlation.ui", "Correlation",
"res:ui/correlation.ui", "Correlation",
_("Could not create the Correlation Tool dialog."),
CORRELATION_KEY,
G_CALLBACK (corr_tool_ok_clicked_cb), NULL,
......@@ -829,7 +829,7 @@ dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_COVARIANCE,
"covariance.ui", "Covariance",
"res:ui/covariance.ui", "Covariance",
_("Could not create the Covariance Tool dialog."),
COVARIANCE_KEY,
G_CALLBACK (cov_tool_ok_clicked_cb), NULL,
......@@ -921,7 +921,7 @@ dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_RANKING,
"rank.ui", "RankPercentile",
"res:ui/rank.ui", "RankPercentile",
_("Could not create the Rank and Percentile "
"Tools dialog."),
RANK_PERCENTILE_KEY,
......@@ -1014,7 +1014,7 @@ dialog_fourier_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (state, wbcg, sheet,
GNUMERIC_HELP_LINK_FOURIER_ANALYSIS,
"fourier-analysis.ui", "FourierAnalysis",
"res:ui/fourier-analysis.ui", "FourierAnalysis",
_("Could not create the Fourier Analysis Tool "
"dialog."),
FOURIER_KEY,
......@@ -1226,7 +1226,7 @@ dialog_descriptive_stat_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_DESCRIPTIVE_STATS,
"descriptive-stats.ui", "DescStats",
"res:ui/descriptive-stats.ui", "DescStats",
_("Could not create the Descriptive Statistics "
"Tool dialog."),
DESCRIPTIVE_STATS_KEY,
......@@ -1612,7 +1612,7 @@ dialog_ttest_tool (WBCGtk *wbcg, Sheet *sheet, ttest_type test)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_MEAN_TESTS,
"mean-tests.ui", "MeanTests",
"res:ui/mean-tests.ui", "MeanTests",
_("Could not create the Mean Tests Tool dialog."),
TTEST_KEY,
G_CALLBACK (ttest_tool_ok_clicked_cb), NULL,
......@@ -1802,7 +1802,7 @@ dialog_ftest_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_F_TEST_TWO_SAMPLE,
"variance-tests.ui", "VarianceTests",
"res:ui/variance-tests.ui", "VarianceTests",
_("Could not create the FTest Tool dialog."),
FTEST_KEY,
G_CALLBACK (ftest_tool_ok_clicked_cb), NULL,
......@@ -2060,7 +2060,7 @@ dialog_sampling_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_SAMPLING,
"sampling.ui", "Sampling",
"res:ui/sampling.ui", "Sampling",
_("Could not create the Sampling Tool dialog."),
SAMPLING_KEY,
G_CALLBACK (sampling_tool_ok_clicked_cb), NULL,
......@@ -2422,7 +2422,7 @@ dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_REGRESSION,
"regression.ui", "Regression",
"res:ui/regression.ui", "Regression",
_("Could not create the Regression Tool dialog."),
REGRESSION_KEY,
G_CALLBACK (regression_tool_ok_clicked_cb), NULL,
......@@ -2732,7 +2732,7 @@ dialog_exp_smoothing_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_EXP_SMOOTHING,
"exp-smoothing.ui",
"res:ui/exp-smoothing.ui",
"ExpSmoothing",
_("Could not create the Exponential Smoothing "
"Tool dialog."),
......@@ -3106,7 +3106,7 @@ dialog_average_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_MOVING_AVERAGES,
"moving-averages.ui",
"res:ui/moving-averages.ui",
"MovAverages",
_("Could not create the Moving Average Tool "
"dialog."),
......@@ -3378,7 +3378,7 @@ dialog_histogram_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_HISTOGRAM,
"histogram.ui", "Histogram",
"res:ui/histogram.ui", "Histogram",
_("Could not create the Histogram Tool dialog."),
HISTOGRAM_KEY,
G_CALLBACK (histogram_tool_ok_clicked_cb), NULL,
......@@ -3562,7 +3562,7 @@ dialog_anova_single_factor_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_ANOVA_SINGLE_FACTOR,
"anova-one.ui", "ANOVA",
"res:ui/anova-one.ui", "ANOVA",
_("Could not create the ANOVA (single factor) "
"tool dialog."),
ANOVA_SINGLE_KEY,
......@@ -3794,7 +3794,7 @@ dialog_anova_two_factor_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_ANOVA_TWO_FACTOR,
"anova-two.ui", "ANOVA",
"res:ui/anova-two.ui", "ANOVA",
_("Could not create the ANOVA (two factor) "
"tool dialog."),
ANOVA_TWO_FACTOR_KEY,
......
......@@ -371,7 +371,7 @@ dialog_auto_filter_expression (WBCGtk *wbcg,
if (gnm_dialog_raise_if_exists
(wbcg, DIALOG_KEY_EXPRESSION))
return;
gui = gnm_gtk_builder_load ("autofilter-expression.ui",
gui = gnm_gtk_builder_load ("res:ui/autofilter-expression.ui",
NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......@@ -471,7 +471,7 @@ dialog_auto_filter (WBCGtk *wbcg,
if (gnm_dialog_raise_if_exists (wbcg, DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("autofilter-top10.ui",
gui = gnm_gtk_builder_load ("res:ui/autofilter-top10.ui",
NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -512,7 +512,7 @@ dialog_autoformat (WBCGtk *wbcg)
AutoFormatState *state;
int i;
gui = gnm_gtk_builder_load ("autoformat.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/autoformat.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -123,7 +123,7 @@ dialog_autosave (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, AUTOSAVE_KEY))
return;
gui = gnm_gtk_builder_load ("autosave.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/autosave.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -107,7 +107,7 @@ dialog_cell_comment (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
if (gnm_dialog_raise_if_exists (wbcg, COMMENT_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("cell-comment.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/cell-comment.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -1300,7 +1300,7 @@ dialog_cell_format_cond (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
gui = gnm_gtk_builder_load ("cell-format-cond.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/cell-format-cond.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -2557,7 +2557,7 @@ dialog_cell_format_init (WBCGtk *wbcg)
GnmCell *edit_cell;
FormatState *state;
gui = gnm_gtk_builder_load ("cell-format.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/cell-format.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return NULL;
......
......@@ -1153,7 +1153,7 @@ dialog_cell_sort (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, CELL_SORT_KEY))
return;
gui = gnm_gtk_builder_load ("cell-sort.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/cell-sort.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -86,7 +86,7 @@ dialog_col_row (WBCGtk *wbcg, char const *operation,
if (gnm_dialog_raise_if_exists (wbcg, COL_ROW_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("colrow.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/colrow.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -245,7 +245,7 @@ dialog_col_width (WBCGtk *wbcg, gboolean use_default)
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));
gui = gnm_gtk_builder_load ("res:ui/col-width.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -545,7 +545,7 @@ dialog_consolidate (WBCGtk *wbcg)
if (dialog_tool_init ((GenericToolState *)state, wbcg, sheet,
GNUMERIC_HELP_LINK_CONSOLIDATE,
"consolidate.ui", "Consolidate",
"res:ui/consolidate.ui", "Consolidate",
_("Could not create the Consolidate dialog."),
CONSOLIDATE_KEY,
G_CALLBACK (cb_consolidate_ok_clicked),
......
......@@ -227,7 +227,7 @@ dialog_data_slicer (WBCGtk *wbcg, gboolean create)
if (gnm_dialog_raise_if_exists (wbcg, DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("data-slicer.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/data-slicer.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (NULL == gui)
return;
......
......@@ -92,7 +92,7 @@ cb_data_table_response (GtkWidget *dialog, gint response_id, GnmDialogDataTable
static gboolean
data_table_init (GnmDialogDataTable *state, WBCGtk *wbcg)
{
state->gui = gnm_gtk_builder_load ("data-table.ui", NULL, GO_CMD_CONTEXT (wbcg));
state->gui = gnm_gtk_builder_load ("res:ui/data-table.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (state->gui == NULL)
return TRUE;
......
......@@ -1056,7 +1056,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
state->is_paste_dialog = is_paste_dialog;
state->has_pasted = FALSE;
state->gui = gnm_gtk_builder_load ("define-name.ui", NULL,
state->gui = gnm_gtk_builder_load ("res:ui/define-name.ui", NULL,
GO_CMD_CONTEXT (wbcg));
if (state->gui == NULL)
return TRUE;
......
......@@ -136,7 +136,7 @@ dialog_delete_cells (WBCGtk *wbcg)
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));
gui = gnm_gtk_builder_load ("res:ui/delete-cells.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -2320,7 +2320,7 @@ dialog_doc_metadata_init (DialogDocMetaData *state,
g_return_val_if_fail (state->metadata != NULL, TRUE);
state->gui = gnm_gtk_builder_load ("doc-meta-data.ui", NULL,
state->gui = gnm_gtk_builder_load ("res:ui/doc-meta-data.ui", NULL,
GO_CMD_CONTEXT (wbcg));
if (state->gui == NULL)
......
......@@ -249,7 +249,7 @@ dialog_fill_series (WBCGtk *wbcg)
if (dialog_tool_init ((GenericToolState *)state, wbcg, sv_sheet (sv),
GNUMERIC_HELP_LINK_FILL_SERIES,
"fill-series.ui", "Fill_series",
"res:ui/fill-series.ui", "Fill_series",
_("Could not create the Fill Series dialog."),
FILL_SERIES_KEY,
G_CALLBACK (cb_fill_series_ok_clicked), NULL,
......
......@@ -1034,7 +1034,7 @@ dialog_formula_guru (WBCGtk *wbcg, GnmFunc *fd)
}
/* Get the dialog and check for errors */
gui = gnm_gtk_builder_load ("formula-guru.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/formula-guru.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -1403,7 +1403,7 @@ dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
if (gnm_dialog_raise_if_exists (wbcg, key))
return;
gui = gnm_gtk_builder_load ("function-select.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/function-select.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -685,7 +685,7 @@ dialog_goal_seek (WBCGtk *wbcg, Sheet *sheet)
/* Only pop up one copy per workbook */
if (gnm_dialog_raise_if_exists (wbcg, GOALSEEK_KEY))
return;
gui = gnm_gtk_builder_load ("goalseek.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/goalseek.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -442,7 +442,7 @@ dialog_goto_cell (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, GOTO_KEY))
return;
gui = gnm_gtk_builder_load ("goto.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/goto.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -582,7 +582,7 @@ dialog_hyperlink (WBCGtk *wbcg, SheetControl *sc)
if (gnm_dialog_raise_if_exists (wbcg, DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("hyperlink.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/hyperlink.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -138,7 +138,7 @@ dialog_insert_cells (WBCGtk *wbcg)
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));
gui = gnm_gtk_builder_load ("res:ui/insert-cells.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -321,7 +321,7 @@ dialog_merge (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, MERGE_KEY))
return;
gui = gnm_gtk_builder_load ("merge.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/merge.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -246,7 +246,7 @@ dialog_paste_special (WBCGtk *wbcg)
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));
gui = gnm_gtk_builder_load ("res:ui/paste-special.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -652,7 +652,7 @@ dialog_plugin_manager (WBCGtk *wbcg)
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));
gui = gnm_gtk_builder_load ("res:ui/plugin-manager.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -1342,7 +1342,7 @@ dialog_preferences (WBCGtk *wbcg, gchar const *page)
return;
}
gui = gnm_gtk_builder_load ("preferences.ui", NULL, GO_CMD_CONTEXT (wbcg));
gui = gnm_gtk_builder_load ("res:ui/preferences.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
......
......@@ -1709,7 +1709,7 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
return;
}
gui = gnm_gtk_builder_load ("hf-config.ui", NULL, GO_CMD_CONTEXT (state->wbcg));