Jeff Mitchell
2f5e2b231a
Merge branch 'master' into atticafixes-waiting-on-attica-release
2012-06-18 16:59:26 -04:00
Jeff Mitchell
ccebc6b9f9
Move proxy factory setup in xmpp client
2012-06-18 16:59:20 -04:00
Jeff Mitchell
bb44c9a2e9
Remove some debug and change around some proxy ordering to make sense when no hostname is passed in
2012-06-18 16:18:44 -04:00
Jeff Mitchell
fda615f0ab
Make headless mode use the Stream ACL by default
2012-06-18 11:36:08 -04:00
Jeff Mitchell
da17f467cf
Wanted to get this in there before 0.5 goes wild, as doing this in a
...
cleaner code fashion requires re-authing your peers. Adds a friendyname
to Users, so that when there is more fine-grained ACL management you can
set/show the friendly name along with the known screen names of a user.
2012-06-18 11:11:11 -04:00
Jeff Mitchell
cec2eb738f
Merge branch 'thqsqlite'
2012-06-18 04:59:53 -04:00
Jeff Mitchell
46bd366643
Refresh delegates on both add and remove; also, if ACL can't be displayed cause it's the wrong item type, just don't paint anything at all
2012-06-18 04:43:12 -04:00
Jeff Mitchell
4aadb95f5d
Refresh delegates on both add and remove; also, if ACL can't be displayed cause it's the wrong item type, just don't paint anything at all
2012-06-18 04:43:00 -04:00
Jeff Mitchell
8a61e89d83
Merge branch 'master' into thqsqlite
2012-06-18 04:22:47 -04:00
Jeff Mitchell
4a8710ce7f
Add FindSqlite and use its values
2012-06-18 04:22:41 -04:00
Jeff Mitchell
09882283d1
Remove unneeded files
2012-06-18 04:09:58 -04:00
Jeff Mitchell
7b05ad29e6
Import QSQLite from 4.8.1. Import Clementine's smain.cpp and
...
CMakeLists.txt (thanks, Clementine!). Do some name changing for sanity's
sake so we're sure of which plugin we're actually connected to.
2012-06-18 04:08:48 -04:00
Jeff Mitchell
b88be39f54
Fix checking result of ACL against name
2012-06-18 03:35:24 -04:00
Jeff Mitchell
0383378385
Fix cases where JID could be reduced to nothing
2012-06-18 03:14:09 -04:00
Jeff Mitchell
3ab01c1b46
Fix typo
2012-06-18 02:24:58 -04:00
Jeff Mitchell
167d71539a
Merge branch 'aclwidget'. NOTE: If you have previous [acl] entries in
...
your Tomahawk.conf from previous testing, be sure to remove them, or
clear them from the button in Settings->Advanced.
Conflicts:
ChangeLog
2012-06-18 01:56:53 -04:00
Jeff Mitchell
df269ae7a6
Update ChangeLog
2012-06-18 01:42:45 -04:00
Jeff Mitchell
7896d15536
For custom JobItems, the delegate is parented to the view, so don't attempt to delete it in the destructor of the item
2012-06-18 01:29:40 -04:00
Jeff Mitchell
4a1adbfb8a
Eep, use name, not nodeid, in the shortening
2012-06-18 01:20:13 -04:00
Jeff Mitchell
a82a8b2abe
Add ACL-clearing button to settings
2012-06-18 01:03:34 -04:00
Jeff Mitchell
f1a0de0f53
Start on acl entry clearing; also change where we strip the JID
2012-06-18 00:22:06 -04:00
Jeff Mitchell
8603667270
Knock down acl issue num 3: XMPP shows and auths against full jid with resource, sometimes
2012-06-18 00:08:40 -04:00
Jeff Mitchell
2c28325ae3
Fix item 1) in remaining ACL issues for 0.5...change text of adding-friend prompt to prevent confusion
2012-06-17 23:53:48 -04:00
Jeff Mitchell
4f1579274e
Always refresh delegates on item finish, not just when that item had a custom delegate, in case it's switched rows
2012-06-17 23:10:06 -04:00
Jeff Mitchell
259e4f3da9
Fix ACL saving/loading
2012-06-17 22:24:49 -04:00
Jeff Mitchell
554cb5d7a1
Properly handle delegates so that a) we don't crash and b) we actually
...
show the proper delegates for items when there are more than two in the
queue. This pretty much makes the job view stuff fully work, except
somehow saving got broken.
2012-06-17 18:56:07 -04:00
Leo Franchi
9d9fae75b5
Set future on artist/album immediately after creating promise
2012-06-17 22:34:31 +02:00
Leo Franchi
1fe28714cb
Remove duplicate function, and fix copy link from sidebar track page
2012-06-17 16:51:56 +02:00
Leo Franchi
a8f0053fc8
Catch by const ref and assert to check hypothesis
2012-06-17 15:30:27 +02:00
Leo Franchi
7b8136a36e
Reimplement QApplication::notify() to print out something about the exception if we can
2012-06-17 15:29:47 +02:00
Leo Franchi
c1d678e2b1
Catch boost::unitialized_future if it is thrown
2012-06-17 13:38:21 +02:00
Leo Franchi
ee8d3e6a92
Another boost/thread.hpp include rather than specific boost headers
2012-06-17 10:01:46 +02:00
Leo Franchi
52752cd234
One include to (hopefully) rule them all
2012-06-17 09:52:49 +02:00
Leo Franchi
7bec03560a
Add another boost include
2012-06-17 09:49:03 +02:00
Leo Franchi
e56f2f7ee0
Try some more includes
2012-06-17 09:44:11 +02:00
Leo Franchi
69b56e0836
Remove old code
2012-06-17 09:01:09 +02:00
Leo Franchi
8c48af423c
Fix oversight in queue draining
2012-06-17 09:01:09 +02:00
Leo Franchi
3f2906d4d1
Safer locking of id() to prevent deadlocks
2012-06-17 09:01:08 +02:00
Leo Franchi
cd3eeb2951
Cleanup fixes
2012-06-17 09:01:08 +02:00
Leo Franchi
75eb35397d
Experimental asynchronous artist and album id loading
2012-06-17 09:01:08 +02:00
Tomahawk CI
8c6af48358
Automatic merge of Transifex translations
2012-06-16 22:19:44 +00:00
Leo Franchi
acd6e75a10
Factor out some code
2012-06-17 00:09:59 +02:00
Leo Franchi
89ab3344d4
Create copyable artist and album page links
2012-06-17 00:09:03 +02:00
Leo Franchi
b1b9ee46db
Handle tomahawk://import/playlist as well as playlist/import as it's more consistent
2012-06-16 21:05:20 +02:00
Leo Franchi
a53ef7370c
Also check if a query has a result to determine equality, instead of only brittle string comparison
2012-06-16 16:57:27 +02:00
Leo Franchi
bc6cd4008d
TWK-936: Allow loading playlists with new open/playlist tomahawk link
2012-06-16 16:57:02 +02:00
Christian Muehlhaeuser
1d5e199d89
* Set the bgcolors in one central place.
2012-06-16 14:11:07 +02:00
Christian Muehlhaeuser
2290da1648
* Have a different color for the info sidebar on track pages.
2012-06-16 14:04:46 +02:00
Christian Muehlhaeuser
3b885aa730
* Show a styled vertical scrollbar for artist's biographies, if needed.
2012-06-16 12:48:09 +02:00
Christian Muehlhaeuser
c15e4062b2
* Try using QPalette::BrightText to make sure the text is always visible.
2012-06-16 12:31:01 +02:00
