Add knowledge of the lumina-info utility to the Lumina desktop (userbutton, config menu). Also make sure that there is a *.desktop shortcut for the application (and update the pkg-plist)

Also allow for "-<something>" to be put in the version number without messing up the version checking routine, and tag the current version on the master branch as 0.8.2-devel (once the stable/official release is branched, the "-devel" tag will get either dropped or changed to "-release" in that branch, with the master branch moving on to the next <version>-devel)

9 files changed, 90 insertions, 17 deletions

diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index fb2e31bd..488af6a8 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -21,7 +21,7 @@
 //  LUtils Functions
 //=============
 QString LUtils::LuminaDesktopVersion(){ 
-  return "0.8.1"; 
+  return "0.8.2-devel"; 
 }
 
 int LUtils::runCmd(QString cmd, QStringList args){
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index d66ddcb4..96184c84 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -173,14 +173,14 @@ void LSession::launchStartupApps(){
 }
 
 void LSession::watcherChange(QString changed){
-  qDebug() << "Session Watcher Change:" << changed;
+  if(DEBUG){ qDebug() << "Session Watcher Change:" << changed; }
   if(changed.endsWith("fluxbox-init") || changed.endsWith("fluxbox-keys")){ refreshWindowManager(); }
   else{ emit DesktopConfigChanged(); }
 }
 
 void LSession::checkUserFiles(){
   //version conversion examples: [1.0.0 -> 100], [1.2.0 -> 120], [0.6.0 -> 60]
-  int oldversion = sessionsettings->value("DesktopVersion","0").toString().remove(".").toInt();
+  int oldversion = sessionsettings->value("DesktopVersion","0").toString().section("-",0,0).remove(".").toInt();
   bool newversion =  ( oldversion < this->applicationVersion().remove(".").toInt() );
   
   //Check for the desktop settings file
diff --git a/lumina-desktop/SettingsMenu.cpp b/lumina-desktop/SettingsMenu.cpp
index d6b07ee4..8c989600 100644
--- a/lumina-desktop/SettingsMenu.cpp
+++ b/lumina-desktop/SettingsMenu.cpp
@@ -44,7 +44,11 @@ void SettingsMenu::InitMenu(){
 	act->setWhatsThis("lumina-open \""+CONTROLPANEL+"\"");
 	this->addAction(act);
     }
-  }	
+  }
+  this->addSeparator();
+  act = new QAction( LXDG::findIcon("lumina",""), tr("About Lumina"), this);
+	act->setWhatsThis("lumina-info");
+	this->addAction(act);  
 }
 
 void SettingsMenu::runApp(QAction* act){
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
index 5f50e707..d5f8cd2e 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp
@@ -34,7 +34,7 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid
   ui->tool_config_screensaver->setIcon( LXDG::findIcon("preferences-desktop-screensaver","") );	
   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()) );
@@ -44,6 +44,7 @@ UserWidget::UserWidget(QWidget* parent) : QTabWidget(parent), ui(new Ui::UserWid
   connect(ui->combo_app_cats, SIGNAL(currentIndexChanged(int)), this, SLOT(updateApps()) );
   connect(ui->tool_home_gohome, SIGNAL(clicked()), this, SLOT(slotGoHome()) );
   connect(ui->tool_home_browse, SIGNAL(clicked()), this, SLOT(slotOpenDir()) );
+  connect(ui->tool_config_about, SIGNAL(clicked()), this, SLOT(openLuminaInfo()) );
   
   //Setup the special buttons
   QString APPSTORE = LOS::AppStoreShortcut();
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.h b/lumina-desktop/panel-plugins/userbutton/UserWidget.h
index 06ad22e8..108f540f 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.h
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.h
@@ -80,7 +80,10 @@ private slots:
 	void openScreenSaverConfig(){
 	  LaunchItem(SSAVER, false);
 	}
-
+	void openLuminaInfo(){
+	  LaunchItem("lumina-info",false);
+	}
+	
 protected:
 	void mouseMoveEvent( QMouseEvent *event);
 
diff --git a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
index 764feddf..9a307cb6 100644
--- a/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
+++ b/lumina-desktop/panel-plugins/userbutton/UserWidget.ui
@@ -17,7 +17,7 @@
    <enum>QTabWidget::West</enum>
   </property>
   <property name="currentIndex">
-   <number>2</number>
+   <number>3</number>
   </property>
   <widget class="QWidget" name="tab_fav">
    <attribute name="title">
@@ -30,7 +30,16 @@
     <property name="spacing">
      <number>2</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>1</number>
+    </property>
+    <property name="topMargin">
+     <number>1</number>
+    </property>
+    <property name="rightMargin">
+     <number>1</number>
+    </property>
+    <property name="bottomMargin">
      <number>1</number>
     </property>
     <item>
@@ -161,8 +170,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>262</width>
-         <height>245</height>
+         <width>98</width>
+         <height>28</height>
         </rect>
        </property>
       </widget>
@@ -181,7 +190,16 @@
     <property name="spacing">
      <number>2</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>1</number>
+    </property>
+    <property name="topMargin">
+     <number>1</number>
+    </property>
+    <property name="rightMargin">
+     <number>1</number>
+    </property>
+    <property name="bottomMargin">
      <number>1</number>
     </property>
     <item>
@@ -258,8 +276,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>262</width>
-         <height>245</height>
+         <width>98</width>
+         <height>28</height>
         </rect>
        </property>
       </widget>
@@ -278,7 +296,16 @@
     <property name="spacing">
      <number>2</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>1</number>
+    </property>
+    <property name="topMargin">
+     <number>1</number>
+    </property>
+    <property name="rightMargin">
+     <number>1</number>
+    </property>
+    <property name="bottomMargin">
      <number>1</number>
     </property>
     <item>
@@ -392,8 +419,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>262</width>
-         <height>245</height>
+         <width>98</width>
+         <height>28</height>
         </rect>
        </property>
       </widget>
@@ -510,6 +537,29 @@
       </property>
      </spacer>
     </item>
+    <item>
+     <widget class="Line" name="line">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QToolButton" name="tool_config_about">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="text">
+       <string>About the Lumina Desktop</string>
+      </property>
+      <property name="toolButtonStyle">
+       <enum>Qt::ToolButtonTextBesideIcon</enum>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>
diff --git a/lumina-info/lumina-info.desktop b/lumina-info/lumina-info.desktop
new file mode 100644
index 00000000..2fea4e2e
--- /dev/null
+++ b/lumina-info/lumina-info.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Exec=lumina-info
+Icon=/usr/local/share/pixmaps/Lumina-DE.png
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=System;
+OnlyShowIn=Lumina
+Name=Lumina Desktop Information
+Comment=View information about the Lumina Desktop Environment
+
diff --git a/lumina-info/lumina-info.pro b/lumina-info/lumina-info.pro
index becebd73..96fce312 100644
--- a/lumina-info/lumina-info.pro
+++ b/lumina-info/lumina-info.pro
@@ -102,4 +102,7 @@ TRANSLATIONS =  i18n/lumina-info_af.ts \
 dotrans.path=$$PREFIX/share/Lumina-DE/i18n/
 dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/i18n/
 
-INSTALLS += target dotrans
+desktop.files=lumina-info.desktop
+desktop.path=$$PREFIX/share/applications/
+
+INSTALLS += target dotrans desktop
diff --git a/port-files/pkg-plist b/port-files/pkg-plist
index 4260a026..f5ec14d0 100644
--- a/port-files/pkg-plist
+++ b/port-files/pkg-plist
@@ -19,6 +19,7 @@ include/LuminaSingleApplication.h
 share/applications/lumina-fm.desktop
 share/applications/lumina-screenshot.desktop
 share/applications/lumina-search.desktop
+share/applications/lumina-info.desktop
 share/pixmaps/Lumina-DE.png
 share/pixmaps/Insight-FileManager.png
 share/xsessions/Lumina-DE.desktop