aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-11-15 09:26:49 -0500
committerKen Moore <ken@ixsystems.com>2017-11-15 09:26:49 -0500
commitfedae78e9b525bf1122170c1d009b8f79a45804c (patch)
tree79c094e778583ec6b94bad5263b0327131972935
parentExpose the "directory" saving option within lumina-config for wallpapers now. (diff)
downloadlumina-fedae78e9b525bf1122170c1d009b8f79a45804c.tar.gz
lumina-fedae78e9b525bf1122170c1d009b8f79a45804c.tar.bz2
lumina-fedae78e9b525bf1122170c1d009b8f79a45804c.zip
Finish cleaning up the new LFileInfo class/file.
-rw-r--r--src-qt5/core/libLumina/LFileInfo.cpp2
-rw-r--r--src-qt5/desktop-utils/lumina-fm/Browser.cpp3
-rw-r--r--src-qt5/desktop-utils/lumina-fm/MainUI.cpp5
3 files changed, 8 insertions, 2 deletions
diff --git a/src-qt5/core/libLumina/LFileInfo.cpp b/src-qt5/core/libLumina/LFileInfo.cpp
index 5f368ad5..e54ce5cc 100644
--- a/src-qt5/core/libLumina/LFileInfo.cpp
+++ b/src-qt5/core/libLumina/LFileInfo.cpp
@@ -12,11 +12,13 @@ LFileInfo::LFileInfo() : QFileInfo(){
}
LFileInfo::LFileInfo(QString filepath) : QFileInfo(){ //overloaded contructor
+ desk = 0;
this->setFile(filepath);
loadExtraInfo();
}
LFileInfo::LFileInfo(QFileInfo info) : QFileInfo(){ //overloaded contructor
+ desk = 0;
this->swap(info); //use the given QFileInfo without re-loading it
loadExtraInfo();
}
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
index 29cc5a99..a3a8f7ee 100644
--- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
@@ -102,7 +102,7 @@ void Browser::futureFinished(QString name, QImage icon){
//Note: this will be called once for every item that loads
//Haven't added the extra files in a directory fix, but that should be easy to do
//Try to load a file with multiple videos and lots of other stuff before any other directory. It crashes for some reason
- //qDebug() << name << "here";
+ //qDebug() << "Finished:" << name;
QIcon *ico = new QIcon();
LFileInfo *info = new LFileInfo(name);
if(!icon.isNull() && showThumbs){
@@ -153,6 +153,7 @@ void Browser::loadDirectory(QString dir, bool force){
if(showHidden){ files = directory.entryList( QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, QDir::NoSort); }
else{ files = directory.entryList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot, QDir::NoSort); }
if(dirupdate){ emit itemsLoading(files.length()); }
+ //qDebug() << "Files Found:" << files.length();
for(int i=0; i<files.length(); i++){
watcher->addPath(directory.absoluteFilePath(files[i]));
QString path = directory.absoluteFilePath(files[i]);
diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
index 9ce7b69e..28bfa20b 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
@@ -8,13 +8,14 @@
#include "ui_MainUI.h"
#include <QMenu>
-#include <QFileInfo>
+
#include "gitCompat.h"
#include "gitWizard.h"
#include <LUtils.h>
#include <LDesktopUtils.h>
#include <ExternalProcess.h>
+#include <LFileInfo.h>
#define DEBUG 0
bool rootmode = false;
@@ -184,6 +185,7 @@ void MainUI::OpenDirs(QStringList dirs){
}*/
//Initialize the widget with the proper settings
+ if(DEBUG){ qDebug() << "Setup Dir Widget"; }
DW->setShowDetails(radio_view_details->isChecked());
DW->setThumbnailSize(settings->value("iconsize", 32).toInt());
DW->showHidden( ui->actionView_Hidden_Files->isChecked() );
@@ -191,6 +193,7 @@ void MainUI::OpenDirs(QStringList dirs){
//DW->showDirTreePane( ui->actionView_showDirTreePane->isChecked() );
DW->adjustTreeWidget( settings->value("dirTree_width", 25.0).toFloat() );
//Now load the directory
+ if(DEBUG){ qDebug() << "Load Directory"; }
DW->ChangeDir(dirs[i]); //kick off loading the directory info
}
//Update visibilities
bgstack15