mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into tweetsip

Browse Source
This commit is contained in:
Jeff Mitchell
2011-02-12 10:54:39 -05:00
parent 68d3f066e3 b32560a6f9
commit 833e474487
7 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,11 +42,11 @@ CREATEDMG='1'
header addQt header addQt
cd tomahawk.app cd tomahawk.app
$ROOT/admin/mac/add-Qt-to-bundle.sh \ $ROOT/../admin/mac/add-Qt-to-bundle.sh \
'QtCore QtGui QtXml QtNetwork QtSql' 'QtCore QtGui QtXml QtNetwork QtSql'
header deposx header deposx
$ROOT/admin/mac/deposx.sh $ROOT/../admin/mac/deposx.sh
header Done! header Done!

31
admin/mac/deposx.sh
View File

@@ -15,6 +15,10 @@ then
exit 1 exit 1
fi fi
cd ..
ORIGROOT=`pwd`
cd -
cd Contents cd Contents
QTLIBS=`ls Frameworks | cut -d. -f1` QTLIBS=`ls Frameworks | cut -d. -f1`
@@ -56,10 +60,10 @@ function deposx_change
function deplib_change function deplib_change
{ {
install_name_tool -change /usr/local/lib/liblastfm.0.dylib @executable_path/liblastfm.0.dylib $1 install_name_tool -change /usr/local/Cellar/liblastfm/0.3.1/lib/liblastfm.0.dylib @executable_path/liblastfm.0.dylib $1
install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.dylib $1 install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.dylib $1
install_name_tool -change libechonest.0.1.0.dylib @executable_path/libechonest.0.1.0.dylib $1 install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
install_name_tool -change /usr/local/lib/libechonest.0.1.0.dylib @executable_path/libechonest.0.1.0.dylib $1 install_name_tool -change /usr/local/Cellar/clucene/0.9.21/lib/libclucene.0.dylib @executable_path/libclucene.0.dylib $1
install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1 install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1
install_name_tool -change /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib @executable_path/libtag.1.dylib $1 install_name_tool -change /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib @executable_path/libtag.1.dylib $1
install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1 install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1
@@ -68,6 +72,10 @@ function deplib_change
install_name_tool -change /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib @executable_path/libmad.0.dylib $1 install_name_tool -change /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib @executable_path/libmad.0.dylib $1
install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib @executable_path/libFLAC++.6.dylib $1 install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib @executable_path/libFLAC++.6.dylib $1
install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib @executable_path/libFLAC.8.dylib $1 install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib @executable_path/libFLAC.8.dylib $1
install_name_tool -change $ORIGROOT/src/libtomahawk/libtomahawklib.dylib @executable_path/libtomahawklib.dylib $1
install_name_tool -change $ORIGROOT/libsip_jabber.dylib @executable_path/libsip_jabber.dylib $1
install_name_tool -change $ORIGROOT/libsip_zeroconf.dylib @executable_path/libsip_zeroconf.dylib $1
install_name_tool -change $ORIGROOT/thirdparty/jdns/libtomahawk_jdns.dylib @executable_path/libtomahawk_jdns.dylib $1
} }
################################################################################ ################################################################################
@@ -83,7 +91,7 @@ do
done done
import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.dylib import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.dylib
import_lib /usr/local/lib/liblastfm.0.dylib import_lib /usr/local/Cellar/liblastfm/0.3.1/lib/liblastfm.0.dylib
import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib
import_lib /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib import_lib /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib
import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib
@@ -92,11 +100,22 @@ import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib
import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib
import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib
import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib
import_lib /usr/local/lib/libechonest.0.1.0.dylib import_lib /usr/local/lib/libechonest.1.1.dylib
import_lib /usr/local/Cellar/clucene/0.9.21/lib/libclucene.0.dylib
import_lib ../../libsip_jabber.dylib
import_lib ../../libsip_zeroconf.dylib
import_lib ../../src/libtomahawk/libtomahawklib.dylib
import_lib ../../thirdparty/jdns/libtomahawk_jdns.dylib
deposx_change MacOS/libqjson.0.dylib deposx_change MacOS/libqjson.0.dylib
deposx_change MacOS/liblastfm.0.dylib deposx_change MacOS/liblastfm.0.dylib
deposx_change MacOS/libechonest.0.1.0.dylib deposx_change MacOS/libclucene.0.dylib
deposx_change MacOS/libechonest.1.1.dylib
deposx_change MacOS/libsip_jabber.dylib
deposx_change MacOS/libsip_zeroconf.dylib
deposx_change MacOS/libtomahawklib.dylib
deposx_change MacOS/libtomahawk_jdns.dylib
# now Qt # now Qt
for x in $QTLIBS for x in $QTLIBS

2
src/libtomahawk/playlist/infobar/infobar.cpp
View File

@@ -13,6 +13,8 @@ InfoBar::InfoBar( QWidget* parent )
, ui( new Ui::InfoBar ) , ui( new Ui::InfoBar )
{ {
ui->setupUi( this ); ui->setupUi( this );
layout()->setSpacing( 0 );
layout()->setContentsMargins( 0, 0, 0, 0 );
QFont boldFont = ui->captionLabel->font(); QFont boldFont = ui->captionLabel->font();
boldFont.setPixelSize( 18 ); boldFont.setPixelSize( 18 );

6
src/libtomahawk/playlist/playlistmanager.cpp
View File

@@ -86,6 +86,7 @@ PlaylistManager::PlaylistManager( QObject* parent )
m_superCollectionFlatModel = new CollectionFlatModel( m_superCollectionView ); m_superCollectionFlatModel = new CollectionFlatModel( m_superCollectionView );
m_superCollectionView->setModel( m_superCollectionFlatModel ); m_superCollectionView->setModel( m_superCollectionFlatModel );
m_superCollectionView->setFrameShape( QFrame::NoFrame ); m_superCollectionView->setFrameShape( QFrame::NoFrame );
m_superCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
m_superAlbumView = new AlbumView(); m_superAlbumView = new AlbumView();
m_superAlbumModel = new AlbumModel( m_superAlbumView ); m_superAlbumModel = new AlbumModel( m_superAlbumView );
@@ -159,6 +160,7 @@ PlaylistManager::show( const Tomahawk::playlist_ptr& playlist )
PlaylistModel* model = new PlaylistModel(); PlaylistModel* model = new PlaylistModel();
view->setModel( model ); view->setModel( model );
view->setFrameShape( QFrame::NoFrame ); view->setFrameShape( QFrame::NoFrame );
view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
model->loadPlaylist( playlist ); model->loadPlaylist( playlist );
playlist->resolve(); playlist->resolve();
@@ -227,6 +229,7 @@ PlaylistManager::show( const Tomahawk::artist_ptr& artist )
PlaylistModel* model = new PlaylistModel(); PlaylistModel* model = new PlaylistModel();
view->setModel( model ); view->setModel( model );
view->setFrameShape( QFrame::NoFrame ); view->setFrameShape( QFrame::NoFrame );
view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
model->append( artist ); model->append( artist );
m_currentInterface = view->proxyModel(); m_currentInterface = view->proxyModel();
@@ -264,6 +267,7 @@ PlaylistManager::show( const Tomahawk::album_ptr& album )
PlaylistModel* model = new PlaylistModel(); PlaylistModel* model = new PlaylistModel();
view->setModel( model ); view->setModel( model );
view->setFrameShape( QFrame::NoFrame ); view->setFrameShape( QFrame::NoFrame );
view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
model->append( album ); model->append( album );
m_currentInterface = view->proxyModel(); m_currentInterface = view->proxyModel();
@@ -303,6 +307,7 @@ PlaylistManager::show( const Tomahawk::collection_ptr& collection )
CollectionFlatModel* model = new CollectionFlatModel(); CollectionFlatModel* model = new CollectionFlatModel();
view->setModel( model ); view->setModel( model );
view->setFrameShape( QFrame::NoFrame ); view->setFrameShape( QFrame::NoFrame );
view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
model->addCollection( collection ); model->addCollection( collection );
m_currentInterface = view->proxyModel(); m_currentInterface = view->proxyModel();
@@ -327,6 +332,7 @@ PlaylistManager::show( const Tomahawk::collection_ptr& collection )
AlbumModel* amodel = new AlbumModel( aview ); AlbumModel* amodel = new AlbumModel( aview );
aview->setModel( amodel ); aview->setModel( amodel );
aview->setFrameShape( QFrame::NoFrame ); aview->setFrameShape( QFrame::NoFrame );
aview->setAttribute( Qt::WA_MacShowFocusRect, 0 );
amodel->addCollection( collection ); amodel->addCollection( collection );
m_currentInterface = aview->proxyModel(); m_currentInterface = aview->proxyModel();

2
src/sip/jabber/CMakeLists.txt
View File

@@ -44,7 +44,7 @@ target_link_libraries( sip_jabber
) )
IF( APPLE ) IF( APPLE )
SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" ) # SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
ENDIF( APPLE ) ENDIF( APPLE )
install( TARGETS sip_jabber DESTINATION lib ) install( TARGETS sip_jabber DESTINATION lib )

2
src/sip/zeroconf/CMakeLists.txt
View File

@@ -37,7 +37,7 @@ target_link_libraries( sip_zeroconf
) )
IF( APPLE ) IF( APPLE )
SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" ) # SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
ENDIF( APPLE ) ENDIF( APPLE )
install( TARGETS sip_zeroconf DESTINATION lib ) install( TARGETS sip_zeroconf DESTINATION lib )

1
src/sourcetree/sourcetreeview.cpp
View File

@@ -44,6 +44,7 @@ SourceTreeView::SourceTreeView( QWidget* parent )
, m_dragging( false ) , m_dragging( false )
{ {
setFrameShape( QFrame::NoFrame ); setFrameShape( QFrame::NoFrame );
setAttribute( Qt::WA_MacShowFocusRect, 0 );
setContentsMargins( 0, 0, 0, 0 ); setContentsMargins( 0, 0, 0, 0 );
setHeaderHidden( true ); setHeaderHidden( true );