Fix up some instability within lumina-fileinfo.

2 files changed, 56 insertions, 50 deletions

diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp
index 2656b855..dfa1ec36 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp
@@ -14,7 +14,7 @@
 #include <LuminaUtils.h>
 #include <LuminaOS.h>
 
-LFileInfo INFO = LFileInfo("");
+//LFileInfo INFO = LFileInfo("");
 	
 MainUI::MainUI() : QDialog(), ui(new Ui::MainUI){
   ui->setupUi(this); //load the designer form
@@ -22,10 +22,12 @@ MainUI::MainUI() : QDialog(), ui(new Ui::MainUI){
   terminate_thread = false;
   UpdateIcons(); //Set all the icons in the dialog
   SetupConnections();
+  INFO = 0;
 }
 
 MainUI::~MainUI(){
   terminate_thread = true;
+  if(INFO!=0){ delete INFO; }
 }
 
 //=============
@@ -35,54 +37,54 @@ void MainUI::LoadFile(QString path, QString type){
   
   //Do the first file information tab
   qDebug() << "Load File:" << path << type;
-  INFO = LFileInfo(path);
-  if(INFO.exists()){ canwrite = INFO.isWritable(); }
-  else if(!INFO.filePath().isEmpty()){
+  INFO = new LFileInfo(path);
+  if(INFO->exists()){ canwrite = INFO->isWritable(); }
+  else if(!INFO->filePath().isEmpty()){
     //See if the containing directory can be written
-    QFileInfo chk(INFO.absolutePath());
+    QFileInfo chk(INFO->absolutePath());
     canwrite = (chk.isDir() && chk.isWritable());
   }else{
     canwrite = true; //no associated file yet
   }
-  if(!INFO.exists() && !type.isEmpty()){
+  if(!INFO->exists() && !type.isEmpty()){
     //Set the proper type flag on the shortcut
-    if(type=="APP"){ INFO.XDG()->type = XDGDesktop::APP; }
-    else if(type=="LINK"){ INFO.XDG()->type = XDGDesktop::LINK; }
+    if(type=="APP"){ INFO->XDG()->type = XDGDesktop::APP; }
+    else if(type=="LINK"){ INFO->XDG()->type = XDGDesktop::LINK; }
   }
 	  
   //First load the general file information
-  if(!INFO.filePath().isEmpty()){
-    ui->label_file_name->setText( INFO.fileName() );
-    ui->label_file_mimetype->setText( INFO.mimetype() );
-    if(!INFO.isDir()){ ui->label_file_size->setText( LUtils::BytesToDisplaySize( INFO.size() ) ); }
+  if(!INFO->filePath().isEmpty()){
+    ui->label_file_name->setText( INFO->fileName() );
+    ui->label_file_mimetype->setText( INFO->mimetype() );
+    if(!INFO->isDir()){ ui->label_file_size->setText( LUtils::BytesToDisplaySize( INFO->size() ) ); }
     else {
       ui->label_file_size->setText(tr("---Calculating---"));
-      QtConcurrent::run(this, &MainUI::GetDirSize, INFO.absoluteFilePath());
+      QtConcurrent::run(this, &MainUI::GetDirSize, INFO->absoluteFilePath());
     }
-    ui->label_file_owner->setText(INFO.owner());
-    ui->label_file_group->setText(INFO.group());
-    ui->label_file_created->setText( INFO.created().toString(Qt::SystemLocaleLongDate) );
-    ui->label_file_modified->setText( INFO.lastModified().toString(Qt::SystemLocaleLongDate) );
+    ui->label_file_owner->setText(INFO->owner());
+    ui->label_file_group->setText(INFO->group());
+    ui->label_file_created->setText( INFO->created().toString(Qt::SystemLocaleLongDate) );
+    ui->label_file_modified->setText( INFO->lastModified().toString(Qt::SystemLocaleLongDate) );
     //Get the file permissions
     QString perms;
-    if(INFO.isReadable() && INFO.isWritable()){ perms = tr("Read/Write"); }
-    else if(INFO.isReadable()){ perms = tr("Read Only"); }
-    else if(INFO.isWritable()){ perms = tr("Write Only"); }
+    if(INFO->isReadable() && INFO->isWritable()){ perms = tr("Read/Write"); }
+    else if(INFO->isReadable()){ perms = tr("Read Only"); }
+    else if(INFO->isWritable()){ perms = tr("Write Only"); }
     else{ perms = tr("No Access"); }
     ui->label_file_perms->setText(perms);
     //Now the special "type" for the file
     QString ftype;
-    if(INFO.suffix().toLower()=="desktop"){ ftype = tr("XDG Shortcut"); }
-    else if(INFO.isDir()){ ftype = tr("Directory"); }
-    else if(INFO.isExecutable()){ ftype = tr("Binary"); }
-    else{ ftype = INFO.suffix().toUpper(); }
-    if(INFO.isHidden()){ ftype = QString(tr("Hidden %1")).arg(type); }
+    if(INFO->suffix().toLower()=="desktop"){ ftype = tr("XDG Shortcut"); }
+    else if(INFO->isDir()){ ftype = tr("Directory"); }
+    else if(INFO->isExecutable()){ ftype = tr("Binary"); }
+    else{ ftype = INFO->suffix().toUpper(); }
+    if(INFO->isHidden()){ ftype = QString(tr("Hidden %1")).arg(type); }
     ui->label_file_type->setText(ftype);
     //Now load the icon for the file
-    if(INFO.isImage()){
-      ui->label_file_icon->setPixmap( QPixmap(INFO.absoluteFilePath()).scaledToHeight(64) );
+    if(INFO->isImage()){
+      ui->label_file_icon->setPixmap( QPixmap(INFO->absoluteFilePath()).scaledToHeight(64) );
     }else{
-      ui->label_file_icon->setPixmap( LXDG::findIcon( INFO.iconfile(), "unknown").pixmap(QSize(64,64)) );
+      ui->label_file_icon->setPixmap( LXDG::findIcon( INFO->iconfile(), "unknown").pixmap(QSize(64,64)) );
     }
     //Now verify the tab is available in the widget
     if(ui->tabWidget->indexOf(ui->tab_file)<0){
@@ -94,15 +96,15 @@ void MainUI::LoadFile(QString path, QString type){
     }
   }
   //Now load the special XDG desktop info
-  qDebug() << INFO.isDesktopFile() << type;
-  if(INFO.isDesktopFile() || !type.isEmpty()){
+  qDebug() << INFO->isDesktopFile() << type;
+  if(INFO->isDesktopFile() || !type.isEmpty()){
   
-    if(INFO.XDG()->type == XDGDesktop::APP){
-      ui->line_xdg_command->setText(INFO.XDG()->exec);
-      ui->line_xdg_wdir->setText(INFO.XDG()->path);
-      ui->check_xdg_useTerminal->setChecked( INFO.XDG()->useTerminal );
-      ui->check_xdg_startupNotify->setChecked( INFO.XDG()->startupNotify );
-    }else if(INFO.XDG()->type==XDGDesktop::LINK){
+    if(INFO->XDG()->type == XDGDesktop::APP){
+      ui->line_xdg_command->setText(INFO->XDG()->exec);
+      ui->line_xdg_wdir->setText(INFO->XDG()->path);
+      ui->check_xdg_useTerminal->setChecked( INFO->XDG()->useTerminal );
+      ui->check_xdg_startupNotify->setChecked( INFO->XDG()->startupNotify );
+    }else if(INFO->XDG()->type==XDGDesktop::LINK){
       //Hide the options that are unavailable for links
       //Command  line (exec)
       ui->line_xdg_command->setVisible(false);
@@ -114,13 +116,13 @@ void MainUI::LoadFile(QString path, QString type){
       ui->check_xdg_startupNotify->setVisible(false);
       //Now load the variables for this type of shortcut
       ui->lblWorkingDir->setText(tr("URL:"));
-      ui->line_xdg_wdir->setText( INFO.XDG()->url );
+      ui->line_xdg_wdir->setText( INFO->XDG()->url );
       ui->tool_xdg_getDir->setVisible(false); //the dir selection button
       
     }
-    ui->line_xdg_name->setText(INFO.XDG()->name);	
-    ui->line_xdg_comment->setText(INFO.XDG()->comment);
-    ui->push_xdg_getIcon->setWhatsThis( INFO.XDG()->icon );
+    ui->line_xdg_name->setText(INFO->XDG()->name);	
+    ui->line_xdg_comment->setText(INFO->XDG()->comment);
+    ui->push_xdg_getIcon->setWhatsThis( INFO->XDG()->icon );
     ReloadAppIcon();
     ui->push_save->setVisible(true);
     ui->push_save->setEnabled(false);
@@ -209,6 +211,7 @@ void MainUI::GetDirSize(const QString dirname) const {
 void MainUI::SetupConnections(){
   connect(ui->line_xdg_command, SIGNAL(editingFinished()), this, SLOT(xdgvaluechanged()) );
   connect(ui->line_xdg_comment, SIGNAL(editingFinished()), this, SLOT(xdgvaluechanged()) );
+  connect(ui->tool_xdg_getCommand, SIGNAL(clicked()), this, SLOT(getXdgCommand()) );
   connect(ui->line_xdg_name, SIGNAL(editingFinished()), this, SLOT(xdgvaluechanged()) );
   connect(ui->line_xdg_wdir, SIGNAL(editingFinished()), this, SLOT(xdgvaluechanged()) );
   connect(ui->check_xdg_useTerminal, SIGNAL(clicked()), this, SLOT(xdgvaluechanged()) );
@@ -229,8 +232,8 @@ void MainUI::on_push_close_clicked(){
 
 void MainUI::on_push_save_clicked(){
   //Save all the xdg values into the structure
-  if( (!INFO.isDesktopFile() && !INFO.filePath().isEmpty()) || !canwrite){ return; }
-  if(INFO.filePath().isEmpty()){
+  if( (!INFO->isDesktopFile() && !INFO->filePath().isEmpty()) || !canwrite){ return; }
+  if(INFO->filePath().isEmpty()){
     //Need to prompt for where to save the file and what to call it
     QString appdir = QString(getenv("XDG_DATA_HOME"))+"/applications/";
     if(!QFile::exists(appdir)){ QDir dir; dir.mkpath(appdir); }
@@ -238,10 +241,10 @@ void MainUI::on_push_save_clicked(){
     if(filePath.isEmpty()){ return; }
     if(!filePath.endsWith(".desktop")){ filePath.append(".desktop"); }
     //Update the file paths in the data structure
-    INFO.setFile(filePath);
-    INFO.XDG()->filePath = filePath;
+    INFO->setFile(filePath);
+    INFO->XDG()->filePath = filePath;
   }
-  XDGDesktop *XDG = INFO.XDG();
+  XDGDesktop *XDG = INFO->XDG();
   //Now change the structure
   XDG->name = ui->line_xdg_name->text();
   XDG->genericName = ui->line_xdg_name->text().toLower();
@@ -266,11 +269,11 @@ void MainUI::on_push_save_clicked(){
   ui->push_save->setEnabled( !saved );
   if(saved){
     //Re-load the file info
-    LoadFile(INFO.absoluteFilePath());
+    LoadFile(INFO->absoluteFilePath());
   }
 }
 
-void MainUI::on_tool_xdg_getCommand_clicked(QString prev){
+void MainUI::getXdgCommand(QString prev){
   //Find a binary to run
   QString dir = prev; //start with the previous attempt (if there was one)
   if(dir.isEmpty()){ ui->line_xdg_command->text(); }//then try current selection
@@ -279,7 +282,7 @@ void MainUI::on_tool_xdg_getCommand_clicked(QString prev){
   if(file.isEmpty()){ return; } //cancelled
   if(!LUtils::isValidBinary(file)){
     QMessageBox::warning(this, tr("Error"), tr("Invalid selection: Not a valid executable"));
-    on_tool_xdg_getCommand_clicked(file);
+    getXdgCommand(file);
     return;
   }
   ui->line_xdg_command->setText(file);
@@ -312,7 +315,7 @@ void MainUI::on_push_xdg_getIcon_clicked(){
 
 //XDG Value Changed
 void MainUI::xdgvaluechanged(){
-  if(INFO.isDesktopFile() || INFO.filePath().isEmpty()){
+  if(INFO!=0 && (INFO->isDesktopFile() || INFO->filePath().isEmpty() ) ){
     ui->push_save->setVisible(true);
     //Compare the current UI values to the file values
     ui->push_save->setEnabled(canwrite); //assume changed at this point
diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h
index e17ab439..cbe23d9e 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h
+++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h
@@ -34,6 +34,8 @@ public slots:
 
 private:
 	Ui::MainUI *ui;
+	LFileInfo *INFO;
+
 	bool canwrite;
 	bool terminate_thread; //flag for terminating the GetDirSize task
 	void ReloadAppIcon();
@@ -49,7 +51,8 @@ private slots:
 	//UI Buttons
 	void on_push_close_clicked();
 	void on_push_save_clicked();
-	void on_tool_xdg_getCommand_clicked(QString prev = "");
+	void getXdgCommand(QString prev = "");
+	//void on_tool_xdg_getCommand_clicked(QString prev = "");
 	void on_tool_xdg_getDir_clicked();
 	void on_push_xdg_getIcon_clicked();