Switch to unified view

a/GUI/mainw/mainw.cpp b/GUI/mainw/mainw.cpp
...
...
30
#include "trayicon.h"
30
#include "trayicon.h"
31
#include "GUI/playlist/GUI_Playlist.h"
31
#include "GUI/playlist/GUI_Playlist.h"
32
#include "HelperStructs/CSettingsStorage.h"
32
#include "HelperStructs/CSettingsStorage.h"
33
#include "HelperStructs/Style.h"
33
#include "HelperStructs/Style.h"
34
#include "HelperStructs/globals.h"
34
#include "HelperStructs/globals.h"
35
#include "application.h"
35
36
36
GUI_Player* obj_ref = 0;
37
GUI_Player* obj_ref = 0;
37
38
38
#ifdef Q_OS_UNIX
39
#ifdef Q_OS_UNIX
39
#include <signal.h>
40
#include <signal.h>
...
...
57
    }
58
    }
58
}
59
}
59
60
60
#endif
61
#endif
61
62
62
GUI_Player::GUI_Player(QTranslator* translator, QWidget *parent) :
63
GUI_Player::GUI_Player(Application *upapp, QWidget *parent) :
63
    QMainWindow(parent), ui(new Ui::Upplay), m_covertempfile(0)
64
    QMainWindow(parent), m_upapp(upapp), ui(new Ui::Upplay), m_covertempfile(0)
64
{
65
{
65
    ui->setupUi(this);
66
    ui->setupUi(this);
66
67
67
    ui->action_viewLibrary->setText(tr("&Library"));
68
    ui->action_viewLibrary->setText(tr("&Library"));
68
    ui->action_Fullscreen->setShortcut(QKeySequence("F11"));
69
    ui->action_Fullscreen->setShortcut(QKeySequence("F11"));
69
    ui->action_Dark->setShortcut(QKeySequence("F10"));
70
    ui->action_Dark->setShortcut(QKeySequence("F10"));
70
71
71
    m_translator = translator;
72
    m_settings = CSettingsStorage::getInstance();
72
    m_settings = CSettingsStorage::getInstance();
73
    m_netmanager = new QNetworkAccessManager(this);
73
    m_netmanager = new QNetworkAccessManager(this);
74
    connect(m_netmanager, SIGNAL(finished(QNetworkReply*)),
74
    connect(m_netmanager, SIGNAL(finished(QNetworkReply*)),
75
            this, SLOT(sl_cover_fetch_done(QNetworkReply*)));
75
            this, SLOT(sl_cover_fetch_done(QNetworkReply*)));
76
76
...
...
132
GUI_Player::~GUI_Player()
132
GUI_Player::~GUI_Player()
133
{
133
{
134
    delete m_covertempfile;
134
    delete m_covertempfile;
135
}
135
}
136
136
137
void GUI_Player::setRendererName(const QString& nm)
138
{
139
    m_renderer_friendly_name = nm;
140
}
141
142
QAction* GUI_Player::createAction(QList<QKeySequence>& seq_list)
137
QAction* GUI_Player::createAction(QList<QKeySequence>& seq_list)
143
{
138
{
144
    QAction* action = new QAction(this);
139
    QAction* action = new QAction(this);
145
140
146
    action->setShortcuts(seq_list);
141
    action->setShortcuts(seq_list);