From 91e0b30ac38cec6ab7c8477615c0df129efed216 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 14 Jul 2018 18:44:48 +0200 Subject: Remove the menuBar() from picture archive The journey started innocent enough, but turned out to be a commit that should have been severals. In the end, the picture archive has no menuBar() any more, as expected, but it's also impossible to call the slide dialog. Will fix that soon. --- pictureviewer2.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'pictureviewer2.h') diff --git a/pictureviewer2.h b/pictureviewer2.h index 3c57005..3813d93 100644 --- a/pictureviewer2.h +++ b/pictureviewer2.h @@ -58,7 +58,6 @@ class PictureViewer2 : public QGraphicsView { void setShowMappingItem(bool show) { mShowMappingItem = show; } void setShowMarkItem(bool show) { mShowMarkItem = show; } void setCurrentDir(const QString &curDir) { mCurrentDir = curDir; } - const PicDataList marked() { return mMarkedFiles; } PicData picData(const QString &fullPath, int fileId = -1); public slots: @@ -70,12 +69,9 @@ class PictureViewer2 : public QGraphicsView { void startSlide(); void readSettings(); void writeSettings(); - void initActions(); - void copyCurrent(); void deleteCurrent(); void showNewPicsDialog(); void addToNewPics(); - void markCurrent(); void clearMarks(); void showSlide(); void doSlide(); @@ -84,8 +80,6 @@ class PictureViewer2 : public QGraphicsView { virtual void wheelEvent(QWheelEvent *event); virtual void contextMenuEvent(QContextMenuEvent *e); virtual void keyPressEvent(QKeyEvent *e); - virtual void showEvent(QShowEvent *e); - virtual void hideEvent(QHideEvent *e); virtual void resizeEvent(QResizeEvent *event); private slots: @@ -126,9 +120,6 @@ class PictureViewer2 : public QGraphicsView { QPointF mInfoPos; QPointF mMappingPos; QPointF mBoundingPos; - QAction *mHideA; - QAction *mMarkA; - QAction *mDeleteA; PicFilesModel *mPicFilesModel; PicData mCurPicData; NewPicsDialog *mNewPicsDlg; -- cgit v1.2.3-70-g09d2