Finish up all the new TreeWidget stuff from JT:

1. Save/load the size of the tree widget between sessions (sync size across all tabs as well).
2. Sync the tree widget with the browser with regards to whether hidden files should be shown or not.
3. Tie the tree widget "dir model" to the line edit so we get auto-completions again.
4. Make sure the tree widget shows the "normalized" directory path (does not show ZFS snapshot dirs and such).
5. Clean up a lot of debugging messages and comment out unused variable declarations.
6. Change the Browser thumbnail loading/scaling routine to always run based on image resolution rather than file size.

1 files changed, 41 insertions, 74 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
index 73d1420a..ec425dd9 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
@@ -94,7 +94,7 @@ QSize orig = settings->value("preferences/MainWindowSize", QSize()).toSize();
   nextTabRShort = new QShortcut( QKeySequence(tr("Shift+Right")), this);
   togglehiddenfilesShort = new QShortcut( QKeySequence(tr("Ctrl+H")), this);
   focusDirWidgetShort = new QShortcut( QKeySequence(tr("Ctrl+L")), this);
-  toggledirtreepaneShort = new QShortcut( QKeySequence(tr("Ctrl+P")), this);
+  //toggledirtreepaneShort = new QShortcut( QKeySequence(tr("Ctrl+P")), this);
 
   //Finish loading the interface
   workThread->start();
@@ -158,6 +158,7 @@ void MainUI::OpenDirs(QStringList dirs){
     connect(DW, SIGNAL(PasteFiles(QString,QStringList)), this, SLOT(PasteFiles(QString, QStringList)) );
     connect(DW, SIGNAL(CloseBrowser(QString)), this, SLOT(CloseBrowser(QString)) );
     connect(DW, SIGNAL(TabNameChanged(QString,QString)), this, SLOT(TabNameChanged(QString, QString)) );
+    connect(DW, SIGNAL(treeWidgetSizeChanged(float)), this, SLOT(treeWidgetWidthChanged(float)) );
     //Now create the tab for this
     //if(radio_view_tabs->isChecked()){
       int index = tabBar->addTab( LXDG::findIcon("folder-open",""), dirs[i].section("/",-1) );
@@ -178,11 +179,12 @@ void MainUI::OpenDirs(QStringList dirs){
     }*/
 
     //Initialize the widget with the proper settings
-    DW->setShowDetails(radio_view_details->isChecked()); 
+    DW->setShowDetails(radio_view_details->isChecked());
     DW->setThumbnailSize(settings->value("iconsize", 32).toInt());
     DW->showHidden( ui->actionView_Hidden_Files->isChecked() );
     DW->showThumbnails( ui->actionShow_Thumbnails->isChecked() );
-    DW->showDirTreePane( ui->actionView_showDirTreePane->isChecked() );
+    //DW->showDirTreePane( ui->actionView_showDirTreePane->isChecked() );
+    DW->adjustTreeWidget( settings->value("dirTree_width", 25.0).toFloat() );
     //Now load the directory
     DW->ChangeDir(dirs[i]); //kick off loading the directory info
   }
@@ -256,7 +258,7 @@ void MainUI::setupConnections(){
   connect(nextTabRShort, SIGNAL(activated()), this, SLOT( nextTab() ) );
   connect(togglehiddenfilesShort, SIGNAL(activated()), this, SLOT( togglehiddenfiles() ) );
   connect(focusDirWidgetShort, SIGNAL(activated()), this, SLOT( focusDirWidget() ) );
-  connect(toggledirtreepaneShort, SIGNAL(activated()), this, SLOT( toggleDirTreePane() ) );
+  //connect(toggledirtreepaneShort, SIGNAL(activated()), this, SLOT( toggleDirTreePane() ) );
 
 }
 
@@ -274,13 +276,13 @@ void MainUI::togglehiddenfiles()
     on_actionView_Hidden_Files_triggered();
 }
 
-void MainUI::toggleDirTreePane()
+/*void MainUI::toggleDirTreePane()
 {
     //change setChecked to inverse value
     ui->actionView_Hidden_Files->setChecked( !settings->value("showdirtree", true).toBool() );
     // then trigger function
     on_actionView_showDirTreePane_triggered();
-}
+}*/
 
 void MainUI::loadSettings(){
   //Note: make sure this is run after all the UI elements are created and connected to slots
@@ -289,8 +291,8 @@ void MainUI::loadSettings(){
     on_actionView_Hidden_Files_triggered(); //make sure to update the models too
   ui->actionShow_Thumbnails->setChecked( settings->value("showthumbnails",true).toBool());
     on_actionShow_Thumbnails_triggered(); //make sure to update models too
-    ui->actionView_showDirTreePane->setChecked( settings->value("showdirtree", false).toBool());
-    on_actionView_showDirTreePane_triggered(); //make sure to update the models too
+    //ui->actionView_showDirTreePane->setChecked( settings->value("showdirtree", false).toBool());
+    //on_actionView_showDirTreePane_triggered(); //make sure to update the models too
 
   //ui->actionShow_Action_Buttons->setChecked(settings->value("showactions", true).toBool() );
     //on_actionShow_Action_Buttons_triggered(); //make sure to update the UI
@@ -413,7 +415,7 @@ void MainUI::DisplayStatusBar(QString msg){
 	//qDebug() << "message to show in the status bar:" << msg;
 	ui->statusbar->showMessage(msg);
 }
-	
+
 //---------------------
 //Menu Actions
 //---------------------
@@ -445,36 +447,6 @@ void MainUI::on_actionClose_triggered(){
   this->close();
 }
 
-/*void MainUI::on_actionRename_triggered(){
-  DirWidget *dir = FindActiveBrowser();
-  if(DEBUG){ qDebug() << "Rename Shortcut Pressed:" << dir << dir->currentDir(); }
-  if(dir!=0){ QTimer::singleShot(0, dir, SLOT(renameFiles()) ); }
-}
-
-void MainUI::on_actionCut_Selection_triggered(){
-  DirWidget *dir = FindActiveBrowser();
-  if(DEBUG){ qDebug() << "Cut Shortcut Pressed:" << dir << dir->currentDir(); }
-  if(dir!=0){ QTimer::singleShot(0, dir, SLOT(cutFiles()) );	 }
-}
-
-void MainUI::on_actionCopy_Selection_triggered(){
-  DirWidget *dir = FindActiveBrowser();
-  if(DEBUG){ qDebug() << "Copy Shortcut Pressed:" << dir << dir->currentDir(); }
-  if(dir!=0){ QTimer::singleShot(0, dir, SLOT(TryCopySelection()) ); }
-}
-
-void MainUI::on_actionPaste_triggered(){
-  DirWidget *dir = FindActiveBrowser();
-  if(DEBUG){ qDebug() << "Paste Shortcut Pressed:" << dir << dir->currentDir(); }
-  if(dir!=0){ QTimer::singleShot(0, dir, SLOT(TryPasteSelection()) ); }
-}
-
-void MainUI::on_actionDelete_Selection_triggered(){
-  DirWidget *dir = FindActiveBrowser();
-  if(DEBUG){ qDebug() << "Delete Shortcut Pressed:" << dir << dir->currentDir(); }
-  if(dir!=0){ QTimer::singleShot(0, dir, SLOT(TryDeleteSelection()) ); }
-}*/
-
 void MainUI::on_actionRefresh_triggered(){
   DirWidget *cur = FindActiveBrowser();
   if(cur!=0){ cur->refresh(); }
@@ -490,20 +462,15 @@ void MainUI::on_actionView_Hidden_Files_triggered(){
 
 }
 
-void MainUI::on_actionView_showDirTreePane_triggered(){
-  //worker->showdirtree = ui->actionView_showDirTreePane->isChecked();
-  settings->setValue("showdirtree", ui->actionView_showDirTreePane->isChecked());
-//Re-load the current browsers
-
+void MainUI::treeWidgetWidthChanged(float percent){
+  //NOTE: Percent needs to be between 0-75
+  if(percent > 75){ percent = 75; }
+  settings->setValue("dirTree_width", percent);
+  //Re-load the current browsers
+  for(int i=0; i<DWLIST.length(); i++){ DWLIST[i]->adjustTreeWidget(percent); }
 }
 
 
-/*void MainUI::on_actionShow_Action_Buttons_triggered(){
-  bool show = ui->actionShow_Action_Buttons->isChecked();
-  settings->setValue("showactions", show);
-  //for(int i=0; i<DWLIST.length(); i++){ DWLIST[i]->setShowSidebar(show); }
-}*/
-
 void MainUI::on_actionShow_Thumbnails_triggered(){
   //Now save this setting for later
   bool show = ui->actionShow_Thumbnails->isChecked();
@@ -522,7 +489,7 @@ void MainUI::goToBookmark(QAction *act){
   }else{
     //Find the current directory
     DirWidget *dir = FindActiveBrowser();
-    if(dir!=0){ 
+    if(dir!=0){
       dir->ChangeDir(act->whatsThis());
       return;
     }
@@ -536,7 +503,7 @@ void MainUI::goToDevice(QAction *act){
     RebuildDeviceMenu();
   }else{
     DirWidget *dir = FindActiveBrowser();
-    if(dir!=0){ 
+    if(dir!=0){
       dir->ChangeDir(act->whatsThis());
       return;
     }
@@ -555,14 +522,14 @@ void MainUI::viewModeChanged(bool active){
   for(int i=0; i<DWLIST.length(); i++){
     DWLIST[i]->setShowDetails(showDetails);
   }
-	
+
 }
 
 /*void MainUI::groupModeChanged(bool active){
   if(!active){ return; } //on every change, all radio buttons will call this function - only run this once though
   //bool usetabs = radio_view_tabs->isChecked();
- //if(usetabs){ 
-    //settings->setValue("groupmode","tabs"); 
+ //if(usetabs){
+    //settings->setValue("groupmode","tabs");
     //Now clean up all the tabs (remove the generic one and add the specific ones)
     for(int i=0; i<tabBar->count(); i++){
       //Remove all the browser tabs
@@ -610,7 +577,7 @@ void MainUI::on_actionSmaller_Icons_triggered(){
   if(size <= 16){ return; }
   size -= 16;
   for(int i=0; i<DWLIST.length(); i++){ DWLIST[i]->setThumbnailSize(size); }
-  settings->setValue("iconsize", size);	
+  settings->setValue("iconsize", size);
 }
 
 void MainUI::CreateBookMark(){
@@ -666,13 +633,13 @@ void MainUI::tabChanged(int tab){
     ui->stackedWidget->setCurrentWidget(ui->page_browser);
     //if(radio_view_tabs->isChecked()){
       for(int i=0; i<DWLIST.length(); i++){
-	 DWLIST[i]->setVisible(DWLIST[i]->id()==info);     
+	 DWLIST[i]->setVisible(DWLIST[i]->id()==info);
       }
     /*}else{
       //For columns, all widgets need to be visible
       for(int i=0; i<DWLIST.length(); i++){
-	 DWLIST[i]->setVisible(true);     
-      }	    
+	 DWLIST[i]->setVisible(true);
+      }
     }*/
   }
   tabBar->setVisible( tabBar->count() > 1 );
@@ -684,7 +651,7 @@ void MainUI::tabClosed(int tab){
   QString info = tabBar->tabWhatsThis(tab);
   if(info=="browser"){ return; }
   //qDebug() << "Tab Closed:" << info;
-   if(!info.startsWith("#")){ 
+   if(!info.startsWith("#")){
     for(int i=0; i<DWLIST.length(); i++){
       if(info == DWLIST[i]->id()){
 	 DWLIST[i]->cleanup();
@@ -711,7 +678,7 @@ void MainUI::prevTab(){
 void MainUI::nextTab(){
   int cur = tabBar->currentIndex();
   if(cur == (tabBar->count()-1) ){ tabBar->setCurrentIndex(0); }
-  else{ tabBar->setCurrentIndex( cur+1 ); }	
+  else{ tabBar->setCurrentIndex( cur+1 ); }
 }
 
 
@@ -763,7 +730,7 @@ void MainUI::OpenImages(LFileInfoList list){
 }
 
 void MainUI::OpenTerminal(QString dirpath){
-  //we use the application defined as the default terminal 
+  //we use the application defined as the default terminal
   //QSettings sessionsettings( QSettings::UserScope, "LuminaDE","sessionsettings", this);
   //xterm remains the default
   QString defTerminal = LXDG::findDefaultAppForMime("application/terminal"); //sessionsettings.value("default-terminal", "xterm").toString();
@@ -825,19 +792,19 @@ void MainUI::PasteFiles(QString dir, QStringList raw){
   }
   if(!dir.endsWith("/")){ dir.append("/"); }
   for(int i=0; i<raw.length(); i++){
-    if(raw[i].startsWith("cut::::")){ 
+    if(raw[i].startsWith("cut::::")){
 	cut << raw[i].section("::::",1,50);
 	newcut << dir+raw[i].section("::::",1,50).section("/",-1);
     }
-    else if(raw[i].startsWith("copy::::")){ 
-	copy << raw[i].section("::::",1,50); 
+    else if(raw[i].startsWith("copy::::")){
+	copy << raw[i].section("::::",1,50);
 	newcopy<< dir+raw[i].section("::::",1,50).section("/",-1);
     }
   }
   //bool errs = false;
   //Perform the copy/move operations
   //worker->pauseData = true; //pause any info requests
-  if(!copy.isEmpty()){ 
+  if(!copy.isEmpty()){
     qDebug() << "Paste Copy:" << copy << "->" << newcopy;
     TRAY->StartOperation( TrayUI::COPY, copy, newcopy);
     /*FODialog dlg(this);
@@ -859,7 +826,7 @@ void MainUI::PasteFiles(QString dir, QStringList raw){
   //Modify the clipboard appropriately
   if(!cut.isEmpty()){
     //Now clear the clipboard since those old file locations are now invalid
-    QApplication::clipboard()->clear(); 
+    QApplication::clipboard()->clear();
     if(!copy.isEmpty()){
       //There were also files copied: save those files back into the clipboard
        QMimeData *dat = new QMimeData;
@@ -920,19 +887,19 @@ void MainUI::RenameFiles(QStringList list){
 }
 
 void MainUI::RemoveFiles(QStringList list){
-  if(list.isEmpty()){ return; } //nothing selected	
+  if(list.isEmpty()){ return; } //nothing selected
   qDebug() << "Remove Files:" << list;
   QStringList paths, names;
   for(int i=0; i<list.length(); i++){
      paths << list[i];
      names << list[i].section("/",-1);
    }
-  
+
   //Verify permanent removal of file/dir
   QMessageBox dlgQ(QMessageBox::Question, tr("Verify Removal"), tr("WARNING: This will permanently delete the file(s) from the system!")+"\n"+tr("Are you sure you want to continue?"), QMessageBox::Yes | QMessageBox::No, this);
     dlgQ.setDetailedText(tr("Items to be removed:")+"\n\n"+names.join("\n"));
   dlgQ.exec();
-  if(dlgQ.result() != QMessageBox::Yes){ return; } //cancelled   
+  if(dlgQ.result() != QMessageBox::Yes){ return; } //cancelled
 
   //Now remove the file/dir
   qDebug() << " - Delete: "<<paths;
@@ -986,11 +953,11 @@ void MainUI::TrayJobsFinished(){
 void MainUI::closeEvent(QCloseEvent *ev){
   //See if the tray is active or not first
   if(TRAY!=0){
-    if(TRAY->isVisible() && !waitingToClose){ 
-      this->hide(); 
-      ev->ignore(); 
+    if(TRAY->isVisible() && !waitingToClose){
+      this->hide();
+      ev->ignore();
       waitingToClose = true;
-      return; 
+      return;
     }
   }
   QMainWindow::closeEvent(ev); //continue normal close routine