Permalink
Browse files

Imported Upstream version 1.4.0

  • Loading branch information...
ronalde committed May 13, 2015
1 parent 51ebb4d commit ef5a88142c7bfcd164d83647e88a0ddb74987ef3
Showing with 1,361 additions and 1,732 deletions.
  1. +11 −5 FAQ.txt
  2. +22 −17 README
  3. +30 −2 changelog
  4. +6 −19 quimup.pro
  5. +267 −0 quimup.pro.user
  6. +0 −137 src/Makefile
  7. +0 −580 src/Makefile.Debug
  8. +0 −580 src/Makefile.Release
  9. +54 −46 src/main.cpp
  10. +41 −3 src/qm_browser.cpp
  11. +7 −1 src/qm_browser.h
  12. +1 −1 src/qm_browser_ids.h
  13. +1 −1 src/qm_clicklabel.cpp
  14. +1 −1 src/qm_clicklabel.h
  15. +1 −1 src/qm_clickprogressbar.cpp
  16. +1 −1 src/qm_clickprogressbar.h
  17. +1 −1 src/qm_colorpicker.cpp
  18. +1 −1 src/qm_colorpicker.h
  19. +1 −1 src/qm_config.cpp
  20. +1 −1 src/qm_config.h
  21. +16 −8 src/qm_core.cpp
  22. +3 −2 src/qm_core.h
  23. +1 −1 src/qm_itemlist.cpp
  24. +1 −1 src/qm_itemlist.h
  25. +20 −6 src/qm_libraryview.cpp
  26. +2 −1 src/qm_libraryview.h
  27. +71 −37 src/qm_mpdcom.cpp
  28. +7 −7 src/qm_mpdcom.h
  29. +433 −25 src/qm_player.cpp
  30. +20 −2 src/qm_player.h
  31. +169 −79 src/qm_playlistview.cpp
  32. +8 −2 src/qm_playlistview.h
  33. +2 −2 src/qm_scroller.cpp
  34. +1 −1 src/qm_scroller.h
  35. +3 −3 src/qm_settings.cpp
  36. +1 −1 src/qm_settings.h
  37. +1 −1 src/qm_songinfo.cpp
  38. +1 −1 src/qm_songinfo.h
  39. +1 −1 src/qm_streamloader.cpp
  40. +1 −1 src/qm_streamloader.h
  41. +1 −1 src/qm_trayicon.cpp
  42. +1 −1 src/qm_trayicon.h
  43. +1 −1 src/qm_widget_ids.h
  44. +42 −47 src/qtlocalpeer.cpp
  45. +4 −3 src/qtlocalpeer.h
  46. +1 −1 src/qtlockedfile.h
  47. +3 −4 src/qtsingleapplication.cpp
  48. +3 −3 src/qtsingleapplication.h
  49. +83 −82 src/quimup.qrc
  50. BIN src/resources/tr_consume.png
  51. BIN src/resources/tr_played_reset.png
  52. BIN src/resources/tr_plistnew.png
  53. BIN src/resources/tr_purge.png
  54. BIN src/resources/tr_single.png
  55. BIN src/resources/tr_update.png
  56. +13 −8 todo
View
16 FAQ.txt
@@ -33,10 +33,10 @@ ______________________________________________________________________________
q. Where does the album art come from?
-a. From the directory where the audio file is located. It is recommended to
- put a 200x200 pixel bitmap named albumart.jpg in the album directory.
- The program looks for a filename that matches *albumart* *folder* *front*
- *cover* or * (in that order), plus extension 'jpg' 'png' 'gif' or 'bmp'.
+a. Quimup first checks the audio-file for embedded album-art (mp3, ogg, mpc,
+ mp4, flac, wv and ape only). If that fails it checks the directory where
+ the audio file is located for a jpg, png, gif, or bmp file that matches
+ *albumart*, *folder*, *front*, *cover* or * (in that order).
______________________________________________________________________________
q. Quimup can't find album art.
@@ -88,11 +88,17 @@ a. Quimup will accept external files only if it is connected to MPD through a
your file manager (%U and %F are both accepted).
______________________________________________________________________________
+q. Wen I use 'open with quimup' the items are added in the wrong order. Why?
+
+a. Your file manager uses 'quimup' when it should use 'quimup %U'. You can
+ change the command in the quimup.desktop file.
+______________________________________________________________________________
+
q. Can I make a feauture request?
a. Of course you can. You can contact me at quimup@coonsden.com. But do keep
in mind that Quimup is a no-bells-or-whistles music player: not a tag
- editor, ipod manager or sound converter.
+ editor, iPod manager or sound converter.
______________________________________________________________________________
View
39 README
@@ -9,21 +9,21 @@
__________________________________________________________________________
QUIMUP
- version 1.3.1
+ version 1.4.0
- for MPD 0.16.0 and above
+ for MPD 0.17.0 and above
__________________________________________________________________________
QUIMUP is a client for the Music Player Daemon (MPD) written in c++ and
- QT4. The program can be used with most Linux desktops (KDE, GNOME, XFCE)
+ QT5. The program can be used with most Linux desktops (KDE, GNOME, XFCE)
and is covered by the General Public License (see LICENSE below).
The clean interface makes controlling MPD's features easy and intuitive.
The focus is on mouse handling: playlist management is done entirely by
drag-&-drop; all playback functions are accessible from the system tray.
Quimup aims to turn MPD into a perfect desktop music player.
- Copyright (C) 2008 - 2013 Johan Spee
+ Copyright (C) 2008 - 2015 Johan Spee
quimup@coonsden.com
www.coonsden.com
__________________________________________________________________________
@@ -47,17 +47,21 @@
DEPENDENCIES
- REQUIRES : MPD 0.16.x (preferably 0.17.x)
- DEPENDS : libmpdclient2 (>= 2.3)
- DEPENDS : libqtcore4 (>= 4.8)
- DEPENDS : libqtgui4 (>= 4.8)
- DEPENDS : libqt4-network(>= 4.8)
+ REQUIRES : MPD (>= 0.17)
+
+ DEPENDS : libmpdclient2 (>= 2.3 )
+ DEPENDS : libtag1-vanilla (>= 1.7 )
+ QT 5:
+ DEPENDS : qtcore (>= 5.1 )
+ DEPENDS : qtgui (>= 5.1 )
+ DEPENDS : qtnetwork (>= 5.1 )
+
- To COMPILE from source additionally install the QT4 and libmpdclient
- development files (on Debian libmpdclient-dev and libqt4-dev) and the
- usual: qmake, make, gcc, cpp, g++, pkg-config, autoconf etc.
+ To COMPILE from source additionally install the QT5, libmpdclient and
+ libtag development files (libmpdclient-dev, qtbase5-dev, libtag1-dev)
+ and the usual: qmake, make, gcc, cpp, g++, pkg-config, autoconf etc.
- [1] To create the makefile run: qmake (or qmake-qt4).
+ [1] To create the makefile run: qmake (or qmake-qt5).
[2] To compile, next run: make.
@@ -68,12 +72,12 @@
KDE, GNOME and XFCE
- Altough the program depends on QT it does not require KDE or depend on
- other KDE libraries, nor is it integrated with KDE in any way.
+ Altough the program depends on some QT libraries it does not require KDE
+ or depend on other KDE libraries, nor is it integrated with KDE in any way.
__________________________________________________________________________
- USING QUIMUP
+ ** USING QUIMUP **
CHECK OUT : FAQ.txt
CHECK OUT : TIPS IN THE SETTINGS WINDOW's ABOUT TAB
@@ -93,6 +97,7 @@
set exactly the same.
It may be necessary to associate relevant file types to 'open with'
- Quimup (this is usually done in the file's 'properties' tab).
+ Quimup (this is usually done in the file's 'properties' tab). Make sure
+ to use 'quimup %U' rather than just 'quimup' as command.
__________________________________________________________________________
View
@@ -9,13 +9,41 @@
version x.y.z (superior.major.minor)
+
+ v. 1.4.0 2015 02 01
+
+ Quimup 1.4.0 depends on QT5 libs!
+
+ * Coded: Migrated the code to QT5
+ * Fixed: After changing colors wrong album-art could be shown.
+ * Added: Use embedded cover art from asf and ape-tagged mp3.
+
+
+ v. 1.3.2 2014 06 12
+
+ Quimup 1.3.2 depends (also) on taglib.
+
+ * Fixed: Provided password was not used unconditionally.
+ * Fixed: Playlist not updated when a dropped item was rejected.
+ * Fixed: Settings were not saved upon system shutdown/logout.
+ * Fixed: Could not find translation(s) in default location.
+ * Fixed: Music dir was not always found automatically.
+ * Added: Use embedded cover art (mp3 ogg mpc mp4 flac wv ape).
+ * Added: Player and Browser now respond to 'media keys'.
+ * Added: Support for *.cue playlist files in folder view.
+ * Added: 'Reset status' to playlist context menu.
+ * Added: '-l none' to cmd parameters to force internal locale.
+ * Added: More extensions are accepted for D&D operations.
+ * Other: Some cosmetic tweaks, as usual.
+
+
v. 1.3.1 2013 12 02
* Added: Support for the 'Disc Number' tag.
* Added: Stream loader can handle compound urls better.
* Added: Manually override MPD's (remote) music dir.
- * Fixed: Crash upon calling mpd_return_pair (Archlinux).
- * Fixed: Player changed position after hide-show toggle.
+ * Fixed: Crash upon calling mpd_return_pair.
+ * Fixed: Hide-show toggle changed player position on Gnome.
* Fixed: Allow more time to connect to MPD at start-up.
* Fixed: Possible wrong sorting order of dragged items.
* Coded: Project 'includes' libmpdclient using pkg-config.
View
@@ -3,7 +3,7 @@
## Author : Johan Spee (quimup@coonsden.com)
## Project : Quimup
## FileName : Quimup.pro
-## Date : 2013-03-21T10:10:10
+## Date : 2015-01-21T10:10:10
## License : GPL
## Comment : Quimup is a client for MPD
## Home Page : www.coonsden.com
@@ -13,26 +13,17 @@
##
###########################################################################################
-XUPProjectSettings {
- EDITOR = QMake
- QT_VERSION = Qt System (4.7.2)
- OTHERS_PLATFORM_TARGET_RELEASE = quimup
-}
+QT += core gui network
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+TARGET = quimup
TEMPLATE = app
-LANGUAGE = C++/Qt4
-TARGET = $$quote(quimup)
-CONFIG -= qt
-CONFIG += qt release -O2
-BUILD_PATH = ./build
CONFIG += link_pkgconfig
PKGCONFIG = libmpdclient
+PKGCONFIG += taglib
-QMAKE_CFLAGS_RELEASE -= -O2
-QMAKE_CXXFLAGS_RELEASE -= -O2
-QMAKE_CFLAGS_RELEASE = -O3
-QMAKE_CXXFLAGS_RELEASE = -O3
+BUILD_PATH = ./build
CONFIG(debug, debug|release) {
#Debug
@@ -104,7 +95,3 @@ RESOURCES += src/quimup.qrc
TRANSLATIONS += quimup_nl.ts \
quimup_cs.ts
-QT = core gui network
-
-XUP.SHOW_QT_VERSION_WARNING = 0
-XUP.OTHERS_PLATFORM_TARGET_DEFAULT = quimup
Oops, something went wrong.

0 comments on commit ef5a881

Please sign in to comment.