From e6a725a855208bccab349c6265c6d99af65ecc42 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Mon, 9 Nov 2015 12:45:10 -0500
Subject: A couple changes to Lumina: 1) Add 3 different "view modes" for
 applications in the start menu: Alphabetical (no categories), Partial
 Categories (same as before - still on list though), or Categories (need to
 click the category to go into it and see the applications).2) Fix the theming
 of partially checked checkboxes and groupboxes. 3) Force the desktop icons to
 have black text in the theme (no matter which color scheme is in use). 4)
 Adjust the outlining effects of the desktop icons to use a radial gradient
 now, so you get a smoother effect which does not steal eye focus as much on
 contrasting backgrounds.

---
 libLumina/LuminaUtils.cpp                    |  2 +-
 libLumina/LuminaXDG.cpp                      | 18 ++++++++++++++++++
 libLumina/LuminaXDG.h                        |  2 ++
 libLumina/themes/Lumina-default.qss.template |  6 ++++++
 libLumina/themes/None.qss.template           |  2 +-
 5 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'libLumina')

diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index 4bcc548a..39e000a2 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -804,7 +804,7 @@ void ResizeMenu::mouseMoveEvent(QMouseEvent *ev){
         if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2)); }
         break;
     default: //NONE
-	qDebug() << " - Mouse At:" << ev->pos();
+	//qDebug() << " - Mouse At:" << ev->pos();
 	//Just adjust the mouse cursor which is shown
         if(ev->pos().x()<=1 && ev->pos().x() >= -1){ this->setCursor(Qt::SizeHorCursor); }
         else if(ev->pos().x() >= this->width()-1 && ev->pos().x() <= this->width()+1){  this->setCursor(Qt::SizeHorCursor); }
diff --git a/libLumina/LuminaXDG.cpp b/libLumina/LuminaXDG.cpp
index f4eeb681..b027f900 100644
--- a/libLumina/LuminaXDG.cpp
+++ b/libLumina/LuminaXDG.cpp
@@ -487,6 +487,24 @@ QHash<QString,QList<XDGDesktop> > LXDG::sortDesktopCats(QList<XDGDesktop> apps){
   return out;
 }
 
+//Return the icon to use for the given category
+QString LXDG::DesktopCatToIcon(QString cat){
+  QString icon = "applications-other";
+  if(cat=="Multimedia"){ icon = "applications-multimedia"; }
+  else if(cat=="Development"){ icon = "applications-development"; }
+  else if(cat=="Education"){ icon = "applications-education"; }
+  else if(cat=="Game"){ icon = "applications-games"; }
+  else if(cat=="Graphics"){ icon = "applications-graphics"; }
+  else if(cat=="Network"){ icon = "applications-internet"; }
+  else if(cat=="Office"){ icon = "applications-office"; }
+  else if(cat=="Science"){ icon = "applications-science"; }
+  else if(cat=="Settings"){ icon = "preferences-system"; }
+  else if(cat=="System"){ icon = "applications-system"; }
+  else if(cat=="Utility"){ icon = "applications-utilities"; }
+  else if(cat=="Wine"){ icon = "wine"; }
+  return icon;
+}
+
 QList<XDGDesktop> LXDG::sortDesktopNames(QList<XDGDesktop> apps){
   //Sort the list by name of the application
   QHash<QString, XDGDesktop> sorter;
diff --git a/libLumina/LuminaXDG.h b/libLumina/LuminaXDG.h
index 82243973..5a9b1441 100644
--- a/libLumina/LuminaXDG.h
+++ b/libLumina/LuminaXDG.h
@@ -123,6 +123,8 @@ public:
 	static QList<XDGDesktop> systemDesktopFiles(bool showAll = false, bool showHidden = false);
 	//Sort a list of Desktop files into the proper categories
 	static QHash< QString, QList<XDGDesktop> > sortDesktopCats(QList<XDGDesktop> apps);
+	//Return the icon to use for the given category
+	static QString DesktopCatToIcon(QString cat);
 	//Sort a list of Desktop files by name
 	static QList<XDGDesktop> sortDesktopNames(QList<XDGDesktop> apps);
 	//Get the executable line from a Desktop file
diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index 4bd2979d..a40a3d48 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -421,6 +421,12 @@ QCheckBox::indicator:checked, QGroupBox::indicator:checked{
   background-clip: content;
   background: %%TEXTCOLOR%%;
 }
+QCheckBox::indicator:indeterminate, QGroupBox::indicator:indeterminate{
+  padding: 1px;
+  background-origin: content;
+  background-clip: content;
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0.49 transparent, stop: 0.5 %%TEXTCOLOR%%);
+}
 
 /* PROGRESSBAR */
 QProgressBar{
diff --git a/libLumina/themes/None.qss.template b/libLumina/themes/None.qss.template
index e8dc4573..a0fd490b 100644
--- a/libLumina/themes/None.qss.template
+++ b/libLumina/themes/None.qss.template
@@ -29,7 +29,7 @@ LDPlugin#applauncher  QToolButton{
 background: transparent;
   border: none;
   border-radius: 5px; 
-  color: %%TEXTCOLOR%%;
+  color: black;
 }
 LDPlugin#applauncher  QToolButton:hover{
   background: %%PRIMARYDISABLECOLOR%%;
-- 
cgit