From 2a1b1f14b8c61593ad899923d86b718d97d08c32 Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 14 Dec 2016 12:53:02 -0500 Subject: set up initial bluetooth page --- src-qt5/core-utils/lumina-config/pages/getPage.h | 1 + .../lumina-config/pages/page_bluetooth_trueos.cpp | 47 ++++++++++++++++++++++ .../lumina-config/pages/page_bluetooth_trueos.h | 33 +++++++++++++++ .../lumina-config/pages/page_bluetooth_trueos.ui | 19 +++++++++ src-qt5/core-utils/lumina-config/pages/pages.pri | 15 +++++-- 5 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp create mode 100644 src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.h create mode 100644 src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.ui (limited to 'src-qt5/core-utils') diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h index c7b5b076..a0e75e4d 100644 --- a/src-qt5/core-utils/lumina-config/pages/getPage.h +++ b/src-qt5/core-utils/lumina-config/pages/getPage.h @@ -69,6 +69,7 @@ static QList KnownPages(){ #include "page_compton.h" #include "page_mouse.h" // #include "page_mouse_trueos.h" +// #include "page_bluetooth_trueos.h" static PageWidget* GetNewPage(QString id, QWidget *parent){ //Find the page that matches this "id" diff --git a/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp new file mode 100644 index 00000000..3e3451fc --- /dev/null +++ b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.cpp @@ -0,0 +1,47 @@ +//=========================================== +// Lumina Desktop Source Code +// Copyright (c) 2016, Ken Moore & JT Pennington +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "page_bluetooth_trueos.h" +#include "ui_page_bluetooth_trueos.h" +#include "getPage.h" + +//========== +// PUBLIC +//========== +page_bluetooth::page_bluetooth(QWidget *parent) : PageWidget(parent), ui(new Ui::page_bluetooth()){ + ui->setupUi(this); + + updateIcons(); +} + +page_bluetooth::~page_bluetooth(){ + +} + +//================ +// PUBLIC SLOTS +//================ +void page_bluetooth::SaveSettings(){ + + emit HasPendingChanges(false); +} + +void page_bluetooth::LoadSettings(int){ + emit HasPendingChanges(false); + emit ChangePageTitle( tr("Bluetooth Settings") ); +} + +void page_bluetooth::updateIcons(){ + +} + +//================= +// PRIVATE +//================= + +//================= +// PRIVATE SLOTS +//================= diff --git a/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.h b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.h new file mode 100644 index 00000000..1f140d82 --- /dev/null +++ b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.h @@ -0,0 +1,33 @@ +//=========================================== +// Lumina Desktop Source Code +// Copyright (c) 2016, Ken Moore & JT Pennington +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_CONFIG_PAGE_BLUETOOTH_TRUEOS_H +#define _LUMINA_CONFIG_PAGE_BLUETOOTH_TRUEOS_H +#include "../globals.h" +#include "PageWidget.h" + +namespace Ui{ + class page_bluetooth; +}; + +class page_bluetooth : public PageWidget{ + Q_OBJECT +public: + page_bluetooth(QWidget *parent); + ~page_bluetooth(); + +public slots: + void SaveSettings(); + void LoadSettings(int screennum); + void updateIcons(); + +private: + Ui::page_bluetooth *ui; + +private slots: + +}; +#endif diff --git a/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.ui b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.ui new file mode 100644 index 00000000..ce2c96d6 --- /dev/null +++ b/src-qt5/core-utils/lumina-config/pages/page_bluetooth_trueos.ui @@ -0,0 +1,19 @@ + + + page_mouse_trueos + + + + 0 + 0 + 427 + 417 + + + + Form + + + + + diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index 02319976..0a900e69 100644 --- a/src-qt5/core-utils/lumina-config/pages/pages.pri +++ b/src-qt5/core-utils/lumina-config/pages/pages.pri @@ -14,7 +14,10 @@ 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_bluetooth_trueos.h \ + $$PWD/page_mouse_trueos.h // $${PWD}/page_mouse_trueos.h @@ -31,7 +34,10 @@ 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_bluetooth_trueos.cpp \ + $$PWD/page_mouse_trueos.cpp // $${PWD}/page_mouse_trueos.cpp @@ -48,5 +54,8 @@ 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_bluetooth_trueos.ui \ + $$PWD/page_mouse_trueos.ui // $${PWD}/page_mouse_trueos.ui -- cgit From a8f26b61bd165ea2bb7cbdebf4bac6eded113d13 Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 14 Dec 2016 12:53:52 -0500 Subject: update source authors --- src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp | 2 +- src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core-utils') diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp b/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp index 60bc2872..edfe1cb7 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.cpp @@ -1,6 +1,6 @@ //=========================================== // Lumina Desktop Source Code -// Copyright (c) 2016, Ken Moore +// Copyright (c) 2016, Ken Moore & JT Pennington // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.h b/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.h index ff643747..998b212b 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.h +++ b/src-qt5/core-utils/lumina-config/pages/page_mouse_trueos.h @@ -1,6 +1,6 @@ //=========================================== // Lumina Desktop Source Code -// Copyright (c) 2016, Ken Moore +// Copyright (c) 2016, Ken Moore & JT Pennington // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== -- cgit From 045bff3b6d47af31a0baf0d60c6c57f928ca9cdb Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 14 Dec 2016 13:22:29 -0500 Subject: add bluetooth page to getpage.h --- src-qt5/core-utils/lumina-config/pages/getPage.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src-qt5/core-utils') diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h index a0e75e4d..a2325c42 100644 --- a/src-qt5/core-utils/lumina-config/pages/getPage.h +++ b/src-qt5/core-utils/lumina-config/pages/getPage.h @@ -39,7 +39,8 @@ static QList 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("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("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"); //Now sort the items according to the translated name QStringList names; for(int i=0; isetWhatsThis(id); -- cgit From 0eac0751384eac5f85a38fc8b8d3c4e53cde4f6f Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 21 Dec 2016 15:16:42 -0500 Subject: fix pages.pri --- src-qt5/core-utils/lumina-config/pages/pages.pri | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'src-qt5/core-utils') diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index 0a900e69..ed8995ab 100644 --- a/src-qt5/core-utils/lumina-config/pages/pages.pri +++ b/src-qt5/core-utils/lumina-config/pages/pages.pri @@ -14,11 +14,9 @@ HEADERS += $${PWD}/getPage.h \ $${PWD}/page_session_locale.h \ $${PWD}/page_session_options.h \ $${PWD}/page_compton.h \ - $${PWD}/page_mouse.h \ -// \ - $$PWD/page_bluetooth_trueos.h \ - $$PWD/page_mouse_trueos.h -// $${PWD}/page_mouse_trueos.h + $${PWD}/page_mouse.h +# $${PWD}/page_bluetooth_trueos.h +# $${PWD}/page_mouse_trueos.h SOURCES += $${PWD}/page_main.cpp \ @@ -34,11 +32,9 @@ 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_bluetooth_trueos.cpp \ - $$PWD/page_mouse_trueos.cpp -// $${PWD}/page_mouse_trueos.cpp + $${PWD}/page_mouse.cpp +# $${PWD}/page_bluetooth_trueos.cpp \ +# $${PWD}/page_mouse_trueos.cpp \ FORMS += $${PWD}/page_main.ui \ @@ -54,8 +50,6 @@ 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_bluetooth_trueos.ui \ - $$PWD/page_mouse_trueos.ui -// $${PWD}/page_mouse_trueos.ui + $${PWD}/page_mouse.ui +# $${PWD}/page_bluetooth_trueos.ui \ +# $${PWD}/page_mouse_trueos.ui \ -- cgit