extragear/multimedia/amarok/src

[Seb Ruiz]

SVN commit 875652 by seb:

It is my pleasure to release a Collection importer for Amarok 2. This will allow importing statistics from arbitrary external sources. I am releasing with a statistics importer for Amarok 1.4 databases.

I have developed a simple framework to allow any contributor to write their own importer very easily. I have also distributed a skeleton implementation for ITunes to give a willing enthusiast a head start.

This commit introduces a significant number of new strings for the translators, and breaks our string freeze as discussed last week.

Celebrate, you can now recover your hard earned Amarok 1.4 statistics!

Enjoy, I'm going to the beach ;)

CCMAIL: amarok at kde.org
CCMAIL: amarok-devel at kde.org
CCMAIL: kde-i18n-doc at kde.org



 M  +7 -0      CMakeLists.txt  
 M  +13 -0     MainWindow.cpp  
 M  +2 -1      MainWindow.h  
 A             databaseimporter (directory)  
 A             databaseimporter/DatabaseImporter.cpp   [License: GPL (v2+)]
 A             databaseimporter/DatabaseImporter.h   [License: GPL (v2+)]
 A             databaseimporter/amarok14 (directory)  
 A             databaseimporter/amarok14/FastForwardImporter.cpp   [License: GPL (v2+)]
 A             databaseimporter/amarok14/FastForwardImporter.h   [License: GPL (v2+)]
 A             databaseimporter/amarok14/FastForwardImporterConfig.cpp   [License: GPL (v2+)]
 A             databaseimporter/amarok14/FastForwardImporterConfig.h   [License: GPL (v2+)]
 A             databaseimporter/amarok14/FastForwardWorker.cpp   [License: GPL (v2+)]
 A             databaseimporter/amarok14/FastForwardWorker.h   [License: GPL (v2+)]
 A             databaseimporter/itunes (directory)  
 A             databaseimporter/itunes/ITunesImporter.cpp   [License: GPL (v2+)]
 A             databaseimporter/itunes/ITunesImporter.h   [License: GPL (v2+)]
 A             dialogs/DatabaseImporterDialog.cpp   [License: GPL (v2+)]
 A             dialogs/DatabaseImporterDialog.h   [License: GPL (v2+)]


--- trunk/extragear/multimedia/amarok/src/CMakeLists.txt #875651:875652
@@ -436,7 +436,13 @@
     covermanager/CoverFetchingActions.cpp
     covermanager/CoverManager.cpp
     cuefile.cpp
+    databaseimporter/DatabaseImporter.cpp
+    databaseimporter/amarok14/FastForwardImporter.cpp
+    databaseimporter/amarok14/FastForwardImporterConfig.cpp
+    databaseimporter/amarok14/FastForwardWorker.cpp
+    databaseimporter/itunes/ITunesImporter.cpp
     dialogs/CollectionSetup.cpp
+    dialogs/DatabaseImporterDialog.cpp
     dialogs/EditFilterDialog.cpp
     dialogs/FilenameLayoutDialog.cpp
     dialogs/PixmapViewer.cpp
@@ -515,6 +521,7 @@
     ${OPENGL_gl_LIBRARY}
     ${OPENGL_glu_LIBRARY}
     ${QT_QTSCRIPT_LIBRARY}
+    ${QT_QTSQL_LIBRARY}
     ${QT_QTWEBKIT_LIBRARY}
     ${QT_QTOPENGL_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
--- trunk/extragear/multimedia/amarok/src/MainWindow.cpp #875651:875652
@@ -44,6 +44,7 @@
 #include "context/ContextView.h"
 #include "context/plasma/plasma.h"
 #include "covermanager/CoverManager.h" // for actions
+#include "dialogs/DatabaseImporterDialog.h"
 #include "playlist/PlaylistActions.h"
 #include "playlist/PlaylistController.h"
 #include "playlist/PlaylistModel.h"
@@ -580,6 +581,13 @@
 }
 
 void
+MainWindow::importCollection() //SLOT
+{
+    DatabaseImporterDialog *dlg = new DatabaseImporterDialog( this );
+    dlg->exec();
+}
+
+void
 MainWindow::slotToggleFocus() //SLOT
 {
     //Port 2.0
@@ -793,6 +801,10 @@
     connect(action, SIGNAL(triggered(bool)), CollectionManager::instance(), SLOT(checkCollectionChanges()));
     ac->addAction( "update_collection", action );
 
+    action = new KAction( KIcon("tools-wizard"), i18n( "Import Collection" ), this );
+    connect(action, SIGNAL(triggered(bool)), SLOT(importCollection()));
+    ac->addAction( "import_collection", action );
+
     action = new KAction( this );
     ac->addAction( "prev", action );
     action->setIcon( KIcon("media-skip-backward-amarok") );
@@ -993,6 +1005,7 @@
 //     m_toolsMenu->addAction( actionCollection()->action("statistics") );
     m_toolsMenu->addSeparator();
     m_toolsMenu->addAction( actionCollection()->action("update_collection") );
+    m_toolsMenu->addAction( actionCollection()->action("import_collection") );
 
 //#ifndef HAVE_LIBVISUAL
 //    actionCollection()->action( "visualizations" )->setEnabled( false );
--- trunk/extragear/multimedia/amarok/src/MainWindow.h #875651:875652
@@ -44,7 +44,7 @@
 class QTimer;
 
 namespace The {
-        AMAROK_EXPORT MainWindow* mainWindow();
+    AMAROK_EXPORT MainWindow* mainWindow();
 }
 
 /**
@@ -117,6 +117,7 @@
         void toolsMenuAboutToShow();
         void slotToggleFocus();
         void slotSetFilter( const QString &filter );
+        void importCollection();
 
     protected:
         virtual void closeEvent( QCloseEvent* );