diff options
| author | Ken Moore <ken@pcbsd.org> | 2014-10-15 14:18:50 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2014-10-15 14:18:50 -0400 |
| commit | 54950e51c2f59e83f28b5ee71230ade767cb308a (patch) | |
| tree | 5c6b4bb6b472ed100b8d51f56a462575673acc7e /lumina-desktop | |
| parent | Make sure to "fully" disable the Phonon usage in LSession: It appears some co... (diff) | |
| download | lumina-54950e51c2f59e83f28b5ee71230ade767cb308a.tar.gz lumina-54950e51c2f59e83f28b5ee71230ade767cb308a.tar.bz2 lumina-54950e51c2f59e83f28b5ee71230ade767cb308a.zip | |
Fix a couple other bugs in the Lumina startup routine. Looks like the effects of a bad conflict merge...
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/LSession.cpp | 8 | ||||
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index fb99ef27..bd7d49fb 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -80,8 +80,8 @@ void LSession::setupSession(){ //Now setup the system watcher for changes qDebug() << " - Initialize file system watcher"; watcher = new QFileSystemWatcher(this); - watcher->addPath( QDir::homePath()+"/.lumina/stylesheet.qss" ); - //watcher->addPath( QDir::homePath()+"/.lumina/LuminaDE/desktopsettings.conf" ); + //watcher->addPath( QDir::homePath()+"/.lumina/stylesheet.qss" ); + watcher->addPath( QDir::homePath()+"/.lumina/LuminaDE/desktopsettings.conf" ); watcher->addPath( QDir::homePath()+"/.lumina/fluxbox-init" ); watcher->addPath( QDir::homePath()+"/.lumina/fluxbox-keys" ); @@ -185,8 +185,8 @@ void LSession::checkUserFiles(){ qDebug() << "Copying default fluxbox configuration files"; if(QFile::exists(dset+"fluxbox-init")){ QFile::remove(dset+"fluxbox-init"); } if(QFile::exists(dset+"fluxbox-keys")){ QFile::remove(dset+"fluxbox-keys"); } - QFile::copy(":/fluxboxconf/fluxbox-init-rc", dset+"fluxbox-init"); - QFile::copy(":/fluxboxconf/fluxbox-keys", dset+"fluxbox-keys"); + QFile::copy(LOS::LuminaShare()+"fluxbox-init-rc", dset+"fluxbox-init"); + QFile::copy(LOS::LuminaShare()+"fluxbox-keys", dset+"fluxbox-keys"); QFile::setPermissions(dset+"fluxbox-init", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); QFile::setPermissions(dset+"fluxbox-keys", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); } diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index 708e2046..b30d8a68 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -107,6 +107,10 @@ wallpapers.files = wallpapers/Lumina_Wispy_gold_1920x1080.jpg \ wallpapers/Lumina_Wispy_red_1920x1080.jpg wallpapers.path = $$PREFIX/share/wallpapers/Lumina-DE +fluxconf.files = fluxboxconf/fluxbox-init-rc \ + fluxboxconf/fluxbox-keys +fluxconf.path = $$PREFIX/share/Lumina-DE/ + defaults.files = defaults/desktop-background.jpg \ defaults/defaultapps.conf \ defaults/desktopsettings.conf \ @@ -181,4 +185,4 @@ TRANSLATIONS = i18n/lumina-desktop_af.ts \ dotrans.path=$$PREFIX/share/Lumina-DE/i18n/ dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/i18n/ -INSTALLS += target desktop icons wallpapers defaults dotrans +INSTALLS += target desktop icons wallpapers defaults fluxconf dotrans |