added feature to disable inode/directory association

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2753 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 33 insertions, 3 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index acbbd2483..6e60603dc 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -60,8 +60,12 @@ target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui)
 add_dependencies(qmmp qmmpui libqmmp)
 install(TARGETS qmmp DESTINATION bin)
 install(FILES qmmp.desktop DESTINATION share/applications)
-install(FILES qmmp_enqueue.desktop DESTINATION share/applications)
 install(FILES images/16x16/qmmp.png DESTINATION share/icons/hicolor/16x16/apps)
 install(FILES images/32x32/qmmp.png DESTINATION share/icons/hicolor/32x32/apps)
 install(FILES images/48x48/qmmp.png DESTINATION share/icons/hicolor/48x48/apps)
 install(FILES images/scalable/qmmp.svgz images/scalable/qmmp-simple.svgz DESTINATION share/icons/hicolor/scalable/apps)
+
+IF(USE_DIR_ASSOC)
+install(FILES qmmp_enqueue.desktop DESTINATION share/applications)
+install(FILES qmmp_dir.desktop DESTINATION share/applications)
+ENDIF(USE_DIR_ASSOC)
diff --git a/src/app/qmmp.desktop b/src/app/qmmp.desktop
index d1602a19b..81db21f10 100644
--- a/src/app/qmmp.desktop
+++ b/src/app/qmmp.desktop
@@ -22,6 +22,5 @@ Icon=qmmp
 Terminal=false
 Type=Application
 Categories=AudioVideo;Player;Audio;Qt;
-MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/x-flac;audio/x-mp3;audio/x-mpeg;audio/x-ms-wma;audio/x-musepack;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mpegurl;audio/x-it;audio/x-mod;audio/x-ape;application/x-cue;audio/x-ffmpeg-shorten;inode/directory;
+MimeType=application/x-ogg;audio/mp3;audio/mpeg;audio/x-flac;audio/x-mp3;audio/x-mpeg;audio/x-ms-wma;audio/x-musepack;application/ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mpegurl;audio/x-it;audio/x-mod;audio/x-ape;application/x-cue;audio/x-ffmpeg-shorten;
 X-KDE-StartupNotify=false
-
diff --git a/src/app/qmmp_dir.desktop b/src/app/qmmp_dir.desktop
new file mode 100644
index 000000000..3bf7ce889
--- /dev/null
+++ b/src/app/qmmp_dir.desktop
@@ -0,0 +1,27 @@
+[Desktop Entry]
+X-Desktop-File-Install-Version=0.11
+Name=Qmmp
+Comment=Qt4-based Multimedia Player
+Comment[ru]=Медиа-проигрыватель на базе Qt4
+Comment[uk]=Медіа-програвач на базі Qt4
+Comment[cs]=Přehrávač hudby založený na Qt
+Comment[tr]=Qt4 tabanlı Çokluortam Oynatıcı
+Comment[de]=Qt4-basierter Audio-Player
+Comment[zh_CN]=基于Qt4的多媒体播放器
+Comment[zh_TW]=基于Qt4的多媒體播放器
+GenericName=Audio player
+GenericName[cs]=Přehrávač hudby
+GenericName[de]=Audio-Player
+GenericName[ru]=Аудио-проигрыватель
+GenericName[uk]=Медіа-програвач
+GenericName[tr]=Ses Oynatıcı
+GenericName[zh_CN]=音乐播放器
+GenericName[zh_TW]=音樂播放器
+Exec=qmmp %F
+Icon=qmmp
+Terminal=false
+NoDisplay=true
+Type=Application
+Categories=AudioVideo;Player;Audio;Qt;
+MimeType=inode/directory;
+X-KDE-StartupNotify=false