From 5b13c16cdd7012f4e221d4d17370516b721d4983 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Wed, 25 Feb 2015 09:04:25 -0500
Subject: Add lumina-xconfig shortcuts into the desktop interface (userbutton,
 settings menu). Clean up/add some desktop/panel "prepareToClose()" routines,
 and have them run when appropriate. Also add these close routines to the
 general session cleanup. Add support for a new "--noclean" CLI flag when
 starting LuminaDE. This flag will tell the session not to close system tray
 utilities and other applications on session close.

---
 .../panel-plugins/userbutton/UserWidget.cpp        |  2 ++
 .../panel-plugins/userbutton/UserWidget.h          |  3 +++
 .../panel-plugins/userbutton/UserWidget.ui         | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+)

(limited to 'lumina-desktop/panel-plugins')

diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
index d5f8cd2e..6ca3ba19 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
@@ -32,12 +32,14 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid
   ui->tool_fav_files->setIcon( LXDG::findIcon("document-multiple","") );
   ui->tool_desktopsettings->setIcon( LXDG::findIcon("preferences-desktop","") );
   ui->tool_config_screensaver->setIcon( LXDG::findIcon("preferences-desktop-screensaver","") );	
+  ui->tool_config_screensettings->setIcon( LXDG::findIcon("preferences-other","") );
   ui->tool_home_gohome->setIcon( LXDG::findIcon("go-home","") );
   ui->tool_home_browse->setIcon( LXDG::findIcon("document-open","") );
   ui->tool_config_about->setIcon( LXDG::findIcon("lumina","") );
   //Connect the signals/slots
   connect(ui->tool_desktopsettings, SIGNAL(clicked()), this, SLOT(openDeskSettings()) );
   connect(ui->tool_config_screensaver, SIGNAL(clicked()), this, SLOT(openScreenSaverConfig()) );
+  connect(ui->tool_config_screensettings, SIGNAL(clicked()), this, SLOT(openScreenConfig()) );
   connect(ui->tool_fav_apps, SIGNAL(clicked()), this, SLOT(FavChanged()) );
   connect(ui->tool_fav_files, SIGNAL(clicked()), this, SLOT(FavChanged()) );
   connect(ui->tool_fav_dirs, SIGNAL(clicked()), this, SLOT(FavChanged()) );
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.h b/lumina-desktop/panel-plugins/userbutton/UserWidget.h
index 108f540f..c7af2a4d 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.h
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.h
@@ -80,6 +80,9 @@ private slots:
 	void openScreenSaverConfig(){
 	  LaunchItem(SSAVER, false);
 	}
+	void openScreenConfig(){
+	  LaunchItem("lumina-xconfig",false);
+	}
 	void openLuminaInfo(){
 	  LaunchItem("lumina-info",false);
 	}
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
index 9a307cb6..f00daf08 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
@@ -480,6 +480,28 @@
       </property>
      </widget>
     </item>
+    <item>
+     <widget class="QToolButton" name="tool_config_screensettings">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="text">
+       <string>Screen Configuration</string>
+      </property>
+      <property name="iconSize">
+       <size>
+        <width>20</width>
+        <height>20</height>
+       </size>
+      </property>
+      <property name="toolButtonStyle">
+       <enum>Qt::ToolButtonTextBesideIcon</enum>
+      </property>
+     </widget>
+    </item>
     <item>
      <widget class="QToolButton" name="tool_qtconfig">
       <property name="sizePolicy">
-- 
cgit