From 725ca9791ec516f1bb0c5a37ec17fbedd888d928 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 13 Oct 2016 13:10:34 -0400 Subject: Another large update to lumina-fm: Have all file operations performed in the background, and show up within a new system tray icon *if* the operation lasts longer than 1 second (automatic cleanup for short ops). --- src-qt5/desktop-utils/lumina-fm/Browser.cpp | 8 +- src-qt5/desktop-utils/lumina-fm/FODialog.cpp | 10 +- src-qt5/desktop-utils/lumina-fm/FODialog.h | 8 +- src-qt5/desktop-utils/lumina-fm/MainUI.cpp | 29 +- src-qt5/desktop-utils/lumina-fm/MainUI.h | 6 +- src-qt5/desktop-utils/lumina-fm/OPWidget.cpp | 108 ++ src-qt5/desktop-utils/lumina-fm/OPWidget.h | 59 ++ src-qt5/desktop-utils/lumina-fm/OPWidget.ui | 71 ++ src-qt5/desktop-utils/lumina-fm/TrayUI.cpp | 86 ++ src-qt5/desktop-utils/lumina-fm/TrayUI.h | 46 + src-qt5/desktop-utils/lumina-fm/lumina-fm.pro | 11 +- .../desktop-utils/lumina-fm/widgets/DirWidget.cpp | 1049 -------------------- .../desktop-utils/lumina-fm/widgets/DirWidget.h | 184 ---- .../desktop-utils/lumina-fm/widgets/DirWidget.ui | 527 ---------- 14 files changed, 413 insertions(+), 1789 deletions(-) create mode 100644 src-qt5/desktop-utils/lumina-fm/OPWidget.cpp create mode 100644 src-qt5/desktop-utils/lumina-fm/OPWidget.h create mode 100644 src-qt5/desktop-utils/lumina-fm/OPWidget.ui create mode 100644 src-qt5/desktop-utils/lumina-fm/TrayUI.cpp create mode 100644 src-qt5/desktop-utils/lumina-fm/TrayUI.h delete mode 100644 src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp delete mode 100644 src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h delete mode 100644 src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.ui (limited to 'src-qt5/desktop-utils/lumina-fm') diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp index 7455e5ea..72920757 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp +++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp @@ -67,12 +67,14 @@ void Browser::loadItem(QString info){ // PRIVATE SLOTS void Browser::fileChanged(QString file){ - if(file.startsWith(currentDir+"/")){ QtConcurrent::run(this, &Browser::loadItem, file ); } - else if(file==currentDir){ QTimer::singleShot(0, this, SLOT(loadDirectory()) ); } + if(file.startsWith(currentDir+"/") ){ + if(QFile::exists(file) ){ QtConcurrent::run(this, &Browser::loadItem, file ); } //file modified but not removed + else{ QTimer::singleShot(0, this, SLOT(loadDirectory()) ); } //file removed - need to update entire dir + }else if(file==currentDir){ QTimer::singleShot(0, this, SLOT(loadDirectory()) ); } } void Browser::dirChanged(QString dir){ - if(dir==currentDir){ QTimer::singleShot(0, this, SLOT(loadDirectory()) ); } + if(dir==currentDir){ QTimer::singleShot(500, this, SLOT(loadDirectory()) ); } else if(dir.startsWith(currentDir)){ QtConcurrent::run(this, &Browser::loadItem, dir ); } } diff --git a/src-qt5/desktop-utils/lumina-fm/FODialog.cpp b/src-qt5/desktop-utils/lumina-fm/FODialog.cpp index b03f1b56..ee22f832 100644 --- a/src-qt5/desktop-utils/lumina-fm/FODialog.cpp +++ b/src-qt5/desktop-utils/lumina-fm/FODialog.cpp @@ -295,17 +295,17 @@ void FOWorker::slotStartOperations(){ if(isRM){ //only old files olist << subfiles(ofiles[i], false); //dirs need to be last for removals }else if(isCP || isRESTORE){ - if(nfiles[i] == ofiles[i] && overwrite==1){ - //Trying to copy a file/dir to itself - skip it - continue; - } if(QFile::exists(nfiles[i])){ if(overwrite!=1){ qDebug() << " - Get New Filename:" << nfiles[i]; nfiles[i] = newFileName(nfiles[i]); //prompt for new file name up front before anything starts - qDebug() << " -- nfiles[i]"; + qDebug() << " -- " << nfiles[i]; } } + if(nfiles[i] == ofiles[i] && overwrite==1){ + //Trying to copy a file/dir to itself - skip it + continue; + } QStringList subs = subfiles(ofiles[i], true); //dirs need to be first for additions for(int s=0; s #include -namespace Ui{ - class FODialog; -}; - class FOWorker : public QObject{ Q_OBJECT public: @@ -57,6 +53,10 @@ signals: void finished(QStringList); //errors returned }; +namespace Ui{ + class FODialog; +}; + class FODialog : public QDialog{ Q_OBJECT public: diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp index bac365e1..02533271 100644 --- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp @@ -105,6 +105,7 @@ QSize orig = settings->value("preferences/MainWindowSize", QSize()).toSize(); if(DEBUG){ qDebug() << " - Devices"; } RebuildDeviceMenu(); //Make sure we start on the browser page + TRAY = new TrayUI(this); if(DEBUG){ qDebug() << " - Done with init"; } } @@ -802,28 +803,30 @@ void MainUI::PasteFiles(QString dir, QStringList raw){ newcopy<< dir+raw[i].section("::::",1,50).section("/",-1); } } - bool errs = false; + //bool errs = false; //Perform the copy/move operations - worker->pauseData = true; //pause any info requests + //worker->pauseData = true; //pause any info requests if(!copy.isEmpty()){ qDebug() << "Paste Copy:" << copy << "->" << newcopy; - FODialog dlg(this); + TRAY->StartOperation( TrayUI::COPY, copy, newcopy); + /*FODialog dlg(this); if( !dlg.CopyFiles(copy, newcopy) ){ return; } //cancelled dlg.show(); dlg.exec(); - errs = errs || !dlg.noerrors; + errs = errs || !dlg.noerrors;*/ } if(!cut.isEmpty()){ qDebug() << "Paste Cut:" << cut << "->" << newcut; - FODialog dlg(this); + TRAY->StartOperation(TrayUI::MOVE, cut, newcut); + /*FODialog dlg(this); if(!dlg.MoveFiles(cut, newcut) ){ return; } //cancelled dlg.show(); dlg.exec(); - errs = errs || !dlg.noerrors; + errs = errs || !dlg.noerrors;*/ } - worker->pauseData = false; //resume info requests + //worker->pauseData = false; //resume info requests //Modify the clipboard appropriately - if(!errs && !cut.isEmpty()){ + if(!cut.isEmpty()){ //Now clear the clipboard since those old file locations are now invalid QApplication::clipboard()->clear(); if(!copy.isEmpty()){ @@ -876,11 +879,12 @@ void MainUI::RenameFiles(QStringList list){ //Now perform the move //Don't pause the background worker for a simple rename - this operation is extremely fast qDebug() << "Rename:" << path+fname << "->" << path+nname; - FODialog dlg(this); + TRAY->StartOperation(TrayUI::MOVE, QStringList() << path+fname, QStringList() << path+nname); + /*FODialog dlg(this); dlg.setOverwrite(overwrite); dlg.MoveFiles(QStringList() << path+fname, QStringList() << path+nname); dlg.show(); - dlg.exec(); + dlg.exec();*/ } //end loop over list of files } @@ -901,11 +905,12 @@ void MainUI::RemoveFiles(QStringList list){ //Now remove the file/dir qDebug() << " - Delete: "<StartOperation(TrayUI::DELETE, paths, QStringList()); //worker->pauseData = true; //pause any info requests - FODialog dlg(this); + /*FODialog dlg(this); dlg.RemoveFiles(paths); dlg.show(); - dlg.exec(); + dlg.exec();*/ //worker->pauseData = false; //resume info requests //for(int i=0; irefresh(); } } diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.h b/src-qt5/desktop-utils/lumina-fm/MainUI.h index 94c6f6c2..0ed9c44b 100644 --- a/src-qt5/desktop-utils/lumina-fm/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fm/MainUI.h @@ -49,7 +49,8 @@ #include // Local includes -#include "FODialog.h" //file operation dialog +//#include "FODialog.h" //file operation dialog +#include "TrayUI.h" #include "BMMDialog.h" //bookmark manager dialog #include "DirData.h" @@ -86,7 +87,8 @@ private: QList DWLIST; MultimediaWidget *MW; SlideshowWidget *SW; - + TrayUI *TRAY; + QSettings *settings; QShortcut *nextTabLShort, *nextTabRShort, *togglehiddenfilesShort, *focusDirWidgetShort; //QCompleter *dirCompleter; diff --git a/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp b/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp new file mode 100644 index 00000000..3e842b90 --- /dev/null +++ b/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp @@ -0,0 +1,108 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "OPWidget.h" +#include "ui_OPWidget.h" + +OPWidget::OPWidget(QWidget *parent) : QWidget(parent), ui(new Ui::OPWidget()){ + starttime = endtime = -1; + WA = new QWidgetAction(0); + WA->setDefaultWidget(this); + worker = 0; + workthread = 0; + //Now create the widget + ui->setupUi(this); + ui->tool_close->setIcon( LXDG::findIcon("dialog-close","view-close") ); + ui->tool_showerrors->setIcon(LXDG::findIcon("view-search","")); + //connect the widget buttons + connect(ui->tool_close, SIGNAL(clicked()), this, SLOT(closeWidget()) ); + connect(ui->tool_showerrors, SIGNAL(clicked()), this, SLOT(showErrors()) ); +} + +OPWidget::~OPWidget(){ + if(worker!=0){ worker->stopped = true; worker->deleteLater(); } + if(workthread!=0){ workthread->quit(); workthread->wait(); delete workthread; } + WA->deleteLater(); +} + +QWidgetAction* OPWidget::widgetAction(){ + return WA; +} + +void OPWidget::setupOperation(QString optype, QStringList oldF, QStringList newF){ + if(workthread==0){ workthread = new QThread(); } + if(worker==0){ + worker = new FOWorker(); + connect(worker, SIGNAL(startingItem(int,int,QString,QString)), this, SLOT(opUpdate(int,int,QString,QString)) ); + connect(worker, SIGNAL(finished(QStringList)), this, SLOT(opFinished(QStringList)) ); + worker->moveToThread(workthread); + } + workthread->start(); + //Now setup the worker with the desired operation + optype = optype.toLower(); + worker->ofiles = oldF; + worker->nfiles = newF; + if(optype=="move"){ worker->isMV = true; tract = tr("Move"); } + else if(optype=="copy"){ worker->isCP = true; tract = tr("Copy"); } + else if(optype=="delete"){ worker->isRM = true; tract = tr("Remove"); } + +} + + +bool OPWidget::isDone(){ + return (endtime>0); +} + +bool OPWidget::hasErrors(){ + return !Errors.isEmpty(); +} + +float OPWidget::duration(){ + return ( (endtime-starttime)/1000.0); //convert from ms to s +} + + +QString OPWidget::finalStat(){ + return ui->label->text(); +} + + +//PUBLIC SLOTS +void OPWidget::startOperation(){ + starttime = QDateTime::currentMSecsSinceEpoch(); + endtime = -1; + QTimer::singleShot(0, worker, SLOT(slotStartOperations()) ); + emit starting(this->whatsThis()); +} + + +// PRIVATE SLOTS +void OPWidget::closeWidget(){ + if(!isDone()){ worker->stopped = true; } + else{ emit closed(this->whatsThis()); } +} + +void OPWidget::showErrors(){ + qDebug() << "Errors:" << Errors; + //TODO +} + +void OPWidget::opFinished(QStringList errors){ + Errors = errors; + endtime = QDateTime::currentMSecsSinceEpoch(); + emit finished(this->whatsThis()); + ui->progressBar->setValue(ui->progressBar->maximum()); //last item finished + ui->tool_showerrors->setVisible(!Errors.isEmpty()); + ui->label->setText( QString(tr("%1 Finished")).arg(tract) + (errors.isEmpty() ? "" : (" ("+tr("Errors Occured")+")") ) ); +} + +void OPWidget::opUpdate(int cur, int tot, QString ofile, QString nfile){ //current, total, old file, new file + ui->progressBar->setRange(0,tot); + ui->progressBar->setValue(cur); + QString txt = tract +": "+ofile.section("/",-1); + if(!nfile.isEmpty()){txt.append(" -> "+nfile.section("/",-1) ); } + ui->label->setText( txt); +} diff --git a/src-qt5/desktop-utils/lumina-fm/OPWidget.h b/src-qt5/desktop-utils/lumina-fm/OPWidget.h new file mode 100644 index 00000000..600df4b7 --- /dev/null +++ b/src-qt5/desktop-utils/lumina-fm/OPWidget.h @@ -0,0 +1,59 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// This is the system tray icon for queueing/running file operations +//=========================================== +#ifndef _LUMINA_FILE_MANAGER_FILE_OP_OPWIDGET_H +#define _LUMINA_FILE_MANAGER_FILE_OP_OPWIDGET_H + +#include "FODialog.h" +namespace Ui{ + class OPWidget; +}; + +class OPWidget : public QWidget{ + Q_OBJECT +public: + OPWidget(QWidget *parent = 0); + ~OPWidget(); + + QWidgetAction* widgetAction(); //for loading the widget into a menu + + void setupOperation(QString optype, QStringList oldF, QStringList newF); + + bool isDone(); + + //Status reporting after worker finishes + bool hasErrors(); + float duration(); //in seconds + QString finalStat(); //Final status message + +public slots: + void startOperation(); + +private: + Ui::OPWidget *ui; + //Main Objects + QWidgetAction *WA; + FOWorker *worker; + QThread *workthread; + //Bookkeeping items for statistics and such + qint64 starttime, endtime; //in ms + QStringList Errors; + QString tract; //translated action + +private slots: + void closeWidget(); + void showErrors(); + void opFinished(QStringList); //errors + void opUpdate(int, int, QString, QString); //current, total, old file, new file + +signals: + void starting(QString); + void finished(QString); + void closed(QString); +}; +#endif diff --git a/src-qt5/desktop-utils/lumina-fm/OPWidget.ui b/src-qt5/desktop-utils/lumina-fm/OPWidget.ui new file mode 100644 index 00000000..3daafaf2 --- /dev/null +++ b/src-qt5/desktop-utils/lumina-fm/OPWidget.ui @@ -0,0 +1,71 @@ + + + OPWidget + + + + 0 + 0 + 202 + 67 + + + + Form + + + + 2 + + + 2 + + + 2 + + + 2 + + + + + 0 + + + -1 + + + + + + + + + ... + + + + + + + ... + + + + + + + + + Evaluating... + + + Qt::AlignCenter + + + + + + + + diff --git a/src-qt5/desktop-utils/lumina-fm/TrayUI.cpp b/src-qt5/desktop-utils/lumina-fm/TrayUI.cpp new file mode 100644 index 00000000..8e796c68 --- /dev/null +++ b/src-qt5/desktop-utils/lumina-fm/TrayUI.cpp @@ -0,0 +1,86 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "TrayUI.h" + +#include +#include + +TrayUI::TrayUI(QObject *parent) : QSystemTrayIcon(parent){ + this->setContextMenu( new QMenu() ); + this->setIcon(LXDG::findIcon("Insight-FileManager","")); +} + +TrayUI::~TrayUI(){ + this->contextMenu()->deleteLater(); +} + +void TrayUI::StartOperation( FILEOP op, QStringList oldF, QStringList newF){ + createOP(op, oldF, newF); + QTimer::singleShot(1000, this, SLOT(checkJobs())); +} + +void TrayUI::createOP( FILEOP type, QStringList oldF, QStringList newF){ + OPWidget *OP = new OPWidget(); + if(type==MOVE){ OP->setupOperation("move", oldF, newF); } + else if(type==COPY){ OP->setupOperation("copy", oldF, newF); } + else if(type==DELETE){ OP->setupOperation("delete",oldF, QStringList()); } + else{ OP->deleteLater(); return; } //invalid type of operation + OP->setWhatsThis( QUuid::createUuid().toString() ); + this->contextMenu()->addAction(OP->widgetAction()); + OPS << OP; + connect(OP, SIGNAL(starting(QString)), this, SLOT(OperationStarted(QString)) ); + connect(OP, SIGNAL(finished(QString)), this, SLOT(OperationFinished(QString)) ); + connect(OP, SIGNAL(closed(QString)), this, SLOT(OperationClosed(QString)) ); + QTimer::singleShot(0, OP, SLOT(startOperation()) ); +} + +//Operation Widget Responses +void TrayUI::OperationClosed(QString ID){ + for(int i=0; iwhatsThis()==ID){ + //qDebug() << "Removing OPWidget:" << ID; + //this->contextMenu()->removeAction(OPS[i]->widgetAction()); + OPS.takeAt(i)->deleteLater(); + break; + } + } + QTimer::singleShot(1000, this, SLOT(checkJobs()) ); +} + +void TrayUI::OperationStarted(QString ID){ + for(int i=0; iwhatsThis()==ID){ + //NOTHING FOR NOW - ENABLE POPUPS LATER (if desired - they can get annoying for short operations) + } + } +} + +void TrayUI::OperationFinished(QString ID){ + //qDebug() << "Op Finished:" << ID; + for(int i=0; iwhatsThis()!=ID){ continue; } + //qDebug() << " - found widget"; + bool err = OPS[i]->hasErrors(); + //qDebug() << " -- Errors:" << err << "Duration:" << OPS[i]->duration(); + //Assemble the notification (if more than 1 second to perform operation) + if(OPS[i]->duration()>1){ + this->showMessage( tr("Finished"), err ? tr("Errors during operation. Click to view details") : tr("No Errors"), err ? QSystemTrayIcon::Warning : QSystemTrayIcon::Information); + } + //Close the widget if no errors + if(!err){ OperationClosed(ID); } + break; + } +} + +void TrayUI::checkJobs(){ + if(OPS.isEmpty()){ + emit JobsFinished(); + this->hide(); + }else{ + this->show(); + } +} diff --git a/src-qt5/desktop-utils/lumina-fm/TrayUI.h b/src-qt5/desktop-utils/lumina-fm/TrayUI.h new file mode 100644 index 00000000..38a99f7a --- /dev/null +++ b/src-qt5/desktop-utils/lumina-fm/TrayUI.h @@ -0,0 +1,46 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// This is the system tray icon for queueing/running file operations +//=========================================== +#ifndef _LUMINA_FILE_MANAGER_FILE_OP_SYSTRAY_H +#define _LUMINA_FILE_MANAGER_FILE_OP_SYSTRAY_H + +#include "OPWidget.h" + +#include +#include + +class TrayUI : public QSystemTrayIcon{ + Q_OBJECT +public: + enum FILEOP{MOVE, COPY, DELETE}; //File Operations + + TrayUI(QObject *parent = 0); + ~TrayUI(); + +public slots: + void StartOperation( FILEOP op, QStringList oldF, QStringList newF); + +private: + QList OPS; + + void createOP( FILEOP, QStringList oldF, QStringList newF); + +private slots: + + //Operation Widget Responses + void OperationClosed(QString ID); + void OperationStarted(QString ID); + void OperationFinished(QString ID); + + void checkJobs(); //see if any jobs are still active/visible, otherwise hide the tray icon + +signals: + void JobsFinished(); + +}; +#endif diff --git a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro index 8fb482c7..92042ad7 100644 --- a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro +++ b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro @@ -19,7 +19,9 @@ SOURCES += main.cpp \ gitCompat.cpp \ gitWizard.cpp \ Browser.cpp \ - BrowserWidget.cpp + BrowserWidget.cpp \ + TrayUI.cpp \ + OPWidget.cpp HEADERS += MainUI.h \ FODialog.h \ @@ -33,7 +35,9 @@ HEADERS += MainUI.h \ gitCompat.h \ gitWizard.h \ Browser.h \ - BrowserWidget.h + BrowserWidget.h \ + TrayUI.h \ + OPWidget.h FORMS += MainUI.ui \ FODialog.ui \ @@ -41,7 +45,8 @@ FORMS += MainUI.ui \ widgets/MultimediaWidget.ui \ widgets/SlideshowWidget.ui \ widgets/DirWidget2.ui \ - gitWizard.ui + gitWizard.ui \ + OPWidget.ui icons.files = Insight-FileManager.png icons.path = $${L_SHAREDIR}/pixmaps diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp deleted file mode 100644 index d729d608..00000000 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.cpp +++ /dev/null @@ -1,1049 +0,0 @@ -//=========================================== -// Lumina-DE source code -// Copyright (c) 2015, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -#include "DirWidget.h" -#include "ui_DirWidget.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "../ScrollDialog.h" - -#define DEBUG 0 - - -const QString sessionsettings_config_file = QDir::homePath() + "/.config/lumina-desktop/sessionsettings.conf"; - -DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){ - ui->setupUi(this); //load the designer file - ID = objID; - //Assemble the toolbar for the widget - toolbar = new QToolBar(this); - toolbar->setContextMenuPolicy(Qt::CustomContextMenu); - toolbar->setFloatable(false); - toolbar->setMovable(false); - toolbar->setOrientation(Qt::Horizontal); - toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly); - //toolbar->setIconSize(QSize(32,32)); - ui->toolbar_layout->addWidget(toolbar); - // - Add the buttons to the toolbar - toolbar->addAction(ui->actionBack); - toolbar->addAction(ui->actionUp); - toolbar->addAction(ui->actionHome); - line_dir = new QLineEdit(this); - toolbar->addWidget(line_dir); - toolbar->addAction(ui->actionStopLoad); - toolbar->addAction(ui->actionClose_Browser); - //Add the browser widgets - listWidget = new DDListWidget(this); - treeWidget = new DDTreeWidget(this); - ui->browser_layout->addWidget(listWidget); - ui->browser_layout->addWidget(treeWidget); - //Create the keyboard shortcuts - /*copyFilesShort = new QShortcut( QKeySequence(tr("Ctrl+C")), this); - pasteFilesShort = new QShortcut( QKeySequence(tr("Ctrl+V")), this); - cutFilesShort = new QShortcut( QKeySequence(tr("Ctrl+X")), this); - deleteFilesShort = new QShortcut( QKeySequence(tr("Delete")), this);*/ - //Create the filesystem watcher - watcher = new QFileSystemWatcher(this); - synctimer = new QTimer(this); - synctimer->setInterval(300); // 300 millisecond pause (combine simultaneous signals from the watcher) - synctimer->setSingleShot(true); - //Now update the rest of the UI - canmodify = false; //initial value - contextMenu = new QMenu(this); - setDateFormat(); - setShowDetails(true); - setShowThumbnails(true); - UpdateIcons(); - UpdateText(); - setupConnections(); -} - -DirWidget::~DirWidget(){ - stopload = true; //just in case another thread is still loading/running -} - -void DirWidget::setFocusLineDir() { - line_dir->setFocus(); - line_dir->selectAll(); -} - -void DirWidget::cleanup(){ - stopload = true; //just in case another thread is still loading/running - if(thumbThread.isRunning()){ thumbThread.waitForFinished(); } //this will stop really quickly with the flag set -} - -void DirWidget::ChangeDir(QString dirpath){ - stopload = true; //just in case it is still loading - emit LoadDirectory(ID, dirpath); -} - -void DirWidget::setDirCompleter(QCompleter *comp){ - //line_dir->setCompleter(comp); -} - -QString DirWidget::id(){ - return ID; -} - -QString DirWidget::currentDir(){ - return CDIR; -} - -void DirWidget::setShowDetails(bool show){ - if(show!=showDetails){ - //View about to change - ensure the selection gets transferred too - tmpSel = currentSelection(); - } - showDetails = show; - listWidget->setVisible(!showDetails); - treeWidget->setVisible(showDetails); - this->refresh(); -} - -void DirWidget::setShowSidebar(bool show){ - ui->group_actions->setVisible(show); -} - -void DirWidget::setShowThumbnails(bool show){ - showThumbs = show; - this->refresh(); -} - -void DirWidget::setDetails(QList list){ - listDetails = list; - //Need to re-create the header item as well - CQTreeWidgetItem *it = new CQTreeWidgetItem(); - int nmcol = -1; int typecol = -1; - for(int t=0; tsetText(t,tr("Name")); - nmcol = t; - break; - case SIZE: - it->setText(t,tr("Size")); - break; - case TYPE: - it->setText(t, tr("Type")); - typecol = t; - break; - case DATEMOD: - it->setText(t, tr("Date Modified") ); - break; - case DATECREATE: - it->setText(t, tr("Date Created") ); - break; - } - } - treeWidget->setHeaderItem(it); - //Now reset the sorting (alphabetically, dirs first) - if(nmcol>=0){ treeWidget->sortItems(nmcol, Qt::AscendingOrder); } // sort by name - if(typecol>=0){ treeWidget->sortItems(typecol, Qt::AscendingOrder); } //sort by type first - - if(CDIR.isEmpty() || !showDetails){ return; } //don't need to reload dir if details are not visible - this->refresh(); -} - -void DirWidget::setThumbnailSize(int px){ - bool larger = listWidget->iconSize().height() < px; - listWidget->setIconSize(QSize(px,px)); - treeWidget->setIconSize(QSize(px,px)); - if(CDIR.isEmpty() || !larger ){ return; } //don't need to reload icons unless the new size is larger - this->refresh(); -} - -void DirWidget::setShowCloseButton(bool show){ - ui->actionClose_Browser->setVisible(show); -} - -QStringList DirWidget::getDateFormat() { - return date_format; -} - -// This function is only called if user changes sessionsettings. By doing so, operations like sorting by date -// are faster because the date format is already stored in DirWidget::date_format static variable -void DirWidget::setDateFormat() { - if(!date_format.isEmpty()) - date_format.clear(); - QSettings settings("lumina-desktop","sessionsettings"); - // If value doesn't exist or is not setted, empty string is returned - date_format << settings.value("DateFormat").toString(); - date_format << settings.value("TimeFormat").toString(); -} - - -// ================ -// PUBLIC SLOTS -// ================ -void DirWidget::LoadDir(QString dir, QList list){ - if(dir.isEmpty()){ return; } //nothing to do - QTime time; - if(DEBUG){time.start(); } - qDebug() << "Load Dir:" << dir; - QString lastdir = CDIR; //for some checks later - QString lastbasedir = normalbasedir; - CDIR = dir; - if(CDIR.endsWith("/") && CDIR.length() > 1){ CDIR.chop(1); } - CLIST = list; //save for later - canmodify = QFileInfo(CDIR).isWritable(); - if(DEBUG){ qDebug() << "Clear UI:" <label_status->setText(tr("(Limited Access) ")); } - else{ ui->label_status->setText(""); } - //Hide the extra buttons for a moment - ui->tool_goToPlayer->setVisible(false); - ui->tool_goToImages->setVisible(false); - ui->tool_new_dir->setVisible(canmodify); - ui->tool_new_file->setVisible(canmodify); - //Set the drag/drop info as appripriate - if(canmodify){ - listWidget->setWhatsThis(CDIR); - treeWidget->setWhatsThis(CDIR); - }else{ - listWidget->setWhatsThis(""); - treeWidget->setWhatsThis(""); - } - bool updateThumbs = (lastdir != CDIR); - //Determine if this is an internal ZFS snapshot - bool loadsnaps = false; - if(DEBUG){ qDebug() << "Load Snap Info:" << time.elapsed(); } - if( dir.contains(ZSNAPDIR) ){ - //This is a zfs snapshot - only update the saved paths necessary to rotate between snapshots/system - snaprelpath = dir.section(ZSNAPDIR,1,1000).section("/",1,1000); //the relative path inside the snapshot - if(snaprelpath.endsWith("/")){ snaprelpath.chop(1); } - normalbasedir = dir.section(ZSNAPDIR,0,0)+"/"+snaprelpath; //Update the new base directory - if(normalbasedir.endsWith("/")){ normalbasedir.chop(1); } - line_dir->setText(normalbasedir); - //See if this was a manual move to the directory, or an internal move - QString tmp = dir.section(ZSNAPDIR,0,0); - if(tmp != snapbasedir.section(ZSNAPDIR,0,0)){ - loadsnaps = true; //different snapshot loaded - need to update internally - } - }else{ - //This is a normal directory - prompt for snapshot information - line_dir->setText(CDIR); - normalbasedir = CDIR; - if(!snapbasedir.isEmpty()){ watcher->removePath(snapbasedir); } - snapbasedir.clear(); - loadsnaps = true; - } - if(loadsnaps){ - //kick this off while still loading the dir contents - ui->group_snaps->setEnabled(false); //to prevent the snap updates to be automatically used - ui->group_snaps->setVisible(false); - ui->slider_snap->setRange(1,1); - emit findSnaps(ID, normalbasedir); - } - - if(DEBUG){ qDebug() << "Update History:" <actionBack->setEnabled(!history.isEmpty()); - //qDebug() << " - Duplicate: removed item"; - }else if(lastbasedir!=normalbasedir){ //not a refresh or internal snapshot change - //qDebug() << " - New History Item:" << normalbasedir; - history << normalbasedir; - ui->actionBack->setEnabled(history.length()>1); - } - if(DEBUG){ qDebug() << "Update Watcher:" << time.elapsed(); } - //Clear the current watcher - if(!watcher->directories().isEmpty()){ watcher->removePaths(watcher->directories()); } - if(!watcher->files().isEmpty()){ watcher->removePaths(watcher->files()); } - watcher->addPath(CDIR); - // add sessionsettings to watcher so date_format can be update based on user settings - watcher->addPath(sessionsettings_config_file); - ui->actionStopLoad->setVisible(true); - stopload = false; - //Clear the display widget (if a new directory) - if(DEBUG){ qDebug() << "Clear Browser Widget:" << time.elapsed(); } - double scrollpercent = -1; - if(updateThumbs){ needThumbs.clear(); } - if(lastbasedir != normalbasedir){ - if(showDetails){ treeWidget->clear(); } - else{ listWidget->clear(); } - QApplication::processEvents(); //make sure it is cleared right away - }else{ - //Need to be smarter about which items need to be removed - // - compare the old/new lists and remove any items not in the new listing (new items taken care of below) - QStringList newfiles; //just the filenames - for(int i=0; itopLevelItemCount(); i++){ - if( !newfiles.contains(treeWidget->topLevelItem(i)->whatsThis(0).section("/",-1)) ){ - if(!updateThumbs){ needThumbs.removeAll( treeWidget->topLevelItem(i)->whatsThis(0).section("::::",1,50)); } - delete treeWidget->takeTopLevelItem(i); - i--; - } - } - QApplication::processEvents(); //make sure the scrollbar is up to date after removals - scrollpercent = treeWidget->verticalScrollBar()->value()/( (double) treeWidget->verticalScrollBar()->maximum()); - }else{ - for(int i=0; icount(); i++){ - if( !newfiles.contains(listWidget->item(i)->text()) ){ - if(!updateThumbs){ needThumbs.removeAll( listWidget->item(i)->whatsThis().section("::::",1,50)); } - delete listWidget->takeItem(i); - i--; - } - } - QApplication::processEvents(); //make sure the scrollbar is up to date after removals - scrollpercent = listWidget->horizontalScrollBar()->value()/( (double) listWidget->horizontalScrollBar()->maximum()); - } - } //end check for CDIR reload - //Now fill the display widget - bool hasimages, hasmultimedia; - hasimages = hasmultimedia = false; - int numdirs = 0; - qint64 filebytes = 0; - //Setup the timer to see when we should process events - /*QTimer updatetime; - updatetime.setInterval(1000); //1 second updates - updatetime.setSingleShot(true); - updatetime.start();*/ - QTime updatetime = QTime::currentTime().addMSecs(500); - if(DEBUG){ qDebug() << "Start Loop over items:" << time.elapsed(); } - for(int i=0; iactionStopLoad->setVisible(false); return; } //stop right now - if(!hasimages && list[i].isImage()){ hasimages = true; ui->tool_goToImages->setVisible(true); } - else if(!hasmultimedia && list[i].isAVFile()){ hasmultimedia = true; ui->tool_goToPlayer->setVisible(true); } - //Update statistics - if(list[i].isDir()){ numdirs++; } - else{ filebytes += list[i].size(); } - watcher->addPath(list[i].absoluteFilePath()); - if(showDetails){ - //Now create all the individual items for the details tree - CQTreeWidgetItem *it; - bool addnew = false; - //See if an item already exists for this file - QList items = treeWidget->findItems(list[i].fileName(),Qt::MatchExactly,0); //NOTE: This requires column 0 to be the name - if(items.isEmpty()){ - it = new CQTreeWidgetItem(); - addnew = true; - }else{ - // Safe downcasting because CQTreeWidgetItem only redefines the virtual function bool opearot<. Not new methos added. - it = static_cast (items.first()); - } - //Now update the entry contents - it->setWhatsThis(0, QString(canmodify ? "cut": "copy")+"::::"+list[i].absoluteFilePath()); - for(int t=0; tsetText(t,list[i].fileName()); - it->setStatusTip(t, list[i].fileName()); - //Since the icon/image is based on the filename - only update this for a new item - // (This is the slowest part of the routine) - if(list[i].isImage()&& (addnew || updateThumbs)){ - if(showThumbs){ - it->setIcon(t, LXDG::findIcon("fileview-preview","image-x-generic") ); - needThumbs << list[i].absoluteFilePath(); - }else{ it->setIcon(t, LXDG::findIcon(list[i].iconfile(),"image-x-generic") ); } - }else if(addnew){ - it->setIcon(t, LXDG::findIcon(list[i].iconfile(),"unknown") ); - } - break; - case SIZE: - if(!list[i].isDir()){ - it->setText(t, LUtils::BytesToDisplaySize(list[i].size()) ); - } - break; - case TYPE: - it->setText(t, list[i].mimetype()); - break; - case DATEMOD: - { - QStringList datetime_format = getDateFormat(); - // Save datetime in WhatThis value. Lately will be used by CQTreeWidgetItem for sorting by date - it->setWhatsThis(t, list[i].lastModified().toString("yyyyMMddhhmmsszzz")); - // Default configurition. Fallback to Qt::DefaultLocaleShortDate for formats - if(datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) - it->setText(t, list[i].lastModified().toString(Qt::DefaultLocaleShortDate) ); - // Date is setted but time not. Time goes to default - else if(!datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) - it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(Qt::DefaultLocaleShortDate)); - // Time is setted but date not. Date goes to default - else if(datetime_format.at(0).isEmpty() && !datetime_format.at(1).isEmpty()) - it->setText(t, list[i].lastModified().date().toString(Qt::DefaultLocaleShortDate) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); - // Both time and date setted. - else - it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); - break; - } - case DATECREATE: - { - QStringList datetime_format = getDateFormat(); - it->setWhatsThis(DATECREATE, list[i].lastModified().toString("yyyyMMddhhmmsszzz")); - if(datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) - it->setText(t, list[i].lastModified().toString(Qt::DefaultLocaleShortDate) ); - else if(!datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) - it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(Qt::DefaultLocaleShortDate)); - else if(datetime_format.at(0).isEmpty() && !datetime_format.at(1).isEmpty()) - it->setText(t, list[i].lastModified().date().toString(Qt::DefaultLocaleShortDate) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); - else - it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); - break; - } - } - } - if(addnew){ treeWidget->addTopLevelItem(it); } - if(tmpSel.contains(list[i].absoluteFilePath())){ it->setSelected(true); } - if(lastdir == CDIR+"/"+list[i].fileName()){ - treeWidget->setCurrentItem(it); - treeWidget->scrollToItem(it); - } - }else{ - //Create all the individual items for the basic list - QListWidgetItem *it; - //See if there is an existing item to re-use - bool addnew = false; - QList items = listWidget->findItems(list[i].fileName(), Qt::MatchExactly); - if(items.isEmpty()){ - it = new QListWidgetItem(); - addnew = true; - }else{ it = items.first(); } - - it->setWhatsThis( QString(canmodify ? "cut": "copy")+"::::"+list[i].absoluteFilePath()); //used for drag and drop - it->setText(list[i].fileName()); - it->setStatusTip(list[i].fileName()); - //Since the icon/image is based on the filename - only update this for a new items (non-thumbnail) - // (This is the slowest part of the routine) - if(list[i].isImage() && (addnew || updateThumbs) ){ - if(showThumbs){ - it->setIcon(LXDG::findIcon("fileview-preview","image-x-generic") ); - needThumbs << list[i].absoluteFilePath(); - }else{ it->setIcon(LXDG::findIcon(list[i].iconfile(),"image-x-generic") ); } - }else if(addnew){ - it->setIcon(LXDG::findIcon(list[i].iconfile(),"unknown") ); - } - listWidget->addItem(it); - if(tmpSel.contains(list[i].absoluteFilePath())){ it->setSelected(true); } - if(lastdir == CDIR+"/"+list[i].fileName()){ - listWidget->setCurrentItem(it); - listWidget->scrollToItem(it); - } - } - if(QTime::currentTime() > updatetime){ QApplication::processEvents(); updatetime = QTime::currentTime().addMSecs(500); }//keep the UI snappy while loading a directory - if(DEBUG){ qDebug() << " - item finished:" << i << time.elapsed(); } - } - tmpSel.clear(); - if(DEBUG){ qDebug() << "Done with item loop:" << time.elapsed() << list.length(); } - ui->actionStopLoad->setVisible(false); - //Another check to ensure the current item is visible (or return to the same scroll position) - if(stopload){ return; } //stop right now - if(scrollpercent<0){ - if(showDetails){ - for(int t=0; tcolumnCount(); t++){treeWidget->resizeColumnToContents(t); } - if(treeWidget->currentItem()!=0){ treeWidget->scrollToItem(treeWidget->currentItem()); } - }else{ - if(listWidget->currentItem()!=0){ listWidget->scrollToItem(listWidget->currentItem()); } - } - }else{ - if(showDetails){ - treeWidget->verticalScrollBar()->setValue( qRound(treeWidget->verticalScrollBar()->maximum()*scrollpercent) ); - }else{ - listWidget->horizontalScrollBar()->setValue( qRound(listWidget->horizontalScrollBar()->maximum()*scrollpercent) ); - } - } - - - if(stopload){ return; } //stop right now - if(DEBUG){ qDebug() << "Assemble Status Message:" << time.elapsed(); } - //Assemble any status message - QString stats = QString(tr("Capacity: %1")).arg(LOS::FileSystemCapacity(CDIR)); - if(list.length()>0){ - stats.prepend("\t"); - if(numdirs < list.length()){ - //Has Files - stats.prepend( QString(tr("Files: %1 (%2)")).arg(QString::number(list.length()-numdirs), LUtils::BytesToDisplaySize(filebytes)) ); - } - if(numdirs > 0){ - //Has Dirs - if(numdirslabel_status->setText( stats.simplified() ); - if(DEBUG){ qDebug() << "DONE:" << time.elapsed(); } - if(showThumbs){ thumbThread = QtConcurrent::run(this, &DirWidget::startLoadThumbs); } -} - -void DirWidget::LoadSnaps(QString basedir, QStringList snaps){ - //Save these value internally for use later - qDebug() << "ZFS Snapshots available:" << basedir << snaps; - snapbasedir = basedir; - snapshots = snaps; - if(!snapbasedir.isEmpty()){ watcher->addPath(snapbasedir); } //add this to the watcher in case snapshots get created/removed - //Now update the UI as necessary - if(ui->tool_snap->menu()==0){ - ui->tool_snap->setMenu(new QMenu(this)); - connect(ui->tool_snap->menu(), SIGNAL(triggered(QAction*)), this, SLOT(direct_snap_selected(QAction*)) ); - } - ui->tool_snap->menu()->clear(); - for(int i=0; itool_snap->menu()->addAction(snapshots[i]); - tmp->setWhatsThis(snapshots[i]); - } - ui->slider_snap->setRange(0, snaps.length()); - if(CDIR.contains(ZSNAPDIR)){ - //The user was already within a snapshot - figure out which one and set the slider appropriately - int index = snaps.indexOf( CDIR.section(ZSNAPDIR,1,1).section("/",0,0) ); - if(index < 0){ index = snaps.length(); } //unknown - load the system (should never happen) - ui->slider_snap->setValue(index); - }else{ - ui->slider_snap->setValue(snaps.length()); //last item (normal system) - } - on_slider_snap_valueChanged(); - QApplication::processEvents(); //let the slider changed signal get thrown away before we re-enable the widget - ui->group_snaps->setEnabled(!snaps.isEmpty()); - ui->group_snaps->setVisible(!snaps.isEmpty()); - ui->tool_snap_newer->setEnabled(ui->slider_snap->value() < ui->slider_snap->maximum()); - ui->tool_snap_older->setEnabled(ui->slider_snap->value() > ui->slider_snap->minimum()); -} - -void DirWidget::refresh(){ - if(!CDIR.isEmpty() && ~ID.isEmpty()){ - stopload = true; //just in case it is still loading - emit LoadDirectory(ID, CDIR); - } -} - -void DirWidget::refreshButtons(){ - SelectionChanged(); -} - -//Theme change functions -void DirWidget::UpdateIcons(){ - //ui->tool_addNewFile->setIcon( LXDG::findIcon("document-new","")); - //ui->tool_addToDir->setIcon( LXDG::findIcon("folder-new","") ); - - //Snapshot buttons - ui->tool_snap_newer->setIcon(LXDG::findIcon("go-next-view","") ); - ui->tool_snap_older->setIcon(LXDG::findIcon("go-previous-view","") ); - //Bottom-Action Buttons - ui->tool_goToImages->setIcon( LXDG::findIcon("fileview-preview","") ); - ui->tool_goToPlayer->setIcon( LXDG::findIcon("applications-multimedia","") ); - ui->tool_new_file->setIcon( LXDG::findIcon("document-new","") ); - ui->tool_new_dir->setIcon( LXDG::findIcon("folder-new","") ); - //Side-Action Buttons - ui->tool_act_run->setIcon( LXDG::findIcon("run-build-file","") ); - ui->tool_act_runwith->setIcon( LXDG::findIcon("run-build-configure","") ); - ui->tool_act_cut->setIcon( LXDG::findIcon("edit-cut","") ); - ui->tool_act_copy->setIcon( LXDG::findIcon("edit-copy","") ); - ui->tool_act_paste->setIcon( LXDG::findIcon("edit-paste","") ); - ui->tool_act_rename->setIcon( LXDG::findIcon("edit-rename","") ); - ui->tool_act_rm->setIcon( LXDG::findIcon("edit-delete","") ); - ui->tool_act_fav->setIcon( LXDG::findIcon("bookmark-toolbar","") ); - //ToolBar Buttons - ui->actionBack->setIcon( LXDG::findIcon("go-previous","") ); - ui->actionUp->setIcon( LXDG::findIcon("go-up","") ); - ui->actionHome->setIcon( LXDG::findIcon("go-home","") ); - ui->actionStopLoad->setIcon( LXDG::findIcon("dialog-cancel","") ); - ui->actionClose_Browser->setIcon( LXDG::findIcon("dialog-close","") ); -} - -void DirWidget::UpdateText(){ - ui->retranslateUi(this); -} - -void DirWidget::UpdateButtons(){ - SelectionChanged(); -} - -//Keyboard Shortcuts triggered -void DirWidget::TryRenameSelection(){ - on_tool_act_rename_clicked(); -} - -void DirWidget::TryCutSelection(){ - on_tool_act_cut_clicked(); -} - -void DirWidget::TryCopySelection(){ - on_tool_act_copy_clicked(); -} - -void DirWidget::TryPasteSelection(){ - on_tool_act_paste_clicked(); -} - -void DirWidget::TryDeleteSelection(){ - on_tool_act_rm_clicked(); -} - -// ================= -// PRIVATE -// ================= -void DirWidget::setupConnections(){ - //Info routines - connect(treeWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OpenContextMenu()) ); - connect(listWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OpenContextMenu()) ); - connect(treeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(SelectionChanged()) ); - connect(listWidget, SIGNAL(itemSelectionChanged()), this, SLOT(SelectionChanged()) ); - - //Activation routines - connect(treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(on_tool_act_run_clicked()) ); - connect(treeWidget, SIGNAL(DataDropped(QString, QStringList)), this, SIGNAL(PasteFiles(QString, QStringList)) ); - connect(listWidget, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(on_tool_act_run_clicked()) ); - connect(listWidget, SIGNAL(DataDropped(QString, QStringList)), this, SIGNAL(PasteFiles(QString, QStringList)) ); - connect(line_dir, SIGNAL(returnPressed()), this, SLOT(dir_changed()) ); - - //Keyboard Shortcuts - /*connect(copyFilesShort, SIGNAL(activated()), this, SLOT( on_tool_act_copy_clicked() ) ); - connect(cutFilesShort, SIGNAL(activated()), this, SLOT( on_tool_act_cut_clicked() ) ); - connect(pasteFilesShort, SIGNAL(activated()), this, SLOT( on_tool_act_paste_clicked() ) ); - connect(deleteFilesShort, SIGNAL(activated()), this, SLOT( on_tool_act_rm_clicked() ) );*/ - - //Filesystem Watcher - connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(startSync(const QString &)) ); - connect(watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(startSync(const QString &)) ); //just in case - connect(synctimer, SIGNAL(timeout()), this, SLOT(refresh()) ); - - //Thumbnail loader - connect(this, SIGNAL(ThumbLoaded(QString, QIcon)), this, SLOT(showThumb(QString, QIcon)) ); -} - -QStringList DirWidget::currentSelection(){ - QStringList out; - if(showDetails){ - QList sel = treeWidget->selectedItems(); - for(int i=0; iwhatsThis(0).section("::::",1,100); //absolute file path - } - }else{ - QList sel = listWidget->selectedItems(); - for(int i=0; iwhatsThis().section("::::",1,100); //absolute file path - } - } - out.removeDuplicates(); - return out; -} - -// ================= -// PRIVATE SLOTS -// ================= -void DirWidget::startLoadThumbs(){ - //This just runs through the dir and loads all the thumbnails as needed - if(DEBUG){ qDebug() << "Start Loading Thumbnails:" << needThumbs; } - if(needThumbs.isEmpty()){ return; } - needThumbs.removeDuplicates(); //just in case - //QTime updatetime = QTime::currentTime().addMSecs(500); - while(!needThumbs.isEmpty() && !stopload){ - QString file = needThumbs.takeFirst(); - QIcon ico(QPixmap(file).scaled(listWidget->iconSize(),Qt::IgnoreAspectRatio, Qt::FastTransformation) ); - emit ThumbLoaded(file, ico); - } -} - -void DirWidget::showThumb(QString file, QIcon ico){ - if(showDetails){ - //Use the tree widget - QList items = treeWidget->findItems(file.section("/",-1), Qt::MatchExactly); - if(items.isEmpty() || stopload){ return; } //invalid item for some reason - QTreeWidgetItem *it = items.first(); - it->setIcon(0, ico ); - }else{ - //Use the list widget - QList items = listWidget->findItems(file.section("/",-1), Qt::MatchExactly); - if(items.isEmpty() || stopload){ return; } //invalid item for some reason - if(stopload){ return; } //stop right now - QListWidgetItem *it = items.first(); - it->setIcon(ico); - } -} - -//UI BUTTONS -// -- Left Action Buttons -void DirWidget::on_tool_act_cut_clicked(){ - QStringList sel = currentSelection(); - qDebug() << "Cutting Items to clipboard:" << sel; - if(sel.isEmpty()){ return; } - emit CutFiles(sel); -} - -void DirWidget::on_tool_act_copy_clicked(){ - QStringList sel = currentSelection(); - if(sel.isEmpty()){ return; } - qDebug() << "Copying Items to clipboard:" << sel; - emit CopyFiles(sel); -} - -void DirWidget::on_tool_act_fav_clicked(){ - QStringList sel = currentSelection(); - if(sel.isEmpty()){ return; } - - emit FavoriteFiles(sel); -} - -void DirWidget::on_tool_act_paste_clicked(){ - qDebug() << "Pasting Items from clipboard:" << CDIR; - emit PasteFiles(CDIR, QStringList()); //use the clipboard for pasting -} - -void DirWidget::on_tool_act_rename_clicked(){ - QStringList sel = currentSelection(); - if(sel.isEmpty()){ return; } - emit RenameFiles(sel); -} - -void DirWidget::on_tool_act_rm_clicked(){ - QStringList sel = currentSelection(); - if(sel.isEmpty()){ return; } - qDebug() << "Deleting selected Items:" << sel; - emit RemoveFiles(sel); -} - -void DirWidget::on_tool_act_run_clicked(){ - QStringList sel = currentSelection(); - if(sel.isEmpty()){ return; } - QStringList dirs; - for(int i=0; iisActive()){ synctimer->start(); } -} - -void DirWidget::on_tool_new_dir_clicked(){ - if(!canmodify){ return; } //cannot create anything here - //Prompt for the new dir name - bool ok = false; - QString newdir = QInputDialog::getText(this, tr("New Directory"), tr("Name:"), QLineEdit::Normal, "", \ - &ok, 0, Qt::ImhFormattedNumbersOnly | Qt::ImhUppercaseOnly | Qt::ImhLowercaseOnly); - if(!ok || newdir.isEmpty()){ return; } - //Now create the new dir - QString full = CDIR; - if(!full.endsWith("/")){ full.append("/"); } - QDir dir(full); //open the current dir - full.append(newdir); //append the new name to the current dir - //Verify that the new dir does not already exist - if(dir.exists(full)){ - QMessageBox::warning(this, tr("Invalid Name"), tr("A file or directory with that name already exists! Please pick a different name.")); - QTimer::singleShot(0,this, SLOT(on_tool_addToDir_clicked()) ); //repeat this function - }else{ - if(!dir.mkdir(newdir) ){ - QMessageBox::warning(this, tr("Error Creating Directory"), tr("The directory could not be created. Please ensure that you have the proper permissions to modify the current directory.")); - } - } - //just in case the watcher does not work for this filesystem -queue up a sync - if(!synctimer->isActive()){ synctimer->start(); } -} - -// -- Top Snapshot Buttons -void DirWidget::on_tool_snap_newer_clicked(){ - ui->slider_snap->setValue( ui->slider_snap->value()+1 ); -} - -void DirWidget::on_tool_snap_older_clicked(){ - ui->slider_snap->setValue( ui->slider_snap->value()-1 ); -} - -void DirWidget::on_slider_snap_valueChanged(int val){ - bool labelsonly = false; - if(val==-1){ val = ui->slider_snap->value(); labelsonly=true; } - //Update the snapshot interface - ui->tool_snap_newer->setEnabled(val < ui->slider_snap->maximum()); - ui->tool_snap_older->setEnabled(val > ui->slider_snap->minimum()); - if(val >= snapshots.length() || val < 0){ - ui->tool_snap->setText(tr("Current")); - }else if(QFile::exists(snapbasedir+snapshots[val])){ - ui->tool_snap->setText( QFileInfo(snapbasedir+snapshots[val]).lastModified().toString(Qt::DefaultLocaleShortDate) ); - } - //Exit if a non-interactive snapshot change - if(!ui->group_snaps->isEnabled() || labelsonly){ return; } //internal change - do not try to change the actual info - //Determine which snapshot is now selected - QString dir; - if(DEBUG){ qDebug() << "Changing snapshot:" << CDIR << val << snapbasedir; } - stopload = true; //stop any currently-loading procedures - if(val >= snapshots.length() || val < 0){ //active system selected - if(DEBUG){ qDebug() << " - Load Active system:" << normalbasedir; } - dir = normalbasedir; - }else{ - dir = snapbasedir+snapshots[val]+"/"; - if(!QFile::exists(dir)){ - //This snapshot must have been removed in the background by pruning tools - // move to a newer snapshot or the current base dir as necessary - qDebug() << "Snapshot no longer available:" << dir; - qDebug() << " - Reloading available snapshots"; - emit findSnaps(ID, normalbasedir); - return; - } - //if(snaprelpath.isEmpty()){ - //Need to figure out the relative path within the snapshot - snaprelpath = normalbasedir.section(snapbasedir.section(ZSNAPDIR,0,0), 1,1000); - if(DEBUG){ qDebug() << " - new snapshot-relative path:" << snaprelpath; } - //} - dir.append(snaprelpath); - dir.replace("//","/"); //just in case any duplicate slashes from all the split/combining - if(DEBUG){ qDebug() << " - Load Snapshot:" << dir; } - } - //Make sure this directory exists, and back up as necessary - if(dir.isEmpty()){ return; } - //Load the newly selected snapshot - stopload = true; //just in case it is still loading - emit LoadDirectory(ID, dir); -} - -void DirWidget::direct_snap_selected(QAction *act){ - QString snap = act->whatsThis(); - int val = snapshots.indexOf(snap); - if(val<0){ return; } - else{ ui->slider_snap->setValue(val); } -} - -//Top Toolbar buttons -void DirWidget::on_actionBack_triggered(){ - if(history.isEmpty()){ return; } //cannot do anything - QString dir = history.takeLast(); - //qDebug() << "Go Back:" << dir << normalbasedir << history.last(); - if(dir == normalbasedir){ - dir = history.takeLast(); - } - stopload = true; //just in case it is still loading - emit LoadDirectory(ID, dir); -} - -void DirWidget::on_actionUp_triggered(){ - QString dir = CDIR.section("/",0,-2); - if(dir.isEmpty()) - dir = "/"; - //Quick check to ensure the directory exists - while(!QFile::exists(dir) && !dir.isEmpty()){ - dir = dir.section("/",0,-2); //back up one additional dir - } - stopload = true; //just in case it is still loading - emit LoadDirectory(ID, dir); -} - -void DirWidget::on_actionHome_triggered(){ - stopload = true; //just in case it is still loading - emit LoadDirectory(ID, QDir::homePath()); -} - -void DirWidget::on_actionStopLoad_triggered(){ - stopload = true; - ui->actionStopLoad->setVisible(false); -} - -void DirWidget::dir_changed(){ - QString dir = line_dir->text().simplified(); - //Run the dir through the user-input checks - dir = LUtils::PathToAbsolute(dir); - qDebug() << "Dir:" << dir; - //Quick check to ensure the directory exists - while(!QFile::exists(dir) && !dir.isEmpty()){ - dir = dir.section("/",0,-2); //back up one additional dir - } - qDebug() << " - Now Dir:" << dir; - stopload = true; //just in case it is still loading - emit LoadDirectory(ID, dir); -} - -void DirWidget::on_actionClose_Browser_triggered(){ - emit CloseBrowser(ID); -} - -// - Other Actions without a specific button on the side -void DirWidget::fileCheckSums(){ - QStringList files = currentSelection(); - if(files.isEmpty()){ return; } - qDebug() << "Run Checksums:" << files; - QStringList info = LOS::Checksums(files); - qDebug() << " - Info:" << info; - if(info.isEmpty() || (info.length() != files.length()) ){ return; } - for(int i=0; iclear(); - if(!sel.isEmpty()){ - contextMenu->addAction(LXDG::findIcon("run-build-file",""), tr("Open"), this, SLOT(on_tool_act_run_clicked()) ); - contextMenu->addAction(LXDG::findIcon("run-build-configure",""), tr("Open With..."), this, SLOT(on_tool_act_runwith_clicked()) ); - - contextMenu->addAction(LXDG::findIcon("edit-rename",""), tr("Rename..."), this, SLOT(on_tool_act_rename_clicked()) )->setEnabled(canmodify); - contextMenu->addAction(LXDG::findIcon("document-encrypted",""), tr("View Checksums..."), this, SLOT(fileCheckSums()) ); - contextMenu->addSeparator(); - } - //Now add the general selection options - contextMenu->addAction(LXDG::findIcon("edit-cut",""), tr("Cut Selection"), this, SLOT(on_tool_act_cut_clicked()) )->setEnabled(canmodify && !sel.isEmpty()); - contextMenu->addAction(LXDG::findIcon("edit-copy",""), tr("Copy Selection"), this, SLOT(on_tool_act_copy_clicked()) )->setEnabled(!sel.isEmpty()); - contextMenu->addAction(LXDG::findIcon("edit-paste",""), tr("Paste"), this, SLOT(on_tool_act_paste_clicked()) )->setEnabled(QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") && canmodify); - contextMenu->addSeparator(); - contextMenu->addAction(LXDG::findIcon("edit-delete",""), tr("Delete Selection"), this, SLOT(on_tool_act_rm_clicked()) )->setEnabled(canmodify&&!sel.isEmpty()); - if(LUtils::isValidBinary("lumina-fileinfo")){ - contextMenu->addSeparator(); - contextMenu->addAction(LXDG::findIcon("edit-find-replace",""), tr("File Properties..."), this, SLOT(fileProperties()) )->setEnabled(!sel.isEmpty()); - } - contextMenu->addSeparator(); - contextMenu->addAction(LXDG::findIcon("system-search",""), tr("Open Terminal here"), this, SLOT(openTerminal())); - - //Now open the menu at the current cursor location - contextMenu->popup(QCursor::pos()); -} - -void DirWidget::SelectionChanged(){ - //Go through and enable/disable the buttons as necessary - bool hasselection = !currentSelection().isEmpty(); - ui->tool_act_copy->setEnabled(hasselection); - ui->tool_act_cut->setEnabled(hasselection && canmodify); - ui->tool_act_fav->setEnabled(hasselection); - ui->tool_act_paste->setEnabled(canmodify && QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") ); - ui->tool_act_rename->setEnabled(hasselection && canmodify); - ui->tool_act_rm->setEnabled(hasselection && canmodify); - ui->tool_act_run->setEnabled(hasselection); - ui->tool_act_runwith->setEnabled(hasselection); -} - -void DirWidget::startSync(const QString &file){ - //Update date_format based on user settings - if(file == sessionsettings_config_file){ setDateFormat(); } - else if(file == snapbasedir){ emit findSnaps(ID, normalbasedir); } //snapshot list changed - else if(file == normalbasedir){ - if(synctimer->isActive()){ synctimer->stop(); } //already starting a sync - restart the timer - synctimer->start(); - }else{ - //Some file in the directory got changed - start the time for a dir reload - // -- This prevents a directory from refreshing constantly if a file within the directory is changing all the time (such as a log file) - if(!synctimer->isActive()){ synctimer->start(); } - } -} - -//==================== -// PROTECTED -//==================== -void DirWidget::mouseReleaseEvent(QMouseEvent *ev){ - static Qt::MouseButtons backmap = Qt::BackButton | Qt::ExtraButton5; - //qDebug() << "Mouse Click:" << ev->button(); - if(backmap.testFlag(ev->button())){ - ev->accept(); - on_actionBack_triggered(); - //}else if(ev->button()==Qt::ForwardButton()){ - //ev->accept(); - }else{ - ev->ignore(); //not handled here - } -} diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h deleted file mode 100644 index fecd6180..00000000 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.h +++ /dev/null @@ -1,184 +0,0 @@ -//=========================================== -// Lumina-DE source code -// Copyright (c) 2015, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -#ifndef _LUMINA_FM_DIRECTORY_BROWSER_WIDGET_H -#define _LUMINA_FM_DIRECTORY_BROWSER_WIDGET_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "../DirData.h" -#include "DDListWidgets.h" - -#define ZSNAPDIR QString("/.zfs/snapshot/") - -namespace Ui{ - class DirWidget; -}; - -class DirWidget : public QWidget{ - Q_OBJECT -public: - enum DETAILTYPES{ NAME, SIZE, TYPE, DATEMOD, DATECREATE}; - DirWidget(QString objID, QWidget *parent = 0); //needs a unique ID (to distinguish from other DirWidgets) - ~DirWidget(); - - void cleanup(); //called before the browser is closed down - - //Directory Managment - void ChangeDir(QString dirpath); - void setDirCompleter(QCompleter *comp); - - //Information - QString id(); - QString currentDir(); - - //View Settings - void setShowDetails(bool show); - void setShowSidebar(bool show); - void setShowThumbnails(bool show); - void setDetails(QList list); //Which details to show and in which order (L->R) - void setThumbnailSize(int px); - void setShowCloseButton(bool show); - void setFocusLineDir(); - - //Date format for show items - QStringList getDateFormat(); - void setDateFormat(); - -public slots: - void LoadDir(QString dir, LFileInfoList list); - void LoadSnaps(QString basedir, QStringList snaps); - - //Refresh options - void refresh(); //Refresh current directory - void refreshButtons(); //Refresh action buttons only - - //Theme change functions - void UpdateIcons(); - void UpdateText(); - - //Button updates - void UpdateButtons(); - - //Keyboard Shortcuts triggered - void TryRenameSelection(); - void TryCutSelection(); - void TryCopySelection(); - void TryPasteSelection(); - void TryDeleteSelection(); - -private: - Ui::DirWidget *ui; - QString ID, CDIR; //unique ID assigned by the parent and the current dir path - LFileInfoList CLIST; //current item list (snap or not) - QString normalbasedir, snapbasedir, snaprelpath; //for maintaining directory context while moving between snapshots - QStringList snapshots, needThumbs, tmpSel; - bool showDetails, showThumbs, canmodify, stopload; //which widget to use for showing items - QList listDetails; - QMenu *contextMenu; - QFuture thumbThread; - //The Toolbar and associated items - QToolBar *toolbar; - QLineEdit *line_dir; - QStringList history; - //The drag and drop brower widgets - DDListWidget *listWidget; - DDTreeWidget *treeWidget; - - //Keyboard Shortcuts - //QShortcut *copyFilesShort, *cutFilesShort, *pasteFilesShort, *deleteFilesShort; - //Watcher to determine when the dir changes - QFileSystemWatcher *watcher; - QTimer *synctimer; - - //Functions for internal use - void setupConnections(); - QStringList currentSelection(); - QStringList date_format; - -private slots: - //Internal loading of thumbnails - void startLoadThumbs(); - void showThumb(QString file, QIcon ico); - - //UI BUTTONS/Actions - // -- Left Action Buttons - void on_tool_act_copy_clicked(); - void on_tool_act_cut_clicked(); - void on_tool_act_fav_clicked(); - void on_tool_act_paste_clicked(); - void on_tool_act_rename_clicked(); - void on_tool_act_rm_clicked(); - void on_tool_act_run_clicked(); - void on_tool_act_runwith_clicked(); - // -- Bottom Action Buttons - void on_tool_goToImages_clicked(); - void on_tool_goToPlayer_clicked(); - void on_tool_new_file_clicked(); - void on_tool_new_dir_clicked(); - // -- Top Snapshot Buttons - void on_tool_snap_newer_clicked(); - void on_tool_snap_older_clicked(); - void on_slider_snap_valueChanged(int val = -1); - void direct_snap_selected(QAction*); - - //Top Toolbar buttons - void on_actionBack_triggered(); - void on_actionUp_triggered(); - void on_actionHome_triggered(); - void on_actionStopLoad_triggered(); - void dir_changed(); //user manually changed the directory - void on_actionClose_Browser_triggered(); - - // - Other Actions without a specific button on the side - void fileCheckSums(); - void fileProperties(); - void openTerminal(); - - - //Browser Functions - void OpenContextMenu(); - void SelectionChanged(); - void startSync(const QString &file); //used internally to collect/pause before updating the dir - -signals: - //Directory loading/finding signals - void OpenDirectories(QStringList); //Directories to open in other tabs/columns - void LoadDirectory(QString, QString); //ID, dirpath (Directory to load here) - void findSnaps(QString, QString); //ID, dirpath (Request snapshot information for a directory) - void CloseBrowser(QString); //ID (Request that this browser be closed) - - //External App/Widget launching - void PlayFiles(LFileInfoList); //open in multimedia player - void ViewFiles(LFileInfoList); //open in slideshow - void LaunchTerminal(QString); //dirpath - - //System Interactions - void CutFiles(QStringList); //file selection - void CopyFiles(QStringList); //file selection - void PasteFiles(QString, QStringList); //current dir - void FavoriteFiles(QStringList); //file selection - void RenameFiles(QStringList); //file selection - void RemoveFiles(QStringList); //file selection - - //Internal thumbnail loading system (multi-threaded) - void ThumbLoaded(QString, QIcon); - -protected: - void mouseReleaseEvent(QMouseEvent *); - -}; - -#endif diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.ui b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.ui deleted file mode 100644 index c5bf12c3..00000000 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget.ui +++ /dev/null @@ -1,527 +0,0 @@ - - - DirWidget - - - - 0 - 0 - 400 - 350 - - - - - 350 - 0 - - - - Form - - - - 0 - - - 0 - - - 0 - - - 0 - - - 1 - - - 2 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Create a new file - - - New File - - - Qt::ToolButtonTextBesideIcon - - - - - - - Create a new directory - - - New Dir - - - Qt::ToolButtonTextBesideIcon - - - - - - - Add selected images to slideshow - - - Slideshow - - - - 20 - 20 - - - - Qt::ToolButtonTextBesideIcon - - - - - - - Enqueue selection in multimedia player - - - Play - - - - 20 - 20 - - - - Qt::ToolButtonTextBesideIcon - - - - - - - - - Status - - - false - - - - - - - - - 1 - - - - - - 1 - - - 1 - - - 1 - - - 1 - - - - - - 0 - 0 - - - - padding-right: 5px; - - - - - - QToolButton::InstantPopup - - - Qt::ToolButtonTextOnly - - - - - - - 1 - - - 1 - - - Qt::Horizontal - - - false - - - false - - - QSlider::TicksAbove - - - - - - - ... - - - - - - - ... - - - - - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Open item - - - Open item - - - - - - - 20 - 20 - - - - Qt::ToolButtonIconOnly - - - true - - - - - - - Open item (select application) - - - Open item (select application) - - - - - - - 20 - 20 - - - - true - - - - - - - Qt::Horizontal - - - - - - - Add item to personal favorites - - - Add item to personal favorites - - - - - - - 20 - 20 - - - - true - - - - - - - Rename item - - - Rename item - - - - - - - 20 - 20 - - - - true - - - - - - - Qt::Horizontal - - - - - - - Cut items - - - Cut items (add to the clipboard) - - - - - - - 20 - 20 - - - - true - - - - - - - Copy items - - - Copy items to the clipboard - - - - - - - 20 - 20 - - - - true - - - - - - - Paste items from clipboard - - - Paste items from clipboard - - - - - - - 20 - 20 - - - - true - - - - - - - Qt::Horizontal - - - - - - - Delete Items - - - Delete Items - - - - - - - 20 - 20 - - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Back - - - Back - - - Go back to previous directory - - - Go back to previous directory - - - - - Up - - - Up - - - Go to parent directory - - - Go to parent directory - - - - - Home - - - Home - - - Go to home directory - - - Go to home directory - - - - - - - - Stop loading the directory - - - - - Close Browser - - - Close Browser - - - Close this browser - - - Close this browser - - - - - - -- cgit