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. --- shemov.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'shemov.cpp') diff --git a/shemov.cpp b/shemov.cpp index 28a6cb6..1168fc0 100644 --- a/shemov.cpp +++ b/shemov.cpp @@ -29,6 +29,7 @@ #include "dbanalyzer.h" #include "newpicsdialog.h" #include "pictureswidget.h" +#include "picturelistview.h" #include "archiveview.h" #include "archivebrowser.h" #include "searchdialog.h" @@ -129,9 +130,9 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla mPicWidget = new PicturesWidget; mTab->addTab(mPicWidget, tr("Pictures")); connect(mPicWidget, &PicturesWidget::needWindowTitleChange, this, &SheMov::setWindowTitle); - connect(mPicWidget->picView(), &PictureView::newMappings, this, &SheMov::statusbarMessage); - connect(mPicWidget->picView(), &PictureView::numSelected, this, &SheMov::updateSelectedCount); - connect(mPicWidget->picView(), &PictureView::selectedSize, this, &SheMov::setSize); + connect(mPicWidget->picView(), &PictureListView::newMappings, this, &SheMov::statusbarMessage); + connect(mPicWidget->picView(), &PictureListView::numSelected, this, &SheMov::updateSelectedCount); + connect(mPicWidget->picView(), &PictureListView::selectedSize, this, &SheMov::setSize); PictureViewer2 *picViewer = SmGlobals::instance()->pictureViewer(); //archivebrower @@ -232,7 +233,7 @@ void SheMov::tabChanged(int newTab){ setWindowTitle(mMovieWidget->wTitle); break; case Pictures: - connect(mPVSelectAllA, &QAction::triggered, mPicWidget->picView(), &PictureView::setPVAll); + connect(mPVSelectAllA, &QAction::triggered, mPicWidget->picView(), &PictureListView::setPVAll); mPicWidget->constructWindowTitle(); setDuration(0x0, false); break; @@ -382,10 +383,10 @@ void SheMov::createActions(){ // Delete... + Edit Mappings... mPWDeletePicFromA = new QAction(QIcon(":/huge_balls_pierced.png"), tr("Delete..."), this); mPicWidget->picView()->addAction(mPWDeletePicFromA); - connect(mPWDeletePicFromA, &QAction::triggered, mPicWidget->picView(), &PictureView::deletePics); + connect(mPWDeletePicFromA, &QAction::triggered, mPicWidget->picView(), &PictureListView::deletePics); mPWEditPicMappingsA = new QAction(QIcon(":/squirting_nipple.png"), tr("Edit mappings..."), this); mPicWidget->picView()->addAction(mPWEditPicMappingsA); - connect(mPWEditPicMappingsA, &QAction::triggered, mPicWidget->picView(), &PictureView::editPicsMappings); + connect(mPWEditPicMappingsA, &QAction::triggered, mPicWidget->picView(), &PictureListView::editPicsMappings); mPicWidget->picView()->addAction(createSeparator()); // Show slide dialog @@ -416,7 +417,7 @@ void SheMov::createActions(){ mPicWidget->picView()->addAction(createSeparator()); mPWRefreshA = new QAction(QIcon(":/huge_bra.png"), tr("Refresh"), this); mPicWidget->picView()->addAction(mPWRefreshA); - connect(mPWRefreshA, &QAction::triggered, mPicWidget->picView(), &PictureView::refresh); + connect(mPWRefreshA, &QAction::triggered, mPicWidget->picView(), &PictureListView::refresh); mPicWidget->setPicViewerAction(mPVToggleA); /* Now the context menu for the actual Viewer -- cgit v1.2.3-70-g09d2