diff options
Diffstat (limited to 'src-qt5/desktop-utils')
27 files changed, 66 insertions, 42 deletions
diff --git a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro index 38e22b37..efb9e68c 100644 --- a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro +++ b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro @@ -5,6 +5,12 @@ QT += core gui widgets TARGET = lumina-calculator target.path = $${L_BINDIR} +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + HEADERS += mainUI.h \ EqValidator.h @@ -13,10 +19,6 @@ SOURCES += main.cpp \ FORMS += mainUI.ui -LIBS += -lLuminaUtils - -DEPENDPATH += ../../libLumina - TRANSLATIONS = i18n/l-calc_af.ts \ i18n/l-calc_ar.ts \ i18n/l-calc_az.ts \ diff --git a/src-qt5/desktop-utils/lumina-calculator/main.cpp b/src-qt5/desktop-utils/lumina-calculator/main.cpp index ea1ae60c..da57763a 100644 --- a/src-qt5/desktop-utils/lumina-calculator/main.cpp +++ b/src-qt5/desktop-utils/lumina-calculator/main.cpp @@ -8,7 +8,7 @@ #include <QDebug> #include <LuminaThemes.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include "mainUI.h" diff --git a/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp b/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp index 3da9ba6d..fcc39fd2 100644 --- a/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp +++ b/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp @@ -10,8 +10,9 @@ #include <QDebug> #include <QClipboard> #include <QFileDialog> +#include <QMenu> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaXDG.h> #include "EqValidator.h" diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp index 8a16f03f..3e0150e2 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp @@ -11,7 +11,7 @@ #include <QFileDialog> #include <QMessageBox> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaOS.h> //LFileInfo INFO = LFileInfo(""); diff --git a/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro b/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro index 685b48a6..ee12b420 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro +++ b/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro @@ -9,6 +9,12 @@ TEMPLATE = app target.path = $${L_BINDIR} +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + SOURCES += main.cpp\ MainUI.cpp @@ -16,12 +22,6 @@ HEADERS += MainUI.h FORMS += MainUI.ui -#RESOURCES+= lumina-fileinfo.qrc - -LIBS += -lLuminaUtils - -DEPENDPATH += ../libLumina - TRANSLATIONS = i18n/l-fileinfo_af.ts \ i18n/l-fileinfo_ar.ts \ diff --git a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp index ac3336bf..46f83831 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp +++ b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp @@ -4,7 +4,7 @@ #include <QFile> #include "MainUI.h" -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaThemes.h> int main(int argc, char ** argv) diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp index 72920757..5b84e2e7 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp +++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp @@ -11,7 +11,7 @@ #include <QtConcurrent> #include <QDebug> -#include <LuminaUtils.h> +#include <LUtils.h> Browser::Browser(QObject *parent) : QObject(parent){ watcher = new QFileSystemWatcher(this); diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp index da651cca..8db13718 100644 --- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp +++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp @@ -10,7 +10,7 @@ #include <QTimer> #include <QSettings> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaOS.h> BrowserWidget::BrowserWidget(QString objID, QWidget *parent) : QWidget(parent){ diff --git a/src-qt5/desktop-utils/lumina-fm/DirData.h b/src-qt5/desktop-utils/lumina-fm/DirData.h index 546dd6c5..c887ed5c 100644 --- a/src-qt5/desktop-utils/lumina-fm/DirData.h +++ b/src-qt5/desktop-utils/lumina-fm/DirData.h @@ -16,7 +16,7 @@ #include <QDir> #include <LuminaXDG.h> -#include <LuminaUtils.h> +#include <LUtils.h> #define ZSNAPDIR QString("/.zfs/snapshot/") diff --git a/src-qt5/desktop-utils/lumina-fm/FODialog.h b/src-qt5/desktop-utils/lumina-fm/FODialog.h index a595b9f2..9b53a934 100644 --- a/src-qt5/desktop-utils/lumina-fm/FODialog.h +++ b/src-qt5/desktop-utils/lumina-fm/FODialog.h @@ -21,7 +21,7 @@ // libLumina includes #include <LuminaXDG.h> -#include <LuminaUtils.h> +#include <LUtils.h> class FOWorker : public QObject{ Q_OBJECT diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp index 128c4cd5..0744ac84 100644 --- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp @@ -7,10 +7,13 @@ #include "MainUI.h" #include "ui_MainUI.h" +#include <QMenu> #include <QFileInfo> #include "gitCompat.h" #include "gitWizard.h" +#include <LDesktopUtils.h> + #define DEBUG 0 MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI){ @@ -845,7 +848,7 @@ void MainUI::PasteFiles(QString dir, QStringList raw){ void MainUI::FavoriteFiles(QStringList list){ qDebug() << "Favorite Files:" << list; for(int i=0; i<list.length(); i++){ - LUtils::addFavorite(list[i]); + LDesktopUtils::addFavorite(list[i]); } //Might want to make this a "toggle" instead of an add later on... } diff --git a/src-qt5/desktop-utils/lumina-fm/OPWidget.h b/src-qt5/desktop-utils/lumina-fm/OPWidget.h index 13fb3cb3..4fdb7db8 100644 --- a/src-qt5/desktop-utils/lumina-fm/OPWidget.h +++ b/src-qt5/desktop-utils/lumina-fm/OPWidget.h @@ -11,6 +11,9 @@ #include "FODialog.h" #include "ScrollDialog.h" + +#include <QWidgetAction> + namespace Ui{ class OPWidget; }; diff --git a/src-qt5/desktop-utils/lumina-fm/gitCompat.h b/src-qt5/desktop-utils/lumina-fm/gitCompat.h index 3e6cb15e..4e63e780 100644 --- a/src-qt5/desktop-utils/lumina-fm/gitCompat.h +++ b/src-qt5/desktop-utils/lumina-fm/gitCompat.h @@ -14,7 +14,7 @@ #include <QProcessEnvironment> #include <QDebug> #include <QTemporaryFile> -#include <LuminaUtils.h> +#include <LUtils.h> #include <unistd.h> diff --git a/src-qt5/desktop-utils/lumina-fm/gitWizard.h b/src-qt5/desktop-utils/lumina-fm/gitWizard.h index 4a6ec2bc..e49f43aa 100644 --- a/src-qt5/desktop-utils/lumina-fm/gitWizard.h +++ b/src-qt5/desktop-utils/lumina-fm/gitWizard.h @@ -12,6 +12,7 @@ #include <QWizard> #include <QString> #include <QMessageBox> +#include <QCloseEvent> #include "gitCompat.h" diff --git a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro index 92042ad7..a98161f0 100644 --- a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro +++ b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro @@ -9,6 +9,12 @@ target.path = $${L_BINDIR} TEMPLATE = app +#include all the special classes from the Lumina tree +include(../../core/libLumina/LDesktopUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + SOURCES += main.cpp \ MainUI.cpp \ FODialog.cpp \ @@ -51,7 +57,6 @@ FORMS += MainUI.ui \ icons.files = Insight-FileManager.png icons.path = $${L_SHAREDIR}/pixmaps -LIBS += -lLuminaUtils TRANSLATIONS = i18n/lumina-fm_af.ts \ i18n/lumina-fm_ar.ts \ diff --git a/src-qt5/desktop-utils/lumina-fm/main.cpp b/src-qt5/desktop-utils/lumina-fm/main.cpp index eaaf182c..c72f031e 100644 --- a/src-qt5/desktop-utils/lumina-fm/main.cpp +++ b/src-qt5/desktop-utils/lumina-fm/main.cpp @@ -6,7 +6,7 @@ #include "MainUI.h" #include <LuminaOS.h> #include <LuminaThemes.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaSingleApplication.h> #include "BrowserWidget.h" diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h b/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h index 8049600e..48127efa 100644 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h +++ b/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h @@ -24,7 +24,7 @@ #include <QUrl> #include <QDir> -#include <LuminaUtils.h> +#include <LUtils.h> //============== // LIST WIDGET diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp index 161225e4..29adf09d 100644 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp +++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp @@ -19,7 +19,7 @@ #include <LuminaOS.h> #include <LuminaXDG.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include "../ScrollDialog.h" diff --git a/src-qt5/desktop-utils/lumina-screenshot/MainUI.h b/src-qt5/desktop-utils/lumina-screenshot/MainUI.h index 853fb194..00b3f8ac 100644 --- a/src-qt5/desktop-utils/lumina-screenshot/MainUI.h +++ b/src-qt5/desktop-utils/lumina-screenshot/MainUI.h @@ -20,7 +20,7 @@ #include <QScreen> #include <LuminaXDG.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaX11.h> #include "ImageEditor.h" diff --git a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro index a85b234c..cb2b9713 100644 --- a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro +++ b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro @@ -9,6 +9,13 @@ target.path = $${L_BINDIR} TEMPLATE = app +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) +include(../../core/libLumina/LuminaX11.pri) + SOURCES += main.cpp \ MainUI.cpp \ ImageEditor.cpp @@ -18,10 +25,6 @@ HEADERS += MainUI.h \ FORMS += MainUI.ui -LIBS += -lLuminaUtils - -DEPENDPATH += ../libLumina - TRANSLATIONS = i18n/l-screenshot_af.ts \ i18n/l-screenshot_ar.ts \ i18n/l-screenshot_az.ts \ diff --git a/src-qt5/desktop-utils/lumina-screenshot/main.cpp b/src-qt5/desktop-utils/lumina-screenshot/main.cpp index 27e1f2ff..a39d6851 100644 --- a/src-qt5/desktop-utils/lumina-screenshot/main.cpp +++ b/src-qt5/desktop-utils/lumina-screenshot/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) diff --git a/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp b/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp index ea970df9..52e15314 100644 --- a/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp +++ b/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp @@ -9,7 +9,7 @@ #include <QDir> #include <QDesktopWidget> -#include <LuminaUtils.h> +#include <LUtils.h> TrayIcon::TrayIcon() : QSystemTrayIcon(){ //Create the child widgets here @@ -169,4 +169,4 @@ void TrayIcon::TermHidden(){ void TrayIcon::TermVisible(){ termVisible = true; -}
\ No newline at end of file +} diff --git a/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro b/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro index ada7110b..4c623087 100644 --- a/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro +++ b/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro @@ -5,6 +5,12 @@ QT += core gui widgets network TARGET = lumina-terminal target.path = $${L_BINDIR} +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + HEADERS += TrayIcon.h \ TermWindow.h \ TerminalWidget.h \ @@ -17,10 +23,8 @@ SOURCES += main.cpp \ TtyProcess.cpp -LIBS += -lLuminaUtils -lncurses - +LIBS += -lncurses -DEPENDPATH += ../../libLumina TRANSLATIONS = i18n/l-terminal_af.ts \ i18n/l-terminal_ar.ts \ diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp index c4f4eaca..4a7fbabf 100644 --- a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp @@ -10,7 +10,7 @@ #include "syntaxSupport.h" #include <LuminaXDG.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include <QFileDialog> #include <QDir> diff --git a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp index 99a0ed75..e8eaa007 100644 --- a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp +++ b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp @@ -14,7 +14,7 @@ #include <QApplication> #include <QMessageBox> -#include <LuminaUtils.h> +#include <LUtils.h> //============== // PUBLIC diff --git a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro index 8b46f7b2..3da05dbc 100644 --- a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro +++ b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro @@ -5,6 +5,12 @@ QT += core gui widgets TARGET = lumina-textedit target.path = $${L_BINDIR} +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + HEADERS += MainUI.h \ PlainTextEditor.h \ syntaxSupport.h \ @@ -18,10 +24,6 @@ SOURCES += main.cpp \ FORMS += MainUI.ui \ ColorDialog.ui -LIBS += -lLuminaUtils - - -DEPENDPATH += ../../libLumina TRANSLATIONS = i18n/l-te_af.ts \ i18n/l-te_ar.ts \ diff --git a/src-qt5/desktop-utils/lumina-textedit/main.cpp b/src-qt5/desktop-utils/lumina-textedit/main.cpp index f4ee02cf..346a6c44 100644 --- a/src-qt5/desktop-utils/lumina-textedit/main.cpp +++ b/src-qt5/desktop-utils/lumina-textedit/main.cpp @@ -8,7 +8,7 @@ #include <QDebug> #include <LuminaThemes.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include "MainUI.h" |