save splitters state. Moved restore and save geometry to ui and
showplayer constructors/destructors
This commit is contained in:
parent
11bd76a458
commit
f6eb15f13c
7 changed files with 62 additions and 111 deletions
|
|
@ -66,17 +66,6 @@ libreMediaServerAudio::~libreMediaServerAudio()
|
|||
if (m_settings->getDmxActive())
|
||||
m_ola->stop();
|
||||
m_mae.stopEngine();
|
||||
Settings::getInstance()->beginGroup("mainwindow");
|
||||
Settings::getInstance()->setValue("size", m_lmsUi->size());
|
||||
Settings::getInstance()->setValue("fullScreen", m_lmsUi->isFullScreen());
|
||||
Settings::getInstance()->setValue("geometry", m_lmsUi->saveGeometry());
|
||||
Settings::getInstance()->setValue("showPlayer", m_lmsUi->m_showPlayer->isVisible());
|
||||
Settings::getInstance()->setValue("showPlayerSize", m_lmsUi->m_showPlayer->size());
|
||||
Settings::getInstance()->setValue("showPlayerGeometry", m_lmsUi->m_showPlayer->saveGeometry());
|
||||
Settings::getInstance()->endGroup();
|
||||
//m_settings->settingsSaver();
|
||||
if (m_settings->getShowPlayerActive())
|
||||
m_lmsUi->m_showPlayer->saveCueTrackList("lastshow.xml");
|
||||
delete m_lmsUi;
|
||||
delete m_settings;
|
||||
sleep(1);
|
||||
|
|
@ -316,7 +305,6 @@ void libreMediaServerAudio::setUi(libreMediaServerAudioUi *lmsUi)
|
|||
m_ola->start(QThread::TimeCriticalPriority );
|
||||
} else {
|
||||
m_lmsUi->m_dmxWidget->hide();
|
||||
//m_lmsUi->topWidget->hide();
|
||||
}
|
||||
for (uint i = 0; i < m_settings->getAudioDeviceQty(); i++) {
|
||||
char *name = m_mae.getDeviceName(i);
|
||||
|
|
@ -326,14 +314,6 @@ void libreMediaServerAudio::setUi(libreMediaServerAudioUi *lmsUi)
|
|||
m_lmsUi->m_showPlayer->loadCueTrackList("lastshow.xml");
|
||||
m_lmsUi->m_showPlayer->show();
|
||||
}
|
||||
m_settings->beginGroup("mainwindow");
|
||||
auto geometry = m_settings->value("geometry", QByteArray()).toByteArray();
|
||||
if (!geometry.isEmpty())
|
||||
lmsUi->restoreGeometry(geometry);
|
||||
geometry = m_settings->value("showPlayerGeometry", QByteArray()).toByteArray();
|
||||
if (!geometry.isEmpty())
|
||||
lmsUi->m_showPlayer->restoreGeometry(geometry);
|
||||
m_settings->endGroup();
|
||||
m_refreshUi = new QTimer(this);
|
||||
connect(m_refreshUi, SIGNAL(timeout()), this, SLOT(refreshUi()));
|
||||
m_refreshUi->start(UI_REFRESH_TIME);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue