From dc8e7acb08930a07c76ca700c1d70979c8a51db9 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 6 Jan 2017 09:03:56 -0500 Subject: Add a new compile-time option: NO_XINPUT This can be used to disable the usage of the xcb/xinput.h class, since some OS's seem to not have it for some reason. Note that this option will make the input device management page in lumina-config unavailable on that operating system. Example: qmake CONFIG+=NO_XINPUT --- src-qt5/core-utils/lumina-config/lumina-config.pro | 7 ++++++- src-qt5/core-utils/lumina-config/pages/getPage.h | 9 +++++++++ src-qt5/core-utils/lumina-config/pages/pages.pri | 14 ++++++++------ 3 files changed, 23 insertions(+), 7 deletions(-) (limited to 'src-qt5') diff --git a/src-qt5/core-utils/lumina-config/lumina-config.pro b/src-qt5/core-utils/lumina-config/lumina-config.pro index 57531e69..d690bcb3 100644 --- a/src-qt5/core-utils/lumina-config/lumina-config.pro +++ b/src-qt5/core-utils/lumina-config/lumina-config.pro @@ -15,7 +15,12 @@ include(../../core/libLumina/LDesktopUtils.pri) #includes LUtils include(../../core/libLumina/LuminaXDG.pri) include(../../core/libLumina/LuminaSingleApplication.pri) include(../../core/libLumina/LuminaThemes.pri) -include(../../core/libLumina/LInputDevice.pri) + +NO_XINPUT{ + DEFINES+=NO_XINPUT +}else{ + include(../../core/libLumina/LInputDevice.pri) +} SOURCES += main.cpp \ mainWindow.cpp \ diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h index e505e450..99aab9a0 100644 --- a/src-qt5/core-utils/lumina-config/pages/getPage.h +++ b/src-qt5/core-utils/lumina-config/pages/getPage.h @@ -38,9 +38,11 @@ static QList KnownPages(){ list << PageInfo("interface-menu", QObject::tr("Menu"), QObject::tr("Menu Plugins"), "format-list-unordered",QObject::tr("Change what options are shown on the desktop context menu"), "interface", QStringList(), QStringList() << "desktop" << "menu" << "plugins" << "shortcuts"); list << PageInfo("session-locale", QObject::tr("Localization"), QObject::tr("Locale Settings"), "preferences-desktop-locale",QObject::tr("Change the default locale settings for this user"), "user", QStringList(), QStringList() << "user"<<"locale"<<"language"<<"translations"); list << PageInfo("session-options", QObject::tr("General Options"), QObject::tr("User Settings"), "configure",QObject::tr("Change basic user settings such as time/date formats"), "user", QStringList(), QStringList() << "user"<<"settings"<<"time"<<"date"<<"icon"<<"reset"<<"numlock"<<"clock"); + #ifndef NO_XINPUT if(LUtils::isValidBinary("xinput")){ list << PageInfo("input-devices", QObject::tr("Input Device Settings"), QObject::tr("Input Device Settings"), "preferences-desktop-peripherals",QObject::tr("Adjust keyboard and mouse devices"), "user", QStringList(), QStringList() << "user"<<"speed"<<"accel"<<"mouse" << "keyboard"); } + #endif // list << PageInfo("mouse-settings", QObject::tr("TrueOS Mouse Settings"), QObject::tr("TrueOS Mouse Settings"), "preferences-desktop-mouse",QObject::tr("Adjust mouse devices"), "user", QStringList(), QStringList() << "user"<<"speed"<<"accel"<<"mouse"); // list << PageInfo("bluetooth-settings", QObject::tr("TrueOS Bluetooth Settings"), QObject::tr("TrueOS Bluetooth Settings"), "preferences-desktop-bluetooth",QObject::tr("Setup Bluetooth devices"), "user", QStringList(), QStringList() << "user"<<"bluetooth"<<"audio"); @@ -71,7 +73,11 @@ static QList KnownPages(){ #include "page_session_locale.h" #include "page_session_options.h" #include "page_compton.h" + +#ifndef NO_XINPUT #include "page_mouse.h" +#endif + // #include "page_mouse_trueos.h" // #include "page_bluetooth_trueos.h" @@ -90,7 +96,10 @@ static PageWidget* GetNewPage(QString id, QWidget *parent){ else if(id=="session-locale"){ page = new page_session_locale(parent); } else if(id=="session-options"){ page = new page_session_options(parent); } else if(id=="compton"){ page = new page_compton(parent); } + #ifndef NO_XINPUT else if(id=="input-devices"){ page = new page_mouse(parent); } + #endif + // else if(id=="mouse-settings"){ page = new page_mouse_trueos(parent); } // else if(id=="bluetooth-settings"){ page = new page_bluetooth_trueos(parent); } //Return the main control_panel page as the fallback/default diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index ae306a80..0ee5d561 100644 --- a/src-qt5/core-utils/lumina-config/pages/pages.pri +++ b/src-qt5/core-utils/lumina-config/pages/pages.pri @@ -13,8 +13,7 @@ HEADERS += $${PWD}/getPage.h \ $${PWD}/page_interface_panels.h \ $${PWD}/page_session_locale.h \ $${PWD}/page_session_options.h \ - $${PWD}/page_compton.h \ - $${PWD}/page_mouse.h + $${PWD}/page_compton.h # $${PWD}/page_bluetooth_trueos.h # $${PWD}/page_mouse_trueos.h @@ -31,8 +30,7 @@ SOURCES += $${PWD}/page_main.cpp \ $${PWD}/page_interface_panels.cpp \ $${PWD}/page_session_locale.cpp \ $${PWD}/page_session_options.cpp \ - $${PWD}/page_compton.cpp \ - $${PWD}/page_mouse.cpp + $${PWD}/page_compton.cpp # $${PWD}/page_bluetooth_trueos.cpp # $${PWD}/page_mouse_trueos.cpp @@ -50,8 +48,12 @@ FORMS += $${PWD}/page_main.ui \ $${PWD}/page_interface_panels.ui \ $${PWD}/page_session_locale.ui \ $${PWD}/page_session_options.ui \ - $${PWD}/page_compton.ui \ - $${PWD}/page_mouse.ui + $${PWD}/page_compton.ui # $${PWD}/page_bluetooth_trueos.ui # $${PWD}/page_mouse_trueos.ui +!NO_XINPUT{ + HEADERS += $${PWD}/page_mouse.h + SOURCES += $${PWD}/page_mouse.cpp + FORMS += $${PWD}/page_mouse.ui +} -- cgit