Switch to unified view

a/GUI/mainw/trayicon.cpp b/GUI/mainw/trayicon.cpp
...
...
40
40
41
    m_settings = CSettingsStorage::getInstance();
41
    m_settings = CSettingsStorage::getInstance();
42
    m_playing = false;
42
    m_playing = false;
43
    m_mute = false;
43
    m_mute = false;
44
44
45
    QString icon_path = Helper::getIconPath();
46
    QIcon play_icon = QIcon(icon_path + "/play.png");
45
    QIcon play_icon = QIcon(Helper::getIconPath("/play.png"));
47
    QIcon pause_icon = QIcon(icon_path + "/pause.png");
46
    QIcon pause_icon = QIcon(Helper::getIconPath("/pause.png"));
48
    QIcon sayo_icon = QIcon(icon_path + "/logo.png");
47
    QIcon sayo_icon = QIcon(Helper::getIconPath("/logo.png"));
49
    QPixmap play_pixmap = play_icon.pixmap(24, 24);
48
    QPixmap play_pixmap = play_icon.pixmap(24, 24);
50
    QPixmap pause_pixmap = pause_icon.pixmap(24, 24);
49
    QPixmap pause_pixmap = pause_icon.pixmap(24, 24);
51
    QPixmap sayo_pixmap = sayo_icon.pixmap(24, 24);
50
    QPixmap sayo_pixmap = sayo_icon.pixmap(24, 24);
52
    setIcon(QIcon(sayo_pixmap));
51
    setIcon(QIcon(sayo_pixmap));
53
52
...
...
63
    _timer = new QTimer(this);
62
    _timer = new QTimer(this);
64
    _timer->setInterval(300);
63
    _timer->setInterval(300);
65
    _md_set = false;
64
    _md_set = false;
66
65
67
    m_playAction = new QAction(tr("Play"), this);
66
    m_playAction = new QAction(tr("Play"), this);
68
    m_playAction->setIcon(QIcon(icon_path + "play.png"));
67
    m_playAction->setIcon(QIcon(Helper::getIconPath("play.png")));
69
    m_stopAction = new QAction(tr("Stop"), this);
68
    m_stopAction = new QAction(tr("Stop"), this);
70
    m_stopAction->setIcon(QIcon(icon_path + "stop.png"));
69
    m_stopAction->setIcon(QIcon(Helper::getIconPath("stop.png")));
71
    m_bwdAction = new QAction(tr("Previous"), this);
70
    m_bwdAction = new QAction(tr("Previous"), this);
72
    m_bwdAction->setIcon(QIcon(icon_path + "bwd.png"));
71
    m_bwdAction->setIcon(QIcon(Helper::getIconPath("bwd.png")));
73
    m_fwdAction = new QAction(tr("Next"), this);
72
    m_fwdAction = new QAction(tr("Next"), this);
74
    m_fwdAction->setIcon(QIcon(icon_path + "fwd.png"));
73
    m_fwdAction->setIcon(QIcon(Helper::getIconPath("fwd.png")));
75
    m_muteAction = new QAction(tr("Mute"), this);
74
    m_muteAction = new QAction(tr("Mute"), this);
76
    m_muteAction->setIcon(QIcon(icon_path + "vol_mute.png"));
75
    m_muteAction->setIcon(QIcon(Helper::getIconPath("vol_mute.png")));
77
    m_closeAction = new QAction(tr("Close"), this);
76
    m_closeAction = new QAction(tr("Close"), this);
78
    m_closeAction->setIcon(QIcon(icon_path + "close.png"));
77
    m_closeAction->setIcon(QIcon(Helper::getIconPath("close.png")));
79
    m_showAction = new QAction(tr("Show"), this);
78
    m_showAction = new QAction(tr("Show"), this);
80
79
81
    m_trayContextMenu = new QMenu();
80
    m_trayContextMenu = new QMenu();
82
    m_trayContextMenu->addAction(m_playAction);
81
    m_trayContextMenu->addAction(m_playAction);
83
    m_trayContextMenu->addAction(m_stopAction);
82
    m_trayContextMenu->addAction(m_stopAction);
...
...
251
    if (style == 1) {
250
    if (style == 1) {
252
        suffix = "_dark";
251
        suffix = "_dark";
253
    }
252
    }
254
253
255
    if (!mute) {
254
    if (!mute) {
256
        m_muteAction->setIcon(QIcon(Helper::getIconPath() + "vol_mute" +
255
        m_muteAction->setIcon(QIcon(Helper::getIconPath("vol_mute.png")));
257
                                    suffix + ".png"));
258
        m_muteAction->setText(tr("Mute"));
256
        m_muteAction->setText(tr("Mute"));
259
    }  else {
257
    }  else {
260
        m_muteAction->setIcon(QIcon(Helper::getIconPath() + "vol_3" +
258
        m_muteAction->setIcon(QIcon(Helper::getIconPath("vol_3.png")));
261
                                    suffix + ".png"));
262
        m_muteAction->setText(tr("Unmute"));
259
        m_muteAction->setText(tr("Unmute"));
263
    }
260
    }
264
}
261
}
265
262
266
void GUI_TrayIcon::setPlaying(bool playing)
263
void GUI_TrayIcon::setPlaying(bool playing)