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

Merge branch 'master' into qmlstation

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-12-03 15:58:07 +01:00
parent 9de5ee9e5a 03bf80352c
commit f55caea634
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/images/track-placeholder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

2
src/TomahawkApp.cpp
View File

@@ -151,7 +151,7 @@ void
TomahawkApp::installTranslator() TomahawkApp::installTranslator()
{ {
#if QT_VERSION >= 0x040800 #if QT_VERSION >= 0x040800
QString locale = QLocale::system().uiLanguages().first(); QString locale = QLocale::system().uiLanguages().first().replace( "-", "_" );
#else #else
QString locale = QLocale::system().name(); QString locale = QLocale::system().name();
#endif #endif

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

@@ -537,6 +537,8 @@ PlayableProxyModel::data( const QModelIndex& index, int role ) const
return QVariant(); return QVariant();
if ( !m_headerStyle.contains( m_style ) ) if ( !m_headerStyle.contains( m_style ) )
return QVariant(); return QVariant();
if ( index.column() < 0 )
return QVariant();
PlayableModel::Columns col = m_headerStyle[ m_style ].at( index.column() ); PlayableModel::Columns col = m_headerStyle[ m_style ].at( index.column() );
QModelIndex sourceIdx = mapToSource( index ); QModelIndex sourceIdx = mapToSource( index );