f69c461955
* src/client/application/geary-config.vala (Configuration): Remove spell-check setting, we can just get it from the list of visible languages instead. Update the schema. * src/client/components/client-web-view.vala (WebView::init_web_context): Pass in a config object, use that to init WebKit's spell checking on the WebContext now that is a global configuration, update it when the config changes, update call sites. * src/client/composer/composer-widget.vala (ComposerWidget): Remove WK1-syle spell checking settings prefs. * src/client/composer/spell-check-popover.vala (SpellCheckPopover): Pass a config object in so we don't have to use the global app singleton instance. * src/client/dialogs/preferences-dialog.vala (PreferencesDialog): Modernise by converting into a widget template. * test/client/components/client-web-view-test-case.vala (TestCase): Construct a config object as a fixture, use it to init the WebContext and make it avalaible to subclasses & update subclasses. * ui/preferences-dialog.ui: Moved from preferences.dialog, remove spell check preference.
66 lines
2.1 KiB
CMake
66 lines
2.1 KiB
CMake
|
|
set(RESOURCE_LIST
|
|
STRIPBLANKS "accelerators.ui"
|
|
STRIPBLANKS "account_cannot_remove.glade"
|
|
STRIPBLANKS "account_list.glade"
|
|
STRIPBLANKS "account_spinner.glade"
|
|
STRIPBLANKS "certificate_warning_dialog.glade"
|
|
"client-web-view.js"
|
|
"client-web-view-allow-remote-images.js"
|
|
STRIPBLANKS "composer-headerbar.ui"
|
|
STRIPBLANKS "composer-menus.ui"
|
|
STRIPBLANKS "composer-widget.ui"
|
|
"composer-web-view.js"
|
|
STRIPBLANKS "conversation-email.ui"
|
|
STRIPBLANKS "conversation-email-attachment-view.ui"
|
|
STRIPBLANKS "conversation-email-menus.ui"
|
|
STRIPBLANKS "conversation-message.ui"
|
|
STRIPBLANKS "conversation-message-menus.ui"
|
|
STRIPBLANKS "conversation-viewer.ui"
|
|
"conversation-web-view.css"
|
|
"conversation-web-view.js"
|
|
STRIPBLANKS "edit_alternate_emails.glade"
|
|
STRIPBLANKS "empty-placeholder.ui"
|
|
STRIPBLANKS "find_bar.glade"
|
|
STRIPBLANKS "folder-popover.ui"
|
|
STRIPBLANKS "gtk/help-overlay.ui"
|
|
STRIPBLANKS "gtk/menus.ui"
|
|
STRIPBLANKS "login.glade"
|
|
STRIPBLANKS "main-toolbar.ui"
|
|
STRIPBLANKS "main-window.ui"
|
|
STRIPBLANKS "password-dialog.glade"
|
|
STRIPBLANKS "preferences-dialog.ui"
|
|
STRIPBLANKS "remove_confirm.glade"
|
|
STRIPBLANKS "toolbar_empty_menu.ui"
|
|
STRIPBLANKS "toolbar_mark_menu.ui"
|
|
STRIPBLANKS "upgrade_dialog.glade"
|
|
"geary.css"
|
|
)
|
|
|
|
compile_gresources(
|
|
RESOURCES_C
|
|
RESOURCES_XML
|
|
TYPE EMBED_C
|
|
SOURCE_DIR "${CMAKE_SOURCE_DIR}/ui"
|
|
PREFIX "/org/gnome/Geary"
|
|
RESOURCES ${RESOURCE_LIST}
|
|
)
|
|
|
|
add_custom_target(resource_c DEPENDS ${RESOURCES_C})
|
|
|
|
# Work around valac wanting the resource files to be in the same
|
|
# directory as the XML file.
|
|
add_custom_target(resource_copy ALL
|
|
mkdir -p ${CMAKE_BINARY_DIR}/ui
|
|
COMMAND
|
|
cp ${RESOURCES_XML} ${CMAKE_BINARY_DIR}/ui
|
|
COMMAND
|
|
cp ${CMAKE_SOURCE_DIR}/ui/*.glade ${CMAKE_SOURCE_DIR}/ui/*.ui ${CMAKE_BINARY_DIR}/ui
|
|
COMMAND
|
|
cp ${CMAKE_SOURCE_DIR}/ui/*.css ${CMAKE_BINARY_DIR}/ui
|
|
)
|
|
add_dependencies(resource_copy resource_c)
|
|
|
|
# Export the file names so they can be used in the source build
|
|
set(RESOURCES_C ${RESOURCES_C} PARENT_SCOPE)
|
|
set(RESOURCES_XML "${CMAKE_BINARY_DIR}/ui/.gresource.xml" PARENT_SCOPE)
|