aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2016-07-25 10:57:09 -0400
committerKen Moore <ken@pcbsd.org>2016-07-25 10:57:09 -0400
commitb51f02eb485ad743495146095f2bc2203be3dac8 (patch)
tree6729f19e19fc88cdda7eb6b3eec9b37dd5ef08a3 /src-qt5/core
parentEnsure that a default compton.conf file is distributed with Lumina. (diff)
downloadlumina-b51f02eb485ad743495146095f2bc2203be3dac8.tar.gz
lumina-b51f02eb485ad743495146095f2bc2203be3dac8.tar.bz2
lumina-b51f02eb485ad743495146095f2bc2203be3dac8.zip
Setup the copy over of the default compton.conf as needed.
Diffstat (limited to 'src-qt5/core')
-rw-r--r--src-qt5/core/lumina-session/session.cpp6
-rw-r--r--src-qt5/core/lumina-session/session.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index 47f1cf34..5f9ca6c4 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -98,10 +98,8 @@ void LSession::start(){
if(LUtils::isValidBinary("compton")){
QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
if(!QFile::exists(set)){
- QStringList dirs = QString(getenv("XDG_CONFIG_DIRS")).split(":");
- for(int i=0; i<dirs.length(); i++){
- if(QFile::exists(dirs[i]+"/compton.conf")){ QFile::copy(dirs[i]+"/compton.conf", set); break; }
- else if(QFile::exists(dirs[i]+"/compton.conf.sample")){ QFile::copy(dirs[i]+"/compton.conf.sample", set); break; }
+ if(QFile::exists(LOS::LuminaShare()+"/compton.conf")){
+ QFile::copy(LOS::LuminaShare()+"/compton.conf", set);
}
}
if(!QFile::exists(set)){
diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h
index 4ae01f85..dee31502 100644
--- a/src-qt5/core/lumina-session/session.h
+++ b/src-qt5/core/lumina-session/session.h
@@ -6,6 +6,7 @@
//===========================================
#include <QObject>
#include <QProcess>
+#include <QDebug>
#include <QFileSystemWatcher>
#include <sys/types.h>
@@ -18,6 +19,8 @@ private:
QString id;
private slots:
void filechanged(QString path){
+ qDebug() << "File Changed:" << path;
+ qDebug() << " - Program:" << this->program();
if(watcher==0){ return; } //just in case
if(this->state()==QProcess::Running){
if(this->program().section(" ",0,0).section("/",-1) == "fluxbox" ){ ::kill(this->pid(), SIGUSR2); } //Fluxbox needs SIGUSR2 to reload it's configs
@@ -33,6 +36,7 @@ public:
id=ID;
watcher = 0;
if(!watchfiles.isEmpty()){
+ qDebug() << "Watch Files for changes:" << ID << watchfiles;
watcher = new QFileSystemWatcher(this);
connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(filechanged(QString)) );
connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(filechanged(QString)) );
bgstack15