|
|
|
@ -127,21 +127,7 @@ DockCorona::~DockCorona()
|
|
|
|
|
delete m_activityConsumer;
|
|
|
|
|
|
|
|
|
|
if (!m_layoutDir.isNull()) {
|
|
|
|
|
qDebug() << "layout directory found:" << m_layoutDir;
|
|
|
|
|
QFile latterc(m_layoutDir + "/lattedockrc");
|
|
|
|
|
QFile appletsrc(m_layoutDir + "/lattedock-appletsrc");
|
|
|
|
|
|
|
|
|
|
if (latterc.exists() && appletsrc.exists()) {
|
|
|
|
|
qDebug() << "updating latte layout...";
|
|
|
|
|
|
|
|
|
|
const auto homeLatterc = QDir::homePath() + "/.config/lattedockrc";
|
|
|
|
|
const auto homeAppletsrc = QDir::homePath() + "/.config/lattedock-appletsrc";
|
|
|
|
|
|
|
|
|
|
if (QFile::remove(homeLatterc) && QFile::remove(homeAppletsrc)){
|
|
|
|
|
QFile::copy(latterc.fileName() , homeLatterc);
|
|
|
|
|
QFile::copy(appletsrc.fileName() , homeAppletsrc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
updateConfigs();
|
|
|
|
|
QDir tempLayoutDir(m_layoutDir);
|
|
|
|
|
|
|
|
|
|
if (tempLayoutDir.exists() && m_layoutDir.startsWith("/tmp")) {
|
|
|
|
@ -149,7 +135,6 @@ DockCorona::~DockCorona()
|
|
|
|
|
tempLayoutDir.removeRecursively();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
qDebug() << "latte corona deleted..." << this;
|
|
|
|
|
}
|
|
|
|
@ -218,12 +203,38 @@ bool DockCorona::reloadLayout(QString path)
|
|
|
|
|
oldLayoutDir.removeRecursively();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QTimer::singleShot(2000, [this]() {
|
|
|
|
|
qDebug() << "reload: starting delayed update config files...";
|
|
|
|
|
updateConfigs();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DockCorona::updateConfigs()
|
|
|
|
|
{
|
|
|
|
|
if (!m_layoutDir.isNull()) {
|
|
|
|
|
qDebug() << "layout directory found:" << m_layoutDir;
|
|
|
|
|
QFile latterc(m_layoutDir + "/lattedockrc");
|
|
|
|
|
QFile appletsrc(m_layoutDir + "/lattedock-appletsrc");
|
|
|
|
|
|
|
|
|
|
if (latterc.exists() && appletsrc.exists()) {
|
|
|
|
|
qDebug() << "updating latte layout...";
|
|
|
|
|
|
|
|
|
|
const auto homeLatterc = QDir::homePath() + "/.config/lattedockrc";
|
|
|
|
|
const auto homeAppletsrc = QDir::homePath() + "/.config/lattedock-appletsrc";
|
|
|
|
|
|
|
|
|
|
if (QFile::remove(homeLatterc) && QFile::remove(homeAppletsrc)){
|
|
|
|
|
QFile::copy(latterc.fileName() , homeLatterc);
|
|
|
|
|
QFile::copy(appletsrc.fileName() , homeAppletsrc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void DockCorona::setupWaylandIntegration()
|
|
|
|
|
{
|
|
|
|
|