diff options
| author | william os4y <william.os4y@gmail.com> | 2015-02-26 18:15:28 +0100 |
|---|---|---|
| committer | william os4y <william.os4y@gmail.com> | 2015-02-26 18:15:28 +0100 |
| commit | aec1ead9ba72cbdedb859610b83f74fc2c8ecb34 (patch) | |
| tree | 2a6b916a99f06eda59ccb010ee5fed626bdd4506 /lumina-fm/MainUI.h | |
| parent | fix issue #55: inform user whan return code is not null (diff) | |
| parent | Have lumina-search load the icons a moment after the application is done init... (diff) | |
| download | lumina-aec1ead9ba72cbdedb859610b83f74fc2c8ecb34.tar.gz lumina-aec1ead9ba72cbdedb859610b83f74fc2c8ecb34.tar.bz2 lumina-aec1ead9ba72cbdedb859610b83f74fc2c8ecb34.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lumina-fm/MainUI.h')
| -rw-r--r-- | lumina-fm/MainUI.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lumina-fm/MainUI.h b/lumina-fm/MainUI.h index ccc85f72..40ef25ff 100644 --- a/lumina-fm/MainUI.h +++ b/lumina-fm/MainUI.h @@ -53,6 +53,7 @@ #include "BMMDialog.h" //bookmark manager dialog #include "MimeIconProvider.h" //icon provider for the view widgets #include "BackgroundWorker.h" +#include "DDFileSystemModel.h" namespace Ui{ class MainUI; @@ -76,7 +77,8 @@ private: //Internal non-ui widgets QTabBar *tabBar; QLineEdit *currentDir; - QFileSystemModel *fsmod, *snapmod; + DDFileSystemModel *fsmod; + QFileSystemModel *snapmod; //QFileSystemWatcher *fswatcher; MimeIconProvider *iconProv; QMenu *contextMenu; @@ -115,7 +117,8 @@ private: QString getCurrentDir(); void setCurrentDir(QString); QFileInfoList getSelectedItems(); - + //QModelIndexList getVisibleItems(); + private slots: void slotSingleInstance(QStringList in){ this->show(); @@ -141,6 +144,7 @@ private slots: void on_actionClose_triggered(); void on_actionView_Hidden_Files_triggered(); void on_actionShow_Action_Buttons_triggered(); + void on_actionShow_Thumbnails_triggered(); void goToBookmark(QAction*); void goToDevice(QAction*); void viewModeChanged(bool); @@ -157,7 +161,8 @@ private slots: void reloadDirectory(); //Update the widget with the dir contents void currentDirectoryLoaded(); //The file system model re-loaded the directory void on_tool_addToDir_clicked(); - void tabChanged(int tab); + void on_tool_addNewFile_clicked(); + void tabChanged(int tab); void tabClosed(int tab = -1); void prevTab(); void nextTab(); |