diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | README.RUS | 1 | ||||
| -rw-r--r-- | src/app/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/app/qmmp.desktop | 3 | ||||
| -rw-r--r-- | src/app/qmmp_dir.desktop | 27 | ||||
| -rw-r--r-- | src/plugins/Input/cue/CMakeLists.txt | 2 |
7 files changed, 40 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2eeae5d6f..739f9e703 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,7 @@ ENDIF(NOT LIB_SUFFIX) SET(LIB_DIR "lib${LIB_SUFFIX}" CACHE STRING "library path") SET(USE_SKINNED TRUE CACHE BOOL "enable/disable standard skinned user interface") +SET(USE_DIR_ASSOC TRUE CACHE BOOL "enable/disable inode/directory mime type association") pkg_search_module(X11 x11) @@ -187,5 +188,6 @@ MESSAGE("") MESSAGE("Advanced:") PRINT_SUMMARY ("Skinned user interface ............" USE_SKINNED X11_FOUND) PRINT_SUMMARY ("Automatic charset detection ......." USE_ENCA ENCA_FOUND) +PRINT_SUMMARY ("Directory association ............." USE_DIR_ASSOC 1) MESSAGE("") @@ -117,7 +117,8 @@ Available options: USE_KDENOTIFY, USE_UDISKS, USE_CONVERTER, USE_SB (general plugins); - USE_QMMP_DIALOG (file dialog); - USE_ENCA (automatic charset detection); -- USE_SKINNED (standard skinned UI) +- USE_SKINNED (standard skinned UI); +- USE_DIR_ASSOC (inode/directory mime type association) Also you can use ccmake for changing plugins configuration. By default program will be installed in /usr/local. You can change default path by running: diff --git a/README.RUS b/README.RUS index f10b5429f..c0f51efd3 100644 --- a/README.RUS +++ b/README.RUS @@ -116,6 +116,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE - USE_QMMP_DIALOG (файловый диалог); - USE_ENCA (автоматическое определение кодировки); - USE_SKINNED (стандартный пользовательский интерфейс) +- USE_DIR_ASSOC (привязка к mime-типу inode/directory) Также вы можете использовать ccmake для изменения конфигурации модулей. По умолчанию программа будет установлена в /usr/local. Вы можете изменить этот путь командой: 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 diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt index 3e8b08a65..9d1463696 100644 --- a/src/plugins/Input/cue/CMakeLists.txt +++ b/src/plugins/Input/cue/CMakeLists.txt @@ -78,4 +78,6 @@ ELSE(USE_ENCA AND ENCA_FOUND) target_link_libraries(cue ${QT_LIBRARIES} -lqmmp) ENDIF(USE_ENCA AND ENCA_FOUND) install(TARGETS cue DESTINATION ${LIB_DIR}/qmmp/Input) +IF(USE_DIR_ASSOC) install(FILES qmmp_cue.desktop DESTINATION share/applications) +ENDIF(USE_DIR_ASSOC) |