Minor bugfixes

[someplayer] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7c22138..9bdd86e 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -71,6 +71,7 @@ MainWindow::MainWindow(QWidget *parent) :
        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(ui->actionOnlineHelp, SIGNAL(triggered()), _about_form, SLOT(onlineHelp()));
        connect(_library, SIGNAL(done()), _library_form, SLOT(refresh()));
        connect(_player_form, SIGNAL(refreshLibrary()), _library_form, SLOT(refresh()));
        connect(_manage_library_form, SIGNAL(refreshLibrary()), _library_form, SLOT(refresh()));
@@ -133,6 +134,13 @@ MainWindow::MainWindow(QWidget *parent) :
        _hw_zoom_policy_changed();
        config.setValue("fmtx/enabled", "no");
        setWindowTitle("SomePlayer");
+
+       QList<QWidget *> widgets = ui->centralWidget->findChildren<QWidget *>();
+       foreach (QWidget *widget, widgets) {
+               if (widget->objectName() != "searchLine") {
+                       widget->installEventFilter(this);
+               }
+       }
 }
 
 MainWindow::~MainWindow()
@@ -215,6 +223,7 @@ void MainWindow::_save_playlist() {
 }
 
 void MainWindow::_clear_current_playlist() {
+       CONFIRM_ACTION(this, tr("Clear playlist?"))
        Playlist playlist = _library->getCurrentPlaylist();
        playlist.clear();
        _library->saveCurrentPlaylist(playlist);
@@ -302,12 +311,14 @@ void MainWindow::_change_orientation() {
 void MainWindow::_orientation_changed() {
        QRect screenGeometry = QApplication::desktop()->screenGeometry();
        if (screenGeometry.width() > screenGeometry.height()) {
+               _orientation = ORIENTATION_LANDSCAPE;
                _player_form->landscapeMode();
                _library_form->landscapeMode();
                _equalizer_dialog->landscapeMode();
                _directory_form->lanscapeMode();
                _settings_form->landscapeMode();
        } else {
+               _orientation = ORIENTATION_PORTRAIT;
                _player_form->portraitMode();
                _library_form->portraitMode();
                _equalizer_dialog->portraitMode();
@@ -373,14 +384,30 @@ void MainWindow::_zoom_key_pressed(quint32 code) {
        }
        Config config;
        QString behavior = config.getValue("hw/zoom_action").toString();
+       bool inverted = config.getValue("hw/zoom_inverted").toBool();
+       if (inverted) {
+               if (code == MM_KEY_DOWN) {
+                       code = MM_KEY_UP;
+               } else {
+                       code = MM_KEY_DOWN;
+               }
+       }
        if (code == MM_KEY_DOWN) {
                if (behavior == "track") {
-                       _player_form->prev();
+                       if (_orientation == ORIENTATION_LANDSCAPE) {
+                               _player_form->next();
+                       } else {
+                               _player_form->prev();
+                       }
                        _dbus_client.setVolume(_system_volume);
                }
        } else if (code == MM_KEY_UP) {
                if (behavior == "track") {
-                       _player_form->next();
+                       if (_orientation == ORIENTATION_LANDSCAPE) {
+                               _player_form->prev();
+                       } else {
+                               _player_form->next();
+                       }
                        _dbus_client.setVolume(_system_volume);
                }
        }
@@ -399,3 +426,53 @@ void MainWindow::_fmtx_settings_changed() {
                system("fmtx_client -p 0 2>&1 >/dev/null");
        }
 }
+
+bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
+       if (event->type() != QEvent::KeyPress) {
+               return QObject::eventFilter(obj, event);
+       }
+       QKeyEvent *keyEvent = (QKeyEvent *) event;
+       int mod = keyEvent->modifiers();
+
+       switch (keyEvent->key()) {
+       case Qt::Key_Space:
+               if ((mod & Qt::ControlModifier) == 0) {
+                       _player_form->toggle();
+               }
+               break;
+       case Qt::Key_Enter:
+               // TODO
+               break;
+       case Qt::Key_Right:
+               _player_form->next();
+               break;
+       case Qt::Key_Left:
+               _player_form->prev();
+               break;
+       case Qt::Key_T:
+               _player_form->stop();
+               break;
+       case Qt::Key_R:
+               _player_form->toggleRandom();
+               break;
+       case Qt::Key_V:
+               _player_form->toggleView();
+               break;
+       case Qt::Key_M:
+               _directory_form->show();
+               break;
+       case Qt::Key_L:
+               _library_form->show();
+               break;
+       case Qt::Key_E:
+               _player_form->toggleRepeat();
+               break;
+       case Qt::Key_S:
+               _player_form->toggleToolsWidget();
+               break;
+       default:
+               return QObject::eventFilter(obj, event);
+       }
+
+       return true;
+}