diff options
| -rw-r--r-- | OS-detect.pri | 50 | ||||
| -rw-r--r-- | libLumina/libLumina.pro | 42 | ||||
| -rw-r--r-- | lumina-desktop/AppMenu.cpp | 2 | ||||
| -rw-r--r-- | lumina-fm/FODialog.cpp | 7 | ||||
| -rw-r--r-- | lumina.pro | 3 |
5 files changed, 74 insertions, 30 deletions
diff --git a/OS-detect.pri b/OS-detect.pri new file mode 100644 index 00000000..d334476d --- /dev/null +++ b/OS-detect.pri @@ -0,0 +1,50 @@ +# ============================================= +# Subroutine for project files to detect which OS is compiling the project +# Generic variables it sets for internal use: OS, LINUX_DISTRO (if OS=="Linux") +# ============================================= +# Main Build Variables: +# PREFIX: Base install directory (${PREFIX}/[bin/share/etc/include] will be used) +# LIBPREFIX: Base install directory for libraries (usually ${PREFIX}/lib) +# QTLIBDIR: Directory where the Qt libraries are currently installed +# +# ============================================= +# Note: Make sure the OS variable matches the name of a libLumina/LuminaOS-<OS>.cpp file +# ============================================= +!defined(OS){ + message("Build OS Info: $${QMAKE_HOST.os}, $${QMAKE_HOST.arch}, $${QMAKE_HOST.version_string}") + OS=$$QMAKE_HOST.os + + #Setup the default values for build settings (if not explicitly set previously) + !defined(PREFIX){ PREFIX=/usr/local/ } + !defined(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib } + !defined(QTLIBDIR){ QTLIBDIR=$${LIBPREFIX}/qt5 } + + #Now go through and setup any known OS build settings + # which are different from the defaults + equals(OS, "NetBSD"){ + PREFIX=/usr/local + LIBPREFIX=/usr/local/lib + QTLIBDIR=/usr/local/lib/qt5 + }else:contains(OS, "Linux"){ + OS=Linux + exists(/bin/lsb_release){ + LINUX_DISTRO = $$system(lsb_release -si) + } else:exists(/usr/bin/lsb_release){ + LINUX_DISTRO = $$system(lsb_release -si) + } + + #Now switch through known Linux distro templates + equals(LINUX_DISTRO, "Fedora"){ + PREFIX=/usr/local + LIBPREFIX=/lib64 + QTLIBDIR=/lib/qt5 + + } + + } + MSG="Build Settings Loaded: $${OS}" + equals(OS,"Linux"){ MSG+="-$${LINUX_DISTRO}" } + message( $$MSG ) + #now remove the temporary MSG variable + +}
\ No newline at end of file diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro index d17908b4..a33ec66d 100644 --- a/libLumina/libLumina.pro +++ b/libLumina/libLumina.pro @@ -1,3 +1,4 @@ +include("$${PWD}/../OS-detect.pri") QT += core network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent svg @@ -5,15 +6,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent TARGET=LuminaUtils -isEmpty(PREFIX) { - PREFIX = /usr/local -} - system(./make-global-h.sh $$PREFIX) -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} target.path = $$DESTDIR$$LIBPREFIX DESTDIR= $$_PRO_FILE_PWD_/ @@ -33,32 +27,24 @@ SOURCES += LuminaXDG.cpp \ LuminaUtils.cpp \ LuminaX11.cpp \ LuminaThemes.cpp \ - LuminaSingleApplication.cpp \ - LuminaOS-FreeBSD.cpp \ - LuminaOS-DragonFly.cpp \ - LuminaOS-NetBSD.cpp \ - LuminaOS-OpenBSD.cpp \ - LuminaOS-kFreeBSD.cpp + LuminaSingleApplication.cpp +# LuminaOS-FreeBSD.cpp \ +# LuminaOS-DragonFly.cpp \ +# LuminaOS-NetBSD.cpp \ +# LuminaOS-OpenBSD.cpp \ +# LuminaOS-kFreeBSD.cpp # new OS support can be added here # check linux distribution and use specific -# LuminaOS support functions (or fall back to -# generic one - -exists(/bin/lsb_release){ - LINUX_DISTRIBUTION = $$system(lsb_release -si) -} exists(/usr/bin/lsb_release){ - LINUX_DISTRIBUTION = $$system(lsb_release -si) +# LuminaOS support functions (or fall back to generic one) +exists($${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp){ + SOURCES += LuminaOS-$${LINUX_DISTRO}.cpp +}else:exists($${PWD}/LuminaOS-$${OS}.cpp){ + SOURCES += LuminaOS-$${OS}.cpp +}else{ + SOURCES += LuminaOS-template.cpp } -equals(LINUX_DISTRIBUTION, "Debian"): { - SOURCES += LuminaOS-Debian.cpp -} else { - SOURCES += LuminaOS-Linux.cpp -} - - - INCLUDEPATH += $$PREFIX/include LIBS += -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage diff --git a/lumina-desktop/AppMenu.cpp b/lumina-desktop/AppMenu.cpp index f38d7d85..14af988a 100644 --- a/lumina-desktop/AppMenu.cpp +++ b/lumina-desktop/AppMenu.cpp @@ -49,7 +49,7 @@ void AppMenu::updateAppList(){ //--Look for the app store XDGDesktop store = LXDG::loadDesktopFile(appstorelink, ok); if(ok){ - this->addAction( LXDG::findIcon(store.icon, ""), tr("Install Applications"), this, SLOT(launchStore()) ); + this->addAction( LXDG::findIcon(store.icon, ""), tr("Manage Applications"), this, SLOT(launchStore()) ); } //--Look for the control panel store = LXDG::loadDesktopFile(controlpanellink, ok); diff --git a/lumina-fm/FODialog.cpp b/lumina-fm/FODialog.cpp index a34e37c9..b9acdc03 100644 --- a/lumina-fm/FODialog.cpp +++ b/lumina-fm/FODialog.cpp @@ -10,6 +10,8 @@ #include <QApplication> #include <QFontMetrics> +#include <ScrollDialog.h> + #define DEBUG 0 FODialog::FODialog(QWidget *parent) : QDialog(parent), ui(new Ui::FODialog){ @@ -163,7 +165,10 @@ void FODialog::WorkDone(QStringList errlist){ else if(Worker->isCP){ msg = tr("Could not copy these files:"); } else if(Worker->isRESTORE){ msg = tr("Could not restore these files:"); } else if(Worker->isMV){ msg = tr("Could not move these files:"); } - QMessageBox::warning(this, tr("File Errors"), msg+"\n\n"+errlist.join("\n")); + ScrollDialog dlg(this); + dlg.setWindowTitle(tr("File Errors")); + dlg.setText( msg+"\n\n"+errlist.join("\n") ); + dlg.exec(); } noerrors = errlist.isEmpty(); this->close(); @@ -1,3 +1,6 @@ + +include("OS-detect.pri") + TEMPLATE = subdirs CONFIG += recursive |