Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] New Radio UI using QML #231

Open
wants to merge 567 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
567 commits
Select commit Hold shift + click to select a range
a2406e8
* Disconnect from previous query correctly.
muesli Jun 12, 2013
812ca58
* Added ColumnItemDelegate.
muesli Jun 12, 2013
7f64f25
* Added ColumnView.
muesli Jun 12, 2013
95e6efd
* Added ColumnViewPreviewWidget.
muesli Jun 12, 2013
d590fa4
* Added FlexibleTreeView.
muesli Jun 12, 2013
53bdd2d
* Updated CMakeLists.txt.
muesli Jun 12, 2013
d098c1c
* Use FlexibleTreeViews for showing collections.
muesli Jun 12, 2013
447c6c0
* Reset the model before applying a filter.
muesli Jun 12, 2013
d2f8bc2
* Removed header from ColumnView.
muesli Jun 12, 2013
e8a48aa
* Show more info in the preview-widget.
muesli Jun 12, 2013
5c2cebb
* Don't show empty labels in preview-widget.
muesli Jun 12, 2013
7b62c3e
* A few ColumnItemDelegate fixes.
muesli Jun 12, 2013
8ac833b
* Double-clicking in ColumnView opens the corresponding page.
muesli Jun 12, 2013
4ea22ba
* Show a default track cover until we retrieved the proper, new one.
muesli Jun 12, 2013
bcd3393
* Added ModeHeader widget.
muesli Jun 12, 2013
0f45146
* Compact BasicHeader.
muesli Jun 12, 2013
3ef99fb
* FlexibleHeader needs to set its own size.
muesli Jun 12, 2013
da8fd58
* Re-enable TreeView for collections.
muesli Jun 12, 2013
a0b7c6e
* Init FilterHeader with parent.
muesli Jun 12, 2013
ff007d8
* Make FlexibleView use new header style - to be consolidated.
muesli Jun 12, 2013
a883c71
* Fixed HistoryWidget's extra header.
muesli Jun 12, 2013
b2ac6ac
* Show 'kbps' next to the bitrate.
muesli Jun 12, 2013
cc62a45
* Draw divider below BasicHeader.
muesli Jun 12, 2013
9cc6c1f
* Tweak page and header colors.
muesli Jun 12, 2013
2b6da82
* Give Dashboard a header.
muesli Jun 12, 2013
f4bd895
* Make hover-glow subtler.
muesli Jun 12, 2013
a95276d
* Auto-resize PlaylistWidget.
muesli Jun 12, 2013
8dc56ab
* Fixed RecentPlaylistsModel not respecting the set limit.
muesli Jun 12, 2013
81d2278
Automatic merge of Transifex translations
Jun 13, 2013
022efd5
* Moved stylesheet methods into TomahawkStyle.
muesli Jun 13, 2013
815ec7c
* Use TomahawkStyle's methods to apply stylesheets.
muesli Jun 13, 2013
7723cad
* Removed obsolete png.
muesli Jun 13, 2013
a59971a
* Emit a signal when the currentTrackPlaylist changes in AudioEngine.
muesli Jun 13, 2013
63ee2cb
* Implemented Flexible(Tree)View's isBeingPlayed().
muesli Jun 13, 2013
0cf8813
* Style fixes in SourceTreeView.
muesli Jun 13, 2013
555d358
* Style fixes in SourcesModel.
muesli Jun 13, 2013
d8311c0
* Style fixes in GenericPageItems.
muesli Jun 13, 2013
bd4e19f
* Implemented LovedTracksItem's isBeingPlayed().
muesli Jun 13, 2013
af5fe4b
* When a track starts playing, check if we need to update the sidebar…
muesli Jun 13, 2013
1e89558
* Make boxes entirely transparent.
muesli Jun 13, 2013
082d86a
* Style fixes.
muesli Jun 13, 2013
e27396b
* Further tweaks to artist-page layout.
muesli Jun 13, 2013
df56877
* Added example ttf font.
muesli Jun 13, 2013
7a4e441
* TomahawkStyle::loadFonts() auto-loads all fonts in the data/fonts/ …
muesli Jun 13, 2013
8c67156
* Load fonts on startup.
muesli Jun 13, 2013
d833f5f
* Use Titillium Web for the labels on ArtistInfoWidget.
muesli Jun 13, 2013
ae8ddb2
* Use TomahawkStyle::HEADER_TEXT for captions.
muesli Jun 13, 2013
d2f9d2d
A bunch of styling to the Arist Page. WIP.
jherskowitz Jun 13, 2013
d302850
Use a font that also has bold. WIP.
jherskowitz Jun 13, 2013
0aade32
* Added regular version of Titillium as resource.
muesli Jun 13, 2013
6166eac
* Cleaned up TomahawkStyle.
muesli Jun 13, 2013
aa5e0fc
* Got rid of obsolete TomahawkStyle colors.
muesli Jun 13, 2013
42640ef
* WIP: Artist page.
muesli Jun 13, 2013
13c87e0
* Fixed link color in header.
muesli Jun 14, 2013
865b7db
Automatic merge of Transifex translations
Jun 14, 2013
0492bbd
* A few more tweaks to artist page.
muesli Jun 14, 2013
2066214
Do not rely on the object to be removed to be deleted after the callback
xhochy Jun 14, 2013
1b9b706
Keep a local strong reference to prevent deleting of the current object
xhochy Jun 14, 2013
2781faf
* Added new color roles to TomahawkStyle.
muesli Jun 14, 2013
99eae3c
* Fixed TomahawkUtils::prepareStyleOption().
muesli Jun 14, 2013
d875b8d
* StatsGauge retrieves color palette from TomahawkStyle.
muesli Jun 14, 2013
0e5e4e9
* Use new color roles on Artist page.
muesli Jun 14, 2013
6e84706
* Use QPalette::Foreground for drawing AlbumItemDelegate's position f…
muesli Jun 14, 2013
82705f6
* Moved highlight color roles into TomahawkStyle.
muesli Jun 14, 2013
ea7a215
Only invoke Closure if receiver still exists
xhochy Jun 14, 2013
3df5ab3
* Got rid of cover shadow / gradient.
muesli Jun 14, 2013
ac5774a
* Set the proper background color for the albums grid on the Artist p…
muesli Jun 14, 2013
2203c7a
* Fixed Track page.
muesli Jun 14, 2013
786a5f4
* Fixed ModeHeader's background color.
muesli Jun 14, 2013
60ad0a0
More Artist page design.
jherskowitz Jun 14, 2013
e7eea28
* Fixed page fonts.
muesli Jun 14, 2013
6bf5d70
Use deleteLater so that peerinfo_ptr can be used in different threads.
xhochy Jun 14, 2013
776c919
Correctly handle/display the different states of PeerInfos
xhochy Jun 14, 2013
0be6ec1
Remove unneeded include
xhochy Jun 14, 2013
5fa5532
Unbreak OSX
jherskowitz Jun 14, 2013
c66300a
More artist & track design plus some updated placeholder icons
jherskowitz Jun 14, 2013
4926fcb
Pretty up the gauge a bit more
jherskowitz Jun 14, 2013
088d7ed
Don't sort alphabetically here. Makes sense as it is in the source co…
rotzbouw Jun 14, 2013
508c7ff
Bump up bio font a couple of point sizes
jherskowitz Jun 14, 2013
9b53ffc
Style fix.
rotzbouw Jun 14, 2013
dd28657
Remove newline.
rotzbouw Jun 14, 2013
c014650
Fix track number color
jherskowitz Jun 14, 2013
5b3c297
Update all the Spotify icons to their new logo, except the one in the…
jherskowitz Jun 14, 2013
8f7671a
Automatic merge of Transifex translations
Jun 15, 2013
1af86b3
More font size tweaks
jherskowitz Jun 15, 2013
4145bf1
* Fixed Artist page's header size and moved font definitions to .ui f…
muesli Jun 15, 2013
d1e97b1
* Moved Track page's font definitions to .ui file.
muesli Jun 15, 2013
ff08efb
* Clean up for Track page.
muesli Jun 15, 2013
1d74242
* Clean up for Artist page.
muesli Jun 15, 2013
5678f61
* New layout for Album page.
muesli Jun 15, 2013
10cb39d
* Fixed albums area on artist page growing too big.
muesli Jun 15, 2013
06dca31
* Nitpicky fix.
muesli Jun 15, 2013
36ae09b
* New layout for Dashboard.
muesli Jun 15, 2013
74972ca
* Removed .ui font definitions.
muesli Jun 15, 2013
b2db38d
* Fixed inbox header color.
muesli Jun 15, 2013
30447ce
* Set captions to non-bold in .ui.
muesli Jun 15, 2013
4be8717
* Set captions to non-bold in .ui.
muesli Jun 15, 2013
5300dda
* New layout for search page.
muesli Jun 15, 2013
bb69cae
* Made deprecated InfoBar look the same as the other headers.
muesli Jun 15, 2013
9d90c07
* Dashboard should use the vanilla InfoBar.
muesli Jun 15, 2013
d6fd70f
* Fixed HistoryWidget's header color.
muesli Jun 15, 2013
df4aa8c
* Trim the artist biography before showing it.
muesli Jun 15, 2013
18d38f5
* Change AudioEngine's state before emitting the signal.
muesli Jun 15, 2013
f79744f
* FlexibleView's GridView looks nicer with black background.
muesli Jun 15, 2013
feaaa6c
* Adjust the splitter handle width.
muesli Jun 15, 2013
53e03f9
* Draw a horizontal splitter.
muesli Jun 15, 2013
f074d4d
Set nodeid directly, not as a property
xhochy Jun 15, 2013
29ba51b
Move private members of Connection into a Dpointer
xhochy Jun 15, 2013
d62bd30
Remove unused qjson includes and member
xhochy Jun 15, 2013
8824466
More padding in breadcrumb. Don't yet know how to make font bigger.
jherskowitz Jun 15, 2013
2ee3693
Unprefix Qt includes
xhochy Jun 15, 2013
bf5fcbd
Remove unused include
xhochy Jun 15, 2013
3d33c68
Move all implementations out of the header
xhochy Jun 15, 2013
34196ec
Pimple Source, remove some headers from Source.h and Connection.h
xhochy Jun 15, 2013
aaf4ced
Remove not needed ControlConnection include
xhochy Jun 15, 2013
70706c9
Move m_name into ConnectionPrivate
xhochy Jun 15, 2013
7efa2fd
Tomahawk::ACL -> Tomahawk::ACL::Type
xhochy Jun 15, 2013
611b108
Move peerport and msg into ConnectionPrivate
xhochy Jun 15, 2013
bf48967
Less (global) includes in/of SipPlugin.h
xhochy Jun 15, 2013
5bf09cc
Rename Tomahawk::ACL -> Tomahawk::ACLStatus
xhochy Jun 15, 2013
1a5406b
Pimple SipStatusMessage
xhochy Jun 15, 2013
ed5cb1d
Automatic merge of Transifex translations
Jun 16, 2013
6e91080
* Fixed compiling.
muesli Jun 16, 2013
bfd5690
Move outbound, ready, onceonly into ConnectionPrivate
xhochy Jun 16, 2013
bd0c3e2
If a ControlConnection is not anymore responsible for a source, it sh…
xhochy Jun 16, 2013
69c2d60
Make access to Connection->nodeid thread-safe
xhochy Jun 16, 2013
ceb856a
Finish Connection pimpeling
xhochy Jun 16, 2013
54e8ee1
Add missing include for OSX
xhochy Jun 16, 2013
5afc5b0
Remove not needed includes
xhochy Jun 16, 2013
c2b5468
Remove not needed includes in Query.h
xhochy Jun 16, 2013
96f28f5
Move implementations out of the header
xhochy Jun 16, 2013
8f7e2f1
Move includes from global headers into local .cpp
xhochy Jun 16, 2013
4d43577
Add missing include
xhochy Jun 16, 2013
ace775d
Fight all compiler warnings in libtomahawk
xhochy Jun 16, 2013
67fc355
No more warnings in tomahawk code
xhochy Jun 16, 2013
4b29d34
Add stub page to pull out again
dschmidt Jun 16, 2013
cb5916b
Use QList < ViewPage* > in ViewManager to store simple view pages
dschmidt Jun 16, 2013
426dd35
Move stub page adding from appendGroups to SourcesModel ctor
dschmidt Jun 16, 2013
187602c
GenericPageItem insertion fixage.
teo Jun 16, 2013
eaf1b58
Remove stub page from ViewManager implementation
dschmidt Jun 16, 2013
68448db
No need for QObject on Private classes
xhochy Jun 16, 2013
e0a6331
Pimple BufferIoDevice
xhochy Jun 16, 2013
8128f1e
Clean up headers
xhochy Jun 16, 2013
63a3339
Add generic page item for new view pages
dschmidt Jun 16, 2013
e5b418a
More include cleanups
xhochy Jun 16, 2013
8817aa6
Pimple Msg
xhochy Jun 16, 2013
6b69e50
Explicitly hide inactive view pages
dschmidt Jun 16, 2013
a928833
Use XInitThreads() on X11 to enable loading the visualizer module
dschmidt Jun 16, 2013
257395a
Pimple ControlConnection
xhochy Jun 16, 2013
68812eb
Add icon() method to ViewPage api and use that and title() for sideba…
dschmidt Jun 16, 2013
3debc10
Clean up
dschmidt Jun 16, 2013
be67d85
Revert "Add icon() method to ViewPage api and use that and title() fo…
dschmidt Jun 16, 2013
a5f1e63
Allow to set icon and text for externally added generic page items wi…
dschmidt Jun 16, 2013
aad713d
* Fixed compiling Hatchet.
muesli Jun 16, 2013
ab88260
Automatic merge of Transifex translations
Jun 17, 2013
4002716
Loosen destructor calls and empty source_ptr instead of deleting it.
xhochy Jun 17, 2013
97da93a
Fix compiler warning
jefferai Jun 17, 2013
c21de81
Re-mark proxy changes as needing restart
jefferai Jun 17, 2013
c002eaf
Try a different label font since Fauna One wasn't so great on Windows
jherskowitz Jun 17, 2013
47fc81b
Don't forget to replace Fauna font on Album pages too.
jherskowitz Jun 17, 2013
e0bff79
Fix slot/signal namespacing
xhochy Jun 17, 2013
0db80a9
Automatic merge of Transifex translations
Jun 18, 2013
e48b409
Automatic merge of Transifex translations
Jun 19, 2013
277edfe
* Don't reset the resolver's icon if we couldn't retrieve one in Reso…
muesli Jun 20, 2013
21beba0
* Style fixes.
muesli Jun 20, 2013
7a2d1ca
* Make sure JSResolver always has at least the default resolver icon …
muesli Jun 20, 2013
42c03fd
* Don't emit Database::ready() just because the FuzzyIndex became ready.
muesli Jun 20, 2013
776b1c9
* Pipeline only becomes ready when Database is entirely finished with…
muesli Jun 20, 2013
8e48956
* Result now always returns the actual score regardless of the online…
muesli Jun 20, 2013
53ad973
* Query's resoltSorter needs to take into account the result's online…
muesli Jun 20, 2013
6ed0879
* Respect results' online state when displaying.
muesli Jun 20, 2013
61a9944
Some dashboard design tweaks
jherskowitz Jun 20, 2013
42c0199
* Fixed incompatible signal/slot types.
muesli Jun 20, 2013
ef00f9c
This breaks too many things: Revert "Some dashboard design tweaks"
muesli Jun 20, 2013
193d4b6
Automatic merge of Transifex translations
Jun 21, 2013
483fa38
Put "out of %1" under the big number in StatsGauge
lliehu Jun 21, 2013
00e8d25
Revert "Put "out of %1" under the big number in StatsGauge"
muesli Jun 21, 2013
ec17293
Do not queue ACL result if there are no sipInfos
xhochy Jun 21, 2013
a6f8dc1
* Get rid of passing tomahawkLoaded signal through TomahawkWindow and…
muesli Jun 22, 2013
a450593
* Changed tomahawkLoaded handling.
muesli Jun 22, 2013
1ecfc8a
* Load recent albums when SourceList is ready.
muesli Jun 22, 2013
d829389
* Filter out tracks with bogus mtime when trying to load recent albums.
muesli Jun 22, 2013
3adeee4
Debug spam++
teo Jun 20, 2013
56dd8e2
Stay insecure if there's no other way.
teo Jun 20, 2013
612d887
Don't output secrets in log.
teo Jun 22, 2013
1c62ec3
Delete AudioEngine after MainWindow
xhochy Jun 22, 2013
10712c7
Automatic merge of Transifex translations
Jun 23, 2013
0403301
Move ScriptEngine into its own files
xhochy Jun 23, 2013
402a7ed
Move JSResolverHelper to its own files
xhochy Jun 23, 2013
2dac747
Remove unneed includes out of JSResolver.h
xhochy Jun 23, 2013
7b69874
Move implementations out of the header
xhochy Jun 23, 2013
9fa387e
Dpointer JSResolver
xhochy Jun 23, 2013
8d80b1e
Improve includes in Resolver.h
xhochy Jun 23, 2013
1b1b885
Improve Includes in ExternalResolvers.h
xhochy Jun 23, 2013
be364d5
* Added xhochy to AUTHORS / about-dialog.
muesli Jun 23, 2013
b4de7d6
Automatic merge of Transifex translations
Jun 24, 2013
09026a3
Debug spam++
xhochy Jun 24, 2013
cde07bc
Write --verbose output to Tomahawk.log
xhochy Jun 24, 2013
546f54f
Make WeakPeerHash more generic
xhochy Jun 26, 2013
7daebc6
Performance++, Memory--
xhochy Jun 26, 2013
04e5b33
Add comment to prevent others from doing the same mistake
xhochy Jun 26, 2013
a381c5e
Use strongRef where strongRef requested
xhochy Jun 26, 2013
419a3f1
Prefix HTTP API v1.0 members
xhochy Jun 14, 2013
f742066
Ensure that Servent still runs on all IPs with Qt 5.0
xhochy Jun 14, 2013
d41a9d8
Update Qxt
xhochy Jun 14, 2013
b0e352a
Generate QxtSslServer fancy header
xhochy Jun 18, 2013
22aa75f
Export JobStatusView
xhochy Jun 23, 2013
179dac3
Only display filename in JS resolver errors/as scriptname
xhochy Jun 26, 2013
4998852
Revert "Only display filename in JS resolver errors/as scriptname"
xhochy Jun 26, 2013
0be198f
Make selection of ControlConnection symmetric
xhochy Jun 26, 2013
fbc8803
Don't try to acquire lock if we do not have a source anymore.
xhochy Jun 26, 2013
6ad4a8c
Automatic merge of Transifex translations
Jun 27, 2013
cb3889f
Few minor fixes/improvements for Windows installer
dschmidt Jun 27, 2013
7219f10
Add Network Activity to ChangeLog
xhochy Jun 27, 2013
1554b63
* More debug output in DbCmd_SetPlaylistRevision.
muesli Jun 27, 2013
15704d8
Unbind from source if we are not responsible for it
xhochy Jun 28, 2013
7f8bb31
Set nodeId on lazy offers
xhochy Jun 28, 2013
8e0dcc6
Update README.md
teo Jun 28, 2013
33cca96
Connections should be started in the thread they live
xhochy Jun 28, 2013
4551911
Only match duplicates on inbound Connections
xhochy Jun 28, 2013
cf93741
Keep lazy offers lazy
xhochy Jun 29, 2013
ff8e905
Only setup a Connection once
xhochy Jun 29, 2013
1252b66
fix merge
Jun 29, 2013
b402347
fix playlist generation and clean up dynamicqmlwidget a bit
Jun 29, 2013
6ab3532
more cleanup
Jun 29, 2013
a7152f8
* Style fix.
muesli Jun 29, 2013
75a1fce
* Create dynamic playlist when needed - for temporary ones.
muesli Jun 29, 2013
02f8eac
* Radio mode needs to initialize a temporary station.
muesli Jun 29, 2013
c946bd9
* Fixed displaying of back / save button.
muesli Jun 29, 2013
59003b8
* Show save button when we have a configured station.
muesli Jun 29, 2013
6378a16
* Fixed invoke.
muesli Jun 29, 2013
a4fee40
* Create those darned controls manually.
muesli Jun 29, 2013
490f736
* Print out controls when creating a station.
muesli Jun 29, 2013
952120a
* Create EchonestParams out of the variant list.
muesli Jun 29, 2013
53ba4aa
generate does the real thing again
Jun 29, 2013
6bb9ec7
* Fixed startFromGenre.
muesli Jun 29, 2013
1d9b76e
station summary does something again, at least for stations by artist
Jun 29, 2013
c161d5d
also add a description for byStation
Jun 29, 2013
d65de01
fix loading state
Jun 29, 2013
cee26a7
adjust station summaries to look the same everywhere
Jun 29, 2013
26f581d
some more work on saving stations
Jul 1, 2013
eb84ddc
Merge branch 'qmlng' of github.com:tomahawk-player/tomahawk into qmlng
Jul 18, 2013
0b4c3cd
Station is now a CoverFlow instead of a CoverFlip
Aug 4, 2013
ec6ec78
fix inputbubble
Aug 4, 2013
9886a15
change artist selection to according to design mockup
Aug 4, 2013
6198d55
tweak input bubble a little
Aug 4, 2013
745bbb8
don't show save button while on page 1
Aug 4, 2013
439730e
changed startByGenre to according to the mockup
Aug 4, 2013
1131840
added a completion list to InputField, use it for all genres input field
Aug 4, 2013
23b477d
revert back to static model for genre tag cloud
Aug 4, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ if( NOT Qt5Core_DIR )
set(QT_USE_QTNETWORK TRUE)
set(QT_USE_QTXML TRUE)
set(QT_USE_QTWEBKIT TRUE)
set(QT_USE_QTDECLARATIVE TRUE)

include( ${QT_USE_FILE} )
endmacro()
Expand Down
4 changes: 2 additions & 2 deletions TomahawkUse.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#FIXME: this only handles qt4 and duplicates top level cmakelists: how can we reduce code duplication?

find_package(Qt4 COMPONENTS QtNetwork QtCore QtGui QtSql REQUIRED)
find_package(Qt4 COMPONENTS QtNetwork QtCore QtGui QtSql QtDeclarative REQUIRED)
include( ${QT_USE_FILE} )

set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
if(BUILD_GUI OR NOT DEFINED BUILD_GUI)
list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg" "QtDeclarative")
endif()

find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
Expand Down
145 changes: 145 additions & 0 deletions data/images/inputfield-border.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions data/images/station-artist.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions data/images/station-genre.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading