[gnumeric] GUI: Move .ui files from goffice resources to glib resources
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] GUI: Move .ui files from goffice resources to glib resources
- Date: Tue, 15 May 2018 18:07:15 +0000 (UTC)
commit 2a05bbbb0fd25ec92b017a8ce80dcdb797f56e61
Author: Morten Welinder <terra gnome org>
Date: Tue May 15 14:06:13 2018 -0400
GUI: Move .ui files from goffice resources to glib resources
src/Makefile.am | 92 +++++++++++++++++-
src/dialogs/.gitignore | 1 -
src/dialogs/Makefile.am | 107 --------------------
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 | 2 +-
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 | 28 +++---
src/dialogs/dialog-autofilter.c | 4 +-
src/dialogs/dialog-autoformat.c | 2 +-
src/dialogs/dialog-autosave.c | 2 +-
src/dialogs/dialog-cell-comment.c | 2 +-
src/dialogs/dialog-cell-format-cond.c | 2 +-
src/dialogs/dialog-cell-format.c | 2 +-
src/dialogs/dialog-cell-sort.c | 2 +-
src/dialogs/dialog-col-row.c | 2 +-
src/dialogs/dialog-col-width.c | 2 +-
src/dialogs/dialog-consolidate.c | 2 +-
src/dialogs/dialog-data-slicer.c | 2 +-
src/dialogs/dialog-data-table.c | 2 +-
src/dialogs/dialog-define-names.c | 2 +-
src/dialogs/dialog-delete-cells.c | 2 +-
src/dialogs/dialog-doc-metadata.c | 2 +-
src/dialogs/dialog-fill-series.c | 2 +-
src/dialogs/dialog-formula-guru.c | 2 +-
src/dialogs/dialog-function-select.c | 2 +-
src/dialogs/dialog-goal-seek.c | 2 +-
src/dialogs/dialog-goto-cell.c | 2 +-
src/dialogs/dialog-hyperlink.c | 2 +-
src/dialogs/dialog-insert-cells.c | 2 +-
src/dialogs/dialog-merge.c | 2 +-
src/dialogs/dialog-paste-special.c | 2 +-
src/dialogs/dialog-plugin-manager.c | 2 +-
src/dialogs/dialog-preferences.c | 2 +-
src/dialogs/dialog-printer-setup.c | 6 +-
src/dialogs/dialog-quit.c | 2 +-
src/dialogs/dialog-random-generator-cor.c | 2 +-
src/dialogs/dialog-random-generator.c | 2 +-
src/dialogs/dialog-recent.c | 2 +-
src/dialogs/dialog-row-height.c | 2 +-
src/dialogs/dialog-scenarios.c | 4 +-
src/dialogs/dialog-search-replace.c | 4 +-
src/dialogs/dialog-search.c | 2 +-
src/dialogs/dialog-sheet-compare.c | 2 +-
src/dialogs/dialog-sheet-order.c | 2 +-
src/dialogs/dialog-sheet-rename.c | 2 +-
src/dialogs/dialog-sheet-resize.c | 2 +-
src/dialogs/dialog-sheetobject-size.c | 2 +-
src/dialogs/dialog-shuffle.c | 2 +-
src/dialogs/dialog-simulation.c | 2 +-
src/dialogs/dialog-so-list.c | 2 +-
src/dialogs/dialog-solver.c | 2 +-
src/dialogs/dialog-stf-export.c | 2 +-
src/dialogs/dialog-stf.c | 2 +-
src/dialogs/dialog-tabulate.c | 2 +-
src/dialogs/dialog-view.c | 2 +-
src/dialogs/dialog-workbook-attr.c | 2 +-
src/dialogs/dialog-zoom.c | 2 +-
src/dialogs/embedded-ui.h | 12 --
src/gnm.gresource.xml | 87 ++++++++++++++++
src/gui-util.c | 6 +-
src/libgnumeric.c | 2 -
src/sheet-object-widget.c | 10 +-
src/wbc-gtk.c | 2 +-
src/widgets/gnm-dao.c | 2 +-
70 files changed, 269 insertions(+), 210 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 47b2500..80a4948 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
diff --git a/src/dialogs/.gitignore b/src/dialogs/.gitignore
index a15eaf4..312cbfd 100644
--- a/src/dialogs/.gitignore
+++ b/src/dialogs/.gitignore
@@ -2,4 +2,3 @@ Makefile.in
Makefile
.deps
*.bak
-embedded-ui.c
diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am
index 4a2b9de..72cb8ef 100644
--- a/src/dialogs/Makefile.am
+++ b/src/dialogs/Makefile.am
@@ -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)
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index d3b53ba..9fdb016 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -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,
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index 835c2d1..a9d53c4 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -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,
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index 85895f9..5c0eb55 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -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,
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 6c871ee..15cc4d9 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -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,
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index 7e17dbf..37e332e 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -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,
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index 85f1f48..3bd338e 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -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),
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c
b/src/dialogs/dialog-analysis-tool-principal-components.c
index bb9e503..6b0e794 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -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,
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 84ffa94..8b32f49 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -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),
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index 4c25cfc..fd9fc91 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -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,
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index a532e83..ad0e3b5 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -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,
diff --git a/src/dialogs/dialog-autofilter.c b/src/dialogs/dialog-autofilter.c
index b277e57..b69b266 100644
--- a/src/dialogs/dialog-autofilter.c
+++ b/src/dialogs/dialog-autofilter.c
@@ -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;
diff --git a/src/dialogs/dialog-autoformat.c b/src/dialogs/dialog-autoformat.c
index 4d73616..d10435e 100644
--- a/src/dialogs/dialog-autoformat.c
+++ b/src/dialogs/dialog-autoformat.c
@@ -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;
diff --git a/src/dialogs/dialog-autosave.c b/src/dialogs/dialog-autosave.c
index d2757c1..5c330b4 100644
--- a/src/dialogs/dialog-autosave.c
+++ b/src/dialogs/dialog-autosave.c
@@ -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;
diff --git a/src/dialogs/dialog-cell-comment.c b/src/dialogs/dialog-cell-comment.c
index f4523de..4478c7c 100644
--- a/src/dialogs/dialog-cell-comment.c
+++ b/src/dialogs/dialog-cell-comment.c
@@ -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;
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index b3682dd..e562224 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -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;
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index c7a3864..227c8e9 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -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;
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index d62d5e8..6c1eb70 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -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;
diff --git a/src/dialogs/dialog-col-row.c b/src/dialogs/dialog-col-row.c
index 23956d9..687de31 100644
--- a/src/dialogs/dialog-col-row.c
+++ b/src/dialogs/dialog-col-row.c
@@ -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;
diff --git a/src/dialogs/dialog-col-width.c b/src/dialogs/dialog-col-width.c
index 0b304e7..4578684 100644
--- a/src/dialogs/dialog-col-width.c
+++ b/src/dialogs/dialog-col-width.c
@@ -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;
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index 5e0e56e..d636834 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -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),
diff --git a/src/dialogs/dialog-data-slicer.c b/src/dialogs/dialog-data-slicer.c
index f628c18..95c3b0f 100644
--- a/src/dialogs/dialog-data-slicer.c
+++ b/src/dialogs/dialog-data-slicer.c
@@ -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;
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index a2098c8..549d78e 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -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;
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 70e1b25..bc5f470 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -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;
diff --git a/src/dialogs/dialog-delete-cells.c b/src/dialogs/dialog-delete-cells.c
index b7a0f45..0254222 100644
--- a/src/dialogs/dialog-delete-cells.c
+++ b/src/dialogs/dialog-delete-cells.c
@@ -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;
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index dea89e3..699f886 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -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)
diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c
index 9c902ba..53fdb01 100644
--- a/src/dialogs/dialog-fill-series.c
+++ b/src/dialogs/dialog-fill-series.c
@@ -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,
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index a69a921..1cd7b06 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -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;
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index 2429efb..0e5c455 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -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;
diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c
index 19df135..dd846d3 100644
--- a/src/dialogs/dialog-goal-seek.c
+++ b/src/dialogs/dialog-goal-seek.c
@@ -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;
diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c
index a80be9d..8298dc5 100644
--- a/src/dialogs/dialog-goto-cell.c
+++ b/src/dialogs/dialog-goto-cell.c
@@ -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;
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index e446bf7..8e71e47 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -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;
diff --git a/src/dialogs/dialog-insert-cells.c b/src/dialogs/dialog-insert-cells.c
index 9ffab41..976419a 100644
--- a/src/dialogs/dialog-insert-cells.c
+++ b/src/dialogs/dialog-insert-cells.c
@@ -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;
diff --git a/src/dialogs/dialog-merge.c b/src/dialogs/dialog-merge.c
index 1ce17e5..ec9f158 100644
--- a/src/dialogs/dialog-merge.c
+++ b/src/dialogs/dialog-merge.c
@@ -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;
diff --git a/src/dialogs/dialog-paste-special.c b/src/dialogs/dialog-paste-special.c
index e84df5e..7dabbe8 100644
--- a/src/dialogs/dialog-paste-special.c
+++ b/src/dialogs/dialog-paste-special.c
@@ -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;
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index 235babd..afe4585 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -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;
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index ca7c5ef..686b783 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -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;
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index 149e921..5719aad 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -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));
+ gui = gnm_gtk_builder_load ("res:ui/hf-config.ui", NULL, GO_CMD_CONTEXT (state->wbcg));
if (gui == NULL)
return;
@@ -1870,7 +1870,7 @@ do_hf_dt_format_customize (gboolean date, HFCustomizeState *hf_state)
gint result;
char *result_string = NULL;
- gui = gnm_gtk_builder_load ("hf-dt-format.ui", NULL,
+ gui = gnm_gtk_builder_load ("res:ui/hf-dt-format.ui", NULL,
GO_CMD_CONTEXT (hf_state->printer_setup_state->wbcg));
if (gui == NULL)
return NULL;
@@ -2805,7 +2805,7 @@ printer_setup_state_new (WBCGtk *wbcg, Sheet *sheet)
PrinterSetupState *state;
GtkBuilder *gui;
- gui = gnm_gtk_builder_load ("print.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/print.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return NULL;
diff --git a/src/dialogs/dialog-quit.c b/src/dialogs/dialog-quit.c
index ca0d801..eb62f9d 100644
--- a/src/dialogs/dialog-quit.c
+++ b/src/dialogs/dialog-quit.c
@@ -248,7 +248,7 @@ show_quit_dialog (GList *dirty, WBCGtk *wbcg)
GObject *age_column;
int quitting_time = g_get_real_time () / 1000000;
- gui = gnm_gtk_builder_load ("quit.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/quit.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return FALSE;
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index 343747f..1207783 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -216,7 +216,7 @@ dialog_random_cor_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init ((GenericToolState *)state, wbcg, sheet,
GNUMERIC_HELP_LINK_RANDOM_GENERATOR_COR,
- "random-generation-cor.ui", "CorRandom",
+ "res:ui/random-generation-cor.ui", "CorRandom",
_("Could not create the Correlated Random Tool dialog."),
RANDOM_COR_KEY,
G_CALLBACK (random_cor_tool_ok_clicked_cb), NULL,
diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c
index 0a61303..39e6c77 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -842,7 +842,7 @@ dialog_random_tool (WBCGtk *wbcg, Sheet *sheet)
if (dialog_tool_init ((GenericToolState *)state, wbcg, sheet,
GNUMERIC_HELP_LINK_RANDOM_GENERATOR,
- "random-generation.ui", "Random",
+ "res:ui/random-generation.ui", "Random",
_("Could not create the Random Tool dialog."),
RANDOM_KEY,
G_CALLBACK (random_tool_ok_clicked_cb), NULL,
diff --git a/src/dialogs/dialog-recent.c b/src/dialogs/dialog-recent.c
index b095e64..111998d 100644
--- a/src/dialogs/dialog-recent.c
+++ b/src/dialogs/dialog-recent.c
@@ -290,7 +290,7 @@ dialog_recent_used (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, RECENT_KEY))
return;
- gui = gnm_gtk_builder_load ("recent.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/recent.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-row-height.c b/src/dialogs/dialog-row-height.c
index 6082bf5..b7b480a 100644
--- a/src/dialogs/dialog-row-height.c
+++ b/src/dialogs/dialog-row-height.c
@@ -254,7 +254,7 @@ dialog_row_height (WBCGtk *wbcg, gboolean use_default)
state->sv = wb_control_cur_sheet_view (GNM_WBC (wbcg));
state->sheet = sv_sheet (state->sv);
state->adjusting = FALSE;
- state->gui = gnm_gtk_builder_load ("row-height.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ state->gui = gnm_gtk_builder_load ("res:ui/row-height.ui", NULL, GO_CMD_CONTEXT (wbcg));
g_return_if_fail (state->gui != NULL);
state->dialog = go_gtk_builder_get_widget (state->gui, "dialog");
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index 7119d3c..0c1b6b0 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -392,7 +392,7 @@ dialog_scenario_add (WBCGtk *wbcg)
if (dialog_tool_init (&state->base, wbcg, wb_control_cur_sheet (wbc),
GNUMERIC_HELP_LINK_SCENARIOS_ADD,
- "scenario-add.ui", "ScenarioAdd",
+ "res:ui/scenario-add.ui", "ScenarioAdd",
error_str,
"ScenarioAdd",
G_CALLBACK (scenario_add_ok_clicked_cb), NULL,
@@ -793,7 +793,7 @@ dialog_scenarios (WBCGtk *wbcg)
if (dialog_tool_init (&state->base, wbcg, sheet,
GNUMERIC_HELP_LINK_SCENARIOS_VIEW,
- "scenario-manager.ui", "Scenarios",
+ "res:ui/scenario-manager.ui", "Scenarios",
error_str, "Scenarios",
G_CALLBACK (scenarios_ok_clicked_cb),
G_CALLBACK (scenarios_cancel_clicked_cb),
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index 0f6db4f..6d2413c 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -244,7 +244,7 @@ dialog_search_replace (WBCGtk *wbcg,
if (gnm_dialog_raise_if_exists (wbcg, SEARCH_REPLACE_KEY))
return;
- gui = gnm_gtk_builder_load ("search-replace.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/search-replace.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
@@ -361,7 +361,7 @@ dialog_search_replace_query (WBCGtk *wbcg,
g_return_val_if_fail (wbcg != NULL, 0);
- gui = gnm_gtk_builder_load ("search-replace.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/search-replace.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return 0;
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index 9ea601b..fbe7b78 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -489,7 +489,7 @@ dialog_search (WBCGtk *wbcg)
return;
#endif
- gui = gnm_gtk_builder_load ("search.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/search.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-sheet-compare.c b/src/dialogs/dialog-sheet-compare.c
index 774a76c..0253c0b 100644
--- a/src/dialogs/dialog-sheet-compare.c
+++ b/src/dialogs/dialog-sheet-compare.c
@@ -844,7 +844,7 @@ dialog_sheet_compare (WBCGtk *wbcg)
wb = wb_control_get_workbook (GNM_WBC (wbcg));
- gui = gnm_gtk_builder_load ("sheet-compare.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/sheet-compare.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index 242bef9..ead536f 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -1440,7 +1440,7 @@ dialog_sheet_order (WBCGtk *wbcg)
widget = GTK_WIDGET (wbcg_toplevel (wbcg));
- gui = gnm_gtk_builder_load ("sheet-order.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/sheet-order.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-sheet-rename.c b/src/dialogs/dialog-sheet-rename.c
index 2875b57..b02e16d 100644
--- a/src/dialogs/dialog-sheet-rename.c
+++ b/src/dialogs/dialog-sheet-rename.c
@@ -128,7 +128,7 @@ dialog_sheet_rename (WBCGtk *wbcg, Sheet *sheet)
if (gnm_dialog_raise_if_exists (wbcg, RENAME_DIALOG_KEY))
return;
- gui = gnm_gtk_builder_load ("sheet-rename.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/sheet-rename.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-sheet-resize.c b/src/dialogs/dialog-sheet-resize.c
index dbfffa7..739c9b3 100644
--- a/src/dialogs/dialog-sheet-resize.c
+++ b/src/dialogs/dialog-sheet-resize.c
@@ -162,7 +162,7 @@ dialog_sheet_resize (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, RESIZE_DIALOG_KEY))
return;
- gui = gnm_gtk_builder_load ("sheet-resize.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/sheet-resize.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c
index 041f7eb..b96f7df 100644
--- a/src/dialogs/dialog-sheetobject-size.c
+++ b/src/dialogs/dialog-sheetobject-size.c
@@ -351,7 +351,7 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
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));
+ gui = gnm_gtk_builder_load ("res:ui/sheetobject-size.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index f444cda..af54889 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -148,7 +148,7 @@ dialog_shuffle (WBCGtk *wbcg)
if (dialog_tool_init (state, wbcg, wb_control_cur_sheet (wbc),
GNUMERIC_HELP_LINK_DATA_SHUFFLE,
- "shuffle.ui", "Shuffling",
+ "res:ui/shuffle.ui", "Shuffling",
_("Could not create the Data Shuffling dialog."),
SHUFFLE_KEY,
G_CALLBACK (shuffle_ok_clicked_cb), NULL,
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index 3fd90fa..285457f 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -418,7 +418,7 @@ dialog_simulation (WBCGtk *wbcg, G_GNUC_UNUSED Sheet *sheet)
state = g_new (SimulationState, 1);
if (dialog_tool_init (state, wbcg, wb_control_cur_sheet (wbc),
GNUMERIC_HELP_LINK_SIMULATION,
- "simulation.ui", "Simulation",
+ "res:ui/simulation.ui", "Simulation",
_("Could not create the Simulation dialog."),
SIMULATION_KEY,
G_CALLBACK (simulation_ok_clicked_cb),
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index c3e9940..015de36 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -103,7 +103,7 @@ so_list_init (GnmDialogSOList *state, WBCGtk *wbcg, SheetObject *so)
GnmExprTop const *texpr;
GtkBuilder *gui;
- gui = gnm_gtk_builder_load ("so-list.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/so-list.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return TRUE;
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 3eb4861..dbdbfb3 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -931,7 +931,7 @@ dialog_init (SolverState *state)
param = state->sheet->solver_parameters;
- state->gui = gnm_gtk_builder_load ("solver.ui", NULL, GO_CMD_CONTEXT (state->wbcg));
+ state->gui = gnm_gtk_builder_load ("res:ui/solver.ui", NULL, GO_CMD_CONTEXT (state->wbcg));
if (state->gui == NULL)
return TRUE;
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index d71e679..2a64508 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -711,7 +711,7 @@ stf_export_dialog (WBCGtk *wbcg, GnmStfExport *stfe, Workbook *wb)
g_return_val_if_fail (GNM_IS_WORKBOOK (wb), TRUE);
g_return_val_if_fail (GNM_IS_STF_EXPORT (stfe), TRUE);
- state.gui = gnm_gtk_builder_load ("dialog-stf-export.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ state.gui = gnm_gtk_builder_load ("res:ui/dialog-stf-export.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (state.gui == NULL)
return TRUE;
diff --git a/src/dialogs/dialog-stf.c b/src/dialogs/dialog-stf.c
index 94d9bef..e324273 100644
--- a/src/dialogs/dialog-stf.c
+++ b/src/dialogs/dialog-stf.c
@@ -264,7 +264,7 @@ stf_dialog (WBCGtk *wbcg,
g_return_val_if_fail (source != NULL, NULL);
g_return_val_if_fail (data != NULL, NULL);
- gui = gnm_gtk_builder_load ("dialog-stf.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/dialog-stf.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return NULL;
diff --git a/src/dialogs/dialog-tabulate.c b/src/dialogs/dialog-tabulate.c
index 7d22add..430cf74 100644
--- a/src/dialogs/dialog-tabulate.c
+++ b/src/dialogs/dialog-tabulate.c
@@ -301,7 +301,7 @@ dialog_tabulate (WBCGtk *wbcg, Sheet *sheet)
if (gnm_dialog_raise_if_exists (wbcg, TABULATE_KEY))
return;
- gui = gnm_gtk_builder_load ("tabulate.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/tabulate.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-view.c b/src/dialogs/dialog-view.c
index 4db3be7..5a63fab 100644
--- a/src/dialogs/dialog-view.c
+++ b/src/dialogs/dialog-view.c
@@ -130,7 +130,7 @@ dialog_new_view (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, VIEW_DIALOG_KEY))
return;
- gui = gnm_gtk_builder_load ("view.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/view.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index b5ebf5e..cfd8ff1 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -334,7 +334,7 @@ dialog_workbook_attr (WBCGtk *wbcg)
if (gnm_dialog_raise_if_exists (wbcg, WORKBOOK_ATTRIBUTE_KEY))
return;
- gui = gnm_gtk_builder_load ("workbook-attr.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/workbook-attr.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/dialogs/dialog-zoom.c b/src/dialogs/dialog-zoom.c
index ffe4422..8697e5e 100644
--- a/src/dialogs/dialog-zoom.c
+++ b/src/dialogs/dialog-zoom.c
@@ -175,7 +175,7 @@ dialog_zoom (WBCGtk *wbcg, Sheet *sheet)
if (gnm_dialog_raise_if_exists (wbcg, ZOOM_DIALOG_KEY))
return;
- gui = gnm_gtk_builder_load ("dialog-zoom.ui", NULL, GO_CMD_CONTEXT (wbcg));
+ gui = gnm_gtk_builder_load ("res:ui/dialog-zoom.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
return;
diff --git a/src/gnm.gresource.xml b/src/gnm.gresource.xml
index fa2c11d..d6a8b18 100644
--- a/src/gnm.gresource.xml
+++ b/src/gnm.gresource.xml
@@ -180,7 +180,94 @@
<file alias="images/gnumeric_splash_1.4.png">src/pixmaps/gnumeric_splash_1.4.png</file>
<file alias="images/unknown_image.png">src/pixmaps/unknown_image.png</file>
<file alias="images/sheet_move_marker.png">src/pixmaps/sheet_move_marker.png</file>
+ <!-- ================================================================== -->
<file alias="ui/gnumeric.css">src/gnumeric.css</file>
<file alias="ui/GNOME_Gnumeric-gtk.xml">src/GNOME_Gnumeric-gtk.xml</file>
+ <!-- ================================================================== -->
+ <file alias="ui/advanced-filter.ui">src/dialogs/advanced-filter.ui</file>
+ <file alias="ui/anova-one.ui">src/dialogs/anova-one.ui</file>
+ <file alias="ui/anova-two.ui">src/dialogs/anova-two.ui</file>
+ <file alias="ui/autofilter-expression.ui">src/dialogs/autofilter-expression.ui</file>
+ <file alias="ui/autofilter-top10.ui">src/dialogs/autofilter-top10.ui</file>
+ <file alias="ui/autoformat.ui">src/dialogs/autoformat.ui</file>
+ <file alias="ui/autosave.ui">src/dialogs/autosave.ui</file>
+ <file alias="ui/cell-comment.ui">src/dialogs/cell-comment.ui</file>
+ <file alias="ui/cell-format-cond.ui">src/dialogs/cell-format-cond.ui</file>
+ <file alias="ui/cell-format.ui">src/dialogs/cell-format.ui</file>
+ <file alias="ui/cell-sort.ui">src/dialogs/cell-sort.ui</file>
+ <file alias="ui/chi-squared.ui">src/dialogs/chi-squared.ui</file>
+ <file alias="ui/col-width.ui">src/dialogs/col-width.ui</file>
+ <file alias="ui/colrow.ui">src/dialogs/colrow.ui</file>
+ <file alias="ui/consolidate.ui">src/dialogs/consolidate.ui</file>
+ <file alias="ui/correlation.ui">src/dialogs/correlation.ui</file>
+ <file alias="ui/covariance.ui">src/dialogs/covariance.ui</file>
+ <file alias="ui/dao.ui">src/dialogs/dao.ui</file>
+ <file alias="ui/data-slicer.ui">src/dialogs/data-slicer.ui</file>
+ <file alias="ui/data-table.ui">src/dialogs/data-table.ui</file>
+ <file alias="ui/define-name.ui">src/dialogs/define-name.ui</file>
+ <file alias="ui/delete-cells.ui">src/dialogs/delete-cells.ui</file>
+ <file alias="ui/descriptive-stats.ui">src/dialogs/descriptive-stats.ui</file>
+ <file alias="ui/dialog-stf-export.ui">src/dialogs/dialog-stf-export.ui</file>
+ <file alias="ui/dialog-stf.ui">src/dialogs/dialog-stf.ui</file>
+ <file alias="ui/dialog-zoom.ui">src/dialogs/dialog-zoom.ui</file>
+ <file alias="ui/doc-meta-data.ui">src/dialogs/doc-meta-data.ui</file>
+ <file alias="ui/exp-smoothing.ui">src/dialogs/exp-smoothing.ui</file>
+ <file alias="ui/fill-series.ui">src/dialogs/fill-series.ui</file>
+ <file alias="ui/formula-guru.ui">src/dialogs/formula-guru.ui</file>
+ <file alias="ui/fourier-analysis.ui">src/dialogs/fourier-analysis.ui</file>
+ <file alias="ui/frequency.ui">src/dialogs/frequency.ui</file>
+ <file alias="ui/function-select.ui">src/dialogs/function-select.ui</file>
+ <file alias="ui/goalseek.ui">src/dialogs/goalseek.ui</file>
+ <file alias="ui/goto.ui">src/dialogs/goto.ui</file>
+ <file alias="ui/hf-config.ui">src/dialogs/hf-config.ui</file>
+ <file alias="ui/hf-dt-format.ui">src/dialogs/hf-dt-format.ui</file>
+ <file alias="ui/histogram.ui">src/dialogs/histogram.ui</file>
+ <file alias="ui/hyperlink.ui">src/dialogs/hyperlink.ui</file>
+ <file alias="ui/insert-cells.ui">src/dialogs/insert-cells.ui</file>
+ <file alias="ui/kaplan-meier.ui">src/dialogs/kaplan-meier.ui</file>
+ <file alias="ui/mean-tests.ui">src/dialogs/mean-tests.ui</file>
+ <file alias="ui/merge.ui">src/dialogs/merge.ui</file>
+ <file alias="ui/moving-averages.ui">src/dialogs/moving-averages.ui</file>
+ <file alias="ui/normality-tests.ui">src/dialogs/normality-tests.ui</file>
+ <file alias="ui/one-mean-test.ui">src/dialogs/one-mean-test.ui</file>
+ <file alias="ui/paste-special.ui">src/dialogs/paste-special.ui</file>
+ <file alias="ui/plugin-manager.ui">src/dialogs/plugin-manager.ui</file>
+ <file alias="ui/preferences.ui">src/dialogs/preferences.ui</file>
+ <file alias="ui/principal-components.ui">src/dialogs/principal-components.ui</file>
+ <file alias="ui/print.ui">src/dialogs/print.ui</file>
+ <file alias="ui/quit.ui">src/dialogs/quit.ui</file>
+ <file alias="ui/random-generation-cor.ui">src/dialogs/random-generation-cor.ui</file>
+ <file alias="ui/random-generation.ui">src/dialogs/random-generation.ui</file>
+ <file alias="ui/rank.ui">src/dialogs/rank.ui</file>
+ <file alias="ui/recent.ui">src/dialogs/recent.ui</file>
+ <file alias="ui/regression.ui">src/dialogs/regression.ui</file>
+ <file alias="ui/row-height.ui">src/dialogs/row-height.ui</file>
+ <file alias="ui/sampling.ui">src/dialogs/sampling.ui</file>
+ <file alias="ui/scenario-add.ui">src/dialogs/scenario-add.ui</file>
+ <file alias="ui/scenario-manager.ui">src/dialogs/scenario-manager.ui</file>
+ <file alias="ui/search-replace.ui">src/dialogs/search-replace.ui</file>
+ <file alias="ui/search.ui">src/dialogs/search.ui</file>
+ <file alias="ui/sheet-compare.ui">src/dialogs/sheet-compare.ui</file>
+ <file alias="ui/sheet-order.ui">src/dialogs/sheet-order.ui</file>
+ <file alias="ui/sheet-rename.ui">src/dialogs/sheet-rename.ui</file>
+ <file alias="ui/sheet-resize.ui">src/dialogs/sheet-resize.ui</file>
+ <file alias="ui/sheetobject-size.ui">src/dialogs/sheetobject-size.ui</file>
+ <file alias="ui/shuffle.ui">src/dialogs/shuffle.ui</file>
+ <file alias="ui/sign-test-two.ui">src/dialogs/sign-test-two.ui</file>
+ <file alias="ui/sign-test.ui">src/dialogs/sign-test.ui</file>
+ <file alias="ui/simulation.ui">src/dialogs/simulation.ui</file>
+ <file alias="ui/so-button.ui">src/dialogs/so-button.ui</file>
+ <file alias="ui/so-checkbox.ui">src/dialogs/so-checkbox.ui</file>
+ <file alias="ui/so-frame.ui">src/dialogs/so-frame.ui</file>
+ <file alias="ui/so-list.ui">src/dialogs/so-list.ui</file>
+ <file alias="ui/so-radiobutton.ui">src/dialogs/so-radiobutton.ui</file>
+ <file alias="ui/so-scrollbar.ui">src/dialogs/so-scrollbar.ui</file>
+ <file alias="ui/solver.ui">src/dialogs/solver.ui</file>
+ <file alias="ui/tabulate.ui">src/dialogs/tabulate.ui</file>
+ <file alias="ui/variance-tests.ui">src/dialogs/variance-tests.ui</file>
+ <file alias="ui/view.ui">src/dialogs/view.ui</file>
+ <file alias="ui/wbcg.ui">src/dialogs/wbcg.ui</file>
+ <file alias="ui/wilcoxon-mann-whitney.ui">src/dialogs/wilcoxon-mann-whitney.ui</file>
+ <file alias="ui/workbook-attr.ui">src/dialogs/workbook-attr.ui</file>
</gresource>
</gresources>
diff --git a/src/gui-util.c b/src/gui-util.c
index 5db82c6..b28679a 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -584,7 +584,11 @@ gnm_gtk_builder_load (char const *uifile, char const *domain, GOCmdContext *cc)
GtkBuilder *gui;
char *f;
- if (g_path_is_absolute (uifile)) {
+ if (strncmp (uifile, "res:", 4) == 0) {
+ f = g_strconcat ("res:/org/gnumeric/gnumeric/",
+ uifile + 4,
+ NULL);
+ } else if (g_path_is_absolute (uifile)) {
f = g_strdup (uifile);
} else {
f = g_strconcat ("res:gnm:", uifile, NULL);
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 950cb10..ac16320 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -60,7 +60,6 @@
#include "hlink.h"
#include "wbc-gtk-impl.h"
#include "gnmresources.h"
-#include "dialogs/embedded-ui.h"
#include <goffice/goffice.h>
#ifdef HAVE_SYS_RESOURCE_H
@@ -297,7 +296,6 @@ gnm_init (void)
gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (),
"/org/gnumeric/gnumeric/icons");
}
- gnm_register_ui_files ();
go_plugin_service_define ("function_group",
&gnm_plugin_service_function_group_get_type);
go_plugin_service_define ("ui",
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 97a39fd..60bf5a0 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -541,7 +541,7 @@ sheet_widget_frame_user_config (SheetObject *so, SheetControl *sc)
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));
+ gui = gnm_gtk_builder_load ("res:ui/so-frame.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (!gui)
return;
state = g_new (FrameConfigState, 1);
@@ -1070,7 +1070,7 @@ sheet_widget_button_user_config (SheetObject *so, SheetControl *sc)
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));
+ gui = gnm_gtk_builder_load ("res:ui/so-button.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (!gui)
return;
state = g_new (ButtonConfigState, 1);
@@ -1680,7 +1680,7 @@ sheet_widget_adjustment_user_config_impl (SheetObject *so, SheetControl *sc, cha
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));
+ gui = gnm_gtk_builder_load ("res:ui/so-scrollbar.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (!gui)
return;
state = g_new (AdjustmentConfigState, 1);
@@ -2522,7 +2522,7 @@ sheet_widget_checkbox_user_config (SheetObject *so, SheetControl *sc)
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));
+ gui = gnm_gtk_builder_load ("res:ui/so-checkbox.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (!gui)
return;
state = g_new (CheckboxConfigState, 1);
@@ -3265,7 +3265,7 @@ sheet_widget_radio_button_user_config (SheetObject *so, SheetControl *sc)
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));
+ gui = gnm_gtk_builder_load ("res:ui/so-radiobutton.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (!gui)
return;
state = g_new (RadioButtonConfigState, 1);
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 00fcbd2..24a9ad2 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -5000,7 +5000,7 @@ wbc_gtk_init (GObject *obj)
GtkStyleContext *ctxt;
guint merge_id;
- wbcg->gui = gnm_gtk_builder_load ("wbcg.ui", NULL, NULL);
+ wbcg->gui = gnm_gtk_builder_load ("res:ui/wbcg.ui", NULL, NULL);
wbcg->cancel_button = GET_GUI_ITEM ("cancel_button");
wbcg->ok_button = GET_GUI_ITEM ("ok_button");
wbcg->func_button = GET_GUI_ITEM ("func_button");
diff --git a/src/widgets/gnm-dao.c b/src/widgets/gnm-dao.c
index 2cc30ec..7acd52f 100644
--- a/src/widgets/gnm-dao.c
+++ b/src/widgets/gnm-dao.c
@@ -69,7 +69,7 @@ gnm_dao_init (GnmDao *gdao)
{
GtkWidget *toplevel;
- gdao->gui = gnm_gtk_builder_load ("dao.ui", NULL, NULL);
+ gdao->gui = gnm_gtk_builder_load ("res:ui/dao.ui", NULL, NULL);
if (gdao->gui == NULL)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
