diff options
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r-- | src-qt5/desktop-utils/lumina-fm/FODialog.cpp | 2 | ||||
-rw-r--r-- | src-qt5/desktop-utils/lumina-fm/MainUI.cpp | 6 | ||||
-rw-r--r-- | src-qt5/desktop-utils/lumina-fm/lumina-fm.pro | 7 | ||||
-rw-r--r-- | src-qt5/desktop-utils/lumina-terminal/TerminalWidget.cpp | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/FODialog.cpp b/src-qt5/desktop-utils/lumina-fm/FODialog.cpp index b9acdc03..b03f1b56 100644 --- a/src-qt5/desktop-utils/lumina-fm/FODialog.cpp +++ b/src-qt5/desktop-utils/lumina-fm/FODialog.cpp @@ -193,7 +193,7 @@ QStringList FOWorker::subfiles(QString dirpath, bool dirsfirst){ for(int i=0; i<subdirs.length(); i++){ out << subfiles(dir.absoluteFilePath(subdirs[i]), dirsfirst); } } //List the files - QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden, QDir::NoSort); + QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System, QDir::NoSort); for(int i=0; i<files.length(); i++){ out << dir.absoluteFilePath(files[i]); } if(!dirsfirst){ diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp index 010df40d..a4d2db28 100644 --- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp @@ -718,10 +718,10 @@ void MainUI::OpenImages(LFileInfoList list){ void MainUI::OpenTerminal(QString dirpath){ //we use the application defined as the default terminal - QSettings sessionsettings( QSettings::UserScope, "LuminaDE","sessionsettings", this); + //QSettings sessionsettings( QSettings::UserScope, "LuminaDE","sessionsettings", this); //xterm remains the default - QString defTerminal = sessionsettings.value("default-terminal", "xterm").toString(); - //qDebug() << "Found default terminal:" << defTerminal; + QString defTerminal = LXDG::findDefaultAppForMime("application/terminal"); //sessionsettings.value("default-terminal", "xterm").toString(); + qDebug() << "Found default terminal:" << defTerminal; //Now get the exec string and run it QString cmd = LUtils::GenerateOpenTerminalExec(defTerminal, dirpath); //qDebug() << "Starting Terminal with command:" << cmd; diff --git a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro index 9bb90a0e..5e0717f8 100644 --- a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro +++ b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro @@ -34,12 +34,11 @@ FORMS += MainUI.ui \ widgets/SlideshowWidget.ui \ widgets/DirWidget.ui -# RESOURCES+= lumina-fm.qrc +icons.files = Insight-FileManager.png +icons.path = $${L_SHAREDIR}/pixmaps LIBS += -lLuminaUtils -DEPENDPATH += ../libLumina - TRANSLATIONS = i18n/lumina-fm_af.ts \ i18n/lumina-fm_ar.ts \ i18n/lumina-fm_az.ts \ @@ -109,7 +108,7 @@ dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_RO desktop.files=lumina-fm.desktop desktop.path=$${L_SHAREDIR}/applications/ -INSTALLS += target dotrans desktop +INSTALLS += target dotrans desktop icons NO_I18N{ INSTALLS -= dotrans diff --git a/src-qt5/desktop-utils/lumina-terminal/TerminalWidget.cpp b/src-qt5/desktop-utils/lumina-terminal/TerminalWidget.cpp index 9d0162a6..e8f80f88 100644 --- a/src-qt5/desktop-utils/lumina-terminal/TerminalWidget.cpp +++ b/src-qt5/desktop-utils/lumina-terminal/TerminalWidget.cpp @@ -18,7 +18,7 @@ TerminalWidget::TerminalWidget(QWidget *parent, QString dir) : QTextEdit(parent){ //Setup the text widget - this->setStyleSheet("background: black;"); + this->setStyleSheet("background: black; color: white;"); this->setLineWrapMode(QTextEdit::WidgetWidth); this->setAcceptRichText(false); this->setOverwriteMode(true); |