Merge branch 'master' of github.com:trueos/lumina

1 files changed, 107 insertions, 18 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h b/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h
index e3de9b0e..254362fd 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DDListWidgets.h
@@ -24,6 +24,8 @@
 #include <QUrl>
 #include <QDir>
 
+#include <LUtils.h>
+
 //==============
 //  LIST WIDGET
 //==============
@@ -42,22 +44,30 @@ public:
 	  this->setFlow(QListView::TopToBottom);
 	  this->setWrapping(true);
 	  this->setMouseTracking(true);
-	  //this->setSortingEnabled(true); //This sorts *only* by name - type is not preserved
+	  this->setSortingEnabled(true); //This sorts *only* by name - type is not preserved
+	  //this->setStyleSheet("QListWidget::item{ border: 1px solid transparent; border-radius: 5px; background-color: transparent;} QListWidget::item:hover{ border-color: black; } QListWidget::item:focus{ border-color: lightblue; }");
 	}
 	~DDListWidget(){}
 
 signals:
 	void DataDropped(QString, QStringList); //Dir path, List of commands
-		
+	void GotFocus();
+
 protected:
+	void focusInEvent(QFocusEvent *ev){
+	  QListWidget::focusInEvent(ev);
+	  emit GotFocus();
+	}
+
 	void startDrag(Qt::DropActions act){
 	  QList<QListWidgetItem*> items = this->selectedItems();
 	  if(items.length()<1){ return; }
 	  QList<QUrl> urilist;
 	  for(int i=0; i<items.length(); i++){ 
-	    urilist << QUrl::fromLocalFile(items[i]->whatsThis().section("::::",1,100));	  
+	    urilist << QUrl::fromLocalFile(items[i]->whatsThis());	  
 	  }
 	  //Create the mime data
+	  //qDebug() << "Start Drag:" << urilist;
 	  QMimeData *mime = new QMimeData;
 	    mime->setUrls(urilist);
 	  //Create the drag structure
@@ -76,19 +86,23 @@ protected:
 	    ev->acceptProposedAction(); //allow this to be dropped here
 	  }else{
 	    ev->ignore();
-	  }		  
+	  }
 	}
 	
 	void dragMoveEvent(QDragMoveEvent *ev){
 	  if(ev->mimeData()->hasUrls() && !this->whatsThis().isEmpty() ){
 	    //Change the drop type depending on the data/dir
 	    QString home = QDir::homePath();
-	    if( this->whatsThis().startsWith(home) ){ ev->setDropAction(Qt::MoveAction); }
-	    else{ ev->setDropAction(Qt::CopyAction); }
+	    //qDebug() << "Drag Move:" << home << this->whatsThis();
+	    if( this->whatsThis().startsWith(home) ){ ev->setDropAction(Qt::MoveAction); this->setCursor(Qt::DragMoveCursor); }
+	    else{ ev->setDropAction(Qt::CopyAction); this->setCursor(Qt::DragCopyCursor);}
 	    ev->acceptProposedAction(); //allow this to be dropped here
+	    //this->setCursor(Qt::CrossCursor);
 	  }else{
+	    this->setCursor(Qt::ForbiddenCursor);
 	    ev->ignore();
 	  }
+	  this->update();
 	}
 	
 	void dropEvent(QDropEvent *ev){
@@ -99,7 +113,8 @@ protected:
 	  //See if the item under the drop point is a directory or not
 	  QListWidgetItem *it = this->itemAt( ev->pos());
 	  if(it!=0){
-	    QFileInfo info(it->whatsThis().section("::::",1,100));
+	    //qDebug() << "Drop Item:" << it->whatsThis();
+	    QFileInfo info(it->whatsThis());
 	    if(info.isDir() && info.isWritable()){
 	      dirpath = info.absoluteFilePath();
 	    }
@@ -110,11 +125,13 @@ protected:
 	  foreach(const QUrl &url, ev->mimeData()->urls()){
 	    const QString filepath = url.toLocalFile();
 	    //If the target file is modifiable, assume a move - otherwise copy
-	    if(QFileInfo(filepath).isWritable() && (filepath.startsWith(home) && dirpath.startsWith(home))){ files << "cut::::"+filepath; }
-	    else{ files << "copy::::"+filepath; }
+	    if(QFileInfo(filepath).isWritable() && (filepath.startsWith(home) && dirpath.startsWith(home))){ 
+	      if(filepath.section("/",0,-2)!=dirpath){ files << "cut::::"+filepath;  } //don't "cut" a file into the same dir
+	    }else{ files << "copy::::"+filepath; }
 	  }
-	  //qDebug() << "Drop Event:" << dirpath;
-	  emit DataDropped( dirpath, files );
+	  //qDebug() << "Drop Event:" << dirpath << files;
+	  if(!files.isEmpty()){  emit DataDropped( dirpath, files ); }
+	  this->setCursor(Qt::ArrowCursor);
 	}
 	
 	void mouseReleaseEvent(QMouseEvent *ev){
@@ -155,14 +172,19 @@ public:
 
 signals:
 	void DataDropped(QString, QStringList); //Dir path, List of commands
-		
+	void GotFocus();
+
 protected:
+	void focusInEvent(QFocusEvent *ev){
+	  QTreeWidget::focusInEvent(ev);
+	  emit GotFocus();
+	}
 	void startDrag(Qt::DropActions act){
 	  QList<QTreeWidgetItem*> items = this->selectedItems();
 	  if(items.length()<1){ return; }
 	  QList<QUrl> urilist;
 	  for(int i=0; i<items.length(); i++){ 
-	    urilist << QUrl::fromLocalFile(items[i]->whatsThis(0).section("::::",1,100));	  
+	    urilist << QUrl::fromLocalFile(items[i]->whatsThis(0));	  
 	  }
 	  //Create the mime data
 	  QMimeData *mime = new QMimeData;
@@ -205,7 +227,7 @@ protected:
 	  //See if the item under the drop point is a directory or not
 	  QTreeWidgetItem *it = this->itemAt( ev->pos());
 	  if(it!=0){
-	    QFileInfo info(it->whatsThis(0).section("::::",1,100));
+	    QFileInfo info(it->whatsThis(0));
 	    if(info.isDir() && info.isWritable()){
 	      dirpath = info.absoluteFilePath();
 	    }
@@ -216,9 +238,10 @@ protected:
 	  QString home = QDir::homePath();
 	  foreach(const QUrl &url, ev->mimeData()->urls()){
 	    const QString filepath = url.toLocalFile();
-	    //If the target file is modifiable, assume a move - otherwise copy
-	    if(QFileInfo(filepath).isWritable() && (filepath.startsWith(home) && dirpath.startsWith(home)) ){ files << "cut::::"+filepath; }
-	    else{ files << "copy::::"+filepath; }
+	   //If the target file is modifiable, assume a move - otherwise copy
+	    if(QFileInfo(filepath).isWritable() && (filepath.startsWith(home) && dirpath.startsWith(home))){ 
+	      if(filepath.section("/",0,-2)!=dirpath){ files << "cut::::"+filepath;  } //don't "cut" a file into the same dir
+	    }else{ files << "copy::::"+filepath; }
 	  }
 	  //qDebug() << "Drop Event:" << dirpath;
 	  emit DataDropped( dirpath, files );
@@ -237,4 +260,70 @@ protected:
 	  else{ QTreeWidget::mouseMoveEvent(ev); } //pass it along to the widget		
 	}*/
 };
-#endif
\ No newline at end of file
+
+/*
+ * Virtual class for managing the sort of folders/files items. The problem with base class is that it only manages texts fields and
+ * we have dates and sizes.
+ *
+ * On this class, we overwrite the function operator<.
+ */
+
+class CQTreeWidgetItem : public QTreeWidgetItem {
+public:
+    CQTreeWidgetItem(int type = Type) : QTreeWidgetItem(type) {}
+    CQTreeWidgetItem(const QStringList & strings, int type = Type) : QTreeWidgetItem(strings, type) {}
+    CQTreeWidgetItem(QTreeWidget * parent, int type = Type) : QTreeWidgetItem(parent, type) {}
+    CQTreeWidgetItem(QTreeWidget * parent, const QStringList & strings, int type = Type) : QTreeWidgetItem(parent, strings, type) {}
+    CQTreeWidgetItem(QTreeWidget * parent, QTreeWidgetItem * preceding, int type = Type) : QTreeWidgetItem(parent, preceding, type) {}
+    CQTreeWidgetItem(QTreeWidgetItem * parent, int type = Type) : QTreeWidgetItem(parent, type) {}
+    CQTreeWidgetItem(QTreeWidgetItem * parent, const QStringList & strings, int type = Type) : QTreeWidgetItem(parent, strings, type) {}
+    CQTreeWidgetItem(QTreeWidgetItem * parent, QTreeWidgetItem * preceding, int type = Type) : QTreeWidgetItem(parent, preceding, type) {}
+    virtual ~CQTreeWidgetItem() {}
+    inline virtual bool operator<(const QTreeWidgetItem &tmp) const {
+      int column = this->treeWidget()->sortColumn();
+      // We are in date text
+      if(column == 3 || column == 4){
+        return this->whatsThis(column) < tmp.whatsThis(column);
+      // We are in size text
+      }else if(column == 1) {
+        QString text = this->text(column);
+        QString text_tmp = tmp.text(column);
+        double filesize, filesize_tmp;
+        // On folders, text is empty so we check for that
+        // In case we are in folders, we put -1 for differentiate of regular files with 0 bytes.
+        // Doing so, all folders we'll be together instead of mixing with files with 0 bytes.
+        if(text.isEmpty())
+          filesize = -1;
+        else
+          filesize = LUtils::DisplaySizeToBytes(text);
+        if(text_tmp.isEmpty())
+          filesize_tmp = -1;
+        else
+          filesize_tmp = LUtils::DisplaySizeToBytes(text_tmp);
+        return filesize < filesize_tmp;
+
+      //Name column - still sort by type too (folders first)
+      }else if(column == 0 && (this->text(2).isEmpty() || tmp.text(2).isEmpty()) ){
+        if(this->text(2) != tmp.text(2)){ return this->text(2).isEmpty(); }
+      }
+      // In other cases, we trust base class implementation
+      return QTreeWidgetItem::operator<(tmp);
+    }
+};
+
+//Item override for sorting purposes of list widget items
+class CQListWidgetItem : public QListWidgetItem {
+public:
+    CQListWidgetItem(const QIcon &icon, const QString &text, QListWidget *parent = Q_NULLPTR) : QListWidgetItem(icon,text,parent) {}
+    virtual ~CQListWidgetItem() {}
+    inline virtual bool operator<(const QListWidgetItem &tmp) const {
+	QString type = this->data(Qt::UserRole).toString();
+	QString tmptype = tmp.data(Qt::UserRole).toString();
+      //Sort by type first
+	if(type!=tmptype){ return (QString::compare(type,tmptype)<0); }
+      //Then sort by name using the normal rules
+      return QListWidgetItem::operator<(tmp);
+    }
+};
+
+#endif