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

Renamed importXSPF to importPlaylist in ActionCollection.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2014-11-10 22:32:10 +01:00
parent edc1be79ce
commit 29080fdd8a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/ActionCollection.cpp
View File

@ -108,7 +108,7 @@ ActionCollection::initActions()
connect( m_actionCollection[ "nextTrack" ], SIGNAL( triggered() ), ae, SLOT( next() ), Qt::UniqueConnection );
// main menu actions
m_actionCollection[ "loadXSPF" ] = new QAction( tr( "Import Playlist..." ), this );
m_actionCollection[ "importPlaylist" ] = new QAction( tr( "Import Playlist..." ), this );
m_actionCollection[ "updateCollection" ] = new QAction( tr( "U&pdate Collection" ), this );
m_actionCollection[ "rescanCollection" ] = new QAction( tr( "Fully &Rescan Collection" ), this );
m_actionCollection[ "showOfflineSources" ] = new QAction( tr( "Show Offline Friends" ), this );
@ -163,7 +163,7 @@ ActionCollection::createMenuBar( QWidget *parent )
controlsMenu->addAction( m_actionCollection[ "togglePrivacy" ] );
controlsMenu->addAction( m_actionCollection[ "showOfflineSources" ] );
controlsMenu->addSeparator();
controlsMenu->addAction( m_actionCollection[ "loadXSPF" ] );
controlsMenu->addAction( m_actionCollection[ "importPlaylist" ] );
controlsMenu->addAction( m_actionCollection[ "updateCollection" ] );
controlsMenu->addAction( m_actionCollection[ "rescanCollection" ] );
controlsMenu->addSeparator();
@ -226,7 +226,7 @@ ActionCollection::createMenuBar( QWidget *parent )
QMenu*
ActionCollection::createCompactMenu( QWidget *parent )
ActionCollection::createCompactMenu( QWidget* parent )
{
QMenu* compactMenu = new QMenu( tr( "Main Menu" ), parent );
compactMenu->setFont( TomahawkUtils::systemFont() );
@ -238,7 +238,7 @@ ActionCollection::createCompactMenu( QWidget *parent )
compactMenu->addAction( m_actionCollection[ "togglePrivacy" ] );
compactMenu->addAction( m_actionCollection[ "showOfflineSources" ] );
compactMenu->addSeparator();
compactMenu->addAction( m_actionCollection[ "loadXSPF" ] );
compactMenu->addAction( m_actionCollection[ "importPlaylist" ] );
compactMenu->addAction( m_actionCollection[ "updateCollection" ] );
compactMenu->addAction( m_actionCollection[ "rescanCollection" ] );
compactMenu->addSeparator();

6
src/libtomahawk/ActionCollection.h
View File

@ -39,7 +39,7 @@ public:
static ActionCollection* instance();
ActionCollection( QObject *parent );
ActionCollection( QObject* parent );
~ActionCollection();
void initActions();
@ -47,7 +47,7 @@ public:
/**
* This method returns a main menu bar, suitable for Windows, Mac and X11.
*/
QMenuBar *createMenuBar( QWidget *parent );
QMenuBar* createMenuBar( QWidget* parent );
/**
* Returns a QMenu with all the entries that would normally be in the main menu,
@ -55,7 +55,7 @@ public:
* and fairly little sense on Unity and other X11 desktop configurations which pull
* out the menu bar from the window.
*/
QMenu *createCompactMenu( QWidget *parent );
QMenu* createCompactMenu( QWidget* parent );
QAction* getAction( const QString& name );
QList< QAction* > getAction( ActionDestination category );

2
src/tomahawk/TomahawkWindow.cpp
View File

@ -679,7 +679,7 @@ TomahawkWindow::setupSignals()
connect( ac->getAction( "openLogfile" ), SIGNAL( triggered() ), SLOT( openLogfile() ) );
connect( ac->getAction( "updateCollection" ), SIGNAL( triggered() ), SLOT( updateCollectionManually() ) );
connect( ac->getAction( "rescanCollection" ), SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) );
connect( ac->getAction( "loadXSPF" ), SIGNAL( triggered() ), SLOT( loadSpiff() ) );
connect( ac->getAction( "importPlaylist" ), SIGNAL( triggered() ), SLOT( loadPlaylist() ) );
connect( ac->getAction( "whatsnew_0_8" ), SIGNAL( triggered() ), SLOT( showWhatsNew_0_8() ) );
connect( ac->getAction( "aboutTomahawk" ), SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
connect( ac->getAction( "quit" ), SIGNAL( triggered() ), qApp, SLOT( quit() ) );