Revert "search clear function on ESC press"

This reverts commit b9840ef585385fece513e24e4cea193d35328dc0, reversing
changes made to cb5524f6fd5186414c11339375bebd3b808b4857.

14 files changed, 139 insertions, 377 deletions

diff --git a/src-qt5/core-utils/lumina-config/LPlugins.cpp b/src-qt5/core-utils/lumina-config/LPlugins.cpp
index dfd490e6..089a181c 100644
--- a/src-qt5/core-utils/lumina-config/LPlugins.cpp
+++ b/src-qt5/core-utils/lumina-config/LPlugins.cpp
@@ -173,13 +173,6 @@ void LPlugins::LoadPanelPlugins(){
     info.ID = "audioplayer";
     info.icon = "media-playback-start";
   PANEL.insert(info.ID, info);
-  //JSON Menu Scripts
-  info = LPI(); //clear it
-    info.name = QObject::tr("Menu Script");
-    info.description = QObject::tr("Run an external script to generate a user defined menu");
-    info.ID = "jsonmenu";
-    info.icon = "text-x-script";
-  PANEL.insert(info.ID, info);
 }
 
 // DESKTOP PLUGINS
@@ -300,7 +293,7 @@ void LPlugins::LoadMenuPlugins(){
     info.ID = "app";
     info.icon = "application-x-desktop";
   MENU.insert(info.ID, info);
-  //JSON Menu Scripts
+  //Custom Apps
   info = LPI(); //clear it
     info.name = QObject::tr("Menu Script");
     info.description = QObject::tr("Run an external script to generate a user defined menu");
diff --git a/src-qt5/core-utils/lumina-config/PanelWidget.cpp b/src-qt5/core-utils/lumina-config/PanelWidget.cpp
index d5d3d9bd..aff7bda3 100644
--- a/src-qt5/core-utils/lumina-config/PanelWidget.cpp
+++ b/src-qt5/core-utils/lumina-config/PanelWidget.cpp
@@ -9,7 +9,7 @@
 
 #include "GetPluginDialog.h"
 #include "AppDialog.h"
-#include "ScriptDialog.h"
+
 
 PanelWidget::PanelWidget(QWidget *parent, QWidget *Main, LPlugins *Pinfo) : QWidget(parent), ui(new Ui::PanelWidget){
   ui->setupUi(this);
@@ -66,18 +66,6 @@ void PanelWidget::LoadSettings(QSettings *settings, int Dnum, int Pnum){
 	      it->setWhatsThis(plugs[i]); //make sure to preserve the entire plugin ID (is the unique version)
 	  ui->list_plugins->addItem(it);
 	}
-
-      }else if(pid.startsWith("jsonmenu")){
-        LPI info = PINFO->panelPluginInfo( plugs[i].section("::::",0,0) );
-        if(info.ID.isEmpty()){ continue; } //invalid plugin type (no longer available?)
-        QString exec = plugs[i].section("::::",1,1);
-        QListWidgetItem *item = new QListWidgetItem();
-          item->setWhatsThis( plugs[i] );
-          item->setIcon( LXDG::findIcon(plugs[i].section("::::",3,3),info.icon) );
-          item->setText( plugs[i].section("::::",2,2) +" ("+info.name+")" );
-          item->setToolTip( info.description );
-        ui->list_plugins->addItem(item);
-
       }else{
         LPI info = PINFO->panelPluginInfo(pid);
         if(!info.ID.isEmpty()){
@@ -192,35 +180,23 @@ void PanelWidget::on_tool_addplugin_clicked(){
 	dlg.exec();
   if(!dlg.selected){ return; } //cancelled
   QString pan = dlg.plugID; //getNewPanelPlugin();
-  QListWidgetItem *it = 0;
   if(pan == "applauncher"){
     //Prompt for the application to add
     QString app =getSysApp();
     if(app.isEmpty()){ return; } //cancelled
     pan.append("::"+app);
     XDGDesktop desk(app);
-    it = new QListWidgetItem( LXDG::findIcon(desk.icon,""), desk.name);
+    QListWidgetItem *it = new QListWidgetItem( LXDG::findIcon(desk.icon,""), desk.name);
       it->setWhatsThis(pan);
-
-  }else if(pan=="jsonmenu"){
-    //Need to prompt for the script file, name, and icon to use
-    //new ID format: "jsonmenu"::::<exec to run>::::<name>::::<icon>
-    ScriptDialog SD(this);
-    SD.exec();
-    if(!SD.isValid()){ return; }
-    LPI info = PINFO->panelPluginInfo(pan);
-    it = new QListWidgetItem( LXDG::findIcon(SD.icon(),"text-x-script"), SD.name()+" ("+info.ID+")" );
-    it->setWhatsThis(info.ID+"::::"+SD.command()+"::::"+SD.name()+"::::"+SD.icon());
-    it->setToolTip( info.description );
+    ui->list_plugins->addItem(it);
+    ui->list_plugins->setCurrentItem(it);
+    ui->list_plugins->scrollToItem(it);
   }else{
     if(pan.isEmpty()){ return; } //nothing selected
     //Add the new plugin to the list
     LPI info = PINFO->panelPluginInfo(pan);
-    it = new QListWidgetItem( LXDG::findIcon(info.icon,""), info.name);
+    QListWidgetItem *it = new QListWidgetItem( LXDG::findIcon(info.icon,""), info.name);
       it->setWhatsThis(info.ID);
-  }
-  //Now add the new item to the list
-  if(it!=0){
     ui->list_plugins->addItem(it);
     ui->list_plugins->setCurrentItem(it);
     ui->list_plugins->scrollToItem(it);
diff --git a/src-qt5/core-utils/lumina-config/globals.h b/src-qt5/core-utils/lumina-config/globals.h
index ed7549aa..0f94785c 100644
--- a/src-qt5/core-utils/lumina-config/globals.h
+++ b/src-qt5/core-utils/lumina-config/globals.h
@@ -35,8 +35,6 @@
 #include <LuminaOS.h>
 #include <LuminaThemes.h>
 
-#include "pages/PageWidget.h"
-
 #endif
 
 //Now the global class for available system applications
diff --git a/src-qt5/core-utils/lumina-config/lumina-config.pro b/src-qt5/core-utils/lumina-config/lumina-config.pro
index 57531e69..fe5494de 100644
--- a/src-qt5/core-utils/lumina-config/lumina-config.pro
+++ b/src-qt5/core-utils/lumina-config/lumina-config.pro
@@ -15,7 +15,6 @@ 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)
 
 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 ea0cfb00..fba3998b 100644
--- a/src-qt5/core-utils/lumina-config/pages/getPage.h
+++ b/src-qt5/core-utils/lumina-config/pages/getPage.h
@@ -38,7 +38,7 @@ static QList<PAGEINFO> KnownPages(){
   list << PageInfo("interface-menu", QObject::tr("Menu"), QObject::tr("Menu Plugins"), "preferences-plugin",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");
-  //list << PageInfo("mouse", QObject::tr("Mouse Settings"), QObject::tr("Mouse Settings"), "input-mouse",QObject::tr("Adjust mouse settings"), "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; }
@@ -66,7 +66,6 @@ static QList<PAGEINFO> KnownPages(){
 #include "page_session_locale.h"
 #include "page_session_options.h"
 #include "page_compton.h"
-#include "page_mouse.h"
 
 static PageWidget* GetNewPage(QString id, QWidget *parent){
   //Find the page that matches this "id"
@@ -83,7 +82,6 @@ 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); }
-  else if(id=="mouse"){ page = new page_mouse(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_compton.cpp b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
index 8cdb2ea7..5f7cd190 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp
@@ -29,7 +29,6 @@ void page_compton::SaveSettings(){
   emit HasPendingChanges(false);
   QSettings settings("lumina-desktop","sessionsettings");
     settings.setValue("enableCompositing", !ui->check_disablecompton->isChecked());
-    settings.setValue("compositingWithGpuAccelOnly", ui->check_GPUverify->isChecked());
   QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
   LUtils::writeFile(set, ui->text_file->toPlainText().split("\n"),true);
 }
@@ -38,7 +37,6 @@ void page_compton::LoadSettings(int){
   emit ChangePageTitle( tr("Compositor Settings") );
   QSettings settings("lumina-desktop","sessionsettings");
     ui->check_disablecompton->setChecked( !settings.value("enableCompositing", true).toBool() );
-    ui->check_GPUverify->setChecked( settings.value("compositingWithGpuAccelOnly", true).toBool() );
   QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf";
   qDebug() << "Load Compton settings:" << set;
   ui->text_file->setPlainText( LUtils::readFile(set).join("\n") );
diff --git a/src-qt5/core-utils/lumina-config/pages/page_compton.ui b/src-qt5/core-utils/lumina-config/pages/page_compton.ui
index 857331d6..9083a2fb 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_compton.ui
+++ b/src-qt5/core-utils/lumina-config/pages/page_compton.ui
@@ -34,13 +34,6 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="check_GPUverify">
-     <property name="text">
-      <string>Only use compositing with GPU acceleration </string>
-     </property>
-    </widget>
-   </item>
-   <item>
     <widget class="QPlainTextEdit" name="text_file"/>
    </item>
   </layout>
diff --git a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.ui b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.ui
index 8440e198..ef72c4f1 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_defaultapps.ui
+++ b/src-qt5/core-utils/lumina-config/pages/page_defaultapps.ui
@@ -29,138 +29,11 @@
    <item>
     <widget class="QTabWidget" name="tabWidget_apps">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <property name="movable">
       <bool>false</bool>
      </property>
-     <widget class="QWidget" name="tab_auto">
-      <attribute name="title">
-       <string>Basic Settings</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_7">
-       <item>
-        <layout class="QGridLayout" name="gridLayout_6">
-         <item row="0" column="0">
-          <layout class="QFormLayout" name="formLayout_10">
-           <property name="fieldGrowthPolicy">
-            <enum>QFormLayout::ExpandingFieldsGrow</enum>
-           </property>
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_37">
-             <property name="font">
-              <font>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string>Web Browser:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QToolButton" name="tool_default_webbrowser">
-             <property name="text">
-              <string notr="true">...</string>
-             </property>
-             <property name="toolButtonStyle">
-              <enum>Qt::ToolButtonTextBesideIcon</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_38">
-             <property name="font">
-              <font>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string>E-Mail Client:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QToolButton" name="tool_default_email">
-             <property name="text">
-              <string notr="true">...</string>
-             </property>
-             <property name="toolButtonStyle">
-              <enum>Qt::ToolButtonTextBesideIcon</enum>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="0" column="1">
-          <layout class="QFormLayout" name="formLayout_11">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_39">
-             <property name="font">
-              <font>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string>File Manager:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_40">
-             <property name="font">
-              <font>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string>Virtual Terminal:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QToolButton" name="tool_default_filemanager">
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="toolButtonStyle">
-              <enum>Qt::ToolButtonTextBesideIcon</enum>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QToolButton" name="tool_default_terminal">
-             <property name="text">
-              <string>...</string>
-             </property>
-             <property name="toolButtonStyle">
-              <enum>Qt::ToolButtonTextBesideIcon</enum>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
      <widget class="QWidget" name="tab_defaults">
       <attribute name="title">
        <string>Advanced</string>
@@ -290,6 +163,133 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_auto">
+      <attribute name="title">
+       <string>Basic Settings</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
+       <item>
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="0" column="0">
+          <layout class="QFormLayout" name="formLayout_10">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::ExpandingFieldsGrow</enum>
+           </property>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_37">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Web Browser:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QToolButton" name="tool_default_webbrowser">
+             <property name="text">
+              <string notr="true">...</string>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_38">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>E-Mail Client:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QToolButton" name="tool_default_email">
+             <property name="text">
+              <string notr="true">...</string>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="0" column="1">
+          <layout class="QFormLayout" name="formLayout_11">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_39">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>File Manager:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_40">
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Virtual Terminal:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QToolButton" name="tool_default_filemanager">
+             <property name="text">
+              <string>...</string>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QToolButton" name="tool_default_terminal">
+             <property name="text">
+              <string>...</string>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse.cpp b/src-qt5/core-utils/lumina-config/pages/page_mouse.cpp
deleted file mode 100644
index dbe075d7..00000000
--- a/src-qt5/core-utils/lumina-config/pages/page_mouse.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-//===========================================
-//  Lumina Desktop Source Code
-//  Copyright (c) 2016, Ken Moore
-//  Available under the 3-clause BSD license
-//  See the LICENSE file for full details
-//===========================================
-#include "page_mouse.h"
-#include "ui_page_mouse.h"
-#include "getPage.h"
-
-//==========
-//    PUBLIC
-//==========
-page_mouse::page_mouse(QWidget *parent) : PageWidget(parent), ui(new Ui::page_mouse()){
-  ui->setupUi(this);
-  connect(ui->slider_accel, SIGNAL(valueChanged(int)), this, SLOT(accelChanged(int)) );
-  updateIcons();
-    qDebug() << "List Devices:";
-   QList<LInputDevice*> devices = LInput::listDevices();
-    for(int i=0; i<devices.length(); i++){
-      if(!devices[i]->isPointer()){
-        ::free( devices.takeAt(i));
-        i--;
-      }else{
-        qDebug() << "Found Pointer:" << devices[i]->devNumber();
-        qDebug() << " - isExtension:" << devices[i]->isExtension();
-        qDebug() << " - Properties:" << devices[i]->listProperties();
-      }
-    }
-}
-
-page_mouse::~page_mouse(){
-  for(int i=0; i<devices.length(); i++){ ::free(devices[i]); }
-}
-
-//================
-//    PUBLIC SLOTS
-//================
-void page_mouse::SaveSettings(){
-
-  emit HasPendingChanges(false);
-}
-
-void page_mouse::LoadSettings(int){
-  emit HasPendingChanges(false);
-  emit ChangePageTitle( tr("Desktop Settings") );
-
-}
-
-void page_mouse::updateIcons(){
-
-}
-
-//=================
-//         PRIVATE 
-//=================
-
-//=================
-//    PRIVATE SLOTS
-//=================
-void page_mouse::accelChanged(int val){
-  if(val<=4){ 
-    val = 4-val; 
-    ui->label_accel->setText( QString("1/%1").arg(QString::number(val)) ); 
-    QProcess::startDetached("xset mouse 1/"+QString::number(val));
-  }else{
-    val = val-4;
-    if(val%2==0){ 
-      val = val/2;
-      ui->label_accel->setText( QString::number(val) ); 
-      QProcess::startDetached("xset mouse "+QString::number(val));
-    }else{
-      ui->label_accel->setText( QString::number(val)+"/2" ); 
-      QProcess::startDetached("xset mouse "+QString::number(val)+"/2");
-    }
-  }
-}
diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse.h b/src-qt5/core-utils/lumina-config/pages/page_mouse.h
deleted file mode 100644
index 849917c5..00000000
--- a/src-qt5/core-utils/lumina-config/pages/page_mouse.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//===========================================
-//  Lumina Desktop Source Code
-//  Copyright (c) 2016, Ken Moore
-//  Available under the 3-clause BSD license
-//  See the LICENSE file for full details 
-//===========================================
-#ifndef _LUMINA_CONFIG_PAGE_MOUSE_H
-#define _LUMINA_CONFIG_PAGE_MOUSE_H
-#include "../globals.h"
-#include "PageWidget.h"
-
-#include <LInputDevice.h>
-
-namespace Ui{
-	class page_mouse;
-};
-
-class page_mouse : public PageWidget{
-	Q_OBJECT
-public:
-	page_mouse(QWidget *parent);
-	~page_mouse();
-
-public slots:
-	void SaveSettings();
-	void LoadSettings(int screennum);
-	void updateIcons();
-
-private:
-	Ui::page_mouse *ui;
-	QList<LInputDevice*> devices;
-
-private slots:
-	void accelChanged(int val);
-};
-#endif
diff --git a/src-qt5/core-utils/lumina-config/pages/page_mouse.ui b/src-qt5/core-utils/lumina-config/pages/page_mouse.ui
deleted file mode 100644
index 619e38dc..00000000
--- a/src-qt5/core-utils/lumina-config/pages/page_mouse.ui
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>page_mouse</class>
- <widget class="QWidget" name="page_mouse">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QFormLayout" name="formLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Mouse Acceleration</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QSlider" name="slider_accel">
-       <property name="maximum">
-        <number>20</number>
-       </property>
-       <property name="value">
-        <number>4</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="tickPosition">
-        <enum>QSlider::TicksBelow</enum>
-       </property>
-       <property name="tickInterval">
-        <number>2</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_accel">
-       <property name="text">
-        <string notr="true"/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp b/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp
index 1af87cd2..333f9da8 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_session_options.cpp
@@ -33,7 +33,6 @@ page_session_options::page_session_options(QWidget *parent) : PageWidget(parent)
   connect(ui->check_session_playloginaudio, SIGNAL(toggled(bool)), this, SLOT(settingChanged()) );
   connect(ui->check_session_playlogoutaudio, SIGNAL(toggled(bool)), this, SLOT(settingChanged()) );
   connect(ui->check_autoapplinks, SIGNAL(toggled(bool)), this, SLOT(settingChanged()) );
-  connect(ui->check_watch_app_procs, SIGNAL(toggled(bool)), this, SLOT(settingChanged()) );
  updateIcons();
  
 }
@@ -54,14 +53,6 @@ void page_session_options::SaveSettings(){
   sessionsettings.setValue("TimeFormat", ui->line_session_time->text());
   sessionsettings.setValue("DateFormat", ui->line_session_date->text());
   sessionsettings.setValue("DateTimeOrder", ui->combo_session_datetimeorder->currentData().toString());
-
-  QString lopenWatchFile = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/nowatch";
-  if(QFile::exists(lopenWatchFile) && ui->check_watch_app_procs->isChecked()){
-    QFile::remove(lopenWatchFile);
-  }else if(!QFile::exists(lopenWatchFile) && !ui->check_watch_app_procs->isChecked()){
-    QFile file(lopenWatchFile);
-    if(file.open(QIODevice::WriteOnly) ){ file.close(); } //just need to touch it to create the file
-  }
   emit HasPendingChanges(false);
 }
 
@@ -80,9 +71,6 @@ void page_session_options::LoadSettings(int){
   int index = ui->combo_session_datetimeorder->findData( sessionsettings.value("DateTimeOrder","timeonly").toString() );
   ui->combo_session_datetimeorder->setCurrentIndex(index);
 
-  QString lopenWatchFile = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/nowatch";
-  ui->check_watch_app_procs->setChecked( !QFile::exists(lopenWatchFile) );
-
   sessionLoadTimeSample();
   sessionLoadDateSample();
   QApplication::processEvents(); //throw away any interaction events from loading
diff --git a/src-qt5/core-utils/lumina-config/pages/page_session_options.ui b/src-qt5/core-utils/lumina-config/pages/page_session_options.ui
index 255166de..55d204ae 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_session_options.ui
+++ b/src-qt5/core-utils/lumina-config/pages/page_session_options.ui
@@ -60,13 +60,6 @@
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="check_watch_app_procs">
-       <property name="text">
-        <string>Show application crash data</string>
-       </property>
-      </widget>
-     </item>
-     <item>
       <layout class="QHBoxLayout" name="horizontalLayout_14">
        <item>
         <widget class="QPushButton" name="push_session_setUserIcon">
diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri
index b36ca7ba..b1db2860 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
 
 
 SOURCES	+=	$${PWD}/page_main.cpp \
@@ -29,8 +28,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
 
 		
 FORMS	+=	$${PWD}/page_main.ui \
@@ -45,5 +43,4 @@ 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