X-Git-Url: http://git.maemo.org/git/?p=someplayer;a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=a7d59d07e06dbd2be3d104d9e85a11fc1f5ce329;hp=6347ae86a8a37de77d3df18ec3d4d9c4e2ed097b;hb=dca4bf6a28a8b904d45ff26376e667b05063a400;hpb=f9685f48a0d412250d81fa0ed67054d8978f4a21

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6347ae8..a7d59d0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -29,12 +29,14 @@
 #include "library.h"
 
 using namespace SomePlayer::DataObjects;
+using namespace SomePlayer::Storage;
 
 MainWindow::MainWindow(QWidget *parent) :
 	QMainWindow(parent),
 	ui(new Ui::MainWindow)
 {
-	_library = new Library(_DATABASE_PATH_, _PLAYLISTS_PATH_);
+	Config config;
+	_library = new Library(config.applicationDir(), config.applicationDir());
 	ui->setupUi(this);
 	connect(ui->actionAbout_Qt, SIGNAL(triggered()), this, SLOT(aboutQt()));
 	connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(about()));
@@ -48,11 +50,13 @@ MainWindow::MainWindow(QWidget *parent) :
 	QAction *add_directory = ui->menuLibrary->addAction("Add directory");
 	QAction *save_playlist = ui->menuLibrary->addAction("Save playlist");
 	QAction *clear_playlist = ui->menuLibrary->addAction("Clear current playlist");
+	QAction *add_files = ui->menuLibrary->addAction("Add file to current playlist");
 	connect(_player_form, SIGNAL(library()), this, SLOT(library()));
 	connect(_library_form, SIGNAL(player()), this, SLOT(player()));
 	connect(add_directory, SIGNAL(triggered()), this, SLOT(_add_directory()));
 	connect(save_playlist, SIGNAL(triggered()), this, SLOT(_save_playlist()));
 	connect(clear_playlist, SIGNAL(triggered()), this, SLOT(_clear_current_playlist()));
+	connect(add_files, SIGNAL(triggered()), this, SLOT(_add_files()));
 	connect(_library, SIGNAL(done()), this, SLOT(library()));
 	connect(_library_form, SIGNAL(done()), this, SLOT(library()));
 	connect(_library_form, SIGNAL(busy(QString)), this, SLOT(showBusyWidget(QString)));
@@ -195,3 +199,8 @@ void MainWindow::_toggle_full_screen() {
 		showFullScreen();
 	}
 }
+
+void MainWindow::_add_files() {
+	QStringList files = QFileDialog::getOpenFileNames(this, "Add file");
+	if (!files.isEmpty()) _player_form->addFiles(files);
+}