Move the "Configure Clementine" menu item into the Tools menu and rename it "Preferences". Also move the global shortcuts dialog into a page in the preferences dialog. Fixes issue #422

data/data.qrc

@@ -50,7 +50,6 @@
         <file>icons/22x22/application-exit.png</file>
         <file>icons/22x22/applications-internet.png</file>
         <file>icons/22x22/configure.png</file>
-        <file>icons/22x22/configure-shortcuts.png</file>
         <file>icons/22x22/document-open.png</file>
         <file>icons/22x22/document-open-folder.png</file>
         <file>icons/22x22/document-open-remote.png</file>
@@ -92,7 +91,6 @@
         <file>icons/32x32/application-exit.png</file>
         <file>icons/32x32/applications-internet.png</file>
         <file>icons/32x32/configure.png</file>
-        <file>icons/32x32/configure-shortcuts.png</file>
         <file>icons/32x32/document-open.png</file>
         <file>icons/32x32/document-open-folder.png</file>
         <file>icons/32x32/document-open-remote.png</file>
@@ -134,7 +132,6 @@
         <file>icons/48x48/application-exit.png</file>
         <file>icons/48x48/applications-internet.png</file>
         <file>icons/48x48/configure.png</file>
-        <file>icons/48x48/configure-shortcuts.png</file>
         <file>icons/48x48/document-open.png</file>
         <file>icons/48x48/document-open-folder.png</file>
         <file>icons/48x48/document-open-remote.png</file>
@@ -186,5 +183,8 @@
         <file>icons/48x48/view-fullscreen.png</file>
         <file>schema-12.sql</file>
         <file>schema-13.sql</file>
+        <file>icons/22x22/input-keyboard.png</file>
+        <file>icons/32x32/input-keyboard.png</file>
+        <file>icons/48x48/input-keyboard.png</file>
     </qresource>
 </RCC>

src/CMakeLists.txt

@@ -116,7 +116,7 @@ set(SOURCES
   ui/edittagdialog.cpp
   ui/equalizer.cpp
   ui/globalshortcutgrabber.cpp
-  ui/globalshortcutsdialog.cpp
+  ui/globalshortcutsconfig.cpp
   ui/iconloader.cpp
   ui/mainwindow.cpp
   ui/qtsystemtrayicon.cpp
@@ -220,7 +220,7 @@ set(HEADERS
   ui/edittagdialog.h
   ui/equalizer.h
   ui/globalshortcutgrabber.h
-  ui/globalshortcutsdialog.h
+  ui/globalshortcutsconfig.h
   ui/mainwindow.h
   ui/qtsystemtrayicon.h
   ui/settingsdialog.h
@@ -268,7 +268,7 @@ set(UI
   ui/edittagdialog.ui
   ui/equalizer.ui
   ui/globalshortcutgrabber.ui
-  ui/globalshortcutsdialog.ui
+  ui/globalshortcutsconfig.ui
   ui/mainwindow.ui
   ui/settingsdialog.ui
 

src/translations/ar.po

@@ -1262,7 +1262,7 @@ msgstr ""
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
 msgstr ""
 
 msgid "Ctrl+P"
@@ -1310,9 +1310,6 @@ msgstr ""
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1349,9 +1346,6 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Settings"
-msgstr ""
-
 msgid "Help"
 msgstr ""
 
@@ -1367,6 +1361,9 @@ msgstr ""
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr ""
 

src/translations/cs.po

@@ -1266,8 +1266,8 @@ msgstr "Uprav tag..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Nastavit Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1314,9 +1314,6 @@ msgstr "Odstranit z playlistu"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1353,9 +1350,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Hudba"
 
-msgid "Settings"
-msgstr "Nastavení"
-
 msgid "Help"
 msgstr "Nápověda"
 
@@ -1371,6 +1365,9 @@ msgstr "Přehrávání"
 msgid "Behavior"
 msgstr "Chování"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Upozornění"
 
@@ -1530,6 +1527,12 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Nastavení"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Nastavit Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Načítá se podpora audia"
 

src/translations/da.po

@@ -1269,8 +1269,8 @@ msgstr "Redigér mærke..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Indstil Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1317,9 +1317,6 @@ msgstr "Fjern fra spilleliste"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1356,9 +1353,6 @@ msgstr ""
 msgid "Music"
 msgstr "Musik"
 
-msgid "Settings"
-msgstr "Indstillinger"
-
 msgid "Help"
 msgstr "Hjælp"
 
@@ -1374,6 +1368,9 @@ msgstr "Afspilning"
 msgid "Behavior"
 msgstr "Opførsel"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Bekendtgørelser"
 
@@ -1533,6 +1530,12 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Indstillinger"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Indstil Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Indlæser lydmotor"
 

src/translations/de.po

@@ -1268,8 +1268,8 @@ msgstr "Tag bearbeiten..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Clementine einrichten..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1316,9 +1316,6 @@ msgstr "Aus der Wiedergabeliste entfernen"
 msgid "Add folder..."
 msgstr "Ordner hinzufügen..."
 
-msgid "Configure global shortcuts..."
-msgstr "Tastenkürzel einrichten..."
-
 msgid "Jump to the currently playing track"
 msgstr "Zum aktuellen Stück springen"
 
@@ -1355,9 +1352,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Musik"
 
-msgid "Settings"
-msgstr "Einstellungen"
-
 msgid "Help"
 msgstr "Hilfe"
 
@@ -1373,6 +1367,9 @@ msgstr "Wiedergabe"
 msgid "Behavior"
 msgstr "Verhalten"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
@@ -1534,6 +1531,15 @@ msgstr "Von der Liste wählen"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Tastenkürzel einrichten..."
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Clementine einrichten..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Audio Engine wird geladen"
 

src/translations/el.po

@@ -1272,8 +1272,8 @@ msgstr "Τροποποίηση ετικέτας..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Παραμετροποίηση του Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1320,9 +1320,6 @@ msgstr "Αφαίρεση από την λίστα"
 msgid "Add folder..."
 msgstr "Προσθήκη φακέλου"
 
-msgid "Configure global shortcuts..."
-msgstr "Ρύθμιση καθολικών συντομεύσεων..."
-
 msgid "Jump to the currently playing track"
 msgstr "Μετάβαση στο τρέχον κομμάτι που παίζει"
 
@@ -1359,9 +1356,6 @@ msgstr "Διαδίκτυο"
 msgid "Music"
 msgstr "Μουσική"
 
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
 msgid "Help"
 msgstr "Βοήθεια"
 
@@ -1377,6 +1371,9 @@ msgstr "Αναπαραγωγή"
 msgid "Behavior"
 msgstr "Συμπεριφορά"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
@@ -1536,6 +1533,15 @@ msgstr "Επιλογή από τη λίστα"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Ρύθμιση καθολικών συντομεύσεων..."
+
+#~ msgid "Settings"
+#~ msgstr "Ρυθμίσεις"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Παραμετροποίηση του Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Φόρτωμα της μηχανής ήχου"
 

src/translations/en_CA.po

@@ -1267,8 +1267,8 @@ msgstr "Edit tag..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configure Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1315,9 +1315,6 @@ msgstr "Remove from playlist"
 msgid "Add folder..."
 msgstr "Add folder..."
 
-msgid "Configure global shortcuts..."
-msgstr "Configure global shortcuts..."
-
 msgid "Jump to the currently playing track"
 msgstr "Jump to the currently playing track"
 
@@ -1354,9 +1351,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Music"
 
-msgid "Settings"
-msgstr "Settings"
-
 msgid "Help"
 msgstr "Help"
 
@@ -1372,6 +1366,9 @@ msgstr "Playback"
 msgid "Behavior"
 msgstr "Behaviour"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notifications"
 
@@ -1531,6 +1528,15 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr "Delay between visualisations"
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Configure global shortcuts..."
+
+#~ msgid "Settings"
+#~ msgstr "Settings"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configure Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Loading audio engine"
 

src/translations/en_GB.po

@@ -1264,8 +1264,8 @@ msgstr "Edit tag..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configure Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1312,9 +1312,6 @@ msgstr "Remove from playlist"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1351,9 +1348,6 @@ msgstr ""
 msgid "Music"
 msgstr "Music"
 
-msgid "Settings"
-msgstr "Settings"
-
 msgid "Help"
 msgstr "Help"
 
@@ -1369,6 +1363,9 @@ msgstr "Playback"
 msgid "Behavior"
 msgstr "Behaviour"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notifications"
 
@@ -1528,6 +1525,12 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr "Delay between visualisations"
 
+#~ msgid "Settings"
+#~ msgstr "Settings"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configure Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Loading audio engine"
 

src/translations/es.po

@@ -1276,8 +1276,8 @@ msgstr "Editar etiqueta..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configurar Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1324,9 +1324,6 @@ msgstr "Eliminar de la lista de reproducción"
 msgid "Add folder..."
 msgstr "Añadir carpeta..."
 
-msgid "Configure global shortcuts..."
-msgstr "Configurar combinaciones de teclas globales"
-
 msgid "Jump to the currently playing track"
 msgstr "Ir a la pista actualmente reproduciéndose"
 
@@ -1363,9 +1360,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Música"
 
-msgid "Settings"
-msgstr "Preferencias"
-
 msgid "Help"
 msgstr "Ayuda"
 
@@ -1381,6 +1375,9 @@ msgstr "Reproducción"
 msgid "Behavior"
 msgstr "Comportamiento"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notificaciones"
 
@@ -1542,6 +1539,15 @@ msgstr "Elegir de la lista"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Configurar combinaciones de teclas globales"
+
+#~ msgid "Settings"
+#~ msgstr "Preferencias"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configurar Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Cargando motor de sonido"
 

src/translations/fi.po

@@ -1262,7 +1262,7 @@ msgstr ""
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
 msgstr ""
 
 msgid "Ctrl+P"
@@ -1310,9 +1310,6 @@ msgstr ""
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1349,9 +1346,6 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Settings"
-msgstr ""
-
 msgid "Help"
 msgstr ""
 
@@ -1367,6 +1361,9 @@ msgstr ""
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr ""
 

src/translations/fr.po

@@ -1272,8 +1272,8 @@ msgstr "Modifier la tag..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configurer Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1320,9 +1320,6 @@ msgstr "Supprimer de la liste de lecture"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1359,9 +1356,6 @@ msgstr ""
 msgid "Music"
 msgstr "Musique"
 
-msgid "Settings"
-msgstr "Configuration"
-
 msgid "Help"
 msgstr "Aide"
 
@@ -1377,6 +1371,9 @@ msgstr "Lecture sonore"
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notifications"
 
@@ -1538,6 +1535,12 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Configuration"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configurer Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Chargement du moteur audio"
 

src/translations/gl.po

@@ -1264,7 +1264,7 @@ msgstr ""
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
 msgstr ""
 
 msgid "Ctrl+P"
@@ -1312,9 +1312,6 @@ msgstr ""
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1351,9 +1348,6 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Settings"
-msgstr ""
-
 msgid "Help"
 msgstr ""
 
@@ -1369,6 +1363,9 @@ msgstr ""
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr ""
 

src/translations/it.po

@@ -1273,8 +1273,8 @@ msgstr "Modifica tag..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configura Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1321,9 +1321,6 @@ msgstr "Rimuovi dalla scaletta"
 msgid "Add folder..."
 msgstr "Aggiungi cartella..."
 
-msgid "Configure global shortcuts..."
-msgstr "Configura le scorciatoie globali..."
-
 msgid "Jump to the currently playing track"
 msgstr "Salta alla traccia in riproduzione"
 
@@ -1360,9 +1357,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Musica"
 
-msgid "Settings"
-msgstr "Impostazioni"
-
 msgid "Help"
 msgstr "Aiuto"
 
@@ -1378,6 +1372,9 @@ msgstr "Riproduzione"
 msgid "Behavior"
 msgstr "Comportamento"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notifiche"
 
@@ -1539,6 +1536,15 @@ msgstr "Scegli dall'elenco"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Configura le scorciatoie globali..."
+
+#~ msgid "Settings"
+#~ msgstr "Impostazioni"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configura Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Caricamento motore audio"
 

src/translations/kk.po

@@ -1264,7 +1264,7 @@ msgstr ""
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
 msgstr ""
 
 msgid "Ctrl+P"
@@ -1312,9 +1312,6 @@ msgstr ""
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1351,9 +1348,6 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Settings"
-msgstr ""
-
 msgid "Help"
 msgstr ""
 
@@ -1369,6 +1363,9 @@ msgstr ""
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr ""
 

src/translations/nb.po

@@ -1266,8 +1266,8 @@ msgstr "Endre merkelapp..."
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Konfigurér Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1314,9 +1314,6 @@ msgstr "Fjern fra spillelisten"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1353,9 +1350,6 @@ msgstr ""
 msgid "Music"
 msgstr "Musikk"
 
-msgid "Settings"
-msgstr "Innstillinger"
-
 msgid "Help"
 msgstr "Hjelp"
 
@@ -1371,6 +1365,9 @@ msgstr "Avspilling"
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Meldinger"
 
@@ -1530,6 +1527,12 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Innstillinger"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Konfigurér Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Laster lydmotor"
 

src/translations/oc.po

@@ -1262,8 +1262,8 @@ msgstr ""
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configurar Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1310,9 +1310,6 @@ msgstr ""
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1349,9 +1346,6 @@ msgstr "Sus Internet"
 msgid "Music"
 msgstr "Musica"
 
-msgid "Settings"
-msgstr "Paramètres"
-
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1367,6 +1361,9 @@ msgstr "Sortida"
 msgid "Behavior"
 msgstr "Compòrtament"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notificacions"
 
@@ -1526,5 +1523,11 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Paramètres"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configurar Clementine..."
+
 #~ msgid "Options"
 #~ msgstr "Opcions"

src/translations/pl.po

@@ -1264,8 +1264,8 @@ msgstr "Edytuj znacznik..."
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Konfiguruj Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1312,9 +1312,6 @@ msgstr "Usuń z playlisty"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1351,9 +1348,6 @@ msgstr ""
 msgid "Music"
 msgstr "Muzyka"
 
-msgid "Settings"
-msgstr "Ustawienia"
-
 msgid "Help"
 msgstr "Pomoc"
 
@@ -1369,6 +1363,9 @@ msgstr "Odtwarzanie"
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Powiadomienia"
 
@@ -1528,6 +1525,12 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Ustawienia"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Konfiguruj Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Ładowanie silnika dźwięku"
 

src/translations/pt.po

@@ -1268,8 +1268,8 @@ msgstr "Editar a marca..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configurar Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1316,9 +1316,6 @@ msgstr "Remover da lista de reprodução"
 msgid "Add folder..."
 msgstr "Adicionar pasta..."
 
-msgid "Configure global shortcuts..."
-msgstr "Configurar atalhos globais..."
-
 msgid "Jump to the currently playing track"
 msgstr "Ir para a faixa de reprodução actual"
 
@@ -1355,9 +1352,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Música"
 
-msgid "Settings"
-msgstr "Definições"
-
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1373,6 +1367,9 @@ msgstr "Reprodução"
 msgid "Behavior"
 msgstr "Comportamento"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notificações"
 
@@ -1533,6 +1530,15 @@ msgstr "Escolher da lista"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Configurar atalhos globais..."
+
+#~ msgid "Settings"
+#~ msgstr "Definições"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configurar Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Carregando o sistema de áudio"
 

src/translations/pt_BR.po

@@ -1272,8 +1272,8 @@ msgstr "Editar Marcador"
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Cnfigurar Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1320,9 +1320,6 @@ msgstr "Remover da lista de reprodução"
 msgid "Add folder..."
 msgstr "Adicionar pasta..."
 
-msgid "Configure global shortcuts..."
-msgstr "Configurar atalhos globais..."
-
 msgid "Jump to the currently playing track"
 msgstr "Pular para a faixa em execução"
 
@@ -1359,9 +1356,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Música"
 
-msgid "Settings"
-msgstr "Configurações"
-
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1377,6 +1371,9 @@ msgstr "Reproduzir"
 msgid "Behavior"
 msgstr "Comportamento"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notificações"
 
@@ -1536,6 +1533,15 @@ msgstr "Escolher da lista"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Configurar atalhos globais..."
+
+#~ msgid "Settings"
+#~ msgstr "Configurações"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Cnfigurar Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Carregando mecanismo de áudio"
 

src/translations/ro.po

@@ -1263,8 +1263,8 @@ msgstr ""
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Configurează Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1311,9 +1311,6 @@ msgstr "Elimină din lista de redare"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1350,9 +1347,6 @@ msgstr ""
 msgid "Music"
 msgstr "Muzică"
 
-msgid "Settings"
-msgstr "Setări"
-
 msgid "Help"
 msgstr "Ajutor"
 
@@ -1368,6 +1362,9 @@ msgstr "Redare"
 msgid "Behavior"
 msgstr "Comportament"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notificări"
 
@@ -1527,6 +1524,12 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Setări"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Configurează Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Se încarcă motorul audio"
 

src/translations/ru.po

@@ -1268,8 +1268,8 @@ msgstr "Редактировать тег..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Настроить Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1316,9 +1316,6 @@ msgstr "Удалить из списка воспроизведения"
 msgid "Add folder..."
 msgstr "Добавить каталог..."
 
-msgid "Configure global shortcuts..."
-msgstr "Настройка глобальных горячих клавиш..."
-
 msgid "Jump to the currently playing track"
 msgstr "Перейти к текущей композиции"
 
@@ -1355,9 +1352,6 @@ msgstr "Интернет"
 msgid "Music"
 msgstr "Музыка"
 
-msgid "Settings"
-msgstr "Настройки"
-
 msgid "Help"
 msgstr "Помощь"
 
@@ -1373,6 +1367,9 @@ msgstr "Воспроизведение"
 msgid "Behavior"
 msgstr "Поведение"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Уведомления"
 
@@ -1533,6 +1530,15 @@ msgstr "Выбор из списка"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Настройка глобальных горячих клавиш..."
+
+#~ msgid "Settings"
+#~ msgstr "Настройки"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Настроить Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Загрузка движка аудио"
 

src/translations/sk.po

@@ -1269,8 +1269,8 @@ msgstr "Upraviť tag..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Nastaviť Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1317,9 +1317,6 @@ msgstr "Odstrániť z playlistu"
 msgid "Add folder..."
 msgstr "Pridať priečinok..."
 
-msgid "Configure global shortcuts..."
-msgstr "Nastaviť globálne skratky..."
-
 msgid "Jump to the currently playing track"
 msgstr "Skočiť na práve prehrávanú skladbu"
 
@@ -1356,9 +1353,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Hudba"
 
-msgid "Settings"
-msgstr "Nastavenia"
-
 msgid "Help"
 msgstr "Nápoveda"
 
@@ -1374,6 +1368,9 @@ msgstr "Prehrávanie"
 msgid "Behavior"
 msgstr "Správanie"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Notifikácie"
 
@@ -1533,6 +1530,15 @@ msgstr "Vybrať zo zoznamu"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Nastaviť globálne skratky..."
+
+#~ msgid "Settings"
+#~ msgstr "Nastavenia"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Nastaviť Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Načítava sa zvukový engine"
 

src/translations/sv.po

@@ -1269,8 +1269,8 @@ msgstr "Redigera tagg..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Ställ in Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1317,9 +1317,6 @@ msgstr "Ta bort från spellista"
 msgid "Add folder..."
 msgstr "Lägg till mapp..."
 
-msgid "Configure global shortcuts..."
-msgstr "Ställ in globala genvägar..."
-
 msgid "Jump to the currently playing track"
 msgstr "Hoppa till det spår som spelas för tillfället"
 
@@ -1356,9 +1353,6 @@ msgstr "Internet"
 msgid "Music"
 msgstr "Musik"
 
-msgid "Settings"
-msgstr "Inställningar"
-
 msgid "Help"
 msgstr "Hjälp"
 
@@ -1374,6 +1368,9 @@ msgstr "Uppspelning"
 msgid "Behavior"
 msgstr "Beteende"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Underrättelser"
 
@@ -1534,6 +1531,15 @@ msgstr "Välj från listan"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Ställ in globala genvägar..."
+
+#~ msgid "Settings"
+#~ msgstr "Inställningar"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Ställ in Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Laddar audiomotor"
 

src/translations/tr.po

@@ -1264,7 +1264,7 @@ msgstr ""
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
 msgstr ""
 
 msgid "Ctrl+P"
@@ -1312,9 +1312,6 @@ msgstr ""
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1351,9 +1348,6 @@ msgstr "İnternet"
 msgid "Music"
 msgstr "Müzik"
 
-msgid "Settings"
-msgstr "Ayarlar"
-
 msgid "Help"
 msgstr "Yardım"
 
@@ -1369,6 +1363,9 @@ msgstr ""
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr ""
 
@@ -1528,6 +1525,9 @@ msgstr ""
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Settings"
+#~ msgstr "Ayarlar"
+
 #~ msgid "Music (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma)"
 #~ msgstr "Müzik (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma)"
 

src/translations/uk.po

@@ -1269,8 +1269,8 @@ msgstr "Змінити позначку..."
 msgid "F2"
 msgstr "F2"
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
-msgstr "Налаштувати Clementine..."
+msgstr ""
 
 msgid "Ctrl+P"
 msgstr ""
@@ -1317,9 +1317,6 @@ msgstr "Вилучити зі списку відтворення"
 msgid "Add folder..."
 msgstr "Додати теку..."
 
-msgid "Configure global shortcuts..."
-msgstr "Налаштувати глобальні комбінації клавіш..."
-
 msgid "Jump to the currently playing track"
 msgstr "Перейти до відтворюваної доріжки"
 
@@ -1356,9 +1353,6 @@ msgstr "Інтернет"
 msgid "Music"
 msgstr "Музика"
 
-msgid "Settings"
-msgstr "Налаштування"
-
 msgid "Help"
 msgstr "Довідка"
 
@@ -1374,6 +1368,9 @@ msgstr "Відтворення"
 msgid "Behavior"
 msgstr "Поведінка"
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr "Сповіщення"
 
@@ -1533,6 +1530,15 @@ msgstr "Вибрати зі списку"
 msgid "Delay between visualizations"
 msgstr ""
 
+#~ msgid "Configure global shortcuts..."
+#~ msgstr "Налаштувати глобальні комбінації клавіш..."
+
+#~ msgid "Settings"
+#~ msgstr "Налаштування"
+
+#~ msgid "Configure Clementine..."
+#~ msgstr "Налаштувати Clementine..."
+
 #~ msgid "Loading audio engine"
 #~ msgstr "Завантаження аудіо-рушія"
 

src/translations/zh_CN.po

@@ -1262,7 +1262,7 @@ msgstr ""
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
 msgstr ""
 
 msgid "Ctrl+P"
@@ -1310,9 +1310,6 @@ msgstr ""
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1349,9 +1346,6 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Settings"
-msgstr ""
-
 msgid "Help"
 msgstr ""
 
@@ -1367,6 +1361,9 @@ msgstr ""
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr ""
 

src/translations/zh_TW.po

@@ -1262,7 +1262,7 @@ msgstr ""
 msgid "F2"
 msgstr ""
 
-msgid "Configure Clementine..."
+msgid "Preferences..."
 msgstr ""
 
 msgid "Ctrl+P"
@@ -1310,9 +1310,6 @@ msgstr "從撥放清單移除"
 msgid "Add folder..."
 msgstr ""
 
-msgid "Configure global shortcuts..."
-msgstr ""
-
 msgid "Jump to the currently playing track"
 msgstr ""
 
@@ -1349,9 +1346,6 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-msgid "Settings"
-msgstr ""
-
 msgid "Help"
 msgstr ""
 
@@ -1367,6 +1361,9 @@ msgstr ""
 msgid "Behavior"
 msgstr ""
 
+msgid "Global Shortcuts"
+msgstr ""
+
 msgid "Notifications"
 msgstr ""
 

src/ui/globalshortcutsconfig.cpp

@@ -15,8 +15,8 @@
 */
 
 #include "globalshortcutgrabber.h"
-#include "globalshortcutsdialog.h"
+#include "globalshortcutsconfig.h"
-#include "ui_globalshortcutsdialog.h"
+#include "ui_globalshortcutsconfig.h"
 #include "core/globalshortcuts.h"
 
 #include <QtDebug>
@@ -26,23 +26,35 @@
 #include <QProcess>
 #include <QMessageBox>
 
-GlobalShortcutsDialog::GlobalShortcutsDialog(GlobalShortcuts* manager,
+GlobalShortcutsConfig::GlobalShortcutsConfig(QWidget* parent)
-                                             QWidget* parent)
+  : QWidget(parent),
-  : QDialog(parent),
+    ui_(new Ui_GlobalShortcutsConfig),
-    ui_(new Ui_GlobalShortcutsDialog),
+    manager_(NULL),
-    manager_(manager),
     grabber_(new GlobalShortcutGrabber)
 {
   ui_->setupUi(this);
   ui_->shortcut_options->setEnabled(false);
   ui_->list->header()->setResizeMode(QHeaderView::ResizeToContents);
 
+  settings_.beginGroup(GlobalShortcuts::kSettingsGroup);
+
+  connect(ui_->list, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), SLOT(ItemClicked(QTreeWidgetItem*)));
+  connect(ui_->radio_none, SIGNAL(clicked()), SLOT(NoneClicked()));
+  connect(ui_->radio_default, SIGNAL(clicked()), SLOT(DefaultClicked()));
+  connect(ui_->radio_custom, SIGNAL(clicked()), SLOT(ChangeClicked()));
+  connect(ui_->change, SIGNAL(clicked()), SLOT(ChangeClicked()));
+  connect(ui_->gnome_open, SIGNAL(clicked()), SLOT(OpenGnomeKeybindingProperties()));
+}
+
+void GlobalShortcutsConfig::SetManager(GlobalShortcuts *manager) {
+  manager_ = manager;
+
+  connect(ui_->mac_open, SIGNAL(clicked()), manager_, SLOT(ShowMacAccessibilityDialog()));
+
   if (!manager->IsGsdAvailable()) {
     ui_->gnome_container->hide();
   }
 
-  settings_.beginGroup(GlobalShortcuts::kSettingsGroup);
-
   foreach (const GlobalShortcuts::Shortcut& s, manager_->shortcuts().values()) {
     Shortcut shortcut;
     shortcut.s = s;
@@ -55,64 +67,45 @@ GlobalShortcutsDialog::GlobalShortcutsDialog(GlobalShortcuts* manager,
   }
 
   ui_->list->sortItems(0, Qt::AscendingOrder);
-
-  connect(ui_->button_box->button(QDialogButtonBox::Reset), SIGNAL(clicked()), SLOT(ResetAll()));
-  connect(ui_->list, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), SLOT(ItemClicked(QTreeWidgetItem*)));
-  connect(ui_->radio_none, SIGNAL(clicked()), SLOT(NoneClicked()));
-  connect(ui_->radio_default, SIGNAL(clicked()), SLOT(DefaultClicked()));
-  connect(ui_->radio_custom, SIGNAL(clicked()), SLOT(ChangeClicked()));
-  connect(ui_->change, SIGNAL(clicked()), SLOT(ChangeClicked()));
-  connect(ui_->gnome_open, SIGNAL(clicked()), SLOT(OpenGnomeKeybindingProperties()));
-  connect(ui_->mac_open, SIGNAL(clicked()), manager_, SLOT(ShowMacAccessibilityDialog()));
-
   ItemClicked(ui_->list->topLevelItem(0));
 }
 
-GlobalShortcutsDialog::~GlobalShortcutsDialog() {
+GlobalShortcutsConfig::~GlobalShortcutsConfig() {
   delete ui_;
 }
 
-void GlobalShortcutsDialog::showEvent(QShowEvent*) {
+void GlobalShortcutsConfig::Load() {
   foreach (const Shortcut& s, shortcuts_.values()) {
     SetShortcut(s.s.id, s.s.action->shortcut());
   }
 
   bool use_gnome = settings_.value("use_gnome", true).toBool();
-  if (ui_->gnome_container->isVisible()) {
+  if (ui_->gnome_container->isVisibleTo(this)) {
     ui_->gnome_checkbox->setChecked(use_gnome);
   }
 
   ui_->mac_container->setVisible(!manager_->IsMacAccessibilityEnabled());
 }
 
-void GlobalShortcutsDialog::ResetAll() {
+void GlobalShortcutsConfig::SetShortcut(const QString& id, const QKeySequence& key) {
-  foreach (const QString& id, shortcuts_.keys()) {
-    SetShortcut(id, shortcuts_[id].s.default_key);
-  }
-}
-
-void GlobalShortcutsDialog::SetShortcut(const QString& id, const QKeySequence& key) {
   Shortcut& shortcut = shortcuts_[id];
 
   shortcut.key = key;
   shortcut.item->setText(1, key.toString(QKeySequence::NativeText));
 }
 
-void GlobalShortcutsDialog::accept() {
+void GlobalShortcutsConfig::Save() {
-  Save();
-  QDialog::accept();
-}
-
-void GlobalShortcutsDialog::Save() {
   foreach (const Shortcut& s, shortcuts_.values()) {
     s.s.action->setShortcut(s.key);
     settings_.setValue(s.s.id, s.key.toString());
   }
 
   settings_.setValue("use_gnome", ui_->gnome_checkbox->isChecked());
+
+  manager_->ReloadSettings();
 }
 
-void GlobalShortcutsDialog::ItemClicked(QTreeWidgetItem* item) {
+void GlobalShortcutsConfig::ItemClicked(QTreeWidgetItem* item) {
   current_id_ = item->data(0, Qt::UserRole).toString();
   Shortcut& shortcut = shortcuts_[current_id_];
 
@@ -128,15 +121,15 @@ void GlobalShortcutsDialog::ItemClicked(QTreeWidgetItem* item) {
     ui_->radio_custom->setChecked(true);
 }
 
-void GlobalShortcutsDialog::NoneClicked() {
+void GlobalShortcutsConfig::NoneClicked() {
   SetShortcut(current_id_, QKeySequence());
 }
 
-void GlobalShortcutsDialog::DefaultClicked() {
+void GlobalShortcutsConfig::DefaultClicked() {
   SetShortcut(current_id_, shortcuts_[current_id_].s.default_key);
 }
 
-void GlobalShortcutsDialog::ChangeClicked() {
+void GlobalShortcutsConfig::ChangeClicked() {
   QKeySequence key = grabber_->GetKey(shortcuts_[current_id_].s.action->text());
   if (key.isEmpty())
     return;
@@ -145,7 +138,7 @@ void GlobalShortcutsDialog::ChangeClicked() {
   SetShortcut(current_id_, key);
 }
 
-void GlobalShortcutsDialog::OpenGnomeKeybindingProperties() {
+void GlobalShortcutsConfig::OpenGnomeKeybindingProperties() {
   if (!QProcess::startDetached("gnome-keybinding-properties")) {
     QMessageBox::warning(this, "Error",
         tr("The \"%1\" command could not be started.")

src/ui/globalshortcutsconfig.h

@@ -14,10 +14,10 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef GLOBALSHORTCUTSDIALOG_H
+#ifndef GLOBALSHORTCUTSCONFIG_H
-#define GLOBALSHORTCUTSDIALOG_H
+#define GLOBALSHORTCUTSCONFIG_H
 
-#include <QDialog>
+#include <QWidget>
 #include <QMap>
 #include <QSettings>
 
@@ -27,25 +27,22 @@
 
 class QTreeWidgetItem;
 
-class Ui_GlobalShortcutsDialog;
+class Ui_GlobalShortcutsConfig;
 class GlobalShortcutGrabber;
 
-class GlobalShortcutsDialog : public QDialog {
+class GlobalShortcutsConfig : public QWidget {
  Q_OBJECT
 
  public:
-  GlobalShortcutsDialog(GlobalShortcuts* manager, QWidget* parent = 0);
+  GlobalShortcutsConfig(QWidget* parent = 0);
-  ~GlobalShortcutsDialog();
+  ~GlobalShortcutsConfig();
 
- protected:
+  void SetManager(GlobalShortcuts* manager);
-  // QWidget
+
-  void showEvent(QShowEvent *);
+  void Load();
+  void Save();
 
  private slots:
-  void accept();
-
-  void ResetAll();
-
   void ItemClicked(QTreeWidgetItem*);
   void NoneClicked();
   void DefaultClicked();
@@ -53,8 +50,6 @@ class GlobalShortcutsDialog : public QDialog {
 
   void OpenGnomeKeybindingProperties();
 
-  void Save();
-
  private:
   struct Shortcut {
     GlobalShortcuts::Shortcut s;
@@ -65,7 +60,7 @@ class GlobalShortcutsDialog : public QDialog {
   void SetShortcut(const QString& id, const QKeySequence& key);
 
  private:
-  Ui_GlobalShortcutsDialog* ui_;
+  Ui_GlobalShortcutsConfig* ui_;
 
   GlobalShortcuts* manager_;
   boost::scoped_ptr<GlobalShortcutGrabber> grabber_;
@@ -76,4 +71,4 @@ class GlobalShortcutsDialog : public QDialog {
   QString current_id_;
 };
 
-#endif // GLOBALSHORTCUTSDIALOG_H
+#endif // GLOBALSHORTCUTSCONFIG_H

src/ui/globalshortcutsconfig.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>GlobalShortcutsDialog</class>
+ <class>GlobalShortcutsConfig</class>
- <widget class="QDialog" name="GlobalShortcutsDialog">
+ <widget class="QWidget" name="GlobalShortcutsConfig">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -167,19 +167,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="button_box">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
-     </property>
-     <property name="centerButtons">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <tabstops>
@@ -188,44 +175,11 @@
   <tabstop>radio_default</tabstop>
   <tabstop>radio_custom</tabstop>
   <tabstop>change</tabstop>
-  <tabstop>button_box</tabstop>
  </tabstops>
  <resources>
   <include location="../../data/data.qrc"/>
  </resources>
  <connections>
-  <connection>
-   <sender>button_box</sender>
-   <signal>accepted()</signal>
-   <receiver>GlobalShortcutsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>358</x>
-     <y>368</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>333</x>
-     <y>346</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>button_box</sender>
-   <signal>rejected()</signal>
-   <receiver>GlobalShortcutsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>436</x>
-     <y>374</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>440</x>
-     <y>391</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>gnome_checkbox</sender>
    <signal>toggled(bool)</signal>

src/ui/mainwindow.cpp

@@ -49,7 +49,6 @@
 #include "ui/albumcovermanager.h"
 #include "ui/edittagdialog.h"
 #include "ui/equalizer.h"
-#include "ui/globalshortcutsdialog.h"
 #include "ui/iconloader.h"
 #include "ui/qtsystemtrayicon.h"
 #ifdef Q_OS_DARWIN
@@ -121,7 +120,6 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
     cover_manager_(NULL),
     equalizer_(new Equalizer),
     transcode_dialog_(new TranscodeDialog),
-    global_shortcuts_dialog_(new GlobalShortcutsDialog(global_shortcuts_)),
     error_dialog_(new ErrorDialog),
 #ifdef ENABLE_VISUALISATIONS
     visualisation_(new VisualisationContainer),
@@ -194,7 +192,6 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
   ui_->action_add_stream->setIcon(IconLoader::Load("document-open-remote"));
   ui_->action_clear_playlist->setIcon(IconLoader::Load("edit-clear-list"));
   ui_->action_configure->setIcon(IconLoader::Load("configure"));
-  ui_->action_configure_global_shortcuts->setIcon(IconLoader::Load("configure-shortcuts"));
   ui_->action_cover_manager->setIcon(IconLoader::Load("download"));
   ui_->action_edit_track->setIcon(IconLoader::Load("edit-rename"));
   ui_->action_equalizer->setIcon(IconLoader::Load("view-media-equalizer"));
@@ -252,7 +249,6 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
   connect(ui_->action_cover_manager, SIGNAL(triggered()), cover_manager_.get(), SLOT(show()));
   connect(ui_->action_equalizer, SIGNAL(triggered()), equalizer_.get(), SLOT(show()));
   connect(ui_->action_transcode, SIGNAL(triggered()), transcode_dialog_.get(), SLOT(show()));
-  connect(ui_->action_configure_global_shortcuts, SIGNAL(triggered()), global_shortcuts_dialog_.get(), SLOT(show()));
   connect(ui_->action_jump, SIGNAL(triggered()), ui_->playlist->view(), SLOT(JumpToCurrentlyPlayingTrack()));
   connect(ui_->action_update_library, SIGNAL(triggered()), library_, SLOT(IncrementalScan()));
   connect(ui_->action_rain, SIGNAL(toggled(bool)), player_, SLOT(MakeItRain(bool)));
@@ -408,14 +404,8 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
 
   // Force this menu to be the app "Preferences".
   ui_->action_configure->setMenuRole(QAction::PreferencesRole);
-  // Force this menu into the "Clementine" menu.
-  ui_->action_configure_global_shortcuts->setMenuRole(QAction::ApplicationSpecificRole);
   // Force this menu to be the app "About".
   ui_->action_about->setMenuRole(QAction::AboutRole);
-
-  if (QSysInfo::MacintoshVersion != QSysInfo::MV_SNOWLEOPARD) {
-    ui_->action_configure_global_shortcuts->setEnabled(false);
-  }
 #endif
 
   // Global shortcuts
@@ -431,7 +421,7 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
   connect(global_shortcuts_, SIGNAL(Mute()), player_, SLOT(Mute()));
   connect(global_shortcuts_, SIGNAL(SeekForward()), player_, SLOT(SeekForward()));
   connect(global_shortcuts_, SIGNAL(SeekBackward()), player_, SLOT(SeekBackward()));
-  connect(global_shortcuts_dialog_.get(), SIGNAL(accepted()), global_shortcuts_, SLOT(ReloadSettings()));
+  settings_dialog_->SetGlobalShortcutManager(global_shortcuts_);
 
   // Settings
   connect(settings_dialog_.get(), SIGNAL(accepted()), SLOT(ReloadSettings()));

src/ui/mainwindow.h

@@ -38,7 +38,6 @@ class EditTagDialog;
 class Equalizer;
 class ErrorDialog;
 class GlobalShortcuts;
-class GlobalShortcutsDialog;
 class GroupByDialog;
 class Library;
 class MultiLoadingIndicator;
@@ -181,7 +180,6 @@ class MainWindow : public QMainWindow, public PlatformInterface {
   boost::scoped_ptr<AlbumCoverManager> cover_manager_;
   boost::scoped_ptr<Equalizer> equalizer_;
   boost::scoped_ptr<TranscodeDialog> transcode_dialog_;
-  boost::scoped_ptr<GlobalShortcutsDialog> global_shortcuts_dialog_;
   boost::scoped_ptr<ErrorDialog> error_dialog_;
 
 #ifdef ENABLE_VISUALISATIONS

src/ui/mainwindow.ui

@@ -89,9 +89,6 @@
               <attribute name="headerVisible">
                <bool>false</bool>
               </attribute>
-              <attribute name="headerVisible">
-               <bool>false</bool>
-              </attribute>
              </widget>
             </item>
            </layout>
@@ -518,13 +515,6 @@
     <addaction name="action_clear_playlist"/>
     <addaction name="action_shuffle"/>
    </widget>
-   <widget class="QMenu" name="menuSettings">
-    <property name="title">
-     <string>Settings</string>
-    </property>
-    <addaction name="action_configure"/>
-    <addaction name="action_configure_global_shortcuts"/>
-   </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>Help</string>
@@ -547,11 +537,12 @@
     <addaction name="action_transcode"/>
     <addaction name="separator"/>
     <addaction name="action_update_library"/>
+    <addaction name="separator"/>
+    <addaction name="action_configure"/>
    </widget>
    <addaction name="menuMusic"/>
    <addaction name="menuPlaylist"/>
    <addaction name="menuTools"/>
-   <addaction name="menuSettings"/>
    <addaction name="menuExtras"/>
    <addaction name="menuHelp"/>
   </widget>
@@ -675,7 +666,7 @@
   </action>
   <action name="action_configure">
    <property name="text">
-    <string>Configure Clementine...</string>
+    <string>Preferences...</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+P</string>
@@ -761,11 +752,6 @@
     <string>Add folder...</string>
    </property>
   </action>
-  <action name="action_configure_global_shortcuts">
-   <property name="text">
-    <string>Configure global shortcuts...</string>
-   </property>
-  </action>
   <action name="action_jump">
    <property name="text">
     <string>Jump to the currently playing track</string>

src/ui/settingsdialog.cpp

@@ -43,9 +43,10 @@ SettingsDialog::SettingsDialog(QWidget* parent)
                             QImage(":nocover.png"));
 
   // Icons
-  ui_->list->item(0)->setIcon(IconLoader::Load("media-playback-start")); // Playback
+  ui_->list->item(Page_Playback)->setIcon(IconLoader::Load("media-playback-start"));
-  ui_->list->item(2)->setIcon(IconLoader::Load("help-hint")); // Notifications
+  ui_->list->item(Page_GlobalShortcuts)->setIcon(IconLoader::Load("input-keyboard"));
-  ui_->list->item(3)->setIcon(IconLoader::Load("folder-sound")); // Library
+  ui_->list->item(Page_Notifications)->setIcon(IconLoader::Load("help-hint"));
+  ui_->list->item(Page_Library)->setIcon(IconLoader::Load("folder-sound"));
 
   // Playback
   connect(ui_->fading_cross, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged()));
@@ -63,12 +64,19 @@ SettingsDialog::SettingsDialog(QWidget* parent)
   // Behaviour
   connect(ui_->b_show_tray_icon_, SIGNAL(toggled(bool)), SLOT(ShowTrayIconToggled(bool)));
 
+  // Global shortcuts
+#ifdef Q_OS_MAC
+  if (QSysInfo::MacintoshVersion != QSysInfo::MV_SNOWLEOPARD) {
+    ui_->list->item(Page_GlobalShortcuts)->setFlags(Qt::NoItemFlags);
+  }
+#endif
+
   // Last.fm
   connect(ui_->lastfm, SIGNAL(ValidationComplete(bool)), SLOT(LastFMValidationComplete(bool)));
 
   // List box
   connect(ui_->list, SIGNAL(currentTextChanged(QString)), SLOT(CurrentTextChanged(QString)));
-  ui_->list->setCurrentRow(0);
+  ui_->list->setCurrentRow(Page_Playback);
 
   // Notifications
   ui_->notifications_bg_preset->setItemData(0, QColor(OSDPretty::kPresetBlue), Qt::DecorationRole);
@@ -94,7 +102,7 @@ SettingsDialog::SettingsDialog(QWidget* parent)
   ui_->list->setMinimumWidth(ui_->list->sizeHintForColumn(0));
 
 #ifdef Q_OS_DARWIN
-  ui_->list->item(1)->setHidden(true);  // Hide "Behaviour" on mac.
+  ui_->list->item(Page_Behaviour)->setHidden(true);  // Hide "Behaviour" on mac.
 #endif
 }
 
@@ -111,6 +119,10 @@ void SettingsDialog::SetLibraryDirectoryModel(LibraryDirectoryModel* model) {
   ui_->library_config->SetModel(model);
 }
 
+void SettingsDialog::SetGlobalShortcutManager(GlobalShortcuts *manager) {
+  ui_->global_shortcuts->SetManager(manager);
+}
+
 void SettingsDialog::LastFMValidationComplete(bool success) {
   ui_->buttonBox->setEnabled(true);
 
@@ -183,6 +195,7 @@ void SettingsDialog::accept() {
 
   ui_->library_config->Save();
   ui_->magnatune->Save();
+  ui_->global_shortcuts->Save();
 
   QDialog::accept();
 }
@@ -209,6 +222,9 @@ void SettingsDialog::showEvent(QShowEvent*) {
   // Magnatune
   ui_->magnatune->Load();
 
+  // Global Shortcuts
+  ui_->global_shortcuts->Load();
+
   // Playback
   s.beginGroup(Engine::Base::kSettingsGroup);
   ui_->fading_out->setChecked(s.value("FadeoutEnabled", true).toBool());

src/ui/settingsdialog.h

@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+class GlobalShortcuts;
 class LibraryDirectoryModel;
 class OSDPretty;
 class Ui_SettingsDialog;
@@ -39,6 +40,7 @@ class SettingsDialog : public QDialog {
   enum Page {
     Page_Playback = 0,
     Page_Behaviour,
+    Page_GlobalShortcuts,
     Page_Notifications,
     Page_Library,
     Page_Lastfm,
@@ -46,6 +48,7 @@ class SettingsDialog : public QDialog {
   };
 
   void SetLibraryDirectoryModel(LibraryDirectoryModel* model);
+  void SetGlobalShortcutManager(GlobalShortcuts* manager);
 #ifdef HAVE_GSTREAMER
   void SetGstEngine(const GstEngine* engine);
 #endif

src/ui/settingsdialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Settings</string>
+   <string>Preferences</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../../data/data.qrc">
@@ -64,6 +64,11 @@
         <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Global Shortcuts</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>Notifications</string>
@@ -109,7 +114,7 @@
      <item>
       <widget class="QStackedWidget" name="stacked_widget">
        <property name="currentIndex">
-        <number>5</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="playback_page">
         <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -409,6 +414,19 @@
          </item>
         </layout>
        </widget>
+       <widget class="QWidget" name="page_2">
+        <layout class="QVBoxLayout" name="verticalLayout_12">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="GlobalShortcutsConfig" name="global_shortcuts" native="true"/>
+         </item>
+        </layout>
+       </widget>
        <widget class="QWidget" name="notifications_page">
         <layout class="QVBoxLayout" name="verticalLayout_4">
          <item>
@@ -670,6 +688,12 @@
    <header>radio/magnatuneconfig.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>GlobalShortcutsConfig</class>
+   <extends>QWidget</extends>
+   <header>ui/globalshortcutsconfig.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>list</tabstop>