extensionPrefs: Move desktop file and icons from top-level data

Another small step towards making the extensions app code
self-contained ...

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1081
This commit is contained in:
Florian Müllner 2020-03-08 15:04:46 +01:00 committed by Florian Müllner
parent c8a4a91681
commit b92ddc0d39
8 changed files with 25 additions and 5 deletions

View File

@ -1,6 +1,5 @@
desktop_files = [ desktop_files = [
'org.gnome.Shell.desktop', 'org.gnome.Shell.desktop',
'org.gnome.Extensions.desktop',
] ]
service_files = [] service_files = []
@ -43,7 +42,6 @@ endforeach
subdir('dbus-interfaces') subdir('dbus-interfaces')
subdir('icons')
subdir('theme') subdir('theme')
data_resources = [ data_resources = [

View File

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -5,3 +5,25 @@ gnome.compile_resources(
install: true, install: true,
install_dir: pkgdatadir install_dir: pkgdatadir
) )
desktopconf = configuration_data()
# We substitute in bindir so it works as an autostart
# file when built in a non-system prefix
desktopconf.set('bindir', bindir)
desktopconf.set('app_id', app_id)
desktopconf.set('prgname', prgname)
i18n.merge_file('desktop',
input: configure_file(
input: app_id + '.desktop.in.in',
output: app_id + '.desktop.in',
configuration: desktopconf
),
output: app_id + '.desktop',
po_dir: po_dir,
install: true,
install_dir: desktopdir,
type: 'desktop'
)
subdir('icons')

View File

@ -2,8 +2,8 @@
Type=Application Type=Application
Name=Extensions Name=Extensions
# Translators: Do NOT translate or transliterate this text (this is an icon file name)! # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gnome.Extensions Icon=@app_id@
Comment=Configure GNOME Shell Extensions Comment=Configure GNOME Shell Extensions
Exec=@bindir@/gnome-shell-extension-prefs %u Exec=@bindir@/@prgname@ %u
Categories=GNOME;GTK; Categories=GNOME;GTK;
OnlyShowIn=GNOME; OnlyShowIn=GNOME;

View File

@ -1,10 +1,10 @@
# List of source files containing translatable strings. # List of source files containing translatable strings.
# Please keep this file sorted alphabetically. # Please keep this file sorted alphabetically.
data/50-gnome-shell-system.xml data/50-gnome-shell-system.xml
data/org.gnome.Extensions.desktop.in.in
data/org.gnome.Shell.desktop.in.in data/org.gnome.Shell.desktop.in.in
data/org.gnome.shell.gschema.xml.in data/org.gnome.shell.gschema.xml.in
data/org.gnome.Shell.PortalHelper.desktop.in.in data/org.gnome.Shell.PortalHelper.desktop.in.in
js/extensionPrefs/data/org.gnome.Extensions.desktop.in.in
js/extensionPrefs/js/main.js js/extensionPrefs/js/main.js
js/extensionPrefs/data/ui/extension-row.ui js/extensionPrefs/data/ui/extension-row.ui
js/extensionPrefs/data/ui/extensions-window.ui js/extensionPrefs/data/ui/extensions-window.ui