Merge branch 'master' of github.com:pcbsd/lumina

3 files changed, 60 insertions, 25 deletions

diff --git a/debian/changelog b/debian/changelog
index b65b5049..bf62959c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lumina-desktop (0.8.5.697-1nano) unstable; urgency=low
+
+  * New git snapshot
+   - display "Not available" in system  monitor if cpu temp
+     can not be read
+   - add support for showing disk i/o stats in system monitor
+   - update luminaDesktop.conf to new format
+
+ -- Christopher Roy Bratusek <nano@jpberlin.de>  Fri, 12 Jun 2015 19:09:30 +0200
+
 lumina-desktop (0.8.5.661-1nano) unstable; urgency=low
 
   * New git snapshot
diff --git a/debian/luminaDesktop.conf b/debian/luminaDesktop.conf
index fe79a02c..ca68ee27 100644
--- a/debian/luminaDesktop.conf
+++ b/debian/luminaDesktop.conf
@@ -4,7 +4,7 @@
 
 #NOTE: To pre-setup default applications for particular mime-types, you need to create *.desktop entries on
 #  system corresponding to the XDG mime-type specifications for default applications
-#  See Here for specifications: http://www.freedesktop.org/wiki/Specifications/mime-apps-spec/
+#  See Here for specifications: http://www.freedesktop_org/wiki/Specifications/mime-apps-spec/
 
 # Possible Desktop Plugins (Lumina version 0.8.4): 
 #   calendar, applauncher[::absolute path to *.desktop file], desktopview, notepad, audioplayer
@@ -15,37 +15,44 @@
 #   terminal, filemanager, applications, line, settings, windowlist, app::<absolute path to *.desktop file>
 
 #GENERAL SESSION SETTINGS 
-session.enablenumlock=true #[true/false] Enable numlock on login using "numlockx"
-session.playloginaudio=false #[true/false] Play the audio chimes on log in
-session.playlogoutaudio=false #[true/false] Play the audio chimes on log out
+session_enablenumlock=true #[true/false] Enable numlock on login using "numlockx"
+session_playloginaudio=false #[true/false] Play the audio chimes on log in
+session_playlogoutaudio=false #[true/false] Play the audio chimes on log out
 
 # DEFAULT UTILITIES
 # Provide the full path to *.desktop file, or a binary name which exists on PATH
 # *.desktop files provide better support for input formats, and are recommended
-#session.default.terminal=xterm
-#session.default.filemanager=lumina-fm 
-#session.default.webbrowser=arora
-#session.default.email=icedove
+#session_default_terminal=xterm
+#session_default_filemanager=lumina-fm 
+#session_default_webbrowser=arora
+#session_default_email=icedove
 
 #THEME SETTINGS
-theme.themefile=/usr/share/Lumina-DE/themes/None.qss.template #Absolute path to the theme template file to use (disable for Lumina-Default)
-#theme.colorfile=<file path> #Absolute path to the color spec file to use for theming
-theme.iconset=oxygen #Name of the icon theme to use
-theme.font=DejaVu Sans #Name of the font family to use
-theme.fontsize=9pt #Default size of the fonts to use on the desktop
+theme_themefile=/usr/share/Lumina-DE/themes/None.qss.template #Absolute path to the theme template file to use (disable for Lumina-Default)
+#theme_colorfile=<file path> #Absolute path to the color spec file to use for theming
+theme_iconset=oxygen #Name of the icon theme to use
+theme_font=DejaVu Sans #Name of the font family to use
+theme_fontsize=9pt #Default size of the fonts to use on the desktop
 
 #DESKTOP SETTINGS (used for the left-most screen in multi-screen setups)
-desktop.visiblepanels=1 #[0/1/2] The number of panels visible by default
-desktop.backgroundfiles=/usr/share/images/desktop-base/lines-grub-1920x1080.png #list of absolute file paths for image files (disable for Lumina default)
-desktop.backgroundrotateminutes=5 #[positive integer] number of minutes between background rotations (if multiple files)
-desktop.plugins=desktopview, calendar #list of plugins to be shown on the desktop by default
+desktop_visiblepanels=1 #[0/1/2] The number of panels visible by default
+desktop_backgroundfiles=/usr/share/images/desktop-base/lines-grub-1920x1080.png #list of absolute file paths for image files (disable for Lumina default)
+desktop_backgroundrotateminutes=5 #[positive integer] number of minutes between background rotations (if multiple files)
+desktop_plugins=desktopview, calendar #list of plugins to be shown on the desktop by default
 
-#PANEL SETTINGS (preface with panel1.<setting> or panel2.<setting>, depending on the number of panels you have visible by default)
+#PANEL SETTINGS (preface with panel1_<setting> or panel2.<setting>, depending on the number of panels you have visible by default)
 #NOTE: If two panels, they need to be on opposite screen edges (top/bottom or left/right)
-panel1.location=top #[top/bottom/left/right] Screen edge the panel should be on
-panel1.pixelsize=4%H #number of pixels wide/high the panel should be (or <number>%[W/H] for a percentage of the screen width/height)
-panel1.autohide=false #[true/false] Have the panel become visible on mouse-over
-panel1.plugins=userbutton, taskmanager, spacer, systemtray, clock, systemdashboard #list of plugins for the panel
+panel1_location=top #[top/bottom/left/right] Screen edge the panel should be on
+panel1_pixelsize=4%H #number of pixels wide/high the panel should be (or <number>%[W/H] for a percentage of the screen width/height)
+panel1_autohide=false #[true/false] Have the panel become visible on mouse-over
+panel1_plugins=userbutton, taskmanager, spacer, systemtray, clock, systemdashboard #list of plugins for the panel
+panel1_pinlocation=center #[left/center/right] Note:[left/right] corresponds to [top/bottom] for vertical panels
+panel1_edgepercent=90 #[1->100] percentage of the screen edge to use
 
 #MENU SETTINGS (right-click menu)
-menu.plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show
+menu_plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show
+
+#FAVORITES CUSTOMIZATION
+#favorites_add=<file/dir path> #Create a favorites entry for this file/dir
+#favorites_remove=<file/dir path> #Remove a favorites entry for this file/dir
+#favorites_add_ifexists=<file/dir path> #Create a favorites entry for this file/dir if the file/dir exists
diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp
index 82374fed..df91819e 100644
--- a/libLumina/LuminaOS-Debian.cpp
+++ b/libLumina/LuminaOS-Debian.cpp
@@ -244,7 +244,9 @@ QStringList LOS::CPUTemperatures(){ //Returns: List containing the temperature o
       temp.removeAt(i); i--;
     }
   }
-  qDebug() << "teperatures" << temp;
+  if(temp.isEmpty()) {
+    temp << "Not available";
+  }
   return temp;
 }
 
@@ -270,6 +272,22 @@ int LOS::MemoryUsagePercent(){
 }
 
 QStringList LOS::DiskUsage(){ //Returns: List of current read/write stats for each device
-  return QStringList(); //not implemented yet
+  QStringList info = LUtils::getCmdOutput("iostat -dx -N");
+  if(info.length()<3){ return QStringList(); } //nothing from command
+  QStringList labs = info[1].split(" ",QString::SkipEmptyParts);
+  QStringList out;
+  QString fmt = "%1: %2 %3";
+  for(int i=2; i<info.length(); i++){ //skip the first two lines, just labels
+    info[i].replace("\t"," ");
+    if(info[i].startsWith("Device:")){ labs = info[i].split(" ", QString::SkipEmptyParts); }//the labels for each column
+    else{
+      QStringList data = info[i].split(" ",QString::SkipEmptyParts); //data[0] is always the device 
+      if(data.length()>2 && labs.length()>2){
+        out << fmt.arg(data[0], data[3]+" "+labs[3], data[4]+" "+labs[4]);
+      }
+    }
+  }
+
+  return out;
 }
 #endif