Merge pull request #111 from william-os4y/iconLayout

New icon layout for the icons on the desktop

3 files changed, 58 insertions, 9 deletions

diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index fd9c97e7..06cbafb6 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -12,17 +12,65 @@ QWidget#LuminaPanelColor{
   /*border: 1px solid transparent;*/
 }
 /* Set the default canvas appearance for Lumina desktop plugins*/
-LDPlugin#LuminaDesktopPlugin{
-  background: transparent;
-  border-radius: 5px;
-  border: none;
+QWidget#LuminaPanelColor{
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
+  border-radius: 3px;
+  /*border: 1px solid transparent;*/
+}
+
+LDPlugin#audioplayer   {
+  background: %%BASECOLOR%%;
+}
+
+LDPlugin#calendar   {
+  background: %%BASECOLOR%%;
 }
-/*For special desktop plugins that should never have a transparent background*/
-LDPlugin#LuminaDesktopPluginVisible{
+
+LDPlugin#notepad   {
   background: %%BASECOLOR%%;
+}
+
+LDPlugin#applauncher  QWidget{
+background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+  stop: 0 transparent, 
+  stop: 0.7 transparent,
+  stop: 1.0 %%ACCENTDISABLECOLOR%%);
+  border-radius: 5px; 
+  color: %%ALTBASECOLOR%%;
+}
+LDPlugin#applauncher  QWidget:hover{
+  background: %%ACCENTDISABLECOLOR%%;
+  border-radius: 5px; 
+  color: %%ALTBASECOLOR%%;
+}
+LDPlugin#applauncher QMenu{
+background: %%BASECOLOR%%;
+color: %%TEXTCOLOR%%;
+}
+
+LDPlugin#desktopview QWidget{
+  background: transparent;
   border: 1px solid transparent;
+}
+LDPlugin#desktopview QListWidget::item{
+  background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+  stop: 0 transparent, 
+  stop: 0.7 transparent,
+  stop: 1.0 %%ACCENTDISABLECOLOR%%);
   border-radius: 5px;
+  color: %%ALTBASECOLOR%%;
 }
+LDPlugin#desktopview QMenu{
+background: %%BASECOLOR%%;
+color: %%TEXTCOLOR%%;
+}
+
+LDPlugin#desktopview QListWidget::item:hover{
+  background: %%ACCENTDISABLECOLOR%%;
+  border-radius: 5px;
+  color: %%ALTBASECOLOR%%;
+}
+
 /*For the special widgets on the user button*/
 UserItemWidget{
   background: transparent;
@@ -525,4 +573,4 @@ QCalendarWidget QWidget#qt_calendar_calendarview{
   border: none;
 }
 
- 
\ No newline at end of file
+ 
diff --git a/lumina-desktop/desktop-plugins/LDPlugin.h b/lumina-desktop/desktop-plugins/LDPlugin.h
index b6d786cc..82f8e22f 100644
--- a/lumina-desktop/desktop-plugins/LDPlugin.h
+++ b/lumina-desktop/desktop-plugins/LDPlugin.h
@@ -40,7 +40,8 @@ public:
 	  if(opaque){ this->setObjectName("LuminaDesktopPluginVisible"); }
 	  else{ this->setObjectName("LuminaDesktopPlugin"); }
 	  //Use plugin-specific values for stylesheet control (applauncher, desktopview, etc...)
-	  //this->setObjectName(id.section("---",0,0).section("::",0,0));
+	  qDebug() << "set Objectname:" << id.section("---",0,0).section("::",0,0);
+	  this->setObjectName(id.section("---",0,0).section("::",0,0));
 	}
 	
 	~LDPlugin(){
diff --git a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
index 527de682..b07984d4 100644
--- a/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
+++ b/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
@@ -21,7 +21,7 @@ DesktopViewPlugin::DesktopViewPlugin(QWidget* parent, QString ID) : LDPlugin(par
     list->setSpacing(2);
     list->setSelectionBehavior(QAbstractItemView::SelectItems);
     list->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    list->setStyleSheet( "QListWidget{ background: transparent; border: none; }" );
+    //list->setStyleSheet( "QListWidget{ background: transparent; border: none; }" );
     int icosize = settings->value("IconSize",64).toInt();
     list->setIconSize(QSize(icosize,icosize));
     list->setUniformItemSizes(true);