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

12 files changed, 61 insertions, 9 deletions

diff --git a/port-files/FreeBSD/deskutils/lumina-archiver/Makefile b/port-files/FreeBSD/deskutils/lumina-archiver/Makefile
index 97657f2d..04e7ee40 100644
--- a/port-files/FreeBSD/deskutils/lumina-archiver/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-archiver/Makefile
@@ -20,9 +20,9 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-calculator/Makefile b/port-files/FreeBSD/deskutils/lumina-calculator/Makefile
index 782a9679..b3bd03ff 100644
--- a/port-files/FreeBSD/deskutils/lumina-calculator/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-calculator/Makefile
@@ -25,11 +25,11 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_GL=		gl
 USE_XORG=	x11 xdamage xcb
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile b/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile
index 88888925..180305c6 100644
--- a/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-fileinfo/Makefile
@@ -20,9 +20,9 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-fm/Makefile b/port-files/FreeBSD/deskutils/lumina-fm/Makefile
index 172411e3..14c5bf98 100644
--- a/port-files/FreeBSD/deskutils/lumina-fm/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-fm/Makefile
@@ -20,9 +20,9 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_QT5=	core gui widgets network svg imageformats \
 		buildtools_build x11extras multimedia concurrent
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-notify/Makefile b/port-files/FreeBSD/deskutils/lumina-notify/Makefile
index b9c28382..5fd3e3e0 100644
--- a/port-files/FreeBSD/deskutils/lumina-notify/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-notify/Makefile
@@ -18,9 +18,9 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-pdf/Makefile b/port-files/FreeBSD/deskutils/lumina-pdf/Makefile
index d6789389..ab45ab1b 100644
--- a/port-files/FreeBSD/deskutils/lumina-pdf/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-pdf/Makefile
@@ -22,9 +22,9 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_QT5=	core gui widgets network svg multimedia \
 		buildtools_build x11extras concurrent printsupport
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile b/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile
index 84bc1e39..7ab6bbb2 100644
--- a/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-screenshot/Makefile
@@ -20,9 +20,9 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/port-files/FreeBSD/deskutils/lumina-textedit/Makefile b/port-files/FreeBSD/deskutils/lumina-textedit/Makefile
index 472d0069..554f5fcb 100644
--- a/port-files/FreeBSD/deskutils/lumina-textedit/Makefile
+++ b/port-files/FreeBSD/deskutils/lumina-textedit/Makefile
@@ -20,9 +20,9 @@ I18N_DESC= Install localization files
 
 MAKE_JOBS_UNSAFE=yes
 
+USES=           qmake
 USE_QT5=	core gui widgets network svg \
 		buildtools_build x11extras concurrent multimedia
-USES=		qmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_PROJECT=	lumina
diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
index 28bfa20b..8455e3aa 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
@@ -118,6 +118,7 @@ QSize orig = settings->value("preferences/MainWindowSize", QSize()).toSize();
   connect(TRAY, SIGNAL(JobsFinished()), this, SLOT(TrayJobsFinished()) );
   if(DEBUG){ qDebug() << " - Done with init"; }
   ui->actionOpen_as_Root->setVisible(LUtils::isValidBinary("qsudo"));
+  ui->transferTreeView->setVisible(false);
 }
 
 MainUI::~MainUI(){
diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.ui b/src-qt5/desktop-utils/lumina-fm/MainUI.ui
index a15f91c9..5f067786 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.ui
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.ui
@@ -69,7 +69,7 @@
              <x>0</x>
              <y>0</y>
              <width>567</width>
-             <height>359</height>
+             <height>161</height>
             </rect>
            </property>
            <layout class="QHBoxLayout" name="BrowserLayout">
@@ -98,6 +98,16 @@
       <widget class="QWidget" name="page_image"/>
      </widget>
     </item>
+    <item>
+     <widget class="QTreeView" name="transferTreeView">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
diff --git a/src-qt5/desktop-utils/lumina-fm/transferd.cpp b/src-qt5/desktop-utils/lumina-fm/transferd.cpp
new file mode 100644
index 00000000..c5a0a156
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/transferd.cpp
@@ -0,0 +1,28 @@
+
+
+int totaltransactions = sel.length();
+QList<TransactionInfo> transaction;
+for(int i=0;i<sel.length();i++){
+    QStringList info;
+    info << sel[i] << sel[i].size() << false;
+    totalsize = totalsize + sel[i].size();
+}
+bool paused = false;
+for(int i=0; i<transaction.length(); i++){
+
+while(paused = 1 ){
+  pausetimer = new QTimer(this);
+  pausetimer->start(5000);
+}
+QElapsedTimer timer;
+timer.start();
+//copy/move file
+timer.elapsed(); // "milliseconds"
+transferTime = transferTime + timer.elapsed()
+transaction[i].value(2) = true;
+currentTransfered++;
+currentTransferedSize = currentTransferedSize + transaction[i].value(1);
+//calculate transfer data rate from transferTime and currentTransferedSize
+avgTransferRate = ( currentTransferedSize / (transferTime * 1000) )
+//can do estimates on potential time?
+}
diff --git a/src-qt5/desktop-utils/lumina-fm/transferd.h b/src-qt5/desktop-utils/lumina-fm/transferd.h
new file mode 100644
index 00000000..291541e8
--- /dev/null
+++ b/src-qt5/desktop-utils/lumina-fm/transferd.h
@@ -0,0 +1,13 @@
+class transactionInfo{
+public:
+  QString filepath;
+  qint64 filesize;
+  Bool finished;
+};
+
+
+QStringList sel;
+int totaltransactions currentTransfered;
+qint64 totalsize, currentTransferedSize, transferTime, avgTransferRate;
+bool paused;
+QElapsedTimer timer;