Fix Glade files loading

By moving the files within the projet, they are now correctly installed and loaded. This also applies the translation files.
See kirienko/gourmet PR 172

.flatpak/io.github.thinkle.Gourmet.yml

@@ -33,6 +33,7 @@ modules:
       - python3 setup.py install --prefix=/app
       - install -Dm644 .flatpak/io.github.thinkle.Gourmet.desktop -t /app/share/applications/
       - install -Dm644 .flatpak/io.github.thinkle.Gourmet.svg -t /app/share/icons/hicolor/scalable/apps/
+      - install -Dm644 gourmet/ui -t /app/share/
 
     sources:
       - type: git

gourmet/po/POTFILES.in

@@ -0,0 +1,231 @@
+[type: gettext/glade]ui/app.ui
+[type: gettext/glade]ui/batchEditor.ui
+[type: gettext/glade]ui/databaseChooser.ui
+[type: gettext/glade]ui/generic_importer.ui
+[type: gettext/glade]ui/preferenceDialog.ui
+[type: gettext/glade]ui/recCardDescriptionEditor.ui
+[type: gettext/glade]ui/recCardDisplay.ui
+[type: gettext/glade]ui/recCardIngredientsEditor.ui
+[type: gettext/glade]ui/recipe_index.ui
+[type: gettext/glade]ui/shopCatEditor.ui
+[type: gettext/glade]ui/timerDialog.ui
+[type: gettext/glade]ui/valueEditor.ui
+gourmet.appdata.xml.in
+gourmet.desktop.in
+GourmetRecipeManager.py
+ImageExtras.py
+OptionParser.py
+Undo.py
+__init__.py
+backends/DatabaseChooser.py
+backends/__init__.py
+backends/db.py
+batchEditor.py
+check_encodings.py
+clockDB.py
+convert.py
+defaults/__init__.py
+defaults/defaults.py
+defaults/defaults_de.py
+defaults/defaults_en.py
+defaults/defaults_en_GB.py
+defaults/defaults_es.py
+defaults/defaults_fr.py
+defaults/defaults_nl.py
+defaults/defaults_pt.py
+defaults/defaults_sk.py
+defaults/defaults_sv.py
+exporters/MarkupString.py
+exporters/__init__.py
+exporters/eatdrinkfeelgood_exporter.py
+exporters/exportManager.py
+exporters/exporter.py
+exporters/gxml_exporter.py
+exporters/printer.py
+exporters/recipe_emailer.py
+exporters/rtf_exporter.py
+exporters/xml_exporter.py
+gdebug.py
+gglobals.py
+gtk_extras/LinkedTextView.py
+gtk_extras/TextBufferMarkup.py
+gtk_extras/WidgetSaver.py
+gtk_extras/__init__.py
+gtk_extras/cb_extras.py
+gtk_extras/dialog_extras.py
+gtk_extras/mnemonic_manager.py
+gtk_extras/numberEntry.py
+gtk_extras/optionTable.py
+gtk_extras/pageable_store.py
+gtk_extras/ratingWidget.py
+gtk_extras/thumbnail.py
+gtk_extras/timeEntry.py
+gtk_extras/treeview_extras.py
+gtk_extras/validatingEntry.py
+importers/__init__.py
+importers/generic_recipe_parser.py
+importers/html_importer.py
+importers/imageBrowser.py
+importers/importManager.py
+importers/importer.py
+importers/interactive_importer.py
+importers/plaintext_importer.py
+importers/rezkonv_importer.py
+importers/webextras.py
+importers/xml_importer.py
+keymanager.py
+plugin.py
+plugin_gui.py
+plugin_loader.py
+plugins/__init__.py
+[type: gettext/ini]plugins/browse_plugin.gourmet-plugin.in
+plugins/browse_recipes/__init__.py
+plugins/browse_recipes/browser.py
+plugins/browse_recipes/icon_helpers.py
+plugins/browse_recipes/images/__init__.py
+plugins/check_for_unicode_16/__init__.py
+[type: gettext/ini]plugins/duplicate_finder.gourmet-plugin.in
+plugins/duplicate_finder/__init__.py
+plugins/duplicate_finder/recipeMerger.py
+[type: gettext/glade]plugins/duplicate_finder/recipeMerger.ui
+plugins/duplicate_finder/recipeMergerPlugin.py
+[type: gettext/ini]plugins/email.gourmet-plugin.in
+plugins/email_plugin/__init__.py
+plugins/email_plugin/emailer.py
+plugins/email_plugin/emailer_plugin.py
+plugins/email_plugin/recipe_emailer.py
+[type: gettext/ini]plugins/field_editor.gourmet-plugin.in
+plugins/field_editor/__init__.py
+plugins/field_editor/fieldEditor.py
+plugins/import_export/__init__.py
+[type: gettext/ini]plugins/import_export/archive.gourmet-plugin.in
+plugins/import_export/archive_plugin/__init__.py
+plugins/import_export/archive_plugin/zip_importer_plugin.py
+plugins/import_export/archive_plugin/zip_readers.py
+[type: gettext/ini]plugins/import_export/gxml.gourmet-plugin.in
+plugins/import_export/gxml_plugin/__init__.py
+plugins/import_export/gxml_plugin/gxml2_exporter.py
+plugins/import_export/gxml_plugin/gxml2_importer.py
+plugins/import_export/gxml_plugin/gxml_exporter_plugin.py
+plugins/import_export/gxml_plugin/gxml_importer.py
+plugins/import_export/gxml_plugin/gxml_importer_plugin.py
+[type: gettext/ini]plugins/import_export/html.gourmet-plugin.in
+plugins/import_export/html_plugin/__init__.py
+plugins/import_export/html_plugin/html_exporter.py
+plugins/import_export/html_plugin/html_exporter_plugin.py
+[type: gettext/ini]plugins/import_export/krecipe_plugin.gourmet-plugin.in
+plugins/import_export/krecipe_plugin/__init__.py
+plugins/import_export/krecipe_plugin/krecipe_importer.py
+plugins/import_export/krecipe_plugin/krecipe_importer_plugin.py
+plugins/import_export/mastercook_import_plugin/__init__.py
+plugins/import_export/mastercook_import_plugin/mastercook_importer.py
+plugins/import_export/mastercook_import_plugin/mastercook_importer_plugin.py
+plugins/import_export/mastercook_import_plugin/mastercook_plaintext_importer.py
+[type: gettext/ini]plugins/import_export/mastercook_plugin.gourmet-plugin.in
+[type: gettext/ini]plugins/import_export/mycookbook_plugin.gourmet-plugin.in
+plugins/import_export/mycookbook_plugin/__init__.py
+plugins/import_export/mycookbook_plugin/mycookbook_exporter.py
+plugins/import_export/mycookbook_plugin/mycookbook_exporter_plugin.py
+plugins/import_export/mycookbook_plugin/mycookbook_importer.py
+plugins/import_export/mycookbook_plugin/mycookbook_importer_plugin.py
+[type: gettext/ini]plugins/import_export/mealmaster.gourmet-plugin.in
+plugins/import_export/mealmaster_plugin/__init__.py
+plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
+plugins/import_export/mealmaster_plugin/mealmaster_exporter_plugin.py
+plugins/import_export/mealmaster_plugin/mealmaster_importer.py
+plugins/import_export/mealmaster_plugin/mealmaster_importer_plugin.py
+[type: gettext/ini]plugins/import_export/pdf.gourmet-plugin.in
+plugins/import_export/pdf_plugin/__init__.py
+plugins/import_export/pdf_plugin/page_drawer.py
+plugins/import_export/pdf_plugin/pdf_exporter.py
+plugins/import_export/pdf_plugin/pdf_exporter_plugin.py
+plugins/import_export/pdf_plugin/print_plugin.py
+[type: gettext/ini]plugins/import_export/plaintext.gourmet-plugin.in
+plugins/import_export/plaintext_plugin/__init__.py
+plugins/import_export/plaintext_plugin/plaintext_exporter_plugin.py
+plugins/import_export/plaintext_plugin/plaintext_importer_plugin.py
+plugins/import_export/web_import_plugin/__init__.py
+plugins/import_export/web_import_plugin/generic_web_importer_plugin.py
+plugins/import_export/web_import_plugin/webpage_importer.py
+[type: gettext/ini]plugins/import_export/webimport.gourmet-plugin.in
+[type: gettext/ini]plugins/import_export/website_import.gourmet-plugin.in
+plugins/import_export/website_import_plugins/__init__.py
+plugins/import_export/website_import_plugins/about_dot_com_plugin.py
+plugins/import_export/website_import_plugins/allrecipes_plugin.py
+plugins/import_export/website_import_plugins/foodnetwork_plugin.py
+[type: gettext/ini]plugins/key_editor.gourmet-plugin.in
+plugins/key_editor/__init__.py
+plugins/key_editor/keyEditor.py
+plugins/key_editor/keyEditorPluggable.py
+plugins/key_editor/keyEditorPlugin.py
+[type: gettext/glade]plugins/key_editor/keyeditor.ui
+plugins/key_editor/recipeEditorPlugin.py
+[type: gettext/ini]plugins/listsaver.gourmet-plugin.in
+plugins/listsaver/__init__.py
+plugins/listsaver/shoppingSaverPlugin.py
+[type: gettext/ini]plugins/nutritional_information.gourmet-plugin.in
+plugins/nutritional_information/__init__.py
+plugins/nutritional_information/data_plugin.py
+plugins/nutritional_information/databaseGrabber.py
+plugins/nutritional_information/enter_nutritional_defaults.py
+plugins/nutritional_information/export_plugin.py
+plugins/nutritional_information/images/Nutrition.png
+plugins/nutritional_information/images/__init__.py
+plugins/nutritional_information/main_plugin.py
+plugins/nutritional_information/nutPrefsPlugin.py
+[type: gettext/glade]plugins/nutritional_information/nut_recipe_card_display.ui
+plugins/nutritional_information/nutrition.py
+plugins/nutritional_information/nutritionDisplay.py
+[type: gettext/glade]plugins/nutritional_information/nutritionDruid.ui
+plugins/nutritional_information/nutritionDruid.py
+plugins/nutritional_information/nutritionGrabberGui.py
+plugins/nutritional_information/nutritionInfoEditor.py
+plugins/nutritional_information/nutritionLabel.py
+plugins/nutritional_information/nutritionModel.py
+plugins/nutritional_information/nutritionView.py
+plugins/nutritional_information/parser_data.py
+plugins/nutritional_information/reccard_plugin.py
+plugins/nutritional_information/shopping_plugin.py
+[type: gettext/ini]plugins/python_shell.gourmet-plugin.in
+plugins/python_shell/__init__.py
+plugins/python_shell/ipython_view.py
+[type: gettext/ini]plugins/shopping_associations.gourmet-plugin.in
+plugins/shopping_associations/__init__.py
+plugins/shopping_associations/shopping_key_editor_plugin.py
+[type: gettext/ini]plugins/spellcheck.gourmet-plugin.in
+plugins/spellcheck/__init__.py
+plugins/spellcheck/reccard_spellcheck_plugin.py
+[type: gettext/ini]plugins/unit_converter.gourmet-plugin.in
+plugins/unit_converter/__init__.py
+plugins/unit_converter/convertGui.py
+[type: gettext/glade]plugins/unit_converter/converter.ui
+[type: gettext/ini]plugins/unit_display_prefs.gourmet-plugin.in
+plugins/unit_display_prefs/__init__.py
+plugins/unit_display_prefs/unit_prefs_dialog.py
+[type: gettext/ini]plugins/utf16.gourmet-plugin.in
+plugins/web_plugin/manage.py
+plugins/web_plugin/gourmetweb/__init__.py
+plugins/web_plugin/gourmetweb/recview/__init__.py
+plugins/web_plugin/gourmetweb/recview/models.py
+plugins/web_plugin/gourmetweb/recview/tests.py
+plugins/web_plugin/gourmetweb/recview/views.py
+plugins/web_plugin/gourmetweb/settings.py
+plugins/web_plugin/gourmetweb/urls.py
+prefs.py
+prefsGui.py
+profileImport.py
+reccard.py
+recindex.py
+recipeIdentifier.py
+recipeManager.py
+shopEditor.py
+shopgui.py
+shopping.py
+sound.py
+sound_gst.py
+sound_windows.py
+threadManager.py
+timeScanner.py
+timer.py
+version.py
+

gourmet/settings.py

@@ -7,7 +7,7 @@
 base_dir = os.path.join(os.path.dirname(__file__), '..')
 lib_dir = os.path.join(base_dir, 'gourmet')
 data_dir = os.path.join(base_dir, 'data')
-ui_base = os.path.join(base_dir, 'ui')
+ui_base = os.path.join(os.path.dirname(__file__), 'ui')
 doc_base = os.path.join(base_dir)
 locale_base = os.path.join(base_dir, 'build', 'mo')
 plugin_base = os.path.join(base_dir, 'build', 'share', 'gourmet')