mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 22:56:42 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into accounts

Browse Source 
Conflicts:
	src/accounts/xmpp/sip/xmppsip.cpp
This commit is contained in:
Leo Franchi
2012-02-11 12:18:58 -05:00
parent 40041f5c1e 1d4320afea
commit 0425bfebac
17 changed files with 3329 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -72,7 +72,7 @@ IF( NOT BUILD_GUI )
MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
ELSE()
MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" )
LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" )
ENDIF()
IF( BUILD_GUI AND UNIX AND NOT APPLE )
@@ -80,7 +80,7 @@ IF( BUILD_GUI AND UNIX AND NOT APPLE )
ENDIF()
macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether \n the qtwebkit-devel package is installed as well")
macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n qtwebkit-devel package and whatever contains QtUiTools is installed too")
macro_optional_find_package(Phonon 4.5.0)
macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")

2
CMakeModules/FindTaglib.cmake
View File

@@ -56,7 +56,7 @@ ELSE()
include(FindLibraryWithDebug)
include(FindPackageHandleStandardArgs)
find_path(TAGLIB_CFLAGS
find_path(TAGLIB_INCLUDES
NAMES
tag.h
PATH_SUFFIXES taglib

4
admin/win/Toolchain-mingw32-openSUSE.cmake
View File

@@ -17,10 +17,6 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# libs with broken find modules
SET(TAGLIB_FOUND true)
SET(TAGLIB_LIBRARIES ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
SET(TAGLIB_INCLUDES ${CMAKE_FIND_ROOT_PATH}/include/taglib)
SET(QT_PLUGINS_DIR ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
SET(QT_QTUITOOLS_LIBRARY_RELEASE ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a)
SET(QT_QTUITOOLS_LIBRARY_DEBUG ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a)

1
lang/tomahawk_i18n.qrc
View File

@@ -4,5 +4,6 @@
<file>tomahawk_de.qm</file>
<file>tomahawk_sv.qm</file>
<file>tomahawk_es.qm</file>
<file>tomahawk_pt_BR.qm</file>
</qresource>
</RCC>

3246
lang/tomahawk_pt_BR.ts Normal file
View File

File diff suppressed because it is too large Load Diff

42
src/accounts/xmpp/sip/xmppsip.cpp
View File

@@ -37,19 +37,19 @@
#include <qjson/parser.h>
#include <qjson/serializer.h>
#include <QtPlugin>
#include <QStringList>
#include <QDateTime>
#include <QTimer>
#include <QtCore/QtPlugin>
#include <QtCore/QStringList>
#include <QtCore/QDateTime>
#include <QtCore/QTimer>
#include <utils/tomahawkutils.h>
#include <utils/logger.h>
#include <accounts/AccountManager.h>
#ifndef ENABLE_HEADLESS
#include <QInputDialog>
#include <QLineEdit>
#include <QMessageBox>
#include <QtGui/QInputDialog>
#include <QtGui/QLineEdit>
#include <QtGui/QMessageBox>
#endif
#include <utils/tomahawkutilsgui.h>
@@ -348,7 +348,7 @@ XmppSipPlugin::errorMessage( Jreen::Client::DisconnectReason reason )
void
XmppSipPlugin::sendMsg(const QString& to, const QString& msg)
JabberPlugin::sendMsg( const QString& to, const QString& msg )
{
qDebug() << Q_FUNC_INFO << to << msg;
@@ -373,7 +373,7 @@ XmppSipPlugin::sendMsg(const QString& to, const QString& msg)
TomahawkXmppMessage *sipMessage;
if(m["visible"].toBool())
{
sipMessage = new TomahawkXmppMessage(m["ip"].toString(),
sipMessage = new TomahawkSipMessage( m["ip"].toString(),
m["port"].toInt(),
m["uniqname"].toString(),
m["key"].toString()
@@ -394,7 +394,7 @@ XmppSipPlugin::sendMsg(const QString& to, const QString& msg)
void
XmppSipPlugin::broadcastMsg(const QString& msg)
JabberPlugin::broadcastMsg( const QString& msg )
{
qDebug() << Q_FUNC_INFO;
@@ -409,7 +409,7 @@ XmppSipPlugin::broadcastMsg(const QString& msg)
void
XmppSipPlugin::addContact(const QString& jid, const QString& msg)
JabberPlugin::addContact( const QString& jid, const QString& msg )
{
// Add contact to the Tomahawk group on the roster
@@ -572,7 +572,8 @@ void XmppSipPlugin::removeMenuHelper()
#endif
}
void XmppSipPlugin::onNewMessage(const Jreen::Message& message)
void JabberPlugin::onNewMessage( const Jreen::Message& message )
{
if ( m_state != Account::Connected )
return;
@@ -656,7 +657,8 @@ void XmppSipPlugin::onPresenceReceived( const Jreen::RosterItem::Ptr &item, cons
}
}
void XmppSipPlugin::onSubscriptionReceived(const Jreen::RosterItem::Ptr& item, const Jreen::Presence& presence)
void JabberPlugin::onSubscriptionReceived( const Jreen::RosterItem::Ptr& item, const Jreen::Presence& presence )
{
if ( m_state != Account::Connected )
return;
@@ -746,7 +748,8 @@ XmppSipPlugin::onSubscriptionRequestConfirmed( int result )
#endif
}
void XmppSipPlugin::onNewIq(const Jreen::IQ& iq)
void JabberPlugin::onNewIq( const Jreen::IQ& iq )
{
if ( m_state != Account::Connected )
return;
@@ -798,7 +801,7 @@ void XmppSipPlugin::onNewIq(const Jreen::IQ& iq)
}*/
else
{
TomahawkXmppMessage::Ptr sipMessage = iq.payload<TomahawkXmppMessage>();
TomahawkSipMessage::Ptr sipMessage = iq.payload< TomahawkSipMessage >();
if(sipMessage)
{
iq.accept();
@@ -827,7 +830,8 @@ void XmppSipPlugin::onNewIq(const Jreen::IQ& iq)
}
}
bool XmppSipPlugin::presenceMeansOnline(Jreen::Presence::Type p)
bool JabberPlugin::presenceMeansOnline( Jreen::Presence::Type p )
{
switch( p )
{
@@ -841,7 +845,8 @@ bool XmppSipPlugin::presenceMeansOnline(Jreen::Presence::Type p)
}
}
void XmppSipPlugin::handlePeerStatus(const Jreen::JID& jid, Jreen::Presence::Type presenceType)
void JabberPlugin::handlePeerStatus( const Jreen::JID& jid, Jreen::Presence::Type presenceType )
{
QString fulljid = jid.full();
@@ -890,7 +895,8 @@ void XmppSipPlugin::handlePeerStatus(const Jreen::JID& jid, Jreen::Presence::Typ
m_peers[ jid ] = presenceType;
}
void XmppSipPlugin::onNewAvatar(const QString& jid)
void JabberPlugin::onNewAvatar( const QString& jid )
{
#ifndef ENABLE_HEADLESS
// qDebug() << Q_FUNC_INFO << jid;

2
src/accounts/xmpp/sip/xmppsip.h
View File

@@ -43,7 +43,7 @@
#include <jreen/mucroom.h>
#ifndef ENABLE_HEADLESS
#include <QMessageBox>
#include <QtGui/QMessageBox>
#endif
#define TOMAHAWK_FEATURE QLatin1String( "tomahawk:sip:v1" )

3
src/accounts/zeroconf/tomahawkzeroconf.h
View File

@@ -53,7 +53,10 @@ signals:
public slots:
void resolved( QHostInfo i )
{
if ( i.hostName().length() )
emit tomahawkHostFound( ip, port, i.hostName(), nid );
else
emit tomahawkHostFound( ip, port, "Unknown", nid );
this->deleteLater();
}

11
src/libtomahawk/network/controlconnection.cpp
View File

@@ -123,16 +123,7 @@ ControlConnection::setup()
return;
}
QString friendlyName;
if ( Servent::isIPWhitelisted( m_sock->peerAddress() ) )
{
// FIXME TODO blocking DNS lookup if LAN, slow/fails on windows?
QHostInfo i = QHostInfo::fromName( m_sock->peerAddress().toString() );
if( i.hostName().length() )
friendlyName = i.hostName();
}
else
friendlyName = name();
QString friendlyName = name();
tDebug() << "Detected name:" << name() << friendlyName << m_sock->peerAddress();

2
src/libtomahawk/network/servent.cpp
View File

@@ -695,6 +695,8 @@ Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString
bool
Servent::checkACL( const Connection* conn, const QString &nodeid, bool showDialog ) const
{
Q_UNUSED( conn );
Q_UNUSED( showDialog );
tDebug( LOGVERBOSE ) << "Checking ACLs";
ACLSystem* aclSystem = ACLSystem::instance();

1
src/libtomahawk/playlistinterface.cpp
View File

@@ -26,6 +26,7 @@ PlaylistInterface::PlaylistInterface ()
: QObject()
, m_latchMode( StayOnSong )
{
m_id = uuid();
qRegisterMetaType<Tomahawk::PlaylistInterface::RepeatMode>( "Tomahawk::PlaylistInterface::RepeatMode" );
}

3
src/libtomahawk/playlistinterface.h
View File

@@ -44,6 +44,8 @@ public:
explicit PlaylistInterface();
virtual ~PlaylistInterface();
const QString id() { return m_id; }
virtual QList< Tomahawk::query_ptr > tracks() = 0;
virtual int unfilteredTrackCount() const = 0;
@@ -98,6 +100,7 @@ protected:
private:
Q_DISABLE_COPY( PlaylistInterface )
QString m_id;
QString m_filter;
};

2
src/libtomahawk/result.cpp
View File

@@ -159,6 +159,8 @@ Result::toVariant() const
m.insert( "score", score() );
m.insert( "sid", id() );
m.insert( "discnumber", discnumber() );
if ( !composer().isNull() )
m.insert( "composer", composer()->name() );
return m;

3
src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp
View File

@@ -158,6 +158,9 @@ AlbumInfoWidget::onLoadingFinished()
bool
AlbumInfoWidget::isBeingPlayed() const
{
//tDebug() << Q_FUNC_INFO << "audioengine playlistInterface = " << AudioEngine::instance()->currentTrackPlaylist()->id();
//tDebug() << Q_FUNC_INFO << "albumsView playlistInterface = " << ui->albumsView->playlistInterface()->id();
//tDebug() << Q_FUNC_INFO << "tracksView playlistInterface = " << ui->tracksView->playlistInterface()->id();
if ( ui->albumsView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() )
return true;

3
src/sourcetree/sourcetreeview.cpp
View File

@@ -323,8 +323,9 @@ SourceTreeView::copyPlaylistLink()
PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
playlist_ptr playlist = item->playlist();
QString suggestedFilename = TomahawkSettings::instance()->playlistDefaultPath() + "/" + playlist->title();
QString filename = QFileDialog::getSaveFileName( TomahawkUtils::tomahawkWindow(), tr( "Save XSPF" ),
TomahawkSettings::instance()->playlistDefaultPath(), tr( "Playlists (*.xspf)" ) );
suggestedFilename, tr( "Playlists (*.xspf)" ) );
if ( !filename.isEmpty() )
{
QFileInfo playlistAbsoluteFilePath = filename;

2
src/tomahawkwindow.cpp
View File

@@ -730,7 +730,7 @@ void
TomahawkWindow::showAboutTomahawk()
{
QMessageBox::about( this, tr( "About Tomahawk" ),
tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>Copyright 2010, 2011<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"
tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>Copyright 2010 - 2012<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"
"Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson" )
.arg( TomahawkUtils::appFriendlyVersion() )
.arg( qApp->applicationVersion() ) );