diff options
author | q5sys <jt@obs-sec.com> | 2016-12-08 00:51:19 -0500 |
---|---|---|
committer | q5sys <jt@obs-sec.com> | 2016-12-08 00:51:19 -0500 |
commit | df9192bf18a26083ed7775ef6699f6c46781e476 (patch) | |
tree | e68e5c3884ebce093f4988b64b36a43b68f45f67 | |
parent | Disable the auto-hide on activation event - something weird is going on (prob... (diff) | |
download | lumina-df9192bf18a26083ed7775ef6699f6c46781e476.tar.gz lumina-df9192bf18a26083ed7775ef6699f6c46781e476.tar.bz2 lumina-df9192bf18a26083ed7775ef6699f6c46781e476.zip |
testing mouse util
-rw-r--r-- | src-qt5/core-utils/lumina-config/pages/getPage.h | 3 | ||||
-rw-r--r-- | src-qt5/core-utils/lumina-config/pages/page_mouse.h | 8 | ||||
-rw-r--r-- | src-qt5/core-utils/lumina-config/pages/pages.pri | 9 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h index b209bb20..aeeade43 100644 --- a/src-qt5/core-utils/lumina-config/pages/getPage.h +++ b/src-qt5/core-utils/lumina-config/pages/getPage.h @@ -39,6 +39,7 @@ static QList<PAGEINFO> KnownPages(){ 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"); 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"); + list << PageInfo("mouse-settings", QObject::tr("Mouse Settings"), QObject::tr("Mouse Settings"), "preferences-desktop-mouse",QObject::tr("Adjust mouse devices"), "user", QStringList(), QStringList() << "user"<<"speed"<<"accel"<<"mouse"); //Now sort the items according to the translated name QStringList names; for(int i=0; i<list.length(); i++){ names << list[i].name; } @@ -67,6 +68,7 @@ static QList<PAGEINFO> KnownPages(){ #include "page_session_options.h" #include "page_compton.h" #include "page_mouse.h" +#include "page_mouse_trueos.h" static PageWidget* GetNewPage(QString id, QWidget *parent){ //Find the page that matches this "id" @@ -84,6 +86,7 @@ static PageWidget* GetNewPage(QString id, QWidget *parent){ else if(id=="session-options"){ page = new page_session_options(parent); } else if(id=="compton"){ page = new page_compton(parent); } else if(id=="input-devices"){ page = new page_mouse(parent); } + else if(id=="mouse-settings"){ page = new page_mouse_trueos(parent); } //Return the main control_panel page as the fallback/default if(page==0){ id.clear(); page = new page_main(parent); } page->setWhatsThis(id); diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse.h b/src-qt5/core-utils/lumina-config/pages/page_mouse.h index 00487910..47b90303 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_mouse.h +++ b/src-qt5/core-utils/lumina-config/pages/page_mouse.h @@ -13,14 +13,14 @@ #include <QTreeWidgetItem> namespace Ui{ - class page_mouse; + class page_mouse; }; class page_mouse : public PageWidget{ Q_OBJECT public: - page_mouse(QWidget *parent); - ~page_mouse(); + page_mouse(QWidget *parent); + ~page_mouse(); public slots: void SaveSettings(); @@ -28,7 +28,7 @@ public slots: void updateIcons(); private: - Ui::page_mouse *ui; + Ui::page_mouse *ui; QList<LInputDevice*> devices; void generateUI(); diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index b36ca7ba..4ea13f01 100644 --- a/src-qt5/core-utils/lumina-config/pages/pages.pri +++ b/src-qt5/core-utils/lumina-config/pages/pages.pri @@ -14,7 +14,8 @@ HEADERS += $${PWD}/getPage.h \ $${PWD}/page_session_locale.h \ $${PWD}/page_session_options.h \ $${PWD}/page_compton.h \ - $${PWD}/page_mouse.h + $${PWD}/page_mouse.h \ + $$PWD/page_mouse_trueos.h SOURCES += $${PWD}/page_main.cpp \ @@ -30,7 +31,8 @@ SOURCES += $${PWD}/page_main.cpp \ $${PWD}/page_session_locale.cpp \ $${PWD}/page_session_options.cpp \ $${PWD}/page_compton.cpp \ - $${PWD}/page_mouse.cpp + $${PWD}/page_mouse.cpp \ + $$PWD/page_mouse_trueos.cpp FORMS += $${PWD}/page_main.ui \ @@ -46,4 +48,5 @@ FORMS += $${PWD}/page_main.ui \ $${PWD}/page_session_locale.ui \ $${PWD}/page_session_options.ui \ $${PWD}/page_compton.ui \ - $${PWD}/page_mouse.ui + $${PWD}/page_mouse.ui \ + $$PWD/page_mouse_trueos.ui |