aboutsummaryrefslogtreecommitdiff
path: root/src-qt5
diff options
context:
space:
mode:
Diffstat (limited to 'src-qt5')
-rw-r--r--src-qt5/core-utils/lumina-config/pages/page_compton.cpp3
-rw-r--r--src-qt5/core/lumina-desktop/defaults/compton.conf89
-rw-r--r--src-qt5/core/lumina-desktop/lumina-desktop.pro1
-rw-r--r--src-qt5/core/lumina-session/session.cpp6
-rw-r--r--src-qt5/core/lumina-session/session.h4
5 files changed, 98 insertions, 5 deletions
diff --git a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
index d0718dc2..fcbd3e41 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
@@ -28,13 +28,14 @@ void page_compton::SaveSettings(){
emit HasPendingChanges(false);
QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
- LUtils::writeFile(set, ui->text_file->toPlainText().split("\n") );
+ LUtils::writeFile(set, ui->text_file->toPlainText().split("\n"),true);
}
void page_compton::LoadSettings(int){
emit HasPendingChanges(false);
emit ChangePageTitle( tr("Compositor Settings") );
QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
+ qDebug() << "Load Compton settings:" << set;
ui->text_file->setPlainText( LUtils::readFile(set).join("\n") );
}
diff --git a/src-qt5/core/lumina-desktop/defaults/compton.conf b/src-qt5/core/lumina-desktop/defaults/compton.conf
new file mode 100644
index 00000000..bbdea641
--- /dev/null
+++ b/src-qt5/core/lumina-desktop/defaults/compton.conf
@@ -0,0 +1,89 @@
+# Shadow
+shadow = true;
+no-dnd-shadow = true;
+no-dock-shadow = true;
+clear-shadow = true;
+shadow-radius = 7;
+shadow-offset-x = -7;
+shadow-offset-y = -7;
+# shadow-opacity = 0.7;
+# shadow-red = 0.0;
+# shadow-green = 0.0;
+# shadow-blue = 0.0;
+shadow-exclude = [
+ "name = 'Notification'",
+ "class_g = 'Conky'",
+ "class_g ?= 'Notify-osd'",
+ "class_g = 'Cairo-clock'",
+ "_GTK_FRAME_EXTENTS@:c"
+];
+# shadow-exclude = "n:e:Notification";
+# shadow-exclude-reg = "x10+0+0";
+# xinerama-shadow-crop = true;
+
+# Opacity
+menu-opacity = 0.9;
+inactive-opacity = 0.9;
+# active-opacity = 0.8;
+frame-opacity = 0.8;
+inactive-opacity-override = false;
+alpha-step = 0.06;
+# inactive-dim = 0.2;
+# inactive-dim-fixed = true;
+# blur-background = true;
+# blur-background-frame = true;
+blur-kern = "3x3box"
+# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"
+# blur-background-fixed = true;
+blur-background-exclude = [
+ "window_type = 'dock'",
+ "window_type = 'desktop'",
+ "_GTK_FRAME_EXTENTS@:c"
+];
+# opacity-rule = [ "80:class_g = 'URxvt'" ];
+
+# Fading
+fading = true;
+# fade-delta = 30;
+fade-in-step = 0.3;
+fade-out-step = 0.3;
+# no-fading-openclose = true;
+# no-fading-destroyed-argb = true;
+fade-exclude = [ ];
+
+# Other
+backend = "xrender"
+mark-wmwin-focused = true;
+mark-ovredir-focused = true;
+# use-ewmh-active-win = true;
+detect-rounded-corners = true;
+detect-client-opacity = true;
+refresh-rate = 0;
+vsync = "none";
+dbe = false;
+paint-on-overlay = true;
+# sw-opti = true;
+# unredir-if-possible = true;
+# unredir-if-possible-delay = 5000;
+# unredir-if-possible-exclude = [ ];
+focus-exclude = [ "class_g = 'Cairo-clock'" ];
+detect-transient = true;
+detect-client-leader = true;
+invert-color-include = [ ];
+# resize-damage = 1;
+
+# GLX backend
+# glx-no-stencil = true;
+glx-copy-from-front = false;
+# glx-use-copysubbuffermesa = true;
+# glx-no-rebind-pixmap = true;
+glx-swap-method = "undefined";
+# glx-use-gpushader4 = true;
+# xrender-sync = true;
+# xrender-sync-fence = true;
+
+# Window type settings
+wintypes:
+{
+ tooltip = { fade = true; shadow = true; opacity = 0.85; focus = true; };
+};
diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro
index 7b0e5250..bc1599c7 100644
--- a/src-qt5/core/lumina-desktop/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro
@@ -82,6 +82,7 @@ wallpapers.path = $${L_SHAREDIR}/wallpapers/Lumina-DE
defaults.files = defaults/luminaDesktop.conf \
+ defaults/compton.conf \
audiofiles/Logout.ogg \
audiofiles/Login.ogg
defaults.path = $${L_SHAREDIR}/lumina-desktop/
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