1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-26 12:53:41 +01:00

438 Commits

Author SHA1 Message Date
Christian Muehlhaeuser
087d910359 * Forgot to update DatabaseCommand. 2011-01-04 09:44:43 +01:00
Christian Muehlhaeuser
5863dc7e14 * Two new DatabaseCommands: LogPlayback and PlaybackHistory.
* LogPlayback keeps track of recently played songs in the database.
* PlaybackHistory retrieves playback logs from the database.
* Added "recently-played" views to WelcomeWidget & SourceInfoWidget.
* Needs testing.
2011-01-04 09:37:04 +01:00
Leo Franchi
2172f68a66 Fix merge and compile, fix schema issue 2011-01-03 23:50:09 -06:00
Leo Franchi
c28a7b8aa4 Merge branch 'master' into dynamic
Conflicts:
	src/CMakeLists.txt
	src/libtomahawk/collection.cpp
	src/libtomahawk/collection.h
	src/libtomahawk/network/filetransferconnection.h
	src/libtomahawk/playlist.h
	src/libtomahawk/query.h
	src/libtomahawk/result.h
	src/playlist/playlistmanager.cpp
	src/playlist/plitem.h
	src/tomahawkwindow.cpp
2011-01-03 22:31:37 -06:00
Christian Muehlhaeuser
f3b7375779 * Updated README. 2011-01-03 14:43:49 +01:00
Christian Muehlhaeuser
108f8cf93b * Added basic WelcomeWidget, which gets shown when Tomahawk starts up. Again, work in progress. 2011-01-03 13:08:41 +01:00
Christian Muehlhaeuser
a5b495127a * Interactive create-new-playlist dialog. Work in progress. 2011-01-03 05:18:25 +01:00
Christian Muehlhaeuser
0af3ac8c80 * Updated OSX build scripts. 2011-01-03 03:50:08 +01:00
Leo Franchi
a305c97972 link to libtomahawk on osx 2011-01-02 13:05:12 -06:00
Christian Muehlhaeuser
6f67d59bf2 * Fixed compiling on Win32. 2010-12-28 02:34:47 +01:00
Christian Muehlhaeuser
83f2ddeebd * Fixed CMakeLists.txt for SIP plugins. 2010-12-28 02:20:03 +01:00
Christian Muehlhaeuser
7c935282ae Merge branch 'master' of github.com:tomahawk-player/tomahawk 2011-01-01 00:21:04 +01:00
Christian Muehlhaeuser
82bd91af19 * Fix SIP plugins on Win32. 2011-01-01 00:20:28 +01:00
Jeff Mitchell
aaf7fc7c3f Install to "." makes libraries install into very bad (and non-working) locations. Put them
in lib like they're supposed to be...(and like they are elsewhere in the
app)
2010-12-30 20:28:29 -05:00
Christian Muehlhaeuser
8b9b02e15d * Mentioning Alejandro (xevix) in the About Dialog. 2010-12-28 06:23:15 +01:00
Christian Muehlhaeuser
27e906f712 * Split tomahawk into application and tomahawklib.
* Plugins link to and interface with tomahawklib.
* Compiles on Linux and Win32, but needs some more export macro love for the sip plugins on Win32.
2010-12-28 06:12:48 +01:00
Leo Franchi
8f1a768e86 WIP 2010-12-19 19:25:56 -05:00
Christian Muehlhaeuser
1496d322bf * Fixed copy & paste mistake. 2010-12-15 15:14:58 +01:00
Christian Muehlhaeuser
857763e31d * Moved zeroconf code into a separate sip plugin (we might want to re-think the SipPlugin interface). 2010-12-15 15:11:33 +01:00
Leo Franchi
004962866c some more work. crashes serializing dbcommand 2010-12-14 23:00:04 -05:00
Alejandro Wainzinger
3b507ff7a8 Make the Connect/Disconnect button do as advertised. Needs some more safety checks likely, but this will do for now. 2010-12-13 18:49:02 -08:00
Alejandro Wainzinger
e882c4f0a9 Fix OS X linking problem and plugin loading on OS X and Windows. 2010-12-12 21:41:43 -08:00
Alejandro Wainzinger
d74dd577fd Add OSX build instructions.
(cherry picked from commit f4a2cb2b8db27783790cfe74ca0e9e828f72faa1)
2010-12-12 19:17:54 -08:00
Alejandro Wainzinger
a87868c1f5 Change device name string handling to use safe conversion to CString (Was causing issues on OSX 10.6.5 Japanese)
(cherry picked from commit 17fb7abb8c88bf9ae45bff349d473e9224e8174e)
2010-12-12 19:17:31 -08:00
Leo Franchi
dedcd7a0f5 first working playlists, wohoo :D 2010-12-12 21:51:26 -05:00
Leo Franchi
e9963bb4d2 collapse plus and minus tosame button area 2010-12-12 17:09:51 -05:00
Leo Franchi
0df8ea0732 finally fix most of the layout issues.
god i hate qlayout...
2010-12-12 17:00:31 -05:00
Leo Franchi
c345ee6e35 fix database stuff 2010-12-12 14:08:25 -05:00
Leo Franchi
a1a01784ee ugly gui for basic functionality 2010-12-11 18:23:11 -05:00
Leo Franchi
4460f3ce60 add a collapse button to the dynamic control widget too 2010-12-11 15:59:19 -05:00
Leo Franchi
eed7a33578 hook up the dynamic GUI a bit 2010-12-11 15:25:17 -05:00
Leo Franchi
6ae37541e2 oops, resolve playlists :) 2010-12-11 14:16:06 -05:00
Leo Franchi
488672dc5c a few fixes 2010-12-11 14:06:45 -05:00
Leo Franchi
e744e57027 Undo code sharing. Since the source tree stores pointers to raw shared pointers, we can't cast them since that creates a new copy of the sharedpointer. BAH!
also fix some signal/slot connections
2010-12-11 13:38:01 -05:00
Leo Franchi
1a2c292124 fix oversight 2010-12-10 21:57:55 -05:00
Leo Franchi
72d5537150 add some handling of dynamic playlists in the sourcelist 2010-12-10 21:51:03 -05:00
Leo Franchi
b2b3f26155 initial commit of dynamic playlist gui 2010-12-10 21:31:43 -05:00
Leo Franchi
f1bd808d33 Rework source tree to use two enums instead of raw ints that drove me crazy... 2010-12-10 21:26:33 -05:00
Leo Franchi
d4e95e05d4 Rename to uppercase 2010-12-10 16:38:26 -05:00
Leo Franchi
f4be2b5067 only keep one playlistview and playlist model in memory at once 2010-12-09 21:52:47 -05:00
Leo Franchi
6faaf5343b various fixes, loads playlists now 2010-12-09 21:01:48 -05:00
Leo Franchi
6ae5a5d798 Load and create dynamic playlists, wohoo 2010-12-09 18:25:36 -05:00
Leo Franchi
73af178418 fix forward decs again :)
and some sql fixes
2010-12-09 18:25:35 -05:00
Leo Franchi
89328215d9 fix more sql stuff 2010-12-09 18:25:35 -05:00
Leo Franchi
b41ab0ad17 fix up a bit 2010-12-09 18:25:35 -05:00
Leo Franchi
6a4a4a18e9 first compiling+linking dynamic code. lots of forward declaring fixes so it touches a lot of headers 2010-12-09 18:25:35 -05:00
Leo Franchi
228cab7080 add echonest generator beginnings 2010-12-09 18:25:35 -05:00
Leo Franchi
c30f62e834 Add dynamic interface, and fix up some more dynamic playlist code 2010-12-09 18:25:35 -05:00
Leo Franchi
5b23b6ad81 first saving non-working commit 2010-12-09 18:25:35 -05:00
Christian Muehlhaeuser
b45c254081 * Try to reconnect if the jabber SIP plugin disconnected. 2010-12-09 08:39:39 +01:00