From 36df3d58e25beb06f16fdf821f18fe8a4bcce2ae Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 20 Oct 2016 12:05:22 -0400 Subject: Finish up the last couple buttons/actions related to the new Tray UI. 1) If closing the main window while an operation is running, hide it instead until the file operation is finished - then close. 2) Fix the icon on the show errors button 3) Hook up the show errors button to show a scroll dialog with the errors. --- src-qt5/desktop-utils/lumina-fm/MainUI.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-fm/MainUI.h') diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.h b/src-qt5/desktop-utils/lumina-fm/MainUI.h index 0ed9c44b..2b4c0d7b 100644 --- a/src-qt5/desktop-utils/lumina-fm/MainUI.h +++ b/src-qt5/desktop-utils/lumina-fm/MainUI.h @@ -88,9 +88,10 @@ private: MultimediaWidget *MW; SlideshowWidget *SW; TrayUI *TRAY; + bool waitingToClose; - QSettings *settings; - QShortcut *nextTabLShort, *nextTabRShort, *togglehiddenfilesShort, *focusDirWidgetShort; + QSettings *settings; + QShortcut *nextTabLShort, *nextTabRShort, *togglehiddenfilesShort, *focusDirWidgetShort; //QCompleter *dirCompleter; //Simplification Functions @@ -169,6 +170,8 @@ private slots: //file info in status bar void DisplayStatusBar(QString); + void TrayJobsFinished(); + signals: void Si_AdaptStatusBar(QFileInfoList fileList, QString path, QString messageFolders, QString messageFiles); @@ -179,6 +182,8 @@ protected: QMainWindow::resizeEvent(ev); //just in case the window needs to see the event too } + void closeEvent(QCloseEvent *ev); + }; #endif -- cgit