From f6eb9eb58568b5fde537cc8119914dc77b25b46a Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 14 Jul 2018 14:30:47 +0200 Subject: Rename PictureView to PictureListView Rename it to make clear(er) that it is a TreeView, not a picture viewer. Also, remove it from pictureswidget.{h,cpp} into a separate file. --- pictureswidget.h | 59 +++----------------------------------------------------- 1 file changed, 3 insertions(+), 56 deletions(-) (limited to 'pictureswidget.h') diff --git a/pictureswidget.h b/pictureswidget.h index 8d17a10..d1cdd36 100644 --- a/pictureswidget.h +++ b/pictureswidget.h @@ -15,27 +15,17 @@ #include "pictureviewer2.h" #include "smtreeview.h" -class PictureView; +class PictureListView; class MappingTreeWidget; -class MappingEditWidget; class MappingEditDialog; -class MappingTreeModel; -class QSqlQuery; -class PicFilesModel; -class QSortFilterProxyModel; -class QHideEvent; -class QEvent; -class HoverWindow; class PictureViewer2; class QAction; -class QActionGroup; -struct MappingData; class PicturesWidget : public QWidget { Q_OBJECT public: explicit PicturesWidget(QWidget *parent = 0); - PictureView *picView() { return mPictureView; } + PictureListView *picView() { return mPictureListView; } void setPicViewerAction(QAction *action) { mPicViewerA = action; } PictureViewer2 *picViewer2() { return mPicViewer; } @@ -55,54 +45,11 @@ class PicturesWidget : public QWidget { private: MappingTreeWidget *mMappingTree; - PictureView *mPictureView; + PictureListView *mPictureListView; PictureViewer2 *mPicViewer; MappingEditDialog *mEditDialog; const QString mWindowTitleBase; QAction *mPicViewerA; }; -class PictureView : public SmTreeView { - Q_OBJECT - public: - explicit PictureView(QWidget *parent = 0); - QList fileMappings() { return mFilesMappings; } - PicFilesModel *filesModel() { return mModel; } - QSortFilterProxyModel *proxy() { return mProxy; } - void setPV(PictureViewer2 *pv) { mPV = pv; } - PictureViewer2 *PV() { return mPV; } - - public slots: - void mappingChanged(int pMapId); - void deletePics(); - void refresh(); - void setPVData(int replace = false); - void setPVAll(); - void setHoverWinVisible(bool visible) const; - - protected: - virtual void hideEvent(QHideEvent *); - virtual bool event(QEvent *e); - virtual void contextMenuEvent(QContextMenuEvent *e); - - private slots: - void selectedFilesChanged(); - - signals: - void newMappings(QString); - void numSelected(int); - void selectedSize(qint64); - void editPicsMappings(); - - private: - HoverWindow *mHoverWin; - QModelIndex mCurHover; - QSortFilterProxyModel *mProxy; - PicFilesModel *mModel; - int mCursorOffset; - QList mFilesMappings; - PictureViewer2 *mPV; - MappingTreeModel *mMappingTreeModel; -}; - #endif // PICTURESWIDGET_H -- cgit v1.2.3-70-g09d2