|
a/GUI/mainw/mainw.cpp |
|
b/GUI/mainw/mainw.cpp |
|
... |
|
... |
| 58 |
}
|
58 |
}
|
| 59 |
|
59 |
|
| 60 |
#endif
|
60 |
#endif
|
| 61 |
|
61 |
|
| 62 |
GUI_Player::GUI_Player(QTranslator* translator, QWidget *parent) :
|
62 |
GUI_Player::GUI_Player(QTranslator* translator, QWidget *parent) :
|
| 63 |
QMainWindow(parent), ui(new Ui::Upplay), m_completeLength_ms(0),
|
63 |
QMainWindow(parent), ui(new Ui::Upplay), m_covertempfile(0)
|
| 64 |
m_covertempfile(0)
|
|
|
| 65 |
{
|
64 |
{
|
| 66 |
ui->setupUi(this);
|
65 |
ui->setupUi(this);
|
| 67 |
|
66 |
|
| 68 |
ui->action_viewLibrary->setText(tr("&Library"));
|
67 |
ui->action_viewLibrary->setText(tr("&Library"));
|
| 69 |
ui->action_Fullscreen->setShortcut(QKeySequence("F11"));
|
68 |
ui->action_Fullscreen->setShortcut(QKeySequence("F11"));
|
|
... |
|
... |
| 78 |
m_metadata_available = false;
|
77 |
m_metadata_available = false;
|
| 79 |
m_overridemin2tray = false;
|
78 |
m_overridemin2tray = false;
|
| 80 |
|
79 |
|
| 81 |
ui_playlist = 0;
|
80 |
ui_playlist = 0;
|
| 82 |
|
81 |
|
| 83 |
ui_startup_dialog = 0;
|
|
|
| 84 |
|
|
|
| 85 |
m_skinSuffix = "";
|
82 |
m_skinSuffix = "";
|
| 86 |
m_class_name = "Player";
|
83 |
m_class_name = "Player";
|
| 87 |
|
|
|
| 88 |
m_cov_lookup = 0;
|
|
|
| 89 |
m_alternate_covers = 0;
|
|
|
| 90 |
|
84 |
|
| 91 |
bool showSmallPlaylistItems = m_settings->getShowSmallPlaylist();
|
85 |
bool showSmallPlaylistItems = m_settings->getShowSmallPlaylist();
|
| 92 |
ui->action_smallPlaylistItems->setChecked(showSmallPlaylistItems);
|
86 |
ui->action_smallPlaylistItems->setChecked(showSmallPlaylistItems);
|
| 93 |
|
87 |
|
| 94 |
QSizePolicy p = ui->library_widget->sizePolicy();
|
88 |
QSizePolicy p = ui->library_widget->sizePolicy();
|
|
... |
|
... |
| 172 |
if (!m_metadata.compare(md)) {
|
166 |
if (!m_metadata.compare(md)) {
|
| 173 |
return;
|
167 |
return;
|
| 174 |
}
|
168 |
}
|
| 175 |
m_metadata = md;
|
169 |
m_metadata = md;
|
| 176 |
|
170 |
|
| 177 |
m_completeLength_ms = md.length_ms;
|
|
|
| 178 |
total_time_changed(md.length_ms);
|
171 |
total_time_changed(md.length_ms);
|
| 179 |
|
172 |
|
| 180 |
ui->player_w->mdata()->setData(md);
|
173 |
ui->player_w->mdata()->setData(md);
|
| 181 |
|
174 |
|
| 182 |
m_trayIcon->songChangedMessage(md);
|
175 |
m_trayIcon->songChangedMessage(md);
|
|
... |
|
... |
| 240 |
/** TRAY ICON **/
|
233 |
/** TRAY ICON **/
|
| 241 |
void GUI_Player::setupTrayActions()
|
234 |
void GUI_Player::setupTrayActions()
|
| 242 |
{
|
235 |
{
|
| 243 |
m_trayIcon = new GUI_TrayIcon(this);
|
236 |
m_trayIcon = new GUI_TrayIcon(this);
|
| 244 |
|
237 |
|
| 245 |
connect(m_trayIcon, SIGNAL(sig_stop_clicked()), this, SLOT(stopClicked()));
|
238 |
connect(m_trayIcon, SIGNAL(sig_stop_clicked()), this, SLOT(onStopActivated()));
|
| 246 |
connect(m_trayIcon, SIGNAL(sig_bwd_clicked()), this, SLOT(backwardClicked()));
|
239 |
connect(m_trayIcon, SIGNAL(sig_bwd_clicked()),
|
|
|
240 |
this, SLOT(onBackwardActivated()));
|
| 247 |
connect(m_trayIcon, SIGNAL(sig_fwd_clicked()), this, SLOT(forwardClicked()));
|
241 |
connect(m_trayIcon, SIGNAL(sig_fwd_clicked()),
|
|
|
242 |
this, SLOT(onForwardActivated()));
|
| 248 |
connect(m_trayIcon, SIGNAL(sig_play_clicked()), this, SLOT(playClicked()));
|
243 |
connect(m_trayIcon, SIGNAL(sig_play_clicked()),
|
|
|
244 |
this, SLOT(onPlayActivated()));
|
| 249 |
connect(m_trayIcon, SIGNAL(sig_pause_clicked()), this, SLOT(playClicked()));
|
245 |
connect(m_trayIcon, SIGNAL(sig_pause_clicked()),
|
|
|
246 |
this, SLOT(onPauseActivated()));
|
| 250 |
connect(m_trayIcon, SIGNAL(sig_mute_clicked()),
|
247 |
connect(m_trayIcon, SIGNAL(sig_mute_clicked()),
|
| 251 |
ui->player_w->volume(), SLOT(toggleMute()));
|
248 |
ui->player_w->volume(), SLOT(toggleMute()));
|
| 252 |
|
249 |
|
| 253 |
connect(m_trayIcon, SIGNAL(sig_close_clicked()), this, SLOT(really_close()));
|
250 |
connect(m_trayIcon, SIGNAL(sig_close_clicked()), this, SLOT(really_close()));
|
| 254 |
connect(m_trayIcon, SIGNAL(sig_show_clicked()), this, SLOT(showNormal()));
|
251 |
connect(m_trayIcon, SIGNAL(sig_show_clicked()), this, SLOT(showNormal()));
|
| 255 |
|
252 |
|
| 256 |
connect(m_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
|
253 |
connect(m_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
|
| 257 |
this, SLOT(trayItemActivated(QSystemTrayIcon::ActivationReason)));
|
254 |
this, SLOT(trayItemActivated(QSystemTrayIcon::ActivationReason)));
|
| 258 |
|
255 |
|
| 259 |
connect(m_trayIcon, SIGNAL(sig_volume_changed_by_wheel(int)),
|
256 |
connect(m_trayIcon, SIGNAL(sig_volume_changed_by_wheel(int)),
|
| 260 |
this, SLOT(volumeChangedByTick(int)));
|
257 |
this, SLOT(onVolumeStepActivated(int)));
|
| 261 |
|
258 |
|
| 262 |
m_trayIcon->setPlaying(false);
|
259 |
m_trayIcon->setPlaying(false);
|
| 263 |
|
260 |
|
| 264 |
m_trayIcon->show();
|
261 |
m_trayIcon->show();
|
| 265 |
}
|
262 |
}
|