Rearrange the Lumina source tree quite a bit:

Now the utilites are arranged by category (core, core-utils, desktop-utils), so all the -utils may be excluded by a package system (or turned into separate packages) as needed.

1 files changed, 0 insertions, 300 deletions

diff --git a/libLumina/LuminaOS-Debian.cpp b/libLumina/LuminaOS-Debian.cpp
deleted file mode 100644
index 75aad108..00000000
--- a/libLumina/LuminaOS-Debian.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-//===========================================
-//  Lumina-DE source code
-//  Copyright (c) 2014, Ken Moore
-//  Available under the 3-clause BSD license
-//  See the LICENSE file for full details
-//===========================================
-#ifdef __linux__
-#include <QDebug>
-#include "LuminaOS.h"
-#include <unistd.h>
-#include <stdio.h> // Needed for BUFSIZ
-
-//can't read xbrightness settings - assume invalid until set
-static int screenbrightness = -1;
-
-QString LOS::OSName(){ return "Debian GNU/Linux"; }
-
-//OS-specific prefix(s)
-// NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in
-QString LOS::LuminaShare(){ return (L_SHAREDIR+"/Lumina-DE/"); } //Install dir for Lumina share files
-QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications
-QString LOS::SysPrefix(){ return "/"; } //Prefix for system
-
-//OS-specific application shortcuts (*.desktop files)
-QString LOS::ControlPanelShortcut(){ return ""; } //system control panel
-QString LOS::AppStoreShortcut(){ return LOS::AppPrefix() + "/share/applications/synaptic.desktop"; } //graphical app/pkg manager
-
-// ==== ExternalDevicePaths() ====
-QStringList LOS::ExternalDevicePaths(){
-  /* Returns: QStringList[<type>::::<filesystem>::::<path>]
-     Note: <type> = [USB, HDRIVE, DVD, SDCARD, UNKNOWN]
-     df is much better for this than mount, because it skips
-     all non-physical devices (like bind-mounts from schroot)
-     so they are not listed in lumina-fm */
-  QStringList devs = LUtils::getCmdOutput("df --output=source,fstype,target");
-  //Now check the output
-  for(int i=0; i<devs.length(); i++){
-    if(devs[i].startsWith("/dev/")){
-      devs[i] = devs[i].simplified();
-      QString type = devs[i].section(" on ",0,0);
-      type.remove("/dev/");
-      //Determine the type of hardware device based on the dev node
-      if(type.startsWith("sd") || type.startsWith("nvme")){ type = "HDRIVE"; }
-      else if(type.startsWith("sr")){ type="DVD"; }
-      else if(type.contains("mapper")){ type="LVM"; }
-      else{ type = "UNKNOWN"; }
-      //Now put the device in the proper output format
-      devs[i] = type + "::::" + devs[i].section(" ",1,1) + "::::" + devs[i].section(" ",2,2);
-    }else{
-      //invalid device - remove it from the list
-      devs.removeAt(i);
-      i--;
-    }
-  }
-  return devs;
-}
-
-//Read screen brightness information
-int LOS::ScreenBrightness(){
-   //Returns: Screen Brightness as a percentage (0-100, with -1 for errors)
-  if(screenbrightness==-1){
-    if(QFile::exists(QDir::homePath()+"/.lumina/.currentxbrightness")){
-      int val = LUtils::readFile(QDir::homePath()+"/.lumina/.currentxbrightness").join("").simplified().toInt();
-      screenbrightness = val;
-    }
-  }
-  return screenbrightness;
-
-}
-
-//Set screen brightness
-void LOS::setScreenBrightness(int percent){
-  //ensure bounds
-  if(percent<0){percent=0;}
-  else if(percent>100){ percent=100; }
-  // float pf = percent/100.0; //convert to a decimel
-  //Run the command
-  QString cmd = "xbacklight -set %1";
-  // cmd = cmd.arg( QString::number( int(65535*pf) ) );
-  cmd = cmd.arg( QString::number( percent ) );
-  int ret = LUtils::runCmd(cmd);
-  //Save the result for later
-  if(ret!=0){ screenbrightness = -1; }
-  else{ screenbrightness = percent; }
-  LUtils::writeFile(QDir::homePath()+"/.lumina/.currentxbrightness", QStringList() << QString::number(screenbrightness), true);
-
-}
-
-//Read the current volume
-int LOS::audioVolume(){ //Returns: audio volume as a percentage (0-100, with -1 for errors)
-QString info = LUtils::getCmdOutput("amixer get Master").join("").simplified();;
-  int out = -1;
-  int start_position, end_position;
-  QString current_volume;
-  if(!info.isEmpty()){
-     start_position = info.indexOf("[");
-     start_position++;
-     end_position = info.indexOf("%");
-     current_volume = info.mid(start_position, end_position - start_position);
-     out = current_volume.toInt();
-  }
-  return out;
-
-}
-
-//Set the current volume
-void LOS::setAudioVolume(int percent){
-  if(percent<0){percent=0;}
-  else if(percent>100){percent=100;}
-  // QString info = "amixer -c 0 sset Master,0 " + QString::number(percent) + "%";
-  QString info = "amixer set Master " + QString::number(percent) + "%";
-  if(!info.isEmpty()){
-    //Run Command
-    LUtils::runCmd(info);
-  }
-
-}
-
-//Change the current volume a set amount (+ or -)
-void LOS::changeAudioVolume(int percentdiff){
-  int old_volume = audioVolume();
-  int new_volume = old_volume + percentdiff;
-  if (new_volume < 0)
-      new_volume = 0;
-  if (new_volume > 100)
-      new_volume = 100;
-  qDebug() << "Setting new volume to: " << new_volume;
-  setAudioVolume(new_volume);
-}
-
-//Check if a graphical audio mixer is installed
-bool LOS::hasMixerUtility(){
-  return QFile::exists(LOS::AppPrefix() + "bin/pavucontrol");
-}
-
-//Launch the graphical audio mixer utility
-void LOS::startMixerUtility(){
-  QProcess::startDetached(LOS::AppPrefix() + "bin/pavucontrol");
-}
-
-//Check for user system permission (shutdown/restart)
-bool LOS::userHasShutdownAccess(){
-  return QProcess::startDetached("dbus-send --system --print-reply=literal \
-  --type=method_call --dest=org.freedesktop.login1 \
-  /org/freedesktop/login1 org.freedesktop.login1.Manager.CanPowerOff");
-}
-
-//Check for whether the system is safe to power off (no updates being perfomed)
-bool LOS::systemPerformingUpdates(){
-  return false; //Not implemented yet
-}
-
-//System Shutdown
-void LOS::systemShutdown(){ //start poweroff sequence
-  QProcess::startDetached("dbus-send --system --print-reply \
-  --dest=org.freedesktop.login1 /org/freedesktop/login1 \
-  org.freedesktop.login1.Manager.PowerOff boolean:true");
-}
-
-//System Restart
-void LOS::systemRestart(){ //start reboot sequence
-  QProcess::startDetached("dbus-send --system --print-reply \
-  --dest=org.freedesktop.login1 /org/freedesktop/login1 \
-  org.freedesktop.login1.Manager.Reboot boolean:true");
-}
-
-//Check for suspend support
-bool LOS::systemCanSuspend(){
-  return QProcess::startDetached("dbus-send --system --print-reply=literal \
-  --type=method_call --dest=org.freedesktop.login1 \
-  /org/freedesktop/login1 org.freedesktop.login1.Manager.CanSuspend");
-}
-
-//Put the system into the suspend state
-void LOS::systemSuspend(){
-  QProcess::startDetached("dbus-send --system --print-reply \
-  --dest=org.freedesktop.login1 /org/freedesktop/login1 \
-  org.freedesktop.login1.Manager.Suspend boolean:true");
-}
-
-//Battery Availability
-bool LOS::hasBattery(){
-  QString my_status = LUtils::getCmdOutput("acpi -b").join("");
-  bool no_battery = my_status.contains("No support");
-  if (no_battery) return false;
-  return true;
-}
-
-//Battery Charge Level
-int LOS::batteryCharge(){ //Returns: percent charge (0-100), anything outside that range is counted as an error
-  QString my_status = LUtils::getCmdOutput("acpi -b").join("");
-  int my_start = my_status.indexOf("%");
-  // get the number right before the % sign
-  int my_end = my_start;
-  my_start--;
-  while ( (my_status[my_start] != ' ') && (my_start > 0) )
-      my_start--;
-  my_start++;
-  int my_charge = my_status.mid(my_start, my_end - my_start).toInt();
-  if ( (my_charge < 0) || (my_charge > 100) ) return -1;
-  return my_charge;
-}
-
-//Battery Charging State
-// Many possible values are returned if the laptop is plugged in
-// these include "Unknown, Full and No support.
-// However, it seems just one status is returned when running
-// on battery and that is "Discharging". So if the value we get
-// is NOT Discharging then we assume the battery is charging.
-bool LOS::batteryIsCharging(){
-  QString my_status = LUtils::getCmdOutput("acpi -b").join("");
-  bool discharging = my_status.contains("Discharging");
-  if (discharging) return false;
-  return true;
-}
-
-//Battery Time Remaining
-int LOS::batterySecondsLeft(){ //Returns: estimated number of seconds remaining
-  return 0; //not implemented yet for Linux
-}
-
-//File Checksums
-QStringList LOS::Checksums(QStringList filepaths){ //Return: checksum of the input file
-  QStringList info = LUtils::getCmdOutput("md5sum \""+filepaths.join("\" \"")+"\"");
-  for(int i=0; i<info.length(); i++){
-    // first: md5sum: = error ; second: there's always one empty entry generated by getCmdOutput
-    if( info[i].startsWith("md5sum:") || info[i].isEmpty()){ info.removeAt(i); i--; }
-    else{
-      //Strip out the extra information
-      info[i] = info[i].section(" ",0,0);
-    }
-  }
- return info;
-}
-
-//file system capacity
-QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as give by the df command
-  QStringList mountInfo = LUtils::getCmdOutput("df -h \"" + dir + "\"");
-  QString::SectionFlag skipEmpty = QString::SectionSkipEmpty;
-  //output: 200G of 400G available on /mount/point
-  QString capacity = mountInfo[1].section(" ",3,3, skipEmpty) + " of " + mountInfo[1].section(" ",1,1, skipEmpty) + " available on " +  mountInfo[1].section(" ",5,5, skipEmpty);
-  return capacity;
-}
-
-QStringList LOS::CPUTemperatures(){ //Returns: List containing the temperature of any CPU's ("50C" for example)
-  QStringList temp = LUtils::getCmdOutput("acpi -t").filter("degrees");
-  for(int i=0; i<temp.length(); i++){
-    if(temp[i].startsWith("Thermal")){
-      temp[i] = temp[i].section(" ", 4, 6);
-    }else{
-      temp.removeAt(i); i--;
-    }
-  }
-  if(temp.isEmpty()) {
-    temp << "Not available";
-  }
-  return temp;
-}
-
-int LOS::CPUUsagePercent(){ //Returns: Overall percentage of the amount of CPU cycles in use (-1 for errors)
-  QStringList info = LUtils::getCmdOutput("top -bn1").filter("Cpu(s)");
-  if(info.isEmpty()){ return -1; }
-  QString idle = info.first().section(" ", 7, 7, QString::SectionSkipEmpty);
-  if(idle.isEmpty()){ return -1; }
-  else{
-    return (100 - idle.toDouble());
-  }
-}
-
-int LOS::MemoryUsagePercent(){
-  QStringList mem = LUtils::getCmdOutput("top -bn1").filter("Mem :");
-  if(mem.isEmpty()){ return -1; }
-  double fB = 0; //Free Bytes
-  double uB = 0; //Used Bytes
-  fB = mem.first().section(" ", 5, 5, QString::SectionSkipEmpty).toDouble();
-  uB = mem.first().section(" ", 7, 7, QString::SectionSkipEmpty).toDouble();
-  double per = (uB/(fB+uB)) * 100.0;
-  return qRound(per);
-}
-
-QStringList LOS::DiskUsage(){ //Returns: List of current read/write stats for each device
-  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