From 751e3203f7285e68f9c307c6d1ddac6414367db8 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 24 Jun 2016 21:25:10 -0400 Subject: Get the new theme page all setup and functional. --- src-qt5/core-utils/lumina-config/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index a63e0fbe..20d517b2 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,8 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - MainUI w; - //mainWindow w; + //MainUI w; + mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); -- cgit From bbb523a3b6b204e4f127f45dc151165086eb970c Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 24 Jun 2016 21:50:04 -0400 Subject: Switch back to the old UI for now (new one still not finished yet). Also have the monitor selection on the new UI hidden if there is only one monitor available. --- src-qt5/core-utils/lumina-config/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index 20d517b2..a63e0fbe 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,8 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - //MainUI w; - mainWindow w; + MainUI w; + //mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); -- cgit From 190781e33b6a94b0708a76fa3a2b8d6a50bf7107 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 27 Jun 2016 13:03:08 -0400 Subject: Add in the search capabilities within the new lumina-config UI. --- src-qt5/core-utils/lumina-config/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index a63e0fbe..20d517b2 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,8 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - MainUI w; - //mainWindow w; + //MainUI w; + mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); -- cgit From c91c9c6b92eeb8293ca4cd5d7fee155de50a7fbc Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 27 Jun 2016 15:43:16 -0400 Subject: Switch back to the old UI for now. --- src-qt5/core-utils/lumina-config/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index 20d517b2..a63e0fbe 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,8 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - //MainUI w; - mainWindow w; + MainUI w; + //mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); -- cgit From e630667a18729e9b4f37c83fbbc4afc2fdd562dd Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 27 Jun 2016 20:53:48 -0400 Subject: Get the new fluxbox-keys page all converted over to the new UI. --- src-qt5/core-utils/lumina-config/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index a63e0fbe..20d517b2 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,8 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - MainUI w; - //mainWindow w; + //MainUI w; + mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); -- cgit From 6eca90c6691a4b215406df0d4fc087c376020eb6 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 27 Jun 2016 23:10:51 -0400 Subject: Re-enable the old UI - only 2 more pages left to convert before switching to the new interface completely. --- src-qt5/core-utils/lumina-config/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index 20d517b2..a63e0fbe 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,8 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - //MainUI w; - mainWindow w; + MainUI w; + //mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); -- cgit From 7738a79cdf92bc10a9bd6679d1753f0587573ffc Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 28 Jun 2016 07:59:30 -0400 Subject: Add in the last 2 converted pages (session_[locale/options]). Leave the new UI enabled now. --- src-qt5/core-utils/lumina-config/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index a63e0fbe..8056a083 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -19,8 +19,7 @@ int main(int argc, char ** argv) LuminaThemeEngine theme(&a); - MainUI w; - //mainWindow w; + mainWindow w; QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) ); w.show(); -- cgit From 79f1863b83d0b3df619eb3e96c01c06dd12cb72f Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 28 Jun 2016 09:42:19 -0400 Subject: Finish up the switch over to the new UI for lumina-config --- src-qt5/core-utils/lumina-config/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core-utils/lumina-config/main.cpp') diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp index 8056a083..856570c0 100644 --- a/src-qt5/core-utils/lumina-config/main.cpp +++ b/src-qt5/core-utils/lumina-config/main.cpp @@ -4,7 +4,7 @@ #include #include -#include "mainUI.h" + #include "mainWindow.h" #include #include -- cgit