Merge remote-tracking branch 'upstream/master' into deskEditor

1 files changed, 29 insertions, 5 deletions

diff --git a/lumina-fm/MainUI.cpp b/lumina-fm/MainUI.cpp
index 9d66bc36..604e4c9c 100644
--- a/lumina-fm/MainUI.cpp
+++ b/lumina-fm/MainUI.cpp
@@ -8,10 +8,13 @@
 #include "ui_MainUI.h"
 
 #include <QImageWriter>
+#include <QFileInfo>
 
 #define DEBUG 0
 
 MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI){
+  //for Signal/slot we must register the Typedef of QFileInfoList
+  qRegisterMetaType<QFileInfoList>("QFileInfoList");
   ui->setupUi(this);
   if(DEBUG){ qDebug() << "Initilization:"; }
   //Be careful about the QSettings setup, it must match the lumina-desktop setup
@@ -214,6 +217,10 @@ void MainUI::setupConnections(){
   connect(worker, SIGNAL(ImagesAvailable(QStringList)), this, SLOT(AvailablePictures(QStringList)) );
   connect(worker, SIGNAL(MultimediaAvailable(QStringList)), this, SLOT(AvailableMultimediaFiles(QStringList)) );
   connect(worker, SIGNAL(SnapshotsAvailable(QString, QStringList)), this, SLOT(AvailableBackups(QString, QStringList)) );
+
+  //Background worker class for statusbar
+  connect(this, SIGNAL(Si_AdaptStatusBar(QFileInfoList, QString, QString)), worker, SLOT(createStatusBarMsg(QFileInfoList, QString, QString)) );
+  connect(worker, SIGNAL(Si_DisplayStatusBar(QString)), this, SLOT(DisplayStatusBar(QString)) );
 	
   //Action buttons on browser page
   connect(ui->tool_act_run, SIGNAL(clicked()), this, SLOT(OpenItem()) );
@@ -439,16 +446,22 @@ void MainUI::setCurrentDir(QString dir){
   //qDebug() << "History:" << history;
   tabBar->setTabData(tabBar->currentIndex(), history);
   //Now adjust the items as necessary
-  ui->tool_goToPlayer->setVisible(false);
-  ui->tool_goToRestore->setVisible(false);
-  ui->tool_goToImages->setVisible(false);
+  if(rawdir != olddir){
+    //The Filesystem model will need to load the new directory (triggering the background checks)
+    ui->tool_goToPlayer->setVisible(false);
+    ui->tool_goToRestore->setVisible(false);
+    ui->tool_goToImages->setVisible(false);
+  }
   //Make sure the shortcut buttons are enabled as necessary
   // If the dir is already loaded into the fsmodel cache it will not emit the directoryLoaded() signal
-  if(rawdir == olddir){
+  /*if(rawdir == olddir){
     emit DirChanged(rawdir); //This will be automatically run when a new dir is loaded
   }
+  emit Si_AdaptStatusBar(fsmod->rootDirectory().entryInfoList(), rawdir, tr("Items"));*/
   if(isUserWritable){ ui->label_dir_stats->setText(""); }
-  else{ ui->label_dir_stats->setText(tr("Limited Access Directory")); }
+  else{ ui->label_dir_stats->setText(tr("Limited Access Directory"));
+  }
+  
   ui->tool_addToDir->setVisible(isUserWritable);
   ui->tool_addNewFile->setVisible(isUserWritable);
   ui->actionUpDir->setEnabled(dir!="/");
@@ -541,6 +554,11 @@ void MainUI::AvailableBackups(QString basedir, QStringList snapdirs){
   ui->tool_goToRestore->setVisible(!snapDirs.isEmpty());
 }
 
+void MainUI::DisplayStatusBar(QString msg){
+	//qDebug() << "message to show in the status bar:" << msg;
+	ui->statusbar->showMessage(msg);
+}
+
 void MainUI::AvailablePictures(QStringList pics){
   if(!pics.isEmpty()){
     QString citem = ui->combo_image_name->currentText();
@@ -832,6 +850,7 @@ void MainUI::currentDirectoryLoaded(){
   ui->tool_goToRestore->setVisible(false);
   ui->tool_goToImages->setVisible(false);
   emit DirChanged(getCurrentDir());
+  emit Si_AdaptStatusBar(fsmod->rootDirectory().entryInfoList(), getCurrentDir(), tr("Items"));
   ItemSelectionChanged();
 }
 
@@ -962,6 +981,11 @@ void MainUI::OpenContextMenu(const QPoint &pt){
 void MainUI::ItemSelectionChanged(){
   //Enable/disable the action buttons
   QFileInfoList sel = getSelectedItems();
+  //display info related to files selected. 
+  //TO CHECK: impact if filesystem is very slow
+  if(sel.size()>0){ emit Si_AdaptStatusBar(sel, "", tr("Items selected")); }
+  else{ emit Si_AdaptStatusBar(fsmod->rootDirectory().entryInfoList(), getCurrentDir(), tr("Items")); }	
+  
   ui->tool_act_run->setEnabled(sel.length()==1);
   ui->tool_act_runwith->setEnabled(sel.length()==1);
   ui->tool_act_rm->setEnabled(!sel.isEmpty() && isUserWritable);