Dominik Schmidt
60142eb92d
Merge branch 'master' into jreen-tpqt4-comp
...
Conflicts:
CMakeLists.txt
src/tomahawkapp.cpp
2011-04-06 06:58:33 +02:00
Dominik Schmidt
c1385761b6
Find jreen headers in source, HACK
2011-04-06 06:43:24 +02:00
Dominik Schmidt
9d95644b9f
Add debug when sending messages
2011-04-05 17:15:02 +02:00
Dominik Schmidt
e944293d02
Build jreen on default
2011-04-05 17:14:11 +02:00
Dominik Schmidt
4cb2532fab
Heyyeeyeeey - hey stupid
2011-04-04 23:22:49 +02:00
Dominik Schmidt
3a0874bcdd
More debug and fails--
2011-04-04 23:20:35 +02:00
Dominik Schmidt
0cfb98b0af
Squash me
2011-04-04 21:14:05 +02:00
Dominik Schmidt
16eb50e02d
Forgot to add tomahawksipmessage stanza extension files
2011-04-04 20:46:21 +02:00
Dominik Schmidt
e7ddedef5a
Test it, baby!
2011-04-04 20:31:10 +02:00
Leo Franchi
b6d12701e7
Merge branch 'stable'
2011-04-04 14:22:58 -04:00
Leo Franchi
9cc74abccc
Keep the dynamic playlist description up to date when it is changed
2011-04-04 14:21:47 -04:00
Dominik Schmidt
63d7fc0b38
Do some cleanup and add comments in jreen sip plugin
2011-04-04 16:44:39 +02:00
Christian Muehlhaeuser
87e813e215
Merge remote-tracking branch 'origin/stable'
2011-04-04 13:55:24 +02:00
Christian Muehlhaeuser
fdc2f5d3e9
* Fixed thread afinity issue related to WebKit.
2011-04-04 13:25:10 +02:00
Christian Muehlhaeuser
92bc03ee3e
* Merged stable.
2011-04-04 10:55:58 +02:00
Christian Muehlhaeuser
5e2d196ba0
* Fixed mtimes issue with windows paths.
2011-04-04 10:36:07 +02:00
Christian Muehlhaeuser
16fd65667f
* Merged stable changes to master.
2011-04-04 09:02:40 +02:00
Jeff Mitchell
74fd092355
Ok. Now the watched scanning is really fixed, in the sense that I can no longer break it. Until someone finds another way.
2011-04-03 13:50:52 -04:00
Jeff Mitchell
f66a062796
Hopefully fix removing files actually being removed from db during watch scan
2011-04-03 13:31:02 -04:00
Christian Muehlhaeuser
8729c91c95
* Fixed crash on startup with empty config.
2011-04-03 13:07:20 +02:00
Jeff Mitchell
680b204d11
Make caching work. Doesn't save/load to disk yet but it's ready to be used as a memcache at least.
2011-04-03 05:44:32 -04:00
Jeff Mitchell
2b85beb704
Requests for cover art from lastfm now go through the infosystem caching mechanism. It's not actually storing a cache yet but the information flow works (at least, for cache misses :-) )
2011-04-02 22:51:10 -04:00
Jeff Mitchell
daa822cd14
Some minor work on infosystem
2011-04-02 21:44:48 -04:00
Jeff Mitchell
c3df88d0f8
More debug, and fixed watch behavior :-)
2011-04-02 20:51:14 -04:00
Leo Franchi
743575b91a
use our export macro that works on windows :)
2011-04-02 19:34:39 -04:00
Jeff Mitchell
a848561e60
Add some debugging for Chris and fix duplicate paths being queued
2011-04-02 19:29:53 -04:00
Leo Franchi
d2e867b9ee
switch to using KDSingleApplicationGuard instead of QtUniqueApp as it's broken on windows.
...
KDSingleApplicationGuard is from KDTools and this is the GPL-licensed version.
2011-04-02 13:47:48 -04:00
Jeff Mitchell
ea744456c9
Don't start scanning on a fresh config/db
2011-04-02 11:07:04 -04:00
Christian Muehlhaeuser
5255fd2a78
* Properly thread QtScriptResolver.
2011-04-02 10:24:58 +02:00
Christian Muehlhaeuser
0a593aeb05
* Only keep track of the 50 most recent tracks in WelcomeWidget. Don't auto-resolve playback-logs any longer.
2011-04-02 10:24:58 +02:00
Christian Muehlhaeuser
6af30bfd2f
* Cleaned up style.
2011-04-02 10:24:58 +02:00
Jeff Mitchell
01f2fe6adc
Fix missing condition, wrong method, and put more info in the ChangeLog
2011-04-02 01:17:48 -04:00
Jeff Mitchell
569c23a30e
Whitespacing
2011-04-02 00:56:36 -04:00
Jeff Mitchell
3bc496eaaf
Implement watched folders and scan-on-startup. Folders are scanned after 10 seconds without a change. Also handles deferring scans of directories if attempted during an ongoing scan, both for recursive and non-recursive scans.
...
Fixes TWK-30 / THK-30.
2011-04-02 00:52:20 -04:00
Christian Muehlhaeuser
d818a7f697
* Added ready() signal to Database class.
2011-04-02 06:10:05 +02:00
Jeff Mitchell
06f0dd8768
More work on dir watchers -- it's mostly there except for the actual DB modifications
2011-04-01 17:05:40 -04:00
Jeff Mitchell
de92b0b726
Initial work on a dir watcher for the scanner
2011-03-31 22:08:32 -04:00
Jeff Mitchell
47451e4fba
Add more debugging and remove the don't-try-to-reconnect behavior
2011-03-31 15:12:08 -04:00
Jeff Mitchell
0c4e304ee5
Make debug output a little more helpful
2011-03-31 12:19:12 -04:00
Julian Bäume
59391e3841
load translation based on system locale
...
this loads the resource that contains translations for the locale the
user has set.
2011-03-31 10:25:14 +08:00
Julian Bäume
a55124ed75
ship the translations within the binary
...
build qm-files for translation
create resource file for translations, contains german translations, for now.
this is some kind of hack to make it work. rcc doesn’t allow
out-of-source builds, so the commands need to be specified by hand, to
copy things around between source and binary directories.
2011-03-31 10:25:14 +08:00
Frank Osterfeld
a05795bf6b
fix case
2011-03-30 19:11:32 +02:00
Frank Osterfeld
b6d6969281
pass parent to messageboxes
2011-03-30 19:11:32 +02:00
Frank Osterfeld
492c2acf18
i18n: tr() and avoid string puzzle
2011-03-30 19:10:41 +02:00
Dominik Schmidt
ff0d5613bb
Set features at the right time
2011-03-30 15:52:49 +02:00
Dominik Schmidt
6386611871
Let the testing begin
2011-03-30 15:15:15 +02:00
Dominik Schmidt
f52205d2cc
Update jreen plugin to newer jreen and sip plugin interface
2011-03-30 05:05:22 +02:00
Jeff Mitchell
35c2fccd6c
Various proxy-related fixes. Still doesn't work properly...parts of it do but gloox jabber doesn't. (Haven't tested twitter yet.)
2011-03-29 19:35:18 -04:00
Jeff Mitchell
f767818966
Update some debug in twitter
2011-03-29 17:27:50 -04:00
Jeff Mitchell
a09167050f
Re-match the regex
2011-03-29 17:06:50 -04:00
