mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-28 03:32:27 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin' into phonon

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2011-03-05 02:03:40 +01:00
commit d79db494ef
20 changed files with 259 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
SET( ORGANIZATION_NAME "Tomahawk" )
SET( ORGANIZATION_DOMAIN "tomahawk-player.org" )
SET( APPLICATION_NAME "Player" )
SET( VERSION "0.0.0" )
SET( VERSION "0.0.1" )
# set paths

24
admin/mac/Info.plist
View File

@ -24,17 +24,21 @@
<string>Tomahawk</string>
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
<key>SUFeedURL</key>
<string>http://download.tomahawk-player.org/sparkle</string>
<key>SUPublicDSAKeyFile</key>
<string>sparkle_pub.pem</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>Tomahawk URL</string>
<key>CFBundleURLSchemes</key>
<array>
<string>tomahawk</string>
</array>
</dict>
</array>
<array>
<dict>
<key>CFBundleURLName</key>
<string>Tomahawk URL</string>
<key>CFBundleURLSchemes</key>
<array>
<string>tomahawk</string>
</array>
</dict>
</array>
<key>CFBundleDocumentTypes</key>
<array>
<dict>

3
admin/mac/build-release-osx.sh
View File

@ -47,6 +47,7 @@ CREATEDMG='1'
header deposx
$ROOT/../admin/mac/deposx.sh
header "Copying Sparkle pubkey"
cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources
header Done!

17
admin/mac/sparkle.rss Executable file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>Tomahawk Player Changelog</title>
<link>http://download.tomahawk-player.org/sparkle</link>
<description>Most recent changes with links to updates.</description>
<language>en</language>
<item>
<title>Version 0.0.1 (Tomahawk Player - It Lives!)</title>
<sparkle:releaseNotesLink>
<!-- http://you.com/app/2.0.html -->
</sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" />
</item>
</channel>
</rss>

20
admin/mac/sparkle_pub.pem Normal file
View File

@ -0,0 +1,20 @@
-----BEGIN PUBLIC KEY-----
MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQDRltnNbKWFroVCsG1nTSdlTDmo7fjl
tgOuQ0YB2s0a1bcqgQ5YJRE59pFvF/z2pkHEHdyBA6USd9N7/T9lolwNcJoByJpO
MobUNs04elqZXliriaAdoSb2g6ZpxiedppbbyNP/BlK6o+zpyn0LVYXDI/OwJFzS
xjGXM+rBEWdUJnogZxV31gF9W3yD1Quz6icBulT9V/Soo6me9Mc60ooKSYj4Zgqd
3ln8tG90RFnWfbb0nbrITvR3ll6XXLfn081tjhymcXqHcgvaaqcmpKWL6ZWwX1mH
3t1pImnif/tSSZPG21KGE3FtuQ/+YFo19apQ6U6l8kaSFxqcDLAYzBy9AhUA/QfN
8WEIvzOEZ9uSWT7lYy64mUkCggEABsUmcs3kwjrmszIAAmPIowA0DBrxWZL03JBV
bDKT6tNHZaFFlCufVSjiL1EFZjRARC16OWYaDcElUsZYFMcsNIIa8LyDQaq6+SSm
quhMO5heeJiYPrutDiJzbJr0+HoY77Ll+Q4/cEkl0UAN4Ovp18WKwaq6GpHAvBnv
71LunLGAKsVb5joXBQ8In6zQkibJhgiBJwzLK90/j0OTiDaaOwM3PsAegORBVlVE
TAk4AQmawmF8nBGLzTyKXl83J571ku1Mm2JTl16jMYziKARKXYBmkcP1at0YddVK
WWpAwRKSxOucVJYfV58JqmjZqst8BBeH6esQKr5dklUvvDMaEwOCAQYAAoIBAQCw
5mo+8/R3S9cNYg9o8JNJGdSbMhSkurILHh9WNElsIC3RNtPcpijmAnWtXTVDhe6w
77wLj37tUuFGbsu2qPXtZoup35emf9DDshZ5w5UOclPaZ9HYjlC1H64c6d66Rllk
fY6FRDv9qVfjT84APbvMDrk6csJ5YHxFPDaqeQaFB0nxFiCMVwjEx+ZSvQNK1jJ2
o2gtuOvSPVSphsMeJ72DDNxO+SRRVnOmWaxg9rlmFuGle6Z+UJ2FItfmPEvhSBMY
hzndUbC7Wi4sIpBzbm9O5MiPYMv0VmN+0t1156EiC9uR4f7AKH2S94dnQob/YeY0
jMH+XxU/wzGUCmsOx1lx
-----END PUBLIC KEY-----

12
src/CMakeLists.osx.txt
View File

@ -12,13 +12,15 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
/System/Library/Frameworks/IOKit.framework
)
if (APPLE)
# find_library(GROWL Growl)
# option(ENABLE_SPARKLE "Sparkle updating" ON)
# find_library(SPARKLE Sparkle)
# if (ENABLE_SPARKLE AND SPARKLE)
# set(HAVE_SPARKLE ON)
# endif (ENABLE_SPARKLE AND SPARKLE)
option(ENABLE_SPARKLE "Sparkle updating" ON)
find_library(SPARKLE Sparkle)
if (ENABLE_SPARKLE AND SPARKLE)
set(HAVE_SPARKLE ON)
set( OS_SPECIFIC_LINK_LIBRARIES ${OS_SPECIFIC_LINK_LIBRARIES} ${SPARKLE} )
endif(ENABLE_SPARKLE AND SPARKLE)
# Uses Darwin kernel version.
# 9.8.0 -> 10.5/Leopard
# 10.4.0 -> 10.6/Snow Leopard

24
src/CMakeLists.txt
View File

@ -65,12 +65,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
tomahawkwindow.cpp
)
IF( APPLE )
SET( tomahawkHeaders ${tomahawkHeaders} mac/tomahawkapp_mac.h mac/macshortcuthandler.h )
SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm mac/macshortcuthandler.cpp )
ENDIF( APPLE )
SET( tomahawkHeaders ${tomahawkHeaders}
"${TOMAHAWK_INC_DIR}/tomahawk/tomahawkapp.h"
"${TOMAHAWK_INC_DIR}/tomahawk/infosystem.h"
@ -153,6 +147,15 @@ IF( UNIX )
INCLUDE( "CMakeLists.unix.txt" )
ENDIF( UNIX )
IF( APPLE )
SET( tomahawkHeaders ${tomahawkHeaders} mac/tomahawkapp_mac.h mac/macshortcuthandler.h )
SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm mac/macshortcuthandler.cpp )
IF(HAVE_SPARKLE)
SET( tomahawkHeaders ${tomahawkHeaders} ${SPARKLE}/Headers )
ENDIF(HAVE_SPARKLE)
ENDIF( APPLE )
IF(GLOOX_FOUND)
SET( tomahawkHeaders ${tomahawkHeaders} xmppbot/xmppbot.h )
@ -212,4 +215,13 @@ TARGET_LINK_LIBRARIES( tomahawk
${QTWEETLIB_LIBRARIES}
)
IF( APPLE )
IF(HAVE_SPARKLE)
MESSAGE("Sparkle Found, installing framekwork in bundle")
INSTALL(DIRECTORY "${SPARKLE}/Versions/Current/Resources" DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Frameworks/Sparkle.framework")
INSTALL(FILES "${CMAKE_SOURCE_DIR}/admin/mac/sparkle_pub.pem" DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources")
ENDIF(HAVE_SPARKLE)
ENDIF( APPLE )
INCLUDE( "CPack.txt" )

92
src/libtomahawk/playlist/dynamic/DynamicModel.cpp
View File

@ -17,6 +17,7 @@
#include "playlist/dynamic/DynamicModel.h"
#include "GeneratorInterface.h"
#include "audio/audioengine.h"
#include <pipeline.h>
using namespace Tomahawk;
@ -25,7 +26,7 @@ DynamicModel::DynamicModel( QObject* parent )
, m_startOnResolved( false )
, m_onDemandRunning( false )
, m_changeOnNext( false )
, m_firstTrackGenerated( false )
, m_filterUnresolvable( true )
, m_currentAttempts( 0 )
, m_lastResolvedRow( 0 )
{
@ -45,9 +46,11 @@ DynamicModel::loadPlaylist( const Tomahawk::dynplaylist_ptr& playlist )
}
m_playlist = playlist;
if( m_playlist->mode() == OnDemand )
setFilterUnresolvable( true );
connect( m_playlist->generator().data(), SIGNAL( nextTrackGenerated( Tomahawk::query_ptr ) ), this, SLOT( newTrackGenerated( Tomahawk::query_ptr ) ) );
PlaylistModel::loadPlaylist( m_playlist, !m_onDemandRunning );
PlaylistModel::loadPlaylist( m_playlist, m_playlist->mode() == Static );
}
QString
@ -62,25 +65,18 @@ DynamicModel::startOnDemand()
{
connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), this, SLOT( newTrackLoading() ) );
// delete all the tracks
clear();
m_playlist->generator()->startOnDemand();
m_onDemandRunning = true;
m_startOnResolved = true;
m_startOnResolved = false; // not anymore---user clicks a track to start it
m_currentAttempts = 0;
m_lastResolvedRow = 0;
m_lastResolvedRow = rowCount( QModelIndex() );
}
void
DynamicModel::newTrackGenerated( const Tomahawk::query_ptr& query )
{
if( m_onDemandRunning ) {
if( !m_firstTrackGenerated ) {
emit firstTrackGenerated();
m_firstTrackGenerated = false;
}
connect( query.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( trackResolveFinished( bool ) ) );
connect( query.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ), this, SLOT( trackResolved() ) );
@ -92,7 +88,6 @@ void
DynamicModel::stopOnDemand( bool stopPlaying )
{
m_onDemandRunning = false;
m_firstTrackGenerated = false;
if( stopPlaying )
AudioEngine::instance()->stop();
@ -156,6 +151,79 @@ DynamicModel::newTrackLoading()
}
}
void
DynamicModel::tracksGenerated( const QList< query_ptr > entries, int limitResolvedTo )
{
if( m_filterUnresolvable ) { // wait till we get them resolved
m_limitResolvedTo = limitResolvedTo;
filterUnresolved( entries );
} else {
addToPlaylist( entries, m_playlist->mode() == OnDemand ); // if ondemand, we're previewing, so clear old
}
}
void
DynamicModel::filterUnresolved( const QList< query_ptr >& entries )
{
m_toResolveList = entries;
foreach( const query_ptr& q, entries ) {
connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( filteringTrackResolved( bool ) ) );
Pipeline::instance()->resolve( q );
}
}
void
DynamicModel::filteringTrackResolved( bool successful )
{
// arg, we don't have the query_ptr, just the Query
Query* q = qobject_cast< Query* >( sender() );
Q_ASSERT( q );
query_ptr realptr;
foreach( const query_ptr& qptr, m_toResolveList ) {
if( qptr.data() == q ) {
realptr = qptr;
break;
}
}
if( realptr.isNull() ) // we already finished
return;
m_toResolveList.removeAll( realptr );
if( successful )
m_resolvedList << realptr;
if( m_toResolveList.isEmpty() || m_resolvedList.size() == m_limitResolvedTo ) { // done, add to playlist
if( m_limitResolvedTo < m_resolvedList.count() ) // limit to how many we were asked for
m_resolvedList = m_resolvedList.mid( 0, m_limitResolvedTo );
addToPlaylist( m_resolvedList, true );
m_toResolveList.clear();
m_resolvedList.clear();
}
}
void
DynamicModel::addToPlaylist( const QList< query_ptr >& entries, bool clearFirst )
{
if( clearFirst )
clear();
if( m_playlist->author()->isLocal() && m_playlist->mode() == Static ) {
m_playlist->addEntries( entries, m_playlist->currentrevision() );
} else { // read-only, so add tracks only in the GUI, not to the playlist itself
foreach( const query_ptr& query, entries ) {
append( query );
}
}
emit tracksAdded();
}
void
DynamicModel::removeIndex(const QModelIndex& idx, bool moreToCome)
{

18
src/libtomahawk/playlist/dynamic/DynamicModel.h
View File

@ -47,13 +47,19 @@ public:
virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );
bool searchingForNext() const { return m_searchingForNext; }
void setFilterUnresolvable( bool filter ) { m_filterUnresolvable = filter; }
bool filterUnresolvable() const { return m_filterUnresolvable; }
// a batchof static tracks wre generated
void tracksGenerated( const QList< query_ptr > entries, int limitResolvedTo = -1 );
signals:
void collapseFromTo( int startRow, int num );
void checkForOverflow();
void firstTrackGenerated();
void trackGenerationFailure( const QString& msg );
void tracksAdded();
private slots:
void newTrackGenerated( const Tomahawk::query_ptr& query );
@ -61,13 +67,23 @@ private slots:
void trackResolved();
void newTrackLoading();
void filteringTrackResolved( bool successful );
private:
void filterUnresolved( const QList< query_ptr >& entries );
void addToPlaylist( const QList< query_ptr >& entries, bool clearFirst );
dynplaylist_ptr m_playlist;
// for filtering unresolvable
int m_limitResolvedTo;
QList< query_ptr > m_toResolveList;
QList< query_ptr > m_resolvedList;
bool m_startOnResolved;
bool m_onDemandRunning;
bool m_changeOnNext;
bool m_searchingForNext;
bool m_firstTrackGenerated;
bool m_filterUnresolvable;
int m_currentAttempts;
int m_lastResolvedRow;
};

17
src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
View File

@ -29,10 +29,10 @@ Tomahawk::EchonestControl::EchonestControl( const QString& selectedType, const Q
: DynamicControl ( selectedType.isEmpty() ? "Artist" : selectedType, typeSelectors, parent )
{
setType( "echonest" );
m_editingTimer.setInterval( 2000 ); // 2 second timeout to edits
m_editingTimer.setInterval( 500 ); //timeout to edits
m_editingTimer.setSingleShot( true );
connect( &m_editingTimer, SIGNAL( timeout() ), this, SIGNAL( changed() ) );
connect( &m_editingTimer, SIGNAL( timeout() ), this, SLOT( editTimerFired() ) );
updateWidgets();
}
@ -340,7 +340,6 @@ Tomahawk::EchonestControl::setupMinMaxWidgets( Echonest::DynamicPlaylist::Playli
connect( match, SIGNAL( activated( int ) ), this, SLOT( editingFinished() ) );
connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( updateData() ) );
connect( input->slider(), SIGNAL( valueChanged( int ) ), this, SLOT( editingFinished() ) );
connect( input->slider(), SIGNAL( sliderMoved( int ) ), &m_editingTimer, SLOT( stop() ) );
match->hide();
input->hide();
@ -491,6 +490,18 @@ Tomahawk::EchonestControl::editingFinished()
m_editingTimer.start();
}
void
Tomahawk::EchonestControl::editTimerFired()
{
// make sure it's really changed
if( m_cacheData != m_data.second ) { // new, so emit changed
emit changed();
}
m_cacheData = m_data.second;
}
void
Tomahawk::EchonestControl::calculateSummary()
{

2
src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
View File

@ -52,6 +52,7 @@ public slots:
private slots:
void updateData();
void editingFinished();
void editTimerFired();
private:
void updateWidgets();
@ -79,6 +80,7 @@ private:
QTimer m_editingTimer;
Echonest::DynamicPlaylist::PlaylistParamData m_data;
QVariant m_cacheData;
friend class EchonestGenerator;
};

8
src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.h
View File

@ -45,13 +45,15 @@ public:
void setPlaylist( const dynplaylist_ptr& playlist );
void fadeIn();
void fadeOut();
qreal opacity() const { return m_opacity; }
void setOpacity( qreal opacity );
virtual void paintEvent( QPaintEvent* );
public slots:
void fadeIn();
void fadeOut();
signals:
void generatePressed( int num );
void typeChanged( const QString& playlistType );

79
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp
View File

@ -68,13 +68,15 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget
connect( m_model, SIGNAL( collapseFromTo( int, int ) ), m_view, SLOT( collapseEntries( int, int ) ) );
connect( m_model, SIGNAL( trackGenerationFailure( QString ) ), this, SLOT( stationFailed( QString ) ) );
connect( m_model, SIGNAL( firstTrackGenerated() ), this, SLOT( firstStationTrackGenerated() ) );
m_loading = new LoadingSpinner( m_view );
connect( m_model, SIGNAL( tracksAdded() ), m_loading, SLOT( fadeOut() ) );
m_setup = new DynamicSetupWidget( playlist, this );
m_setup->fadeIn();
connect( m_model, SIGNAL( tracksAdded() ), m_setup, SLOT( fadeOut() ) );
loadDynamicPlaylist( playlist );
m_layout->setContentsMargins( 0, 0, 0, 0 );
@ -90,8 +92,7 @@ DynamicWidget::DynamicWidget( const Tomahawk::dynplaylist_ptr& playlist, QWidget
connect( m_controls, SIGNAL( controlChanged( Tomahawk::dyncontrol_ptr ) ), this, SLOT( controlChanged( Tomahawk::dyncontrol_ptr ) ), Qt::QueuedConnection );
connect( m_controls, SIGNAL( controlsChanged() ), this, SLOT( controlsChanged() ), Qt::QueuedConnection );
connect( PlaylistManager::instance(), SIGNAL( playClicked() ), this, SLOT( playPressed() ) );
connect( PlaylistManager::instance(), SIGNAL( pauseClicked() ), this, SLOT( pausePressed() ) );
connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), this, SLOT( trackStarted() ) );
connect( AudioEngine::instance(), SIGNAL( playlistChanged( PlaylistInterface* ) ), this, SLOT( playlistStopped( PlaylistInterface* ) ) );
}
@ -153,6 +154,9 @@ DynamicWidget::loadDynamicPlaylist( const Tomahawk::dynplaylist_ptr& playlist )
if( !m_playlist.isNull() )
m_controls->setControls( m_playlist, m_playlist->author()->isLocal() );
if( m_playlist->mode() == OnDemand )
showPreview();
connect( m_playlist->generator().data(), SIGNAL( generated( QList<Tomahawk::query_ptr> ) ), this, SLOT( tracksGenerated( QList<Tomahawk::query_ptr> ) ) );
connect( m_playlist.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( onRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ) );
connect( m_playlist->generator().data(), SIGNAL( error( QString, QString ) ), this, SLOT( generatorError( QString, QString ) ) );
@ -232,15 +236,10 @@ DynamicWidget::showEvent(QShowEvent* )
void
DynamicWidget::generate( int num )
{
if( m_playlist->mode() == Static )
{
// get the items from the generator, and put them in the playlist
m_view->setDynamicWorking( true );
m_loading->fadeIn();
m_playlist->generator()->generate( num );
} else if( m_playlist->mode() == OnDemand ) {
}
// get the items from the generator, and put them in the playlist
m_view->setDynamicWorking( true );
m_loading->fadeIn();
m_playlist->generator()->generate( num );
}
void
@ -253,36 +252,16 @@ DynamicWidget::stationFailed( const QString& msg )
stopStation( false );
}
void
DynamicWidget::pausePressed()
{
// we don't handle explicit pausing right now
// no more track plays == no more adding. we stop when
// the user switches to a different playlist.
}
void
DynamicWidget::playPressed()
{
DynamicWidget::trackStarted()
{
if( isVisible() && !m_playlist.isNull() &&
m_playlist->mode() == OnDemand && !m_runningOnDemand ) {
m_view->setDynamicWorking( true );
startStation();
}
}
void
DynamicWidget::firstStationTrackGenerated()
{
m_view->setDynamicWorking( false );
m_loading->fadeOut();
}
void
DynamicWidget::stopStation( bool stopPlaying )
{
@ -328,17 +307,16 @@ DynamicWidget::playlistTypeChanged( QString )
void
DynamicWidget::tracksGenerated( const QList< query_ptr >& queries )
{
m_loading->fadeOut();
if( m_playlist->author()->isLocal() ) {
m_playlist->addEntries( queries, m_playlist->currentrevision() );
{
int limit = -1; // only limit the "preview" of a station
if( m_playlist->author()->isLocal() && m_playlist->mode() == Static ) {
m_resolveOnNextLoad = true;
} else { // read-only, so add tracks only in the GUI, not to the playlist itself
foreach( const query_ptr& query, queries ) {
m_model->append( query );
}
}
} else if( m_playlist->mode() == OnDemand )
limit = 5;
if( m_playlist->mode() != OnDemand )
m_loading->fadeOut();
m_model->tracksGenerated( queries, limit );
}
@ -348,8 +326,6 @@ DynamicWidget::controlsChanged()
// controlsChanged() is emitted when a control is added or removed
// in the case of addition, it's blank by default... so to avoid an error
// when playing a station just ignore it till we're ready and get a controlChanged()
/* if( m_runningOnDemand )
m_model->changeStation();*/
m_controlsChanged = true;
if( !m_playlist->author()->isLocal() )
@ -365,8 +341,19 @@ DynamicWidget::controlChanged( const Tomahawk::dyncontrol_ptr& control )
return;
m_playlist->createNewRevision();
m_seqRevLaunched++;
showPreview();
}
void
DynamicWidget::showPreview()
{
if( m_playlist->mode() == OnDemand && !m_runningOnDemand ) { // if this is a not running station, preview matching tracks
generate( 40 ); // ask for more, we'll filter how many we actually want
}
}
void
DynamicWidget::generatorError( const QString& title, const QString& content )
{

5
src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h
View File

@ -85,8 +85,7 @@ public slots:
void startStation();
void stopStation( bool stopPlaying = true );
void playPressed();
void pausePressed();
void trackStarted();
void stationFailed( const QString& );
void playlistStopped( PlaylistInterface* );
@ -95,10 +94,10 @@ private slots:
void generate( int = -1 );
void tracksGenerated( const QList< Tomahawk::query_ptr>& queries );
void generatorError( const QString& title, const QString& content );
void firstStationTrackGenerated();
void controlsChanged();
void controlChanged( const Tomahawk::dyncontrol_ptr& control );
void showPreview();
void layoutFloatingWidgets();

2
src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp
View File

@ -104,7 +104,7 @@ LoadingSpinner::paintEvent( QPaintEvent* ev )
{
QPainter p( this );
qDebug() << "FADING" << ( m_showHide->state() == QTimeLine::Running ) << "at frame:" << m_showHide->currentValue();
// qDebug() << "FADING" << ( m_showHide->state() == QTimeLine::Running ) << "at frame:" << m_showHide->currentValue();
if( m_showHide->state() == QTimeLine::Running ) { // showing or hiding
p.setOpacity( (qreal)m_showHide->currentValue() );
}

1
src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.h
View File

@ -34,6 +34,7 @@ public:
virtual void paintEvent( QPaintEvent* );
virtual void resizeEvent( QResizeEvent* );
public slots:
void fadeIn();
void fadeOut();

1
src/mac/tomahawkapp_mac.h
View File

@ -24,6 +24,7 @@ void macMain();
void setShortcutHandler(Tomahawk::MacShortcutHandler* engine);
// used for opening files with tomahawk
void setApplicationHandler(PlatformInterface* handler);
void checkForUpdates();
};

14
src/mac/tomahawkapp_mac.mm
View File

@ -16,6 +16,10 @@
#import <AppKit/NSEvent.h>
#import <AppKit/NSNibDeclarations.h>
#ifdef HAVE_SPARKLE
#import <Sparkle/SUUpdater.h>
#endif
// Capture global media keys on Mac (Cocoa only!)
// See: http://www.rogueamoeba.com/utm/2007/09/29/apple-keyboard-media-key-event-handling/
@ -146,10 +150,10 @@ void Tomahawk::macMain() {
[[NSAutoreleasePool alloc] init];
// Creates and sets the magic global variable so QApplication will find it.
[MacApplication sharedApplication];
#ifdef HAVE_SPARKLE
#ifdef HAVE_SPARKLE
// Creates and sets the magic global variable for Sparkle.
[[SUUpdater sharedUpdater] setDelegate: NSApp];
#endif
#endif
}
@ -161,8 +165,8 @@ void Tomahawk::setApplicationHandler(Tomahawk::PlatformInterface* handler) {
[NSApp setApplicationHandler: handler];
}
void CheckForUpdates() {
#ifdef HAVE_SPARKLE
void Tomahawk::checkForUpdates() {
#ifdef HAVE_SPARKLE
[[SUUpdater sharedUpdater] checkForUpdates: NSApp];
#endif
#endif
}

14
src/tomahawkwindow.cpp
View File

@ -124,6 +124,12 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
toolbar->setToolButtonStyle( Qt::ToolButtonFollowStyle );
toolbar->installEventFilter( new WidgetDragFilter( toolbar ) );
#if defined( Q_OS_DARWIN ) && defined( HAVE_SPARKLE )
QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check for updates...") );
checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole );
connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) );
#endif
m_backAvailable = toolbar->addAction( QIcon( RESPATH "images/back.png" ), tr( "Back" ), PlaylistManager::instance(), SLOT( historyBack() ) );
m_forwardAvailable = toolbar->addAction( QIcon( RESPATH "images/forward.png" ), tr( "Forward" ), PlaylistManager::instance(), SLOT( historyForward() ) );
toolbar->addAction( QIcon( RESPATH "images/home.png" ), tr( "Home" ), PlaylistManager::instance(), SLOT( showWelcomePage() ) );
@ -422,3 +428,11 @@ TomahawkWindow::showAboutTomahawk()
"Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Alejandro Wainzinger, Harald Sitter and Steve Robertson" )
.arg( qApp->applicationVersion() ) );
}
void
TomahawkWindow::checkForUpdates()
{
#ifdef Q_WS_MAC
Tomahawk::checkForUpdates();
#endif
}

1
src/tomahawkwindow.h
View File

@ -58,6 +58,7 @@ private slots:
void onHistoryForwardAvailable( bool avail );
void showAboutTomahawk();
void checkForUpdates();
private:
void loadSettings();