diff --git a/data/help-overlay.ui b/data/help-overlay.ui
index e1d751970bf3e28af1f32eb992350e3b1711e3f5..ebddf7c408f342e83afdb3f1a1a324ce9b985270 100644
--- a/data/help-overlay.ui
+++ b/data/help-overlay.ui
@@ -90,28 +90,28 @@
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 270f0593535c000365248669d00d9c7f54a9b6c6..0d849e0c58017553c98a397ce25bf6db418b6220 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -383,16 +383,16 @@ class Window(Gtk.ApplicationWindow):
and modifiers == mod1_mask):
self.headerbar._on_back_button_clicked()
if ((event.keyval in [Gdk.KEY_1, Gdk.KEY_KP_1])
- and modifiers == control_mask):
+ and modifiers == mod1_mask):
self._toggle_view(View.ALBUM)
if ((event.keyval in [Gdk.KEY_2, Gdk.KEY_KP_2])
- and modifiers == control_mask):
+ and modifiers == mod1_mask):
self._toggle_view(View.ARTIST)
if ((event.keyval in [Gdk.KEY_3, Gdk.KEY_KP_3])
- and modifiers == control_mask):
+ and modifiers == mod1_mask):
self._toggle_view(View.SONG)
if ((event.keyval in [Gdk.KEY_4, Gdk.KEY_KP_4])
- and modifiers == control_mask):
+ and modifiers == mod1_mask):
self._toggle_view(View.PLAYLIST)
else:
if (event.keyval == Gdk.KEY_AudioPlay
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index 632bbe2f9b4c08d8c7307ea51080a1aa2e536e77..9bc24264d9d2eed6b027bfb42e90c3ab76a9e35d 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -1,20 +1,27 @@
{
- "app-id": "org.gnome.MusicDevel",
- "runtime": "org.gnome.Platform",
- "runtime-version": "master",
- "sdk": "org.gnome.Sdk",
- "command": "gnome-music",
- "tags": ["devel", "development", "nightly"],
- "desktop-file-name-prefix": "(Development) ",
- "finish-args": [
- "--share=ipc", "--socket=x11",
+ "app-id" : "org.gnome.MusicDevel",
+ "runtime" : "org.gnome.Platform",
+ "runtime-version" : "master",
+ "sdk" : "org.gnome.Sdk",
+ "command" : "gnome-music",
+ "tags" : [
+ "devel",
+ "development",
+ "nightly"
+ ],
+ "desktop-file-name-prefix" : "(Development) ",
+ "finish-args" : [
+ "--share=ipc",
+ "--socket=x11",
"--share=network",
"--socket=wayland",
"--talk-name=org.freedesktop.Tracker1",
"--env=TRACKER_SPARQL_BACKEND=bus",
"--talk-name=org.gnome.OnlineAccounts",
- "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
- "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+ "--filesystem=xdg-run/dconf",
+ "--filesystem=~/.config/dconf:ro",
+ "--talk-name=ca.desrt.dconf",
+ "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
"--own-name=org.mpris.MediaPlayer2.GnomeMusic",
"--talk-name=org.gnome.SettingsDaemon.MediaKeys",
"--talk-name=com.intel.dleyna-server",
@@ -23,13 +30,13 @@
"--filesystem=xdg-cache/media-art"
],
"build-options" : {
- "cflags": "-O2 -g",
- "cxxflags": "-O2 -g",
- "env": {
- "V": "1"
+ "cflags" : "-O2 -g",
+ "cxxflags" : "-O2 -g",
+ "env" : {
+ "V" : "1"
}
},
- "cleanup": [
+ "cleanup" : [
"/include",
"/lib/pkgconfig",
"/share/pkgconfig",
@@ -41,116 +48,135 @@
"*.la",
"*.a"
],
- "modules": [
+ "modules" : [
{
- "name": "libmediaart",
- "sources": [
+ "name" : "libmediaart",
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/libmediaart.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/libmediaart.git"
}
]
},
{
- "name": "libdazzle",
+ "name" : "libdazzle",
"config-opts" : [
"--libdir=/app/lib"
],
- "buildsystem": "meson",
- "sources": [
+ "buildsystem" : "meson",
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/libdazzle.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/libdazzle.git"
}
]
},
{
- "name": "tracker",
- "cleanup": [ "/bin", "/etc", "/libexec" ],
- "config-opts": [ "--disable-miner-apps", "--disable-static",
- "--disable-tracker-extract", "--disable-tracker-needle",
- "--disable-tracker-preferences", "--disable-artwork",
- "--disable-tracker-writeback", "--disable-miner-user-guides",
- "--with-bash-completion-dir=no" ],
- "sources": [
+ "name" : "tracker",
+ "cleanup" : [
+ "/bin",
+ "/etc",
+ "/libexec"
+ ],
+ "config-opts" : [
+ "--disable-miner-apps",
+ "--disable-static",
+ "--disable-tracker-extract",
+ "--disable-tracker-needle",
+ "--disable-tracker-preferences",
+ "--disable-artwork",
+ "--disable-tracker-writeback",
+ "--disable-miner-user-guides",
+ "--with-bash-completion-dir=no"
+ ],
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/tracker.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/tracker.git"
}
]
},
{
- "name": "gnome-online-accounts",
- "config-opts": [ "--enable-introspection",
- "--disable-telepathy",
- "--disable-documentation",
- "--disable-backend",
- "--disable-Werror" ],
- "sources": [
+ "name" : "gnome-online-accounts",
+ "config-opts" : [
+ "--enable-introspection",
+ "--disable-telepathy",
+ "--disable-documentation",
+ "--disable-backend",
+ "--disable-Werror"
+ ],
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
}
]
},
{
- "name": "totem-pl-parser",
- "buildsystem": "meson",
- "sources": [
+ "name" : "totem-pl-parser",
+ "buildsystem" : "meson",
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/totem-pl-parser.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/totem-pl-parser.git"
}
]
},
{
- "name": "grilo",
- "buildsystem": "meson",
- "sources": [
+ "name" : "grilo",
+ "buildsystem" : "meson",
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/grilo.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/grilo.git"
}
],
- "cleanup": [ "/include", "/bin" ]
+ "cleanup" : [
+ "/include",
+ "/bin"
+ ]
},
{
- "name": "grilo-plugins",
- "buildsystem": "meson",
- "config-opts": [ "-Denable-dleyna=yes",
- "-Denable-goa=yes",
- "-Denable-tracker=yes",
- "-Denable-bookmarks=no",
- "-Denable-filesystem=no",
- "-Denable-freebox=no",
- "-Denable-localmetadata=no",
- "-Denable-lua-factory=no",
- "-Denable-metadata-store=no",
- "-Denable-opensubtitles=no",
- "-Denable-optical-media=no",
- "-Denable-podcasts=no",
- "-Denable-thetvdb=no",
- "-Denable-tmdb=no",
- "-Denable-vimeo=no",
- "-Denable-youtube=no" ],
- "sources": [
+ "name" : "grilo-plugins",
+ "buildsystem" : "meson",
+ "config-opts" : [
+ "-Denable-dleyna=yes",
+ "-Denable-goa=yes",
+ "-Denable-tracker=yes",
+ "-Denable-bookmarks=no",
+ "-Denable-filesystem=no",
+ "-Denable-freebox=no",
+ "-Denable-localmetadata=no",
+ "-Denable-lua-factory=no",
+ "-Denable-metadata-store=no",
+ "-Denable-opensubtitles=no",
+ "-Denable-optical-media=no",
+ "-Denable-podcasts=no",
+ "-Denable-thetvdb=no",
+ "-Denable-tmdb=no",
+ "-Denable-vimeo=no",
+ "-Denable-youtube=no"
+ ],
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/grilo-plugins.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/grilo-plugins.git"
}
],
- "cleanup": [ "/include" ]
+ "cleanup" : [
+ "/include"
+ ]
},
{
- "name": "gnome-music",
+ "name" : "gnome-music",
"config-opts" : [
"-Dprofile=development"
],
- "buildsystem": "meson",
- "sources": [
+ "buildsystem" : "meson",
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/gnome-music.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/gnome-music.git"
}
]
}