From 3b6e8b8ee6e05e3d05e3d69b64b2afe5bc8c0d22 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 15 Aug 2017 19:19:54 -0400 Subject: Get the lumina-xconfig monitor settings all up and working again. 1) Add 2D placement options for screens 2) Add Rotation options for screens 3) Add Fluxbox restart fix for session changes. --- src-qt5/core-utils/lumina-xconfig/ScreenSettings.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src-qt5/core-utils/lumina-xconfig/ScreenSettings.h') diff --git a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h index 5826f804..0532cf72 100644 --- a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h +++ b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h @@ -13,7 +13,7 @@ #include class ScreenInfo{ - public: + public: QString ID; QRect geom; //screen geometry bool isprimary; @@ -21,13 +21,15 @@ class ScreenInfo{ bool isavailable; int order; //left to right QStringList resList; + int rotation; //possible values: [-90, 0, 90, 180] //Initial Defaults ScreenInfo(){ - order = -1; //initial value is invalid + order = -1; //initial value is invalid isprimary = false; isactive = false; isavailable = false; + rotation = 0; //no rotation by default } ~ScreenInfo(){} }; @@ -42,9 +44,9 @@ public: //Save the screen config for later static bool SaveScreens(QList screens); - + //Apply screen configuration static void Apply(QList screens); -}; +}; #endif -- cgit From da9c5fa59b4f90b0041548962c61877379654a89 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 16 Aug 2017 12:55:34 -0400 Subject: More updates for lumina-xconfig: 1) Unify the enable/disable routines. --- src-qt5/core-utils/lumina-xconfig/ScreenSettings.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-xconfig/ScreenSettings.h') diff --git a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h index 0532cf72..9371e361 100644 --- a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h +++ b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h @@ -19,13 +19,14 @@ class ScreenInfo{ bool isprimary; bool isactive; bool isavailable; - int order; //left to right + int applyChange; //[<=0: do nothing, 1: deactivate] QStringList resList; int rotation; //possible values: [-90, 0, 90, 180] + //Initial Defaults ScreenInfo(){ - order = -1; //initial value is invalid + applyChange = -1; //initial value is invalid isprimary = false; isactive = false; isavailable = false; -- cgit From 4473c070989a9e3835ad032e03e952cf2cb6b0fa Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 16 Aug 2017 15:23:22 -0400 Subject: Fix up a bit more of the new lumina-xconfig. --- src-qt5/core-utils/lumina-xconfig/ScreenSettings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core-utils/lumina-xconfig/ScreenSettings.h') diff --git a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h index 9371e361..b1b9cad9 100644 --- a/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h +++ b/src-qt5/core-utils/lumina-xconfig/ScreenSettings.h @@ -19,7 +19,7 @@ class ScreenInfo{ bool isprimary; bool isactive; bool isavailable; - int applyChange; //[<=0: do nothing, 1: deactivate] + int applyChange; //[<=0: do nothing, 1: deactivate, 2: activate] QStringList resList; int rotation; //possible values: [-90, 0, 90, 180] -- cgit