X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=f71f9dc77730ce5b766565556a4a5bc2411a3d88;hb=9171ce8d32ef99f598ec1c1eefed07e13616e54c;hp=ddbca43b8e39dad951d27a3b7d0125c4a7bbb4f2;hpb=eb71a7754a947fffbde4f6944b8f609a40102a87;p=someplayer diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ddbca43..f71f9dc 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include "player/player.h" @@ -46,65 +47,64 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(about())); connect(ui->actionSettings, SIGNAL(triggered()), this, SLOT(settings())); setAnimated(true); - _player_form = new PlayerForm(_library, ui->stackedWidget); - _library_form = new LibraryForm(_library, ui->stackedWidget); - _busy_widget = new BusyWidget(ui->stackedWidget); + setAttribute(Qt::WA_Maemo5StackedWindow); + _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); - ui->stackedWidget->insertWidget(0, _player_form); - ui->stackedWidget->insertWidget(1, _library_form); - ui->stackedWidget->insertWidget(2, _busy_widget); - 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"); - QAction *set_timer = ui->menuBar->addAction("Set timer"); - QAction *equalizer = ui->menuBar->addAction("Equalizer"); + _manage_library_form = new ManageLibraryForm(_library, this); connect(_player_form, SIGNAL(library()), this, SLOT(library())); - connect(_library_form, SIGNAL(player(bool)), this, SLOT(player(bool))); - 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(set_timer, SIGNAL(triggered()), this, SLOT(_set_timer())); - connect(equalizer, SIGNAL(triggered()), this, SLOT(_equalizer())); - connect(_library, SIGNAL(done()), this, SLOT(library())); + connect(_library_form, SIGNAL(refreshPlayer()), this, SLOT(player())); + connect(ui->actionManageLibrary, SIGNAL(triggered()), this, SLOT(_manage_library())); + connect(ui->actionSavePlaylist, SIGNAL(triggered()), this, SLOT(_save_playlist())); + connect(_player_form, SIGNAL(clearPlaylist()), this, SLOT(_clear_current_playlist())); + connect(ui->actionSetTimer, SIGNAL(triggered()), this, SLOT(_set_timer())); + connect(ui->actionEqualizer, SIGNAL(triggered()), this, SLOT(_equalizer())); connect(_library, SIGNAL(done()), _library_form, SLOT(refresh())); - connect(_library, SIGNAL(addingTracks(int)), _busy_widget, SLOT(setMax(int))); - connect(_library, SIGNAL(trackAdded()), _busy_widget, SLOT(tick())); - connect(_library_form, SIGNAL(done()), this, SLOT(library())); - connect(_library_form, SIGNAL(busy(QString)), this, SLOT(showBusyWidget(QString))); + connect(_player_form, SIGNAL(refreshLibrary()), _library_form, SLOT(refresh())); + connect(_manage_library_form, SIGNAL(refreshLibrary()), _library_form, SLOT(refresh())); connect(_timer, SIGNAL(timeout()), this, SLOT(_timeout())); connect(_equalizer_dialog, SIGNAL(valueChanged(int,int)), this, SLOT(_equalizer_value_changed(int, int))); connect(_equalizer_dialog, SIGNAL(equalizerEnabled()), _player_form, SLOT(enableEqualizer())); connect(_equalizer_dialog, SIGNAL(equalizerDisabled()), _player_form, SLOT(disableEqualizer())); connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(_orientation_changed())); connect(_player_form, SIGNAL(fullscreen(bool)), this, SLOT(_fullscreen(bool))); - connect(_library_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)), this, SLOT(_add_tracks(QList))); _player_form->reload(true); - library(); QString mode = config.getValue("ui/orientation").toString(); if (mode == "landscape") { setAttribute(Qt::WA_Maemo5LandscapeOrientation); _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"); } MainWindow::~MainWindow() @@ -120,32 +120,47 @@ void MainWindow::about() { "Author: Nikolay Tischenko aka \"somebody\" "); } -void MainWindow::player(bool reread) { - ui->stackedWidget->setCurrentIndex(0); - _player_form->reload(reread); - setWindowTitle("SomePlayer"); +void MainWindow::player() { + _player_form->reload(true); _orientation_changed(); // workaround } void MainWindow::library() { ui->menuBar->setEnabled(true); - ui->stackedWidget->setCurrentIndex(1); - setWindowTitle("SomePlayer Library"); + _library_form->show(); _orientation_changed(); // workaround + _manage_library_form->hide(); } -void MainWindow::_add_directory() { - QString directory = QFileDialog::getExistingDirectory (this, "Select directory", "/home/user/MyDocs", QFileDialog::ShowDirsOnly ); - if (!directory.isEmpty()) { - showBusyWidget("

Scanning... Please wait

"); - _library->addDirectory(directory); - } +void MainWindow::_manage_library() { + _manage_library_form->refresh(); + _manage_library_form->show(); } void MainWindow::_save_playlist() { QList playlists = _library->getPlaylistsNames(); playlists.removeOne(_CURRENT_PLAYLIST_SUBST_); - SavePlaylistDialog dialog(this); + Playlist cur = _library->getCurrentPlaylist(); + // construct playlist name if possible + QString suggest_name; + QList tracks = cur.tracks(); + QString artist = tracks.at(0).metadata().artist(), album = tracks.at(0).metadata().album(); + foreach (Track t, tracks) { + if (t.metadata().album() != album) + album = ""; + if (t.metadata().artist() != artist) + artist = ""; + } + if (album.isEmpty() && artist.isEmpty()) { + suggest_name = "New playlist"; + } else if (album.isEmpty()) { + suggest_name = artist; + } else { + suggest_name = QString("%1 - %2").arg(artist).arg(album); + } + + // constructed + SavePlaylistDialog dialog(suggest_name, this); dialog.setPlaylistNames(playlists); if (dialog.exec() == QDialog::Accepted) { QString name = dialog.selectedName(); @@ -160,7 +175,6 @@ void MainWindow::_save_playlist() { } } if (append) { - Playlist cur = _library->getCurrentPlaylist(); Playlist target = _library->getPlaylist(name); QList tracks = cur.tracks(); foreach (Track track, tracks) { @@ -168,9 +182,8 @@ void MainWindow::_save_playlist() { } _library->savePlaylist(target); } else { - Playlist playlist = _library->getCurrentPlaylist(); - playlist.setName(name); - _library->savePlaylist(playlist); + cur.setName(name); + _library->savePlaylist(cur); } } } @@ -182,23 +195,12 @@ void MainWindow::_clear_current_playlist() { _player_form->reload(true); } -void MainWindow::showBusyWidget(QString caption) { - _busy_widget->setText(caption); - ui->menuBar->setEnabled(false); - ui->stackedWidget->setCurrentIndex(2); -} - -void MainWindow::_add_files() { - QStringList files = QFileDialog::getOpenFileNames(this, "Add file"); - if (!files.isEmpty()) _player_form->addFiles(files); -} - void MainWindow::_set_timer() { TimerDialog dialog(this); 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; @@ -208,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() { @@ -255,8 +272,14 @@ void MainWindow::settings() { } _player_form->updateIcons(); _library_form->updateIcons(); + _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() { @@ -265,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(); } } @@ -276,3 +301,12 @@ void MainWindow::_fullscreen(bool f) { if (f) showFullScreen(); else showNormal(); } + +void MainWindow::_add_tracks(QList tracks) { + Playlist cur = _library->getCurrentPlaylist(); + foreach (Track track, tracks) { + cur.addTrack(track); + } + _library->saveCurrentPlaylist(cur); + _player_form->reload(true); +}