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

5 files changed, 36 insertions, 29 deletions

diff --git a/src-qt5/core/lumina-info/MainUI.cpp b/src-qt5/core/lumina-info/MainUI.cpp
index 98a4c160..7e6a3630 100644
--- a/src-qt5/core/lumina-info/MainUI.cpp
+++ b/src-qt5/core/lumina-info/MainUI.cpp
@@ -8,7 +8,8 @@
 #include "ui_MainUI.h"
 
 #include <LuminaOS.h>
-#include <LuminaUtils.h>
+#include <LDesktopUtils.h>
+#include <LUtils.h>
 #include <LuminaXDG.h>
 
 #include <QPixmap>
@@ -38,7 +39,7 @@ void MainUI::updateUI(){
   ui->tool_website->setIcon( LXDG::findIcon("go-home",""));
   connect(ui->push_close, SIGNAL(clicked()), this, SLOT(close()) );
   //General Tab
-  ui->label_version->setText( LUtils::LuminaDesktopVersion() );
+  ui->label_version->setText( LDesktopUtils::LuminaDesktopVersion() );
   ui->label_OS->setText( LOS::OSName() );
   connect(ui->tool_aboutQt, SIGNAL(clicked()), this, SLOT(showQtInfo()) );
   //License Tab
diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_el.ts b/src-qt5/core/lumina-info/i18n/lumina-info_el.ts
index 98a8182d..45d73ebd 100644
--- a/src-qt5/core/lumina-info/i18n/lumina-info_el.ts
+++ b/src-qt5/core/lumina-info/i18n/lumina-info_el.ts
@@ -1,95 +1,95 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="el">
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"></location>
+        <location filename="../MainUI.ui" line="14"/>
         <source>Lumina Desktop Information</source>
         <translation>Πληροφορίες Γραφικού Περιβάλλοντος Lumina</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="60"></location>
+        <location filename="../MainUI.ui" line="60"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="89"></location>
+        <location filename="../MainUI.ui" line="89"/>
         <source>Source Repository</source>
         <translation>Πηγή Αποθετηρίου</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="124"></location>
+        <location filename="../MainUI.ui" line="124"/>
         <source>Lumina Website</source>
         <translation>Η Ιστοσελίδα του Lumina</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="152"></location>
+        <location filename="../MainUI.ui" line="152"/>
         <source>Bug Reports</source>
         <translation>Aναφορές Σφαλμάτων (Bugs)</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="179"></location>
+        <location filename="../MainUI.ui" line="179"/>
         <source>Desktop Version:</source>
         <translation>Έκδοση Γραφικού Περιβάλλοντος</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="202"></location>
+        <location filename="../MainUI.ui" line="202"/>
         <source>OS Build:</source>
         <translation>Έκδοση Δόμησης OS:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="218"></location>
+        <location filename="../MainUI.ui" line="218"/>
         <source>Qt Version:</source>
         <translation>Έκδοση Qt:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="276"></location>
+        <location filename="../MainUI.ui" line="276"/>
         <source>Ask the Community</source>
         <translation>Ρωτήστε την Κοινότητα</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="233"></location>
+        <location filename="../MainUI.ui" line="233"/>
         <source>View Information</source>
         <translation>Προβολή Πληροφοριών</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="298"></location>
+        <location filename="../MainUI.ui" line="298"/>
         <source>License</source>
         <translation>Άδεια Χρήσης</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="315"></location>
+        <location filename="../MainUI.ui" line="315"/>
         <source>Acknowledgements</source>
         <translation>Ευχαριστίες</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="333"></location>
+        <location filename="../MainUI.ui" line="333"/>
         <source>Project Lead:</source>
         <translation>Επικεφαλής του Έργου:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="340"></location>
-        <source>&lt;a href="https://github.com/beanpole135"&gt;Ken Moore&lt;/a&gt;</source>
-        <translation>&lt;a href="https://github.com/beanpole135"&gt;&lt;a href="https://github.com/beanpole135"&gt;Ken Moore&lt;/a&gt;&lt;/a&gt;</translation>
+        <location filename="../MainUI.ui" line="340"/>
+        <source>&lt;a href=&quot;https://github.com/beanpole135&quot;&gt;Ken Moore&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/beanpole135&quot;&gt;&lt;a href=&quot;https://github.com/beanpole135&quot;&gt;Ken Moore&lt;/a&gt;&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="353"></location>
+        <location filename="../MainUI.ui" line="353"/>
         <source>Contributors:</source>
         <translation>Συντελεστές:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="366"></location>
+        <location filename="../MainUI.ui" line="366"/>
         <source>Sponsors:</source>
         <translation>Χορηγοί</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="428"></location>
-        <source>&lt;a href="https://github.com/pcbsd/lumina/graphs/contributors"&gt;Open in web browser&lt;a&gt;</source>
-        <translation>&lt;a href="https://github.com/pcbsd/lumina/graphs/contributors"&gt;Άνοιγμα στον Φυλλομετρητή (Browser)&lt;a&gt;</translation>
+        <location filename="../MainUI.ui" line="428"/>
+        <source>&lt;a href=&quot;https://github.com/pcbsd/lumina/graphs/contributors&quot;&gt;Open in web browser&lt;a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/pcbsd/lumina/graphs/contributors&quot;&gt;Άνοιγμα στον Φυλλομετρητή (Browser)&lt;a&gt;</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="454"></location>
+        <location filename="../MainUI.ui" line="454"/>
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts b/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts
index b886b049..f86f8764 100644
--- a/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts
+++ b/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru">
 <context>
diff --git a/src-qt5/core/lumina-info/lumina-info.pro b/src-qt5/core/lumina-info/lumina-info.pro
index 9ced275b..3ba1f527 100644
--- a/src-qt5/core/lumina-info/lumina-info.pro
+++ b/src-qt5/core/lumina-info/lumina-info.pro
@@ -8,6 +8,12 @@ target.path = $${L_BINDIR}
 
 TEMPLATE = app
 
+#include all the special classes from the Lumina tree
+include(../libLumina/LDesktopUtils.pri) #includes LUtils
+include(../libLumina/LuminaXDG.pri)
+include(../libLumina/LuminaSingleApplication.pri)
+include(../libLumina/LuminaThemes.pri)
+
 SOURCES += main.cpp \
 		MainUI.cpp
 
@@ -17,9 +23,9 @@ FORMS    += MainUI.ui
 
 RESOURCES+= lumina-info.qrc
 
-LIBS     += -lLuminaUtils
+#LIBS     += -lLuminaUtils
 
-DEPENDPATH	+= ../libLumina
+#DEPENDPATH	+= ../libLumina
 
 TRANSLATIONS =  i18n/lumina-info_af.ts \
                 i18n/lumina-info_ar.ts \
diff --git a/src-qt5/core/lumina-info/main.cpp b/src-qt5/core/lumina-info/main.cpp
index 8fe6a183..e30911c5 100644
--- a/src-qt5/core/lumina-info/main.cpp
+++ b/src-qt5/core/lumina-info/main.cpp
@@ -6,7 +6,7 @@
 #include "MainUI.h"
 #include <LuminaOS.h>
 #include <LuminaThemes.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 #include <LuminaSingleApplication.h>
 
 int main(int argc, char ** argv)