From 711b219a001d0c4fdd61367903696fa1c6ff1a3d Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 3 Oct 2017 15:24:26 -0400 Subject: Added experimental video thumbnails in lumina-fm and fileinfo --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-fileinfo/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h index cbe23d9e..e1f37425 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h @@ -14,11 +14,11 @@ #define _LUMINA_FILE_INFO_MAIN_UI_H #include - +#include #include +#include -namespace Ui{ - class MainUI; +namespace Ui{ class MainUI; }; class MainUI : public QDialog{ @@ -35,6 +35,8 @@ public slots: private: Ui::MainUI *ui; LFileInfo *INFO; + LVideoSurface *surface; + QMediaPlayer *player; bool canwrite; bool terminate_thread; //flag for terminating the GetDirSize task @@ -51,6 +53,7 @@ private slots: //UI Buttons void on_push_close_clicked(); void on_push_save_clicked(); + //void stopVideo(QImage); void getXdgCommand(QString prev = ""); //void on_tool_xdg_getCommand_clicked(QString prev = ""); void on_tool_xdg_getDir_clicked(); -- cgit From 3005f7ab6b19cabf423b85ec7c3845d840c7cb18 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 3 Oct 2017 18:36:51 -0400 Subject: Reworked the VideoSurface subclass --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src-qt5/desktop-utils/lumina-fileinfo/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h index e1f37425..5ce7b01a 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h @@ -37,6 +37,7 @@ private: LFileInfo *INFO; LVideoSurface *surface; QMediaPlayer *player; + bool flag; bool canwrite; bool terminate_thread; //flag for terminating the GetDirSize task @@ -53,7 +54,8 @@ private slots: //UI Buttons void on_push_close_clicked(); void on_push_save_clicked(); - //void stopVideo(QImage); + void stopVideo(QPixmap); + void setDuration(QMediaPlayer::MediaStatus); void getXdgCommand(QString prev = ""); //void on_tool_xdg_getCommand_clicked(QString prev = ""); void on_tool_xdg_getDir_clicked(); -- cgit From 79fbc99707377264761434b44147281457189691 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Thu, 5 Oct 2017 17:06:58 -0400 Subject: Finished video thumnails for lumina-fm and lumina-fileinfo --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src-qt5/desktop-utils/lumina-fileinfo/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h index 5ce7b01a..3bc85aae 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h @@ -17,6 +17,7 @@ #include #include #include +#include namespace Ui{ class MainUI; }; @@ -38,6 +39,7 @@ private: LVideoSurface *surface; QMediaPlayer *player; bool flag; + QElapsedTimer timer; bool canwrite; bool terminate_thread; //flag for terminating the GetDirSize task -- cgit From f649d4976e64cfdf9b32022d55bfd08f39d00a8f Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Wed, 11 Oct 2017 20:51:56 -0400 Subject: Added framework to play video when the mouse is put over them. Breaks picture and video preview for lumina-fileinfo currently --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-fileinfo/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h index 3bc85aae..8cac813c 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h @@ -17,6 +17,7 @@ #include #include #include +#include #include namespace Ui{ class MainUI; @@ -56,8 +57,6 @@ private slots: //UI Buttons void on_push_close_clicked(); void on_push_save_clicked(); - void stopVideo(QPixmap); - void setDuration(QMediaPlayer::MediaStatus); void getXdgCommand(QString prev = ""); //void on_tool_xdg_getCommand_clicked(QString prev = ""); void on_tool_xdg_getDir_clicked(); -- cgit From ccea2e1130bf1cf54aea58528a493aacadbeda13 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 1 Nov 2017 12:47:19 -0400 Subject: Start working on fixing up lumina-fileinfo --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-fileinfo/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h index 8cac813c..089dbe6c 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h @@ -33,18 +33,17 @@ public: public slots: void UpdateIcons(); - + void ReloadAppIcon(); private: Ui::MainUI *ui; LFileInfo *INFO; - LVideoSurface *surface; - QMediaPlayer *player; - bool flag; - QElapsedTimer timer; + LVideoSurface *surface; + QMediaPlayer *player; + bool flag; + QElapsedTimer timer; bool canwrite; bool terminate_thread; //flag for terminating the GetDirSize task - void ReloadAppIcon(); void GetDirSize(const QString dirname) const; //function to get folder size signals: -- cgit From b82e9b864dc3f5321fc47f3e4b0e1e6fdca9f1fc Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 1 Nov 2017 15:13:52 -0400 Subject: Rework quite a bit of the lumina-fileinfo backend. Still not quite finished yet, but it is already much more stable/reliable. Just need to add new features. --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-fileinfo/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h index 089dbe6c..f45e15d7 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h @@ -13,17 +13,19 @@ #ifndef _LUMINA_FILE_INFO_MAIN_UI_H #define _LUMINA_FILE_INFO_MAIN_UI_H -#include +#include #include -#include #include #include #include -namespace Ui{ class MainUI; +#include + +namespace Ui{ + class MainUI; }; -class MainUI : public QDialog{ +class MainUI : public QMainWindow{ Q_OBJECT public: MainUI(); @@ -34,6 +36,7 @@ public: public slots: void UpdateIcons(); void ReloadAppIcon(); + private: Ui::MainUI *ui; LFileInfo *INFO; @@ -46,16 +49,23 @@ private: bool terminate_thread; //flag for terminating the GetDirSize task void GetDirSize(const QString dirname) const; //function to get folder size + void SyncFileInfo(); + + void syncXdgStruct(XDGDesktop*); + + bool saveFile(QString path); + signals: void folder_size_changed(quint64 size, quint64 files, quint64 folders, bool finished) const; //Signal for updating the folder size asynchronously private slots: + void SetupNewFile(); //Initialization functions void SetupConnections(); //UI Buttons - void on_push_close_clicked(); - void on_push_save_clicked(); + void closeApplication(); + void save_clicked(); void getXdgCommand(QString prev = ""); //void on_tool_xdg_getCommand_clicked(QString prev = ""); void on_tool_xdg_getDir_clicked(); -- cgit From a84c814bb9db9bd2ca6f52f05803729272bb25dd Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 2 Nov 2017 10:21:06 -0400 Subject: Finish up the large cleanup of lumina-fileinfo. --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-fileinfo/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h index f45e15d7..d7b17207 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.h @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -44,9 +45,12 @@ private: QMediaPlayer *player; bool flag; QElapsedTimer timer; + QFuture sizeThread; bool canwrite; bool terminate_thread; //flag for terminating the GetDirSize task + void stopDirSize(); + void GetDirSize(const QString dirname) const; //function to get folder size void SyncFileInfo(); @@ -54,6 +58,7 @@ private: void syncXdgStruct(XDGDesktop*); bool saveFile(QString path); + QString findOpenDirFile(bool isdir = false); signals: void folder_size_changed(quint64 size, quint64 files, quint64 folders, bool finished) const; //Signal for updating the folder size asynchronously @@ -66,16 +71,20 @@ private slots: //UI Buttons void closeApplication(); void save_clicked(); + void save_as_local_clicked(); + void save_as_register_clicked(); + void open_dir_clicked(); + void open_file_clicked(); void getXdgCommand(QString prev = ""); - //void on_tool_xdg_getCommand_clicked(QString prev = ""); void on_tool_xdg_getDir_clicked(); void on_push_xdg_getIcon_clicked(); //XDG Value Changed + bool checkXDGValidity(); void xdgvaluechanged(); - //Folder size - void refresh_folder_size(quint64 size, quint64 files, quint64 folders, bool finished); //Slot for updating the folder size asynchronously + //Folder size + void refresh_folder_size(quint64 size, quint64 files, quint64 folders, bool finished); //Slot for updating the folder size asynchronously }; #endif -- cgit