From 1d45add3f8ea48c2e55090477ebec999d80d1f80 Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 4 Apr 2018 08:43:20 +0200 Subject: Rename FSView to SmView Turns out it's more general purpose than I thought. Gonna reuse it for MovieWidget. --- fsview.cpp | 16 ---------------- fsview.h | 16 ---------------- fswidget.cpp | 8 ++++---- fswidget.h | 4 ++-- shemov.pro | 8 ++++---- smview.cpp | 16 ++++++++++++++++ smview.h | 16 ++++++++++++++++ 7 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 fsview.cpp delete mode 100644 fsview.h create mode 100644 smview.cpp create mode 100644 smview.h diff --git a/fsview.cpp b/fsview.cpp deleted file mode 100644 index 6b0b7c3..0000000 --- a/fsview.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include - -#include "fsview.h" - -FSView::FSView(QWidget *parent) : QTreeView(parent) {} - -void FSView::contextMenuEvent(QContextMenuEvent *e){ - QMenu contextMenu(this); - for(QAction *a : actions()){ - if(a->data() != InvisibleAction){ - contextMenu.addAction(a); - } - } - contextMenu.exec(e->globalPos()); -} diff --git a/fsview.h b/fsview.h deleted file mode 100644 index 380ae5f..0000000 --- a/fsview.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef FSVIEW_H -#define FSVIEW_H - -#include - -class FSView : public QTreeView { - Q_OBJECT - public: - enum { InvisibleAction }; - explicit FSView(QWidget *parent = nullptr); - - protected: - virtual void contextMenuEvent(QContextMenuEvent *e); -}; - -#endif // FSVIEW_H diff --git a/fswidget.cpp b/fswidget.cpp index 8a74f9c..9e299c7 100644 --- a/fswidget.cpp +++ b/fswidget.cpp @@ -25,7 +25,7 @@ #include "newmoviewizard.h" #include "newpicsdialog.h" #include "fsproxy.h" -#include "fsview.h" +#include "smview.h" #include "viewer.h" FSWidget::FSWidget(QWidget *parent) : QWidget(parent) { @@ -96,11 +96,11 @@ void FSWidget::setupWidget(){ QAction *selectFilterA = new QAction(tr("Select by filter..."), this); connect(selectFilterA, &QAction::triggered, this, &FSWidget::selectFilter); selectFilterA->setShortcut(tr("CTRL+j")); - selectFilterA->setData(FSView::InvisibleAction); + selectFilterA->setData(SmView::InvisibleAction); QAction *unselectAllA = new QAction(tr("unselect all..."), this); connect(unselectAllA, &QAction::triggered, [=] { mFileView->selectionModel()->clear(); }); unselectAllA->setShortcut(tr("CTRL+k")); - unselectAllA->setData(FSView::InvisibleAction); + unselectAllA->setData(SmView::InvisibleAction); QIcon plusIcon = Helper::icon(QColor(255,85,255), Qt::white, '+', true, true); QIcon minusIcon = Helper::icon(QColor(255,85,255), Qt::white, '-', true, true); @@ -152,7 +152,7 @@ void FSWidget::setupWidget(){ topWL->addWidget(mFilterCB); topWL->addWidget(filterTB); - mFileView = new FSView; + mFileView = new SmView; mFileView->setAlternatingRowColors(true); mFileView->setSortingEnabled(true); mFileView->setUniformRowHeights(true); diff --git a/fswidget.h b/fswidget.h index 351dc3f..8b8e0ab 100644 --- a/fswidget.h +++ b/fswidget.h @@ -14,7 +14,7 @@ class NewMovieWizard; class NewPicsDialog; class Viewer; class FSProxy; -class FSView; +class SmView; class FSWidget : public QWidget { Q_OBJECT @@ -55,7 +55,7 @@ class FSWidget : public QWidget { void setupWidget(); QComboBox *mDirCB; QComboBox *mFilterCB; - FSView *mFileView; + SmView *mFileView; QStandardItemModel *mModel; FSProxy *mProxy; NewMovieWizard *mMovieWizard; diff --git a/shemov.pro b/shemov.pro index 0d464a4..ffcebc8 100644 --- a/shemov.pro +++ b/shemov.pro @@ -45,8 +45,8 @@ SOURCES = main.cpp \ fswidget.cpp \ fsproxy.cpp \ viewer.cpp \ - fsview.cpp \ - moviewidget.cpp + moviewidget.cpp \ + smview.cpp HEADERS = \ shemov.h \ helper.h \ @@ -86,8 +86,8 @@ HEADERS = \ fswidget.h \ fsproxy.h \ viewer.h \ - fsview.h \ - moviewidget.h + moviewidget.h \ + smview.h LIBS += -lmagic -lXfixes -lX11 -lMagick++-6.Q16HDRI INCLUDEPATH += /usr/include/ImageMagick-6/ RESOURCES = shemov.qrc diff --git a/smview.cpp b/smview.cpp new file mode 100644 index 0000000..31540c7 --- /dev/null +++ b/smview.cpp @@ -0,0 +1,16 @@ +#include +#include + +#include "smview.h" + +SmView::SmView(QWidget *parent) : QTreeView(parent) {} + +void SmView::contextMenuEvent(QContextMenuEvent *e){ + QMenu contextMenu(this); + for(QAction *a : actions()){ + if(a->data() != InvisibleAction){ + contextMenu.addAction(a); + } + } + contextMenu.exec(e->globalPos()); +} diff --git a/smview.h b/smview.h new file mode 100644 index 0000000..a1ff36b --- /dev/null +++ b/smview.h @@ -0,0 +1,16 @@ +#ifndef FSVIEW_H +#define FSVIEW_H + +#include + +class SmView : public QTreeView { + Q_OBJECT + public: + enum { InvisibleAction }; + explicit SmView(QWidget *parent = nullptr); + + protected: + virtual void contextMenuEvent(QContextMenuEvent *e); +}; + +#endif // FSVIEW_H -- cgit v1.2.3-70-g09d2