Switch to unified view

a/GUI/mainw/mw_connections.cpp b/GUI/mainw/mw_connections.cpp
...
...
19
#include "mainw.h"
19
#include "mainw.h"
20
20
21
void GUI_Player::setupConnections()
21
void GUI_Player::setupConnections()
22
{
22
{
23
    connect(ui->player_w->playctl(), SIGNAL(playrequested()),
23
    connect(ui->player_w->playctl(), SIGNAL(playrequested()),
24
            this, SLOT(playClicked()));
24
            this, SLOT(onPlayActivated()));
25
    connect(ui->player_w->playctl(), SIGNAL(pauserequested()),
25
    connect(ui->player_w->playctl(), SIGNAL(pauserequested()),
26
            this, SLOT(pauseClicked()));
26
            this, SLOT(onPauseActivated()));
27
    connect(ui->player_w->playctl(), SIGNAL(forwardrequested()),
27
    connect(ui->player_w->playctl(), SIGNAL(forwardrequested()),
28
            this, SLOT(forwardClicked()));
28
            this, SLOT(onForwardActivated()));
29
    connect(ui->player_w->playctl(), SIGNAL(backwardrequested()),
29
    connect(ui->player_w->playctl(), SIGNAL(backwardrequested()),
30
            this, SLOT(backwardClicked()));
30
            this, SLOT(onBackwardActivated()));
31
    connect(ui->player_w->playctl(), SIGNAL(stoprequested()),
31
    connect(ui->player_w->playctl(), SIGNAL(stoprequested()),
32
            this, SLOT(stopClicked()));
32
            this, SLOT(onStopActivated()));
33
33
34
    connect(ui->player_w->volume(), SIGNAL(muteChanged(bool)),
34
    connect(ui->player_w->volume(), SIGNAL(muteChanged(bool)),
35
            this, SLOT(onMuteChanged(bool)));
35
            this, SLOT(onMuteActivated(bool)));
36
    connect(ui->player_w->volume(), SIGNAL(volumeChanged(int)),
36
    connect(ui->player_w->volume(), SIGNAL(volumeChanged(int)),
37
            this, SIGNAL(sig_volume_changed(int)));
37
            this, SIGNAL(sig_volume_changed(int)));
38
38
39
    connect(ui->player_w->progress(), SIGNAL(seekRequested(int)),
39
    connect(ui->player_w->progress(), SIGNAL(seekRequested(int)),
40
            this, SIGNAL(sig_seek(int)));
40
            this, SIGNAL(sig_seek(int)));
...
...
68
    // about
68
    // about
69
    connect(ui->action_about, SIGNAL(triggered(bool)), this, SLOT(about(bool)));
69
    connect(ui->action_about, SIGNAL(triggered(bool)), this, SLOT(about(bool)));
70
70
71
    connect(ui->action_help, SIGNAL(triggered(bool)), this, SLOT(help(bool)));
71
    connect(ui->action_help, SIGNAL(triggered(bool)), this, SLOT(help(bool)));
72
    connect(m_trayIcon, SIGNAL(sig_volume_changed_by_wheel(int)), 
72
    connect(m_trayIcon, SIGNAL(sig_volume_changed_by_wheel(int)), 
73
            this, SLOT(volumeChangedByTick(int)));
73
            this, SLOT(onVolumeStepActivated(int)));
74
74
75
75
76
    QList<QKeySequence> lst;
76
    QList<QKeySequence> lst;
77
    lst << QKeySequence(Qt::Key_MediaTogglePlayPause) <<
77
    lst << QKeySequence(Qt::Key_MediaTogglePlayPause) <<
78
        QKeySequence(Qt::Key_MediaPlay) << QKeySequence(Qt::Key_MediaPause) <<
78
        QKeySequence(Qt::Key_MediaPlay) << QKeySequence(Qt::Key_MediaPause) <<
...
...
102
102
103
103
104
104
105
    QAction* louder_action = createAction(QKeySequence(Qt::AltModifier |
105
    QAction* louder_action = createAction(QKeySequence(Qt::AltModifier |
106
                                                       Qt::Key_Up));
106
                                                       Qt::Key_Up));
107
    connect(louder_action, SIGNAL(triggered()), this, SLOT(volumeHigher()));
107
    connect(louder_action, SIGNAL(triggered()), this, SLOT(onVolumeHigherActivated()));
108
108
109
    QAction* leiser_action = createAction(QKeySequence(Qt::AltModifier |
109
    QAction* leiser_action = createAction(QKeySequence(Qt::AltModifier |
110
                                                       Qt::Key_Down));
110
                                                       Qt::Key_Down));
111
    connect(leiser_action, SIGNAL(triggered()), this, SLOT(volumeLower()));
111
    connect(leiser_action, SIGNAL(triggered()), this, SLOT(onVolumeLowerActivated()));
112
112
113
113
114
    QAction* two_perc_plus_action = createAction(QKeySequence(Qt::AltModifier |
114
    QAction* two_perc_plus_action = createAction(QKeySequence(Qt::AltModifier |
115
                                                              Qt::Key_Right));
115
                                                              Qt::Key_Right));
116
    connect(two_perc_plus_action, SIGNAL(triggered()),
116
    connect(two_perc_plus_action, SIGNAL(triggered()),
117
            this, SLOT(jump_forward()));
117
            this, SLOT(onJumpForwardActivated()));
118
118
119
    QAction* two_perc_minus_action = createAction(QKeySequence(Qt::AltModifier |
119
    QAction* two_perc_minus_action = createAction(QKeySequence(Qt::AltModifier |
120
                                                               Qt::Key_Left));
120
                                                               Qt::Key_Left));
121
    connect(two_perc_minus_action, SIGNAL(triggered()),
121
    connect(two_perc_minus_action, SIGNAL(triggered()),
122
            this, SLOT(jump_backward()));
122
            this, SLOT(onJumpBackwardActivated()));
123
123
124
}
124
}