1 files changed, 41 insertions, 20 deletions

diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp
index 71fb6db1..9d41374c 100644
--- a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp
@@ -44,7 +44,7 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI){
   ui->actionExtract_All->setEnabled(false);
   ui->actionAdd_Dirs->setEnabled(false);
   loadIcons();
-  ui->tree_contents->setHeaderLabels( QStringList() << tr("File") << tr("MimeType") << tr("Size") << tr("Compressed")+" " );
+  ui->tree_contents->setHeaderLabels( QStringList() << tr("File") << tr("MimeType") << tr("Size")+" " );
 }
 
 MainUI::~MainUI(){
@@ -53,7 +53,11 @@ MainUI::~MainUI(){
 
 void MainUI::LoadArguments(QStringList args){
   for(int i=0; i<args.length(); i++){
-    if(QFile::exists(args[i])){ BACKEND->loadFile(args[i]);  break;}
+    if(QFile::exists(args[i])){ 
+      ui->label_progress->setText(tr("Opening Archive..."));
+      BACKEND->loadFile(args[i]);  
+      break;
+    }
   }
 }
 
@@ -75,17 +79,16 @@ void MainUI::loadIcons(){
 QTreeWidgetItem* MainUI::findItem(QString path, QTreeWidgetItem *start){
   if(start==0){
     for(int i=0; i<ui->tree_contents->topLevelItemCount(); i++){
-      QString itpath = ui->tree_contents->topLevelItem(i)->whatsThis(0);
-      if(itpath == path){ return ui->tree_contents->topLevelItem(i); }
-      else if(path.startsWith(itpath+"/")){ return findItem(path, ui->tree_contents->topLevelItem(i)); }
+      if(ui->tree_contents->topLevelItem(i)->whatsThis(0) == path){ return ui->tree_contents->topLevelItem(i); }
+      else if(path.startsWith(ui->tree_contents->topLevelItem(i)->whatsThis(0)+"/")){ return findItem(path, ui->tree_contents->topLevelItem(i)); }
     }
   }else{
     for(int i=0; i<start->childCount(); i++){
-      QString itpath = start->child(i)->whatsThis(0);
-      if(itpath == path){ return start->child(i); }
-      else if(path.startsWith(itpath+"/")){ return findItem(path, start->child(i)); }      
+      if(start->child(i)->whatsThis(0) == path){ return start->child(i); }
+      else if(path.startsWith(start->child(i)->whatsThis(0)+"/")){ return findItem(path, start->child(i)); }      
     }
   }
+  //qDebug() << "Could not find item:" << path;
   return 0; //nothing found
 }
 
@@ -168,21 +171,21 @@ void MainUI::NewArchive(){
 void MainUI::OpenArchive(){
   QString file = QFileDialog::getOpenFileName(this, tr("Open Archive"), QDir::homePath(), OpenFileTypes() );
   if(file.isEmpty()){ return; }
-  ui->label_progress->setText(tr("Opening Archive"));
+  ui->label_progress->setText(tr("Opening Archive..."));
   BACKEND->loadFile(file);
 }
 
 void MainUI::addFiles(){
   QStringList files = QFileDialog::getOpenFileNames(this, tr("Add to Archive"), QDir::homePath() );
   if(files.isEmpty()){ return; }
-  ui->label_progress->setText(tr("Adding Items"));
+  ui->label_progress->setText(tr("Adding Items..."));
   BACKEND->startAdd(files);
 }
 
 void MainUI::addDirs(){
   QString dirs = QFileDialog::getExistingDirectory(this, tr("Add to Archive"), QDir::homePath() );
   if(dirs.isEmpty()){ return; }
-  ui->label_progress->setText(tr("Adding Items"));
+  ui->label_progress->setText(tr("Adding Items..."));
   BACKEND->startAdd(QStringList() << dirs);
 }
 
@@ -193,7 +196,7 @@ void MainUI::remFiles(){
     items << sel[i]->whatsThis(0);
   }
   items.removeDuplicates();
-  ui->label_progress->setText(tr("Removing Items"));
+  ui->label_progress->setText(tr("Removing Items..."));
   BACKEND->startRemove(items);
 }
 
@@ -220,20 +223,30 @@ void MainUI::ViewFile(QTreeWidgetItem *it){
 }
 
 void MainUI::UpdateTree(){
-  ui->tree_contents->setHeaderLabels( QStringList() << tr("File") << tr("MimeType") << tr("Size") << tr("Compressed")+" " );
+  this->setEnabled(false);
+  ui->tree_contents->setHeaderLabels( QStringList() << tr("File") << tr("MimeType") << tr("Size")+" " );
   QStringList files = BACKEND->heirarchy();
   files.sort();
   //Remove any entries for file no longer in the archive
   bool changed = cleanItems(files);
-  qDebug() << "Found Files:" << files;
+  //qDebug() << "Found Files:" << files;
   for(int i=0; i<files.length(); i++){
     if(0 != findItem(files[i]) ){ continue; } //already in the tree widget
     QString mime = LXDG::findAppMimeForFile(files[i].section("/",-1), false); //first match only
-    QTreeWidgetItem *it = new QTreeWidgetItem( QStringList() << files[i].section("/",-1) << mime << LUtils::BytesToDisplaySize( BACKEND->size(files[i])) << LUtils::BytesToDisplaySize(BACKEND->csize(files[i])) );
+    QTreeWidgetItem *it = new QTreeWidgetItem();
+      it->setText(0, files[i].section("/",-1) );
+      if(!BACKEND->isLink(files[i])){
+        it->setText(1, LXDG::findAppMimeForFile(files[i].section("/",-1), false) );
+        it->setText(2, LUtils::BytesToDisplaySize( BACKEND->size(files[i])) );
+      }else{
+        it->setText(1, QString(tr("Link To: %1")).arg(BACKEND->linkTo(files[i]) ) );
+      }
     it->setWhatsThis(0, files[i]);
     if(BACKEND->isDir(files[i])){
       it->setIcon(0, LXDG::findIcon("folder",""));
       it->setText(1,""); //clear the mimetype
+    }else if(BACKEND->isLink(files[i])){
+      it->setIcon(0, LXDG::findIcon("emblem-symbolic-link","") );
     }else{
       it->setIcon(0, LXDG::findMimeIcon(files[i].section("/",-1)) );
     }
@@ -245,14 +258,23 @@ void MainUI::UpdateTree(){
       else{ parent->addChild(it); }
     }else{
       ui->tree_contents->addTopLevelItem(it);
+      QApplication::processEvents();
     }
     changed = true;
   }
-  int wid = 0;
+
   if(changed){
-    for(int i=3; i>0; i--){ui->tree_contents->resizeColumnToContents(i); wid+= ui->tree_contents->columnWidth(i); }
+    int wid = ui->tree_contents->fontMetrics().width("W")*5;
+    ui->tree_contents->setColumnWidth(2, wid);
+    for(int i=1; i<2; i++){ui->tree_contents->resizeColumnToContents(i); QApplication::processEvents(); wid+= ui->tree_contents->columnWidth(i); }
+    //qDebug() << "Set column 0 width:" << wid << ui->tree_contents->viewport()->width();
     ui->tree_contents->setColumnWidth(0, ui->tree_contents->viewport()->width()-wid);
   }
+  ui->tree_contents->sortItems(0, Qt::AscendingOrder); //sort by name
+  ui->tree_contents->sortItems(1,Qt::AscendingOrder); //sort by mimetype (put dirs first - still organized by name)
+
+  this->setEnabled(true);
+  ui->tree_contents->setEnabled(true);
 }
 
 //Backend Handling
@@ -260,19 +282,19 @@ void MainUI::ProcStarting(){
   ui->progressBar->setRange(0,0);
   ui->progressBar->setValue(0);
   ui->progressBar->setVisible(true);
-  ui->label_progress->setVisible(true);
+  ui->label_progress->setVisible(!ui->label_progress->text().isEmpty());
   ui->label_progress_icon->setVisible(false);
   ui->tree_contents->setEnabled(false);
   ui->label_archive->setText(BACKEND->currentFile());
 }
 
 void MainUI::ProcFinished(bool success, QString msg){
+  UpdateTree();
   ui->progressBar->setRange(0,0);
   ui->progressBar->setValue(0);
   ui->progressBar->setVisible(false);
   ui->label_progress->setText(msg);
   ui->label_progress->setVisible(!msg.isEmpty());
-  ui->tree_contents->setEnabled(true);
   ui->label_progress_icon->setVisible(!msg.isEmpty());
   if(success){ ui->label_progress_icon->setPixmap( LXDG::findIcon("task-complete","").pixmap(32,32) );}
   else{ ui->label_progress_icon->setPixmap( LXDG::findIcon("task-attention","").pixmap(32,32) );}
@@ -289,7 +311,6 @@ void MainUI::ProcFinished(bool success, QString msg){
     ui->actionRemove_File->setEnabled(canmodify && info.exists());
     ui->actionExtract_All->setEnabled(info.exists());
     ui->actionAdd_Dirs->setEnabled(canmodify);
-  UpdateTree();
 }
 
 void MainUI::ProcUpdate(int percent, QString txt){