mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 07:49:42 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into infosystemrequestids

Browse Source
This commit is contained in:
Jeff Mitchell 2011-10-26 11:48:39 -04:00
commit 4e71a56b18
4 changed files with 176 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

327
lang/tomahawk_de.ts
View File

File diff suppressed because it is too large Load Diff

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

@ -384,7 +384,7 @@ PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int r
// so check if the drag originated in this playlist to determine whether or not to copy
#ifdef Q_WS_MAC
if ( !data->hasFormat( "application/tomahawk.playlist.id" ) ||
data->data( "application/tomahawk.playlist.id" ) != m_playlist->guid() )
( !m_playlist.isNull() && data->data( "application/tomahawk.playlist.id" ) != m_playlist->guid() ) )
dj->setDropAction( DropJob::Append );
#else
if ( action & Qt::CopyAction )

2
src/tomahawkwindow.cpp
View File

@ -180,6 +180,8 @@ TomahawkWindow::applyPlatformTweaks()
setUnifiedTitleAndToolBarOnMac( true );
delete ui->hline1;
delete ui->hline2;
/// Mac users allready have Tomahawk appmenu, change the name
ui->menuApp->setTitle( "&Music Player" );
#else
ui->hline1->setStyleSheet( "border: 1px solid gray;" );
ui->hline2->setStyleSheet( "border: 1px solid gray;" );

18
src/tomahawkwindow.ui
View File

@ -67,7 +67,7 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>22</height>
<height>20</height>
</rect>
</property>
<widget class="QMenu" name="menuSettings">
@ -78,12 +78,16 @@
</widget>
<widget class="QMenu" name="menuApp">
<property name="title">
<string>&amp;Music Player</string>
<string>&amp;Tomahawk</string>
</property>
<addaction name="actionPlay"/>
<addaction name="actionPrevious"/>
<addaction name="actionNext"/>
<addaction name="separator"/>
<addaction name="actionCreatePlaylist"/>
<addaction name="actionCreate_New_Station"/>
<addaction name="actionLoadXSPF"/>
<addaction name="separator"/>
<addaction name="actionUpdateCollection"/>
<addaction name="actionRescanCollection"/>
<addaction name="separator"/>
@ -112,17 +116,7 @@
<addaction name="actionDiagnostics"/>
<addaction name="actionAboutTomahawk"/>
</widget>
<widget class="QMenu" name="menuPlaylist">
<property name="title">
<string>&amp;Playlist</string>
</property>
<addaction name="actionCreatePlaylist"/>
<addaction name="actionCreate_New_Station"/>
<addaction name="separator"/>
<addaction name="actionLoadXSPF"/>
</widget>
<addaction name="menuApp"/>
<addaction name="menuPlaylist"/>
<addaction name="menuNetwork"/>
<addaction name="menuSettings"/>
<addaction name="menuWindow"/>