Oops, forgot to add a couple new files.

3 files changed, 1144 insertions, 0 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
new file mode 100644
index 00000000..a79f4516
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -0,0 +1,717 @@
+//===========================================
+//  Lumina-DE source code
+//  Copyright (c) 2015, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "DirWidget2.h"
+#include "ui_DirWidget2.h"
+
+#include <QMessageBox>
+#include <QCursor>
+#include <QClipboard>
+#include <QMimeData>
+#include <QTimer>
+#include <QInputDialog>
+#include <QScrollBar>
+#include <QSettings>
+#include <QtConcurrent/QtConcurrentRun>
+
+#include <LuminaOS.h>
+#include <LuminaXDG.h>
+#include <LuminaUtils.h>
+
+#include "../ScrollDialog.h"
+
+#define DEBUG 1
+
+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);
+    connect(line_dir, SIGNAL(returnPressed()), this, SLOT(dir_changed()) );
+  toolbar->addAction(ui->actionSingleColumn);
+  ui->actionSingleColumn->setChecked(true);
+  toolbar->addAction(ui->actionDualColumn);
+  toolbar->addAction(ui->actionMenu);
+  //Add the browser widgets
+  RCBW = 0; //right column browser is unavailable initially
+  BW = new BrowserWidget("", this);
+  ui->browser_layout->addWidget(BW);
+  connect(BW, SIGNAL(dirChange(QString)), this, SLOT(currentDirectoryChanged()) );
+  connect(BW, SIGNAL(itemsActivated()), this, SLOT(runFiles()) );
+  connect(BW, SIGNAL(DataDropped(QString, QStringList)), this, SIGNAL(PasteFiles(QString, QStringList)) );
+  connect(BW, SIGNAL(contextMenuRequested()), this, SLOT(OpenContextMenu()) );
+  connect(BW, SIGNAL(updateDirectoryStatus(QString)), this, SLOT(dirStatusChanged(QString)) );
+  connect(BW, SIGNAL(hasFocus(QString)), this, SLOT(setCurrentBrowser(QString)) );
+  //Now update the rest of the UI
+  canmodify = false; //initial value
+  contextMenu = new QMenu(this);
+  cNewMenu = cOpenMenu = cFModMenu = cFViewMenu = 0; //not created yet
+  connect(contextMenu, SIGNAL(aboutToShow()), this, SLOT(UpdateContextMenu()) );
+
+  UpdateIcons();
+  UpdateText();	
+  createMenus();
+}
+
+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);
+  qDebug() << "ChangeDir:" << dirpath;
+  currentBrowser()->changeDirectory(dirpath);
+}
+
+void DirWidget::setDirCompleter(QCompleter *comp){
+  //line_dir->setCompleter(comp);
+}
+
+QString DirWidget::id(){
+  return ID;
+}
+
+QString DirWidget::currentDir(){
+  return currentBrowser()->currentDirectory();	
+}
+
+void DirWidget::setShowDetails(bool show){
+  BW->showDetails(show);
+  if(RCBW!=0){ RCBW->showDetails(show); }
+}
+
+void DirWidget::showHidden(bool show){
+  BW->showHiddenFiles(show);
+  if(RCBW!=0){ RCBW->showHiddenFiles(show); }
+}
+
+void DirWidget::setThumbnailSize(int px){
+  BW->setThumbnailSize(px);
+  if(RCBW!=0){ RCBW->setThumbnailSize(px); }
+  ui->tool_zoom_in->setEnabled(px < 256); //upper limit on image sizes
+  ui->tool_zoom_out->setEnabled(px >16); //lower limit on image sizes
+}
+
+// ================
+//    PUBLIC SLOTS
+// ================
+
+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; i<snapshots.length(); i++){
+    QAction *tmp = ui->tool_snap->menu()->addAction(snapshots[i]);
+      tmp->setWhatsThis(snapshots[i]);
+  }
+  ui->slider_snap->setRange(0, snaps.length());
+  if(currentBrowser()->currentDirectory().contains(ZSNAPDIR)){
+    //The user was already within a snapshot - figure out which one and set the slider appropriately
+    int index = snaps.indexOf( currentBrowser()->currentDirectory().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(){
+  currentBrowser()->changeDirectory(""); //refresh current dir
+}
+
+//Theme change functions
+void DirWidget::UpdateIcons(){
+  //Snapshot buttons
+  ui->tool_snap_newer->setIcon(LXDG::findIcon("go-next-view","") );
+  ui->tool_snap_older->setIcon(LXDG::findIcon("go-previous-view","") );
+
+  //ToolBar Buttons
+  ui->actionBack->setIcon( LXDG::findIcon("go-previous","") );
+  ui->actionUp->setIcon( LXDG::findIcon("go-up","") );
+  ui->actionHome->setIcon( LXDG::findIcon("go-home","") );
+  ui->actionMenu->setIcon( LXDG::findIcon("format-justify-fill","format-list-unordered") );
+  ui->actionSingleColumn->setIcon(LXDG::findIcon("view-right-close","view-close") );
+  ui->actionDualColumn->setIcon(LXDG::findIcon("view-right-new","view-split-left-right") );
+  
+  ui->tool_zoom_in->setIcon(LXDG::findIcon("zoom-in",""));
+  ui->tool_zoom_out->setIcon(LXDG::findIcon("zoom-out",""));
+
+}
+
+void DirWidget::UpdateText(){
+  ui->retranslateUi(this);
+  BW->retranslate();
+  if(RCBW!=0){ RCBW->retranslate(); }
+}
+
+
+//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::createMenus(){
+  //Note: contextMenu already created - this is just for the sub-items
+  if(cNewMenu==0){ cNewMenu = new QMenu(this); }
+  else{ cNewMenu->clear(); }
+  cNewMenu->setTitle(tr("Create...") );
+  cNewMenu->setIcon( LXDG::findIcon("list-add","") );
+  cNewMenu->addAction(LXDG::findIcon("document-new",""), tr("File"), this, SLOT(createNewFile()) );
+  cNewMenu->addAction(LXDG::findIcon("folder-new",""), tr("Directory"), this, SLOT(createNewDir()) );
+  if(LUtils::isValidBinary("lumina-fileinfo")){ cNewMenu->addAction(LXDG::findIcon("system-run",""), tr("Application Launcher"), this, SLOT(createNewXDGEntry()) ); }
+
+  if(cOpenMenu==0){ cOpenMenu = new QMenu(this); }
+  else{ cOpenMenu->clear(); }
+  cOpenMenu->setTitle(tr("Launch..."));
+  cOpenMenu->setIcon( LXDG::findIcon("quickopen","") );
+  cOpenMenu->addAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"), this, SLOT(openTerminal()));
+  cOpenMenu->addAction(LXDG::findIcon("view-preview",""), tr("SlideShow"), this, SLOT(openInSlideshow()));
+  cOpenMenu->addAction(LXDG::findIcon("view-media-lyrics","media-playback-start"), tr("Multimedia Player"), this, SLOT(openMultimedia()));
+
+  if(cFModMenu==0){ cFModMenu = new QMenu(this); }
+  else{ cFModMenu->clear(); }
+  cFModMenu->setTitle(tr("Modify Files..."));
+  cFModMenu->setIcon( LXDG::findIcon("document-edit","") );
+  cFModMenu->addAction(LXDG::findIcon("edit-cut",""), tr("Cut Selection"), this, SLOT(cutFiles()) );
+  cFModMenu->addAction(LXDG::findIcon("edit-copy",""), tr("Copy Selection"), this, SLOT(copyFiles()) );
+  cFModMenu->addSeparator();
+  cFModMenu->addAction(LXDG::findIcon("edit-rename",""), tr("Rename..."), this, SLOT(renameFiles()) );
+  cFModMenu->addSeparator();
+  cFModMenu->addAction(LXDG::findIcon("edit-delete",""), tr("Delete Selection"), this, SLOT(removeFiles()) );
+
+  if(cFViewMenu==0){ cFViewMenu = new QMenu(this); }
+  else{ cFViewMenu->clear(); }
+  cFViewMenu->setTitle(tr("View Files..."));
+  cFViewMenu->setIcon( LXDG::findIcon("document-preview","") );
+  cFViewMenu->addAction(LXDG::findIcon("document-encrypted",""), tr("Checksums"), this, SLOT(fileCheckSums()) );
+  if(LUtils::isValidBinary("lumina-fileinfo")){
+    cFViewMenu->addAction(LXDG::findIcon("edit-find-replace",""), tr("Properties"), this, SLOT(fileProperties()) );
+  }
+
+}
+
+BrowserWidget* DirWidget::currentBrowser(){
+  if(cBID.isEmpty() || RCBW==0){ return BW; }
+  else{ return RCBW; }
+}
+
+QStringList DirWidget::currentDirFiles(){
+  return currentBrowser()->currentItems(-1);  //files only
+}
+// =================
+//    PRIVATE SLOTS
+// =================
+
+//UI BUTTONS
+void DirWidget::on_tool_zoom_in_clicked(){
+  int size = BW->thumbnailSize();
+  size += 16;
+  setThumbnailSize(size);
+  //Now Save the size value as the default for next time
+  QSettings SET("lumina-desktop","lumina-fm");
+  SET.setValue("iconsize", size);
+}
+
+void DirWidget::on_tool_zoom_out_clicked(){
+  int size = BW->thumbnailSize();
+  if(size <= 16){ return; }
+  size -= 16;
+  setThumbnailSize(size);
+  //Now Save the size value as the default for next time
+  QSettings SET("lumina-desktop","lumina-fm");
+  SET.setValue("iconsize", size);
+}
+
+// -- 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:" << currentBrowser()->currentDirectory() << 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;
+    }
+    //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
+  currentBrowser()->changeDirectory(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(){
+  QStringList history = currentBrowser()->history();
+  if(history.length()<2){ return; } //cannot do anything
+  QString dir = history.takeLast();
+  //qDebug() << "Go Back:" << dir << normalbasedir << history;
+  if(dir == normalbasedir){
+    dir = history.takeLast();
+  }
+  history << dir; //make sure the current dir is always last in the history
+  currentBrowser()->changeDirectory(dir);
+  currentBrowser()->setHistory(history); //re-write the history to account for going backwards
+  ui->actionBack->setEnabled(history.length()>1);
+}
+
+void DirWidget::on_actionUp_triggered(){
+  QString dir = currentBrowser()->currentDirectory().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
+  }
+  currentBrowser()->changeDirectory(dir);
+}
+
+void DirWidget::on_actionHome_triggered(){
+  currentBrowser()->changeDirectory(QDir::homePath());
+}
+
+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;
+  currentBrowser()->changeDirectory(dir);
+  //emit LoadDirectory(ID, dir);
+}
+
+
+void DirWidget::on_actionSingleColumn_triggered(bool checked){
+  if(!checked){ return; }
+  ui->actionDualColumn->setChecked(false);
+  if(RCBW==0){ return; } //nothing to do
+  ui->browser_layout->removeWidget(RCBW);
+  RCBW->deleteLater();
+  RCBW = 0;
+  setCurrentBrowser(""); //reset back to the remaining browser
+}
+
+void DirWidget::on_actionDualColumn_triggered(bool checked){
+   if(!checked){ return; }
+  ui->actionSingleColumn->setChecked(false);
+  if(RCBW!=0){ return; } //nothing to do
+  RCBW = new BrowserWidget("rc", this);
+  ui->browser_layout->addWidget(RCBW);
+  connect(RCBW, SIGNAL(dirChange(QString)), this, SLOT(currentDirectoryChanged()) );
+  connect(RCBW, SIGNAL(itemsActivated()), this, SLOT(itemsActivated()) );
+  connect(RCBW, SIGNAL(DataDropped(QString, QStringList)), this, SIGNAL(PasteFiles(QString, QStringList)) );
+  connect(RCBW, SIGNAL(contextMenuRequested()), this, SLOT(OpenContextMenu()) );
+  connect(RCBW, SIGNAL(updateDirectoryStatus(QString)), this, SLOT(dirStatusChanged(QString)) );
+  connect(RCBW, SIGNAL(hasFocus(QString)), this, SLOT(setCurrentBrowser(QString)) );
+  //Now make sure it has all the same settings as the main browser
+  setCurrentBrowser("rc");
+  RCBW->showDetails(BW->hasDetails());
+  RCBW->showHiddenFiles( BW->hasHiddenFiles());
+  RCBW->setThumbnailSize( BW->thumbnailSize());
+  RCBW->changeDirectory( BW->currentDirectory());
+}
+
+void DirWidget::on_actionMenu_triggered(){
+  OpenContextMenu();
+}
+
+
+// - Other Actions without a specific button on the side
+void DirWidget::fileCheckSums(){
+  QStringList files = currentBrowser()->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; i<info.length(); i++){
+    info[i] = QString("%2\n\t(%1)").arg(files[i].section("/",-1), info[i]);
+  }
+  ScrollDialog dlg(this);
+    dlg.setWindowTitle( tr("File Checksums:") );
+    dlg.setWindowIcon( LXDG::findIcon("document-encrypted","") );
+    dlg.setText(info.join("\n"));
+  dlg.exec();
+}
+
+void DirWidget::fileProperties(){
+  QStringList sel = currentBrowser()->currentSelection();
+  //qDebug() << "Open File properties:" << sel;
+  if(sel.isEmpty()){ return; }
+  if(!LUtils::isValidBinary("lumina-fileinfo")){
+    //It should never get to this point due to checks earlier - but just in case...
+    QMessageBox::warning(this, tr("Missing Utility"), tr("The \"lumina-fileinfo\" utility could not be found on the system. Please install it first.") );
+    return;
+  }
+  for(int i=0; i<sel.length(); i++){ 
+    QProcess::startDetached("lumina-fileinfo \""+sel[i]+"\""); //use absolute paths
+  }
+}
+
+void DirWidget::openTerminal(){
+  emit LaunchTerminal(currentBrowser()->currentDirectory());
+}
+
+//Browser Functions
+void DirWidget::OpenContextMenu(){
+  //Now open the menu at the current cursor location
+  contextMenu->popup(QCursor::pos());
+}
+
+void DirWidget::UpdateContextMenu(){
+  //First generate the context menu based on the selection
+  qDebug() << "Update context menu";
+  QStringList sel = currentBrowser()->currentSelection();
+  contextMenu->clear();
+
+  if(!sel.isEmpty()){  
+    contextMenu->addAction(LXDG::findIcon("run-build-file",""), tr("Open"), this, SLOT(runFiles()) );
+    contextMenu->addAction(LXDG::findIcon("run-build-configure",""), tr("Open With..."), this, SLOT(runWithFiles()) );
+  }
+  contextMenu->addSection(LXDG::findIcon("unknown",""), tr("File Operations"));
+  contextMenu->addMenu(cFModMenu);
+    cFModMenu->setEnabled(!sel.isEmpty() && canmodify);
+  contextMenu->addMenu(cFViewMenu);
+    cFViewMenu->setEnabled(!sel.isEmpty());
+  contextMenu->addAction(LXDG::findIcon("edit-paste",""), tr("Paste"), this, SLOT(pasteFiles()) )->setEnabled(QApplication::clipboard()->mimeData()->hasFormat("x-special/lumina-copied-files") && canmodify);
+  //Now add the general selection options
+  contextMenu->addSection(LXDG::findIcon("folder","inode/directory"), tr("Directory Operations"));
+  if(canmodify){
+    contextMenu->addMenu(cNewMenu);
+  }
+  contextMenu->addMenu(cOpenMenu);
+}
+
+void DirWidget::currentDirectoryChanged(bool widgetonly){
+  QString cur = currentBrowser()->currentDirectory();
+  QFileInfo info(cur);
+  canmodify = info.isWritable();
+  if(widgetonly){ ui->label_status->setText(currentBrowser()->status()); }
+  else{ ui->label_status->setText(tr("Loading...")); }
+  //qDebug() << "Start search for snapshots";
+  if(!cur.contains("/.zfs/snapshot")){ 
+    normalbasedir = cur;
+    ui->group_snaps->setVisible(false);
+    emit findSnaps(ID, cur); 
+  }else{
+    //Re-assemble the normalbasedir variable (in case moving around within a snapshot)
+    normalbasedir = cur.replace( QRegExp("/\\.zfs/snapshot/(.)+/"), "/" );
+  }
+  ui->actionBack->setEnabled( currentBrowser()->history().length()>1 );
+  line_dir->setText(normalbasedir);
+  emit TabNameChanged(ID, normalbasedir.section("/",-1));
+}
+
+void DirWidget::dirStatusChanged(QString stat){
+  if(!canmodify){ stat.prepend(tr("(Limited Access) ")); }
+  ui->label_status->setText(stat);
+}
+
+void DirWidget::setCurrentBrowser(QString id){
+  if(id==cBID){ return; } //no change
+  cBID = id;
+  currentDirectoryChanged(true); //update all the averarching widget elements (widget only)
+  //Now adjust the frame/highlighting around the "active" browser
+  if(RCBW==0){ BW->setShowActive(true); }
+  else{
+    BW->setShowActive( cBID.isEmpty() );
+    RCBW->setShowActive( !cBID.isEmpty() );
+  }
+}
+
+//Context Menu Functions
+void DirWidget::createNewFile(){
+ if(!canmodify){ return; } //cannot create anything here
+  //Prompt for the new filename
+  bool ok = false;
+  QString newdocument = QInputDialog::getText(this, tr("New Document"), tr("Name:"), QLineEdit::Normal, "", \
+        &ok, 0, Qt::ImhFormattedNumbersOnly | Qt::ImhUppercaseOnly | Qt::ImhLowercaseOnly);
+  if(!ok || newdocument.isEmpty()){ return; }	
+  //Create the empty file
+  QString full = BW->currentDirectory();
+  if(!full.endsWith("/")){ full.append("/"); }
+  //verify the new file does not already exist
+  if(QFile::exists(full+newdocument)){
+    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(createNewFile()) ); //repeat this function
+    return;
+  }
+  QFile file(full+newdocument);
+  if(file.open(QIODevice::ReadWrite)){
+    //If successfully opened, it has created a blank file
+    file.close();
+  }else{
+    QMessageBox::warning(this, tr("Error Creating Document"), tr("The document could not be created. Please ensure that you have the proper permissions."));	  
+  }
+}
+
+void DirWidget::createNewDir(){
+  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 = BW->currentDirectory();
+  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(createNewDir()) ); //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."));
+    }
+  }
+}
+
+void DirWidget::createNewXDGEntry(){
+  if(!canmodify){ return; } //cannot create anything here
+  //Prompt for the new filename
+  bool ok = false;
+  QString newdocument = QInputDialog::getText(this, tr("New Document"), tr("Name:"), QLineEdit::Normal, "", \
+        &ok, 0, Qt::ImhFormattedNumbersOnly | Qt::ImhUppercaseOnly | Qt::ImhLowercaseOnly);
+  if(!ok || newdocument.isEmpty()){ return; }	
+  if(!newdocument.endsWith(".desktop")){ newdocument.append(".desktop"); }
+  //Create the empty file
+  QString full = BW->currentDirectory();
+  if(!full.endsWith("/")){ full.append("/"); }
+  //Verify the file does not already exist
+  if(QFile::exists(full+newdocument)){
+    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(createNewFile()) ); //repeat this function
+    return;
+  }
+  QProcess::startDetached("lumina-fileinfo -application \""+full+newdocument+"\"");
+}
+
+/*void DirWidget::createNewSymlink{
+
+}*/
+
+// - Selected FILE operations
+void DirWidget::cutFiles(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ return; }
+  emit CutFiles(sel);	
+}
+
+void DirWidget::copyFiles(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ return; }
+  emit CopyFiles(sel);	
+}
+
+void DirWidget::pasteFiles(){
+  emit PasteFiles(currentBrowser()->currentDirectory(), QStringList() );	
+}
+
+void DirWidget::renameFiles(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ return; }
+  qDebug() << "Deleting selected Items:" << sel;
+  emit RenameFiles(sel);	
+}
+
+void DirWidget::favoriteFiles(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ return; }
+  emit FavoriteFiles(sel);	
+}
+
+void DirWidget::removeFiles(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ return; }
+  qDebug() << "Deleting selected Items:" << sel;
+  emit RemoveFiles(sel);	
+}
+
+void DirWidget::runFiles(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ return; }
+  QStringList dirs;
+  for(int i=0; i<sel.length(); i++){ 
+    if(QFileInfo(sel[i]).isDir()){
+      dirs << sel[i];
+    }else{
+      QProcess::startDetached("lumina-open \""+sel[i]+"\"");
+    }
+  }	  
+  if(!dirs.isEmpty()){
+    currentBrowser()->changeDirectory( dirs.takeFirst()); //load the first directory in this widget
+  }
+  if(!dirs.isEmpty()){
+    emit OpenDirectories(dirs); //open the rest of the directories in other tabs
+  }
+}
+
+void DirWidget::runWithFiles(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ return; }
+  QStringList dirs;
+  for(int i=0; i<sel.length(); i++){ 
+    if(QFileInfo(sel[i]).isDir()){
+      dirs << sel[i];
+    }else{
+      QProcess::startDetached("lumina-open -select \""+sel[i]+"\"");
+    }
+  }	  
+  if(!dirs.isEmpty()){
+    emit OpenDirectories(dirs); //open the rest of the directories in other tabs
+  }
+}
+
+/*void DirWidget::attachToNewEmail(){
+
+}*/	
+
+// - Context-specific operations
+void DirWidget::openInSlideshow(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ sel = currentDirFiles(); }
+  //Now turn them all into a list and emit them
+    LFileInfoList list;
+    for(int i=0; i<sel.length(); i++){
+      if(sel.endsWith(".desktop")){ continue; } //simplification to make sure we don't read any files which are not needed
+      LFileInfo info(sel[i]);
+      if( info.isImage() ){  list << info; } //add to the list
+    }
+  if(!list.isEmpty()){ emit ViewFiles(list); }
+}
+
+void DirWidget::openMultimedia(){
+  QStringList sel = currentBrowser()->currentSelection();
+  if(sel.isEmpty()){ sel = currentDirFiles(); }
+  //Now turn them all into a list and emit them
+    LFileInfoList list;
+    for(int i=0; i<sel.length(); i++){
+      if(sel.endsWith(".desktop")){ continue; } //simplification to make sure we don't read any files which are not needed
+      LFileInfo info(sel[i]);
+      if( info.isAVFile() ){  list << info; } //add to the list
+    }
+  if(!list.isEmpty()){ emit PlayFiles(list); }
+}
+
+//====================
+//         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/DirWidget2.h b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
new file mode 100644
index 00000000..6a9bdf79
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
@@ -0,0 +1,178 @@
+//===========================================
+//  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 <QList>
+#include <QWidget>
+#include <QObject>
+#include <QMenu>
+#include <QToolBar>
+#include <QLineEdit>
+#include <QShortcut>
+#include <QFileSystemWatcher>
+#include <QTimer>
+#include <QFuture>
+
+#include "../BrowserWidget.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 showHidden(bool show);
+	void setThumbnailSize(int px);
+	void setFocusLineDir();
+	
+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;
+	BrowserWidget *BW, *RCBW; //Main BrowserWidget and right-column browser widget
+	QString ID, cBID; //unique ID assigned by the parent, and currently active browser widget
+	QString normalbasedir, snapbasedir, snaprelpath; //for maintaining directory context while moving between snapshots
+	QStringList snapshots, needThumbs, tmpSel;
+	bool canmodify;
+
+	//The Toolbar and associated items
+	QToolBar *toolbar;
+	QLineEdit *line_dir;
+
+	//The context menu and associated items
+	QMenu *contextMenu, *cNewMenu, *cOpenMenu, *cFModMenu, *cFViewMenu;
+
+	//Functions for internal use
+	void createMenus(); //on init only
+
+	BrowserWidget* currentBrowser();
+	QStringList currentDirFiles(); //all the "files" available within the current dir/browser
+
+private slots:
+	//UI BUTTONS/Actions
+
+	// -- Bottom Action Buttons
+	void on_tool_zoom_in_clicked();
+	void on_tool_zoom_out_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 dir_changed(); //user manually changed the directory
+	void on_actionSingleColumn_triggered(bool);
+	void on_actionDualColumn_triggered(bool);
+	void on_actionMenu_triggered();
+
+	// - Other Actions without a specific button on the side
+	void fileCheckSums();
+	void fileProperties();
+	void openTerminal();
+	
+
+	//Browser Functions
+	void OpenContextMenu();
+	void UpdateContextMenu();
+	void currentDirectoryChanged(bool widgetonly = false);
+	void dirStatusChanged(QString);
+	void setCurrentBrowser(QString);
+  
+	//Context Menu Functions
+	// - DIRECTORY operations
+	void createNewFile();
+	void createNewDir();
+	void createNewXDGEntry();
+	//void createNewSymlink();
+
+	// - Selected FILE operations
+	void cutFiles();
+	void copyFiles();
+	void pasteFiles();
+	void renameFiles();
+	void favoriteFiles();
+	void removeFiles();
+	void runFiles();
+	void runWithFiles();
+	//void attachToNewEmail();	
+
+	// - Context-specific operations
+	void openInSlideshow();
+	void openMultimedia();
+
+signals:
+	//Directory loading/finding signals
+	void OpenDirectories(QStringList); //Directories to open in other tabs/columns
+	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
+	void TabNameChanged(QString, QString); //objID, new tab name
+	
+protected:
+	void mouseReleaseEvent(QMouseEvent *);
+	
+};
+
+#endif
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.ui b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.ui
new file mode 100644
index 00000000..29660ad4
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.ui
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DirWidget</class>
+ <widget class="QWidget" name="DirWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>350</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>350</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0" columnstretch="0,1">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing">
+    <number>1</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>2</number>
+   </property>
+   <item row="0" column="0" rowspan="2" colspan="2">
+    <layout class="QHBoxLayout" name="toolbar_layout"/>
+   </item>
+   <item row="2" column="1">
+    <layout class="QVBoxLayout" name="browser_layout_main">
+     <property name="spacing">
+      <number>1</number>
+     </property>
+     <item>
+      <widget class="QFrame" name="group_snaps">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <property name="leftMargin">
+         <number>1</number>
+        </property>
+        <property name="topMargin">
+         <number>1</number>
+        </property>
+        <property name="rightMargin">
+         <number>1</number>
+        </property>
+        <property name="bottomMargin">
+         <number>1</number>
+        </property>
+        <item>
+         <widget class="QToolButton" name="tool_snap">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">padding-right: 5px;</string>
+          </property>
+          <property name="text">
+           <string notr="true"/>
+          </property>
+          <property name="popupMode">
+           <enum>QToolButton::InstantPopup</enum>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextOnly</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSlider" name="slider_snap">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>1</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="invertedAppearance">
+           <bool>false</bool>
+          </property>
+          <property name="invertedControls">
+           <bool>false</bool>
+          </property>
+          <property name="tickPosition">
+           <enum>QSlider::TicksAbove</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="tool_snap_older">
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="tool_snap_newer">
+          <property name="text">
+           <string notr="true">...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="browser_layout"/>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_status">
+       <property name="text">
+        <string notr="true">Status</string>
+       </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="tool_zoom_in">
+       <property name="toolTip">
+        <string>Increase Icon Sizes</string>
+       </property>
+       <property name="text">
+        <string notr="true">ZoomIn</string>
+       </property>
+       <property name="popupMode">
+        <enum>QToolButton::InstantPopup</enum>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="tool_zoom_out">
+       <property name="toolTip">
+        <string>Decrease Icon Sizes</string>
+       </property>
+       <property name="text">
+        <string notr="true">ZoomOut</string>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+  <action name="actionBack">
+   <property name="text">
+    <string notr="true">Back</string>
+   </property>
+   <property name="iconText">
+    <string>Back</string>
+   </property>
+   <property name="toolTip">
+    <string>Go back to previous directory</string>
+   </property>
+   <property name="statusTip">
+    <string>Go back to previous directory</string>
+   </property>
+  </action>
+  <action name="actionUp">
+   <property name="text">
+    <string notr="true">Up</string>
+   </property>
+   <property name="iconText">
+    <string>Up</string>
+   </property>
+   <property name="toolTip">
+    <string>Go to parent directory</string>
+   </property>
+   <property name="statusTip">
+    <string>Go to parent directory</string>
+   </property>
+  </action>
+  <action name="actionHome">
+   <property name="text">
+    <string notr="true">Home</string>
+   </property>
+   <property name="iconText">
+    <string>Home</string>
+   </property>
+   <property name="toolTip">
+    <string>Go to home directory</string>
+   </property>
+   <property name="statusTip">
+    <string>Go to home directory</string>
+   </property>
+  </action>
+  <action name="actionMenu">
+   <property name="text">
+    <string>Menu</string>
+   </property>
+   <property name="toolTip">
+    <string>Select Action</string>
+   </property>
+  </action>
+  <action name="actionSingleColumn">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>SingleColumn</string>
+   </property>
+   <property name="toolTip">
+    <string>Single column view</string>
+   </property>
+  </action>
+  <action name="actionDualColumn">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Dual Column</string>
+   </property>
+   <property name="toolTip">
+    <string>Dual Column View</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>