X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=f71f9dc77730ce5b766565556a4a5bc2411a3d88;hb=refs%2Ftags%2F1.4.0;hp=67b1399bd17689bc2b3a47ff64c358c82d9214e0;hpb=d4379a95b33befd0e1d7636367b2077d915ad2a7;p=someplayer

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 67b1399..f71f9dc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -24,6 +24,7 @@
 #include <QInputDialog>
 #include <QFile>
 #include <QDesktopWidget>
+#include <QTranslator>
 
 #include "player/player.h"
 
@@ -50,6 +51,8 @@ MainWindow::MainWindow(QWidget *parent) :
 	_player_form = new PlayerForm(_library, this);
 	ui->centralWidget->layout()->addWidget(_player_form);
 	_library_form = new LibraryForm(_library, this);
+	_directory_form = new DirectoryView(this);
+	_directory_form->hide();
 	_timer = new QTimer(this);
 	_equalizer_dialog = new EqualizerDialog(this);
 	_manage_library_form = new ManageLibraryForm(_library, this);
@@ -70,6 +73,9 @@ MainWindow::MainWindow(QWidget *parent) :
 	connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(_orientation_changed()));
 	connect(_player_form, SIGNAL(fullscreen(bool)), this, SLOT(_fullscreen(bool)));
 	connect(_library_form, SIGNAL(addAndPlay(Track)), _player_form, SLOT(play(Track)));
+	connect(_directory_form, SIGNAL(addAndPlay(Track)), _player_form, SLOT(play(Track)));
+	connect(_player_form, SIGNAL(dirView()), _directory_form, SLOT(show()));
+	connect(_directory_form, SIGNAL(addTracks(QList<Track>)), this, SLOT(_add_tracks(QList<Track>)));
 	_player_form->reload(true);
 	QString mode = config.getValue("ui/orientation").toString();
 	if (mode == "landscape") {
@@ -77,22 +83,27 @@ MainWindow::MainWindow(QWidget *parent) :
 		_player_form->landscapeMode();
 		_library_form->landscapeMode();
 		_equalizer_dialog->landscapeMode();
+		_directory_form->lanscapeMode();
 	} else if (mode == "portrait") {
 		setAttribute(Qt::WA_Maemo5PortraitOrientation);
 		_player_form->portraitMode();
 		_library_form->portraitMode();
 		_equalizer_dialog->portraitMode();
+		_directory_form->portraitMode();
 	} else if (mode == "auto") { // initialization in landscape
 		_player_form->landscapeMode();
 		_library_form->landscapeMode();
 		_equalizer_dialog->landscapeMode();
+		_directory_form->lanscapeMode();
 		setAttribute(Qt::WA_Maemo5AutoOrientation);
 	}
 	_library_form->updateIcons();
 	_player_form->updateIcons();
 	_manage_library_form->updateIcons();
+	_directory_form->updateIcons();
 	_player_form->checkGradient();
 	_library_form->checkGradient();
+	_directory_form->updateGradient();
 	setWindowTitle("SomePlayer");
 }
 
@@ -189,7 +200,7 @@ void MainWindow::_set_timer() {
 	dialog.init();
 	if (_timer->isActive()) {
 		dialog.showDisable();
-		int msec = _timer->interval();
+		int msec = _timeout_interval;
 		int h = msec/3600000;
 		int m = msec/60000 - h * 60;
 		int s = msec/1000 - h * 3600 - m * 60;
@@ -199,17 +210,32 @@ void MainWindow::_set_timer() {
 		if (!dialog.timerDisabled()) {
 			int h, m, s;
 			dialog.getTime(&h, &m, &s);
-			_timer->setInterval(h*3600000+m*60000+s*1000);
+			_timeout_interval = h*3600000+m*60000+s*1000;
+			_timer->setInterval(1000);
+			_timer->setSingleShot(false);
 			_timer->start();
 		} else if (_timer->isActive()) {
 			_timer->stop();
+			_player_form->hideCountdown();
 		}
 	}
 }
 
 void MainWindow::_timeout() {
-	_player_form->stop();
-	_timer->stop();
+	_timeout_interval -= 1000;
+	if (_timeout_interval <= 0) {
+		_player_form->stop();
+		_player_form->hideCountdown();
+		_timer->stop();
+	} else {
+		int h = _timeout_interval / 3600000;
+		int m = (_timeout_interval / 60000) - 60*h;
+		int s = (_timeout_interval / 1000) - 3600*h - 60*m;
+		QString hp = h < 10 ? QString("0%1").arg(h) : QString("%1").arg(h);
+		QString mp = m < 10 ? QString("0%1").arg(m) : QString("%1").arg(m);
+		QString sp = s < 10 ? QString("0%1").arg(s) : QString("%1").arg(s);
+		_player_form->showCountdown(hp+":"+mp+":"+sp);
+	}
 }
 
 void MainWindow::_equalizer() {
@@ -249,6 +275,11 @@ void MainWindow::settings() {
 	_manage_library_form->updateIcons();
 	_player_form->checkGradient();
 	_library_form->checkGradient();
+	_directory_form->updateIcons();
+	_directory_form->updateGradient();
+	QTranslator *translator = new QTranslator(this);
+	translator->load(QString("/opt/someplayer/someplayer_%1").arg(config.getValue("ui/language").toString()));
+	QApplication::installTranslator(translator);
 }
 
 void MainWindow::_orientation_changed() {
@@ -257,10 +288,12 @@ void MainWindow::_orientation_changed() {
 		_player_form->landscapeMode();
 		_library_form->landscapeMode();
 		_equalizer_dialog->landscapeMode();
+		_directory_form->lanscapeMode();
 	} else {
 		_player_form->portraitMode();
 		_library_form->portraitMode();
 		_equalizer_dialog->portraitMode();
+		_directory_form->portraitMode();
 	}
 }
 
@@ -268,3 +301,12 @@ void MainWindow::_fullscreen(bool f) {
 	if (f) showFullScreen();
 	else showNormal();
 }
+
+void MainWindow::_add_tracks(QList<Track> tracks) {
+	Playlist cur = _library->getCurrentPlaylist();
+	foreach (Track track, tracks) {
+		cur.addTrack(track);
+	}
+	_library->saveCurrentPlaylist(cur);
+	_player_form->reload(true);
+}