diff options
8 files changed, 126 insertions, 11 deletions
diff --git a/src-qt5/core-utils/lumina-config/pages/getPage.h b/src-qt5/core-utils/lumina-config/pages/getPage.h index 6161c4f8..e505e450 100644 --- a/src-qt5/core-utils/lumina-config/pages/getPage.h +++ b/src-qt5/core-utils/lumina-config/pages/getPage.h @@ -42,6 +42,8 @@ static QList<PAGEINFO> KnownPages(){ 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("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; i<list.length(); i++){ names << list[i].name; } @@ -71,6 +73,7 @@ static QList<PAGEINFO> 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" @@ -89,6 +92,7 @@ static PageWidget* GetNewPage(QString id, QWidget *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); } + // else if(id=="bluetooth-settings"){ page = new page_bluetooth_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_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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>page_mouse_trueos</class> + <widget class="QWidget" name="page_mouse_trueos"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>427</width> + <height>417</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + </widget> + <resources/> + <connections/> +</ui> 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 //=========================================== diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index 56346a32..ae306a80 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_bluetooth_trueos.h # $${PWD}/page_mouse_trueos.h @@ -32,7 +33,9 @@ SOURCES += $${PWD}/page_main.cpp \ $${PWD}/page_session_options.cpp \ $${PWD}/page_compton.cpp \ $${PWD}/page_mouse.cpp -# $${PWD}/page_mouse_trueos.cpp +# $${PWD}/page_bluetooth_trueos.cpp +# $${PWD}/page_mouse_trueos.cpp + FORMS += $${PWD}/page_main.ui \ @@ -49,4 +52,6 @@ FORMS += $${PWD}/page_main.ui \ $${PWD}/page_session_options.ui \ $${PWD}/page_compton.ui \ $${PWD}/page_mouse.ui -# $${PWD}/page_mouse_trueos.ui +# $${PWD}/page_bluetooth_trueos.ui +# $${PWD}/page_mouse_trueos.ui + diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp index 48ad6aa5..9b26e2e5 100644 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp +++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp @@ -239,7 +239,7 @@ void DirWidget::createMenus(){ cOpenMenu->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"), this, SLOT(openTerminal()), kOpTerm->key()); cOpenMenu->addAction(LXDG::findIcon("view-preview",""), tr("SlideShow"), this, SLOT(openInSlideshow()), kOpSS->key()); cOpenMenu->addAction(LXDG::findIcon("view-media-lyrics","media-playback-start"), tr("Multimedia Player"), this, SLOT(openMultimedia()), kOpMM->key()); - +/* if(cFModMenu==0){ cFModMenu = new QMenu(this); } else{ cFModMenu->clear(); } cFModMenu->setTitle(tr("Modify Files...")); @@ -250,7 +250,7 @@ void DirWidget::createMenus(){ cFModMenu->addAction(LXDG::findIcon("edit-rename",""), tr("Rename..."), this, SLOT(renameFiles()), kRename->key() ); cFModMenu->addSeparator(); cFModMenu->addAction(LXDG::findIcon("edit-delete",""), tr("Delete Selection"), this, SLOT(removeFiles()), kDel->key() ); - +*/ if(cFViewMenu==0){ cFViewMenu = new QMenu(this); } else{ cFViewMenu->clear(); } cFViewMenu->setTitle(tr("View Files...")); @@ -486,11 +486,18 @@ void DirWidget::UpdateContextMenu(){ contextMenu->addAction(LXDG::findIcon("run-build-configure",""), tr("Open With..."), this, SLOT(runWithFiles()) ); } contextMenu->addSection(LXDG::findIcon("unknown",""), tr("File Operations")); - contextMenu->addMenu(cFModMenu); - cFModMenu->setEnabled(!sel.isEmpty() && canmodify); + // contextMenu->addMenu(cFModMenu); + // cFModMenu->setEnabled(!sel.isEmpty() && canmodify); contextMenu->addMenu(cFViewMenu); - cFViewMenu->setEnabled(!sel.isEmpty()); - contextMenu->addAction(LXDG::findIcon("edit-paste",""), tr("Paste"), this, SLOT(pasteFiles()), QKeySequence(Qt::CTRL+Qt::Key_V) )->setEnabled(QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") && canmodify); + contextMenu->setEnabled(!sel.isEmpty()); + contextMenu->addAction(LXDG::findIcon("edit-rename",""), tr("Rename..."), this, SLOT(renameFiles()), kRename->key() ); + contextMenu->addAction(LXDG::findIcon("edit-cut",""), tr("Cut Selection"), this, SLOT(cutFiles()), kCut->key() ); + contextMenu->addAction(LXDG::findIcon("edit-copy",""), tr("Copy Selection"), this, SLOT(copyFiles()), kCopy->key() ); + contextMenu->addAction(LXDG::findIcon("edit-paste",""), tr("Paste"), this, SLOT(pasteFiles()), QKeySequence(Qt::CTRL+Qt::Key_V) )->setEnabled(QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") && canmodify); + contextMenu->addSeparator(); + contextMenu->addAction(LXDG::findIcon("edit-delete",""), tr("Delete Selection"), this, SLOT(removeFiles()), kDel->key() ); + contextMenu->addSeparator(); + //Now add the general selection options contextMenu->addSection(LXDG::findIcon("folder","inode/directory"), tr("Directory Operations")); if(canmodify){ |