diff options
Diffstat (limited to 'shemov.cpp')
| -rw-r--r-- | shemov.cpp | 212 |
1 files changed, 106 insertions, 106 deletions
@@ -60,24 +60,24 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla setWindowTitle(mFSWidget->windowTitle()); mTab = new QTabWidget; mTab->addTab(mFSWidget, tr("Filemanager")); - connect(this, SIGNAL(configChanged()), mFSWidget, SLOT(configChanged())); + connect(this, &SheMov::configChanged, mFSWidget, &FilesystemWidget::configChanged); //experimental splash.showMessage(tr("Creating Movie archive..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); mArchive = new ArchiveView; mTab->addTab(mArchive, "Movies"); - connect(mArchive->archiveModel(), SIGNAL(message(QString)), this, SLOT(statusbarMessage(QString))); + connect(mArchive->archiveModel(), &ArchiveModel::message, this, &SheMov::statusbarMessage); //pictures splash.showMessage(tr("Creating Picture Archive..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); mPicWidget = new PicturesWidget; mTab->addTab(mPicWidget, tr("Pictures")); - connect(mPicWidget, SIGNAL(needWindowTitleChange(QString)), this, SLOT(setWindowTitle(QString))); - connect(mPicWidget->picView(), SIGNAL(newMappings(QString)), this, SLOT(statusbarMessage(QString))); - connect(mPicWidget->picView(), SIGNAL(numSelected(int)), this, SLOT(updateSelectedCount(int))); - connect(mPicWidget->picView(), SIGNAL(selectedSize(qint64)), this, SLOT(setSize(qint64))); + 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); PictureViewer2 *picViewer = SmGlobals::instance()->pictureViewer(); //archivebrower @@ -85,15 +85,15 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla qApp->processEvents(); mArchiveBrowser = new ArchiveBrowser; mTab->addTab(mArchiveBrowser, tr("Archive Browser")); - connect(mArchiveBrowser, SIGNAL(sizeChanged(qint64)), this, SLOT(setSize(qint64))); - connect(mArchiveBrowser, SIGNAL(itemCountChanged(int)), this, SLOT(updateSelectedCount(int))); - connect(mArchiveBrowser, SIGNAL(needFSFreeUpdate()), this, SLOT(setFsFree())); + connect(mArchiveBrowser, &ArchiveBrowser::sizeChanged, this, &SheMov::setSize); + connect(mArchiveBrowser, &ArchiveBrowser::itemCountChanged, this, &SheMov::updateSelectedCount); + connect(mArchiveBrowser, &ArchiveBrowser::needFSFreeUpdate, this, &SheMov::setFsFree); //randomtab splash.showMessage(tr("Creating Random Browser..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); mRandomTab = new RandomTab; - connect(mRandomTab, SIGNAL(configure()), this, SLOT(configure())); + connect(mRandomTab, &RandomTab::configure, this, &SheMov::configure); mTab->addTab(mRandomTab, tr("Random")); //newmoviewizard + dbanalyzer + newpicsdialog + searchdialog @@ -102,15 +102,15 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla mNewMovieWizard = new NewMovieWizard(this); mNewMovieWizard->setMinimumWidth(1024); ArchiveController *c = SmGlobals::instance()->archiveController(); - connect(mNewMovieWizard, SIGNAL(accepted()), c->archiveTreeModel(), SLOT(refresh())); + connect(mNewMovieWizard, &NewMovieWizard::accepted, c->archiveTreeModel(), &ArchiveModel::refresh); mNewPicsDialog = new NewPicsDialog(this); mSearchDialog = new SearchDialog(this); - connect(mSearchDialog, SIGNAL(searchResultClicked(int)), this, SLOT(searchResult(int))); + connect(mSearchDialog, &SearchDialog::searchResultClicked, this, &SheMov::searchResult); //experimental archive - connect(c, SIGNAL(sizeChanged(qint64)), this, SLOT(setSize(qint64))); - connect(c, SIGNAL(durationChanged(qint64,bool)), this, SLOT(setDuration(qint64,bool))); - connect(c->archiveTreeModel(), SIGNAL(windowTitle(QString)), this, SLOT(setWindowTitle(QString))); + connect(c, &ArchiveController::sizeChanged, this, &SheMov::setSize); + connect(c, &ArchiveController::durationChanged, this, &SheMov::setDuration); + connect(c->archiveTreeModel(), &ArchiveModel::windowTitle, this, &SheMov::setWindowTitle); QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(mTab); @@ -125,21 +125,21 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla splash.showMessage(tr("Finishing..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); - connect(mFSWidget->fileView(), SIGNAL(selectedSize(qint64)), this, SLOT(setSize(qint64))); - connect(mFSWidget->fileView(), SIGNAL(selectedDuration(qint64,bool)), this, SLOT(setDuration(qint64,bool))); - connect(mFSWidget->fileView(), SIGNAL(numSelected(int)), this, SLOT(updateSelectedCount(int))); - connect(mFSWidget, SIGNAL(windowTitle(QString)), this, SLOT(setWindowTitle(QString))); - connect(mFSWidget->fileView(), SIGNAL(statusbarMessage(const QString &)), this, SLOT(statusbarMessage(const QString &))); - connect(mFSWidget, SIGNAL(statusbarMessage(const QString &)), this, SLOT(statusbarMessage(const QString &))); - connect(mTab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); - connect(mFSWidget->dirModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(setFsFree())); - connect(mFSWidget->dirModel(), SIGNAL(layoutChanged()), this, SLOT(setFsFree())); - connect(mFSWidget->dirModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(setFsFree())); - connect(mFSWidget->fileModel(), SIGNAL(fsFreeChanged()), this, SLOT(setFsFree())); - connect(this, SIGNAL(configChanged()), mFSWidget->fileView(), SLOT(readConfig())); - connect(this, SIGNAL(configChanged()), picViewer, SLOT(readSettings())); - connect(this, SIGNAL(configChanged()), c->archiveTreeModel(), SLOT(readConfig())); - connect(mFSWidget, SIGNAL(mounted(bool)), this, SLOT(checkMount(bool))); + connect(mFSWidget->fileView(), &FileView::selectedSize, this, &SheMov::setSize); + connect(mFSWidget->fileView(), &FileView::selectedDuration, this, &SheMov::setDuration); + connect(mFSWidget->fileView(), &FileView::numSelected, this, &SheMov::updateSelectedCount); + connect(mFSWidget, QOverload<const QString &>::of(&FilesystemWidget::windowTitle), this, &SheMov::windowTitle); + connect(mFSWidget->fileView(), &FileView::statusbarMessage, this, &SheMov::statusbarMessage); + connect(mFSWidget, &FilesystemWidget::statusbarMessage, this, &SheMov::statusbarMessage); + connect(mTab, &QTabWidget::currentChanged, this, &SheMov::tabChanged); + connect(mFSWidget->dirModel(), &FileSystemModel::dataChanged, this, &SheMov::setFsFree); + connect(mFSWidget->dirModel(), &FileSystemModel::layoutChanged, this, &SheMov::setFsFree); + connect(mFSWidget->dirModel(), &FileSystemModel::rowsRemoved, this, &SheMov::setFsFree); + connect(mFSWidget->fileModel(), &SmDirModel::fsFreeChanged, this, &SheMov::setFsFree); + connect(this, &SheMov::configChanged, mFSWidget->fileView(), &FileView::readConfig); + connect(this, &SheMov::configChanged, picViewer, &PictureViewer2::readSettings); + connect(this, &SheMov::configChanged, c->archiveTreeModel(), &ArchiveModel::readConfig); + connect(mFSWidget, &FilesystemWidget::mounted, this, &SheMov::checkMount); QWidget *centralWidget = new QWidget; centralWidget->setLayout(mainLayout); @@ -210,7 +210,7 @@ void SheMov::tabChanged(int newTab){ ArchiveController *c = SmGlobals::instance()->archiveController(); switch(newTab){ case FileManager: - connect(mPVSelectAllA, SIGNAL(triggered()), mFSWidget, SLOT(selectAllPV())); + connect(mPVSelectAllA, &QAction::triggered, mFSWidget, &FilesystemWidget::selectAllPV); mFSWidget->fileView()->selectedFilesChanged(); mFSWidget->setWindowTitle(); break; @@ -219,7 +219,7 @@ void SheMov::tabChanged(int newTab){ c->archiveTreeModel()->setWindowTitle(); break; case Pictures: - connect(mPVSelectAllA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(setPVAll())); + connect(mPVSelectAllA, &QAction::triggered, mPicWidget->picView(), &PictureView::setPVAll); mPicWidget->constructWindowTitle(); setDuration(0x0, false); break; @@ -298,7 +298,7 @@ void SheMov::newMovieWizardWithFiles(){ } mNewMovieWizard->restart(); mNewMovieWizard->infoPage()->setCurrentDir(mFSWidget->currentDir()); - foreach(QModelIndex sel, selected){ + for(const QModelIndex &sel : selected){ mNewMovieWizard->infoPage()->addFile(sel.data(SmDirModel::FullPathRole).toString()); mNewMovieWizard->infoPage()->guessOld(sel.data(SmDirModel::FullPathRole).toString()); } @@ -307,7 +307,7 @@ void SheMov::newMovieWizardWithFiles(){ QString coverPath = s.value("paths/coverpath").toString(); if(autoAddCovers && !coverPath.isEmpty()){ QDir coverDir(coverPath); - foreach(QFileInfo fi, coverDir.entryInfoList(QDir::Files)){ + for(const QFileInfo &fi : coverDir.entryInfoList(QDir::Files)){ mNewMovieWizard->infoPage()->addFile(fi.absoluteFilePath()); } } @@ -382,7 +382,7 @@ void SheMov::createStatusbar(){ void SheMov::createActions(){ //File menu mPlaySelectedFSA = new QAction(tr("Play selected movies..."), this); - connect(mPlaySelectedFSA, SIGNAL(triggered()), mFSWidget, SLOT(playSelected())); + connect(mPlaySelectedFSA, &QAction::triggered, mFSWidget, &FilesystemWidget::playSelectedWithDefault); mOpenTimesFSAG = new QActionGroup(this); for(int i = 2; i < 6; ++i){ QString actString = QString("Play %1 times...").arg(i); @@ -393,53 +393,53 @@ void SheMov::createActions(){ mOpenTimesFSAG->addAction(createSeparator()); QString infiniteTimes = QString(tr("Play %1 times")).arg(QChar(0x221E)); // infinite mPlaySelectedInfTimesA = new QAction(infiniteTimes, this); - connect(mPlaySelectedInfTimesA, SIGNAL(triggered()), mFSWidget, SLOT(playSelectedInfinite())); + connect(mPlaySelectedInfTimesA, &QAction::triggered, mFSWidget, &FilesystemWidget::playSelectedInfinite); mOpenTimesFSAG->addAction(mPlaySelectedInfTimesA); mPlaySelectedFSTimesA = new QAction(tr("Play repeat..."), this); mNewMovieWizardA = new QAction(tr("Archive movie..."), this); - connect(mNewMovieWizardA, SIGNAL(triggered()), this, SLOT(newMovieWizard())); + connect(mNewMovieWizardA, &QAction::triggered, this, &SheMov::newMovieWizard); mArchiveSelectedMovsA = new QAction(QIcon(":/butt_plug.png"), tr("Archive selected movies..."), this); - connect(mArchiveSelectedMovsA, SIGNAL(triggered()), this, SLOT(newMovieWizardWithFiles())); + connect(mArchiveSelectedMovsA, &QAction::triggered, this, &SheMov::newMovieWizardWithFiles); mArchiveSelectedPicsA = new QAction(QIcon(":/hourglass_figure.png"), tr("Archive selected pics..."), this); - connect(mArchiveSelectedPicsA, SIGNAL(triggered()), this, SLOT(newPicsDialogWithFiles())); + connect(mArchiveSelectedPicsA, &QAction::triggered, this, &SheMov::newPicsDialogWithFiles); mArchivePicsInDirA = new QAction(QIcon(":/higheels.png"), tr("Archive all pics..."), this); - connect(mArchivePicsInDirA, SIGNAL(triggered()), this, SLOT(newPicsDialogWithDir())); + connect(mArchivePicsInDirA, &QAction::triggered, this, &SheMov::newPicsDialogWithDir); mConsistencyA = new QAction(tr("Check consisteny..."), this); - connect(mConsistencyA, SIGNAL(triggered()), this, SLOT(checkConsistency())); + connect(mConsistencyA, &QAction::triggered, this, &SheMov::checkConsistency); mNewPicsA = new QAction(tr("Archive pics...."), this); - connect(mNewPicsA, SIGNAL(triggered()), this, SLOT(newPicsDialog())); + connect(mNewPicsA, &QAction::triggered, this, &SheMov::newPicsDialog); mUnpackA = new QAction(QIcon(":/dog_hood.png"), tr("Unpack..."), this); - connect(mUnpackA, SIGNAL(triggered()), mFSWidget, SLOT(unpack())); + connect(mUnpackA, &QAction::triggered, mFSWidget, &FilesystemWidget::unpack); mSearchDialogA = new QAction(tr("Search..."), this); mSearchDialogA->setShortcut(tr("CTRL+f")); - connect(mSearchDialogA, SIGNAL(triggered()), mSearchDialog, SLOT(show())); + connect(mSearchDialogA, &QAction::triggered, mSearchDialog, &SearchDialog::show); //connnect mQuitA = new QAction(tr("Quit"), this); mQuitA->setShortcut(tr("CTRL+q")); - connect(mQuitA, SIGNAL(triggered()), qApp, SLOT(closeAllWindows())); + connect(mQuitA, &QAction::triggered, qApp, &QApplication::closeAllWindows); //Edit menu (FS) mCdupA = new QAction(QIcon(":/up_dick.png"), tr("Go up"), this); - connect(mCdupA, SIGNAL(triggered()), mFSWidget, SLOT(parentDir())); + connect(mCdupA, &QAction::triggered, mFSWidget, &FilesystemWidget::parentDir); mBackDirA = new QAction(QIcon(":/back_dick.png"), tr("Go back"), this); - connect(mBackDirA, SIGNAL(triggered()), mFSWidget, SLOT(goBack())); + connect(mBackDirA, &QAction::triggered, mFSWidget, &FilesystemWidget::goBack); mGotoArchiveA = new QAction(tr("Goto archive..."), this); - connect(mGotoArchiveA, SIGNAL(triggered()), this, SLOT(gotoArchive())); + connect(mGotoArchiveA, &QAction::triggered, this, &SheMov::gotoArchive); mMarkFilesA = new QAction(tr("Select files..."), this); mMarkFilesA->setShortcut(tr("CTRL++")); mMarkFilesA->setShortcut(QKeySequence(Qt::CTRL + Qt::KeypadModifier + Qt::Key_Plus)); - connect(mMarkFilesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(markFiles())); + connect(mMarkFilesA, &QAction::triggered, mFSWidget->fileView(), &FileView::markFiles); mUnmarkFilesA = new QAction(tr("Deselect all files"), this); mUnmarkFilesA->setShortcut(tr("CTRL+-")); mUnmarkFilesA->setShortcut(QKeySequence(Qt::CTRL + Qt::KeypadModifier + Qt::Key_Minus)); - connect(mUnmarkFilesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(unmarkFiles())); + connect(mUnmarkFilesA, &QAction::triggered, mFSWidget->fileView(), &FileView::unmarkFiles); mCreateFolderA = new QAction(QIcon(":/folder.png"), tr("New folder..."), this); mCreateFolderA->setShortcut(tr("CTRL+n")); - connect(mCreateFolderA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(createFolder())); + connect(mCreateFolderA, &QAction::triggered, mFSWidget->fileView(), &FileView::createFolder); mDeleteFilesA = new QAction(QIcon(":/delete.png"), tr("Delete selected..."), this); mDeleteFilesA->setShortcut(tr("CTRL+d")); - connect(mDeleteFilesA, SIGNAL(triggered()), mFSWidget, SLOT(deleteFiles())); + connect(mDeleteFilesA, &QAction::triggered, mFSWidget, &FilesystemWidget::deleteFiles); mCopyA = new QAction(tr("Copy"), this); mCopyA->setShortcut(tr("CTRL+c")); connect(mCopyA, &QAction::triggered, [=] {mFSWidget->toClipboard(FilesystemWidget::Copy); }); @@ -448,36 +448,36 @@ void SheMov::createActions(){ connect(mCutA, &QAction::triggered, [=] {mFSWidget->toClipboard(FilesystemWidget::Cut); }); mPasteA = new QAction(tr("Paste"), this); mPasteA->setShortcut(tr("Ctrl+v")); - connect(mPasteA, SIGNAL(triggered()), mFSWidget, SLOT(fromClipboard())); + connect(mPasteA, &QAction::triggered, mFSWidget, &FilesystemWidget::fromClipboard); mRenameA = new QAction(QIcon(":/rename.png"), tr("Rename..."), this); mRenameA->setShortcut(tr("CTRL+r")); - connect(mRenameA, SIGNAL(triggered()), mFSWidget, SLOT(renameFile())); + connect(mRenameA, &QAction::triggered, mFSWidget, &FilesystemWidget::renameFile); mMountDvdA = new QAction(QIcon(":/diaper.png"), tr("(Un)mount DVD drive"), this); mMountDvdA->setCheckable(true); - connect(mMountDvdA, SIGNAL(triggered()), mFSWidget, SLOT(dvdMount())); + connect(mMountDvdA, &QAction::triggered, mFSWidget, &FilesystemWidget::dvdMount); mConfigA = new QAction(QIcon(":/chastity_belt.png"), tr("Configure..."), this); - connect(mConfigA, SIGNAL(triggered()), this, SLOT(configure())); + connect(mConfigA, &QAction::triggered, this, &SheMov::configure); mMoveToArchiveA = new QAction(tr("Move to archive"), this); - connect(mMoveToArchiveA, SIGNAL(triggered()), mFSWidget, SLOT(moveToArchive())); + connect(mMoveToArchiveA, &QAction::triggered, mFSWidget, &FilesystemWidget::moveToArchive); //View menu (FS) mRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this); - connect(mRefreshA, SIGNAL(triggered()), mFSWidget->fileModel(), SLOT(refresh())); + connect(mRefreshA, &QAction::triggered, mFSWidget->fileModel(), &SmDirModel::refresh); mFSViewPropertiesA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Properties..."), this); - connect(mFSViewPropertiesA, SIGNAL(triggered()), mFSWidget->fileView(), SLOT(properties())); + connect(mFSViewPropertiesA, &QAction::triggered, mFSWidget->fileView(), &FileView::properties); mFSPreviewA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Preview..."), this); - connect(mFSPreviewA, SIGNAL(triggered()), mFSWidget, SLOT(preview())); + connect(mFSPreviewA, &QAction::triggered, mFSWidget, &FilesystemWidget::preview); mFSResizeA = new QAction(QIcon(":/analstretcher.png"), tr("Resize"), this); - connect(mFSResizeA, SIGNAL(triggered()), mFSWidget, SLOT(resizeFileView())); + connect(mFSResizeA, &QAction::triggered, mFSWidget, &FilesystemWidget::resizeFileView); //Help menu QString aboutLabel = QString(tr("About %1...")).arg(qApp->applicationName()); mAboutShemovA = new QAction(aboutLabel, this); - connect(mAboutShemovA, SIGNAL(triggered()), this, SLOT(aboutShemov())); + connect(mAboutShemovA, &QAction::triggered, this, &SheMov::aboutShemov); mAboutQtA = new QAction(tr("About Qt..."), this); - connect(mAboutQtA, SIGNAL(triggered()), qApp, SLOT(aboutQt())); + connect(mAboutQtA, &QAction::triggered, qApp, &QApplication::aboutQt); mStatisticsA = new QAction(tr("Some statistics..."), this); - connect(mStatisticsA, SIGNAL(triggered()), this, SLOT(showStatistics())); + connect(mStatisticsA, &QAction::triggered, this, &SheMov::showStatistics); //headers mFileSysHeaderGroup = new QActionGroup(this); @@ -505,10 +505,10 @@ void SheMov::createActions(){ // Delete... + Edit Mappings... mPWDeletePicFromA = new QAction(QIcon(":/huge_balls_pierced.png"), tr("Delete..."), this); mPicWidget->picView()->addAction(mPWDeletePicFromA); - connect(mPWDeletePicFromA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(deletePics())); + connect(mPWDeletePicFromA, &QAction::triggered, mPicWidget->picView(), &PictureView::deletePics); mPWEditPicMappingsA = new QAction(QIcon(":/squirting_nipple.png"), tr("Edit mappings..."), this); mPicWidget->picView()->addAction(mPWEditPicMappingsA); - connect(mPWEditPicMappingsA, SIGNAL(triggered()), mPicWidget->picView(), SIGNAL(editPicsMappings())); + connect(mPWEditPicMappingsA, &QAction::triggered, mPicWidget->picView(), &PictureView::editPicsMappings); mPicWidget->picView()->addAction(createSeparator()); // Show slide dialog @@ -516,14 +516,14 @@ void SheMov::createActions(){ mPVSlideDlgA = new QAction(QIcon(":/hourglass_figure.png"), tr("Show slide dialog..."), this); mPVSlideDlgA->setData(PictureViewer2::SlideAction); mPicWidget->picView()->addAction(mPVSlideDlgA); - connect(mPVSlideDlgA, SIGNAL(triggered()), picViewer, SLOT(showSlide())); + connect(mPVSlideDlgA, &QAction::triggered, picViewer, &PictureViewer2::showSlide); mPicWidget->picView()->addAction(createSeparator()); // Show/Hide Picture Viewer mPVToggleA = new QAction(QIcon(":/dick_in_cage.png"), tr("Show/Hide Picture Viewer"), this); mPVToggleA->setCheckable(true); mPVToggleA->setData(PictureViewer2::HideAction); - connect(mPVToggleA, SIGNAL(toggled(bool)), picViewer, SLOT(setVisible(bool))); + connect(mPVToggleA, &QAction::toggled, picViewer, &PictureViewer2::setVisible); mPVToggleA->setChecked(false); mPicWidget->picView()->addAction(mPVToggleA); @@ -539,7 +539,7 @@ void SheMov::createActions(){ mPicWidget->picView()->addAction(createSeparator()); mPWRefreshA = new QAction(QIcon(":/huge_bra.png"), tr("Refresh"), this); mPicWidget->picView()->addAction(mPWRefreshA); - connect(mPWRefreshA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(refresh())); + connect(mPWRefreshA, &QAction::triggered, mPicWidget->picView(), &PictureView::refresh); mPicWidget->setPicViewerAction(mPVToggleA); /* Now the context menu for the actual Viewer @@ -561,30 +561,30 @@ void SheMov::createActions(){ mPVMarkA = new QAction(QIcon(":/higheels.png"), tr("(Un-)Mark"), this); mPVMarkA->setCheckable(true); mPVMarkA->setData(PictureViewer2::MarkAction); - connect(mPVMarkA, SIGNAL(triggered()), picViewer, SLOT(markCurrent())); + connect(mPVMarkA, &QAction::triggered, picViewer, &PictureViewer2::markCurrent); picViewer->addAction(mPVMarkA); mPVClearMarksA = new QAction(tr("Clear marks"), this); - connect(mPVClearMarksA, SIGNAL(triggered()), picViewer, SLOT(clearMarks())); + connect(mPVClearMarksA, &QAction::triggered, picViewer, &PictureViewer2::clearMarks); picViewer->addAction(mPVClearMarksA); mPVDeleteA = new QAction(QIcon(":/delete.png"), tr("Delete..."), this); mPVDeleteA->setData(PictureViewer2::DeleteAction); - connect(mPVDeleteA, SIGNAL(triggered()), picViewer, SLOT(deleteCurrent())); + connect(mPVDeleteA, &QAction::triggered, picViewer, &PictureViewer2::deleteCurrent); picViewer->addAction(mPVDeleteA); picViewer->addAction(createSeparator()); // Copy to... mPVCopyToA = new QAction(tr("Copy to..."), this); - connect(mPVCopyToA, SIGNAL(triggered()), picViewer, SLOT(copyCurrent())); + connect(mPVCopyToA, &QAction::triggered, picViewer, &PictureViewer2::copyCurrent); picViewer->addAction(mPVCopyToA); // NewPicsDialog actions mPVShowNPDialogA = new QAction(tr("Show new pics dialog..."), this); mPVShowNPDialogA->setShortcut(tr("CTRL+s")); - connect(mPVShowNPDialogA, SIGNAL(triggered()), picViewer, SLOT(showNewPicsDialog())); + connect(mPVShowNPDialogA, &QAction::triggered, picViewer, &PictureViewer2::showNewPicsDialog); picViewer->addAction(mPVShowNPDialogA); mPVAddToNPA = new QAction(tr("Set file in new pics dialog"), this); mPVAddToNPA->setShortcut(tr("CTRL+a")); - connect(mPVAddToNPA, SIGNAL(triggered()), picViewer, SLOT(addToNewPics())); + connect(mPVAddToNPA, &QAction::triggered, picViewer, &PictureViewer2::addToNewPics); picViewer->addAction(mPVAddToNPA); // assign actions to PictureViewer2 members, so they can be toggled from within @@ -598,107 +598,107 @@ void SheMov::createActions(){ // edit mArchiveViewRenameA = new QAction(tr("Edit..."), this); mArchiveViewRenameA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewRenameA, SIGNAL(triggered()), c->archiveTree(), SLOT(edit())); + connect(mArchiveViewRenameA, &QAction::triggered, c->archiveTree(), &ArchiveTree::edit); // edit actors mArchiveViewActorsA = new QAction(tr("Edit actors..."), this); mArchiveViewActorsA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewActorsA, SIGNAL(triggered()), c->archiveTree(), SLOT(editActors())); + connect(mArchiveViewActorsA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editActors); // edit genres mArchiveViewGenresA = new QAction(tr("Edit genres..."), this); mArchiveViewGenresA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewGenresA, SIGNAL(triggered()), c->archiveTree(), SLOT(editGenres())); + connect(mArchiveViewGenresA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editGenres); // edit part no and subtitle mArchiveViewPartnoA = new QAction(tr("Edit Part No..."), this); mArchiveViewPartnoA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewPartnoA, SIGNAL(triggered()), c->archiveTree(), SLOT(editSeriesPart())); + connect(mArchiveViewPartnoA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editSeriesPart); // edit metadata mArchiveViewMetadataA = new QAction(tr("Edit metadata..."), this); mArchiveViewMetadataA->setData(ArchiveModel::SeriesPartNode); // add Covers - connect(mArchiveViewMetadataA, SIGNAL(triggered()), c->archiveTree(), SLOT(editMetadata())); + connect(mArchiveViewMetadataA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editMetadata); mArchiveViewAddCoversA = new QAction(QIcon(":/huge_bra.png"), tr("Add Files..."), this); mArchiveViewAddCoversA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewAddCoversA, SIGNAL(triggered()), c, SLOT(addFiles())); + connect(mArchiveViewAddCoversA, &QAction::triggered, c, &ArchiveController::addFiles); //collapse and expand... mArchiveViewExpandAllA = new QAction(tr("Expand all"), this); mArchiveViewExpandAllA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewExpandAllA, SIGNAL(triggered()), c->archiveTree(), SLOT(expandAll())); + connect(mArchiveViewExpandAllA, &QAction::triggered, c->archiveTree(), &ArchiveTree::expandAll); mArchiveViewCollapseAllA = new QAction(tr("Collapse all"), this); mArchiveViewCollapseAllA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewCollapseAllA, SIGNAL(triggered()), c->archiveTree(), SLOT(collapseAll())); + connect(mArchiveViewCollapseAllA, &QAction::triggered, c->archiveTree(), &ArchiveTree::collapseAll); // refresh all mArchiveViewRefreshA = new QAction(tr("Refresh"), this); mArchiveViewRefreshA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewRefreshA, SIGNAL(triggered()), c->archiveView(), SLOT(refreshArchive())); + connect(mArchiveViewRefreshA, &QAction::triggered, c->archiveView(), &ArchiveView::refreshArchive); // mark as favorite mArchiveViewMarkFavA = new QAction(tr("Mark as favorite"), this); mArchiveViewMarkFavA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewMarkFavA, SIGNAL(triggered()), c->archiveTree(), SLOT(markAsFavorite())); + connect(mArchiveViewMarkFavA, &QAction::triggered, c->archiveTree(), &ArchiveTree::markAsFavorite); //delete from Tree mArchiveViewDeleteA = new QAction(QIcon(":/delete.png"), tr("Delete..."), this); int deleteMask = 0; deleteMask |= ArchiveModel::SeriesNode; deleteMask |= ArchiveModel::SeriesPartNode; mArchiveViewDeleteA->setData(deleteMask); - connect(mArchiveViewDeleteA, SIGNAL(triggered()), c->archiveTree(), SLOT(deleteFromTree())); + connect(mArchiveViewDeleteA, &QAction::triggered, c->archiveTree(), &ArchiveTree::deleteFromTree); //add new series part mArchiveViewNewPartA = new QAction(QIcon(":/french_maid_dress.png"), tr("New..."), this); mArchiveViewNewPartA->setData(ArchiveModel::SeriesNode); - connect(mArchiveViewNewPartA, SIGNAL(triggered()), c->archiveTree(), SLOT(newPart())); + connect(mArchiveViewNewPartA, &QAction::triggered, c->archiveTree(), &ArchiveTree::newPart); // ArchiveFiles actions <- ArchiveView! // play selected mArchiveFilesPlayA = new QAction(tr("Play selected..."), this); - connect(mArchiveFilesPlayA, SIGNAL(triggered()), c, SLOT(playSelectedFiles())); + connect(mArchiveFilesPlayA, &QAction::triggered, c, &ArchiveController::playSelectedFiles); // set quality mArchiveFilesQualityA = new QAction(QIcon(":/letter_q.png"), tr("Set Quality..."), this); - connect(mArchiveFilesQualityA, SIGNAL(triggered()), c, SLOT(editQuality())); + connect(mArchiveFilesQualityA, &QAction::triggered, c, &ArchiveController::editQuality); // set dvd mArchiveFilesDvdNoA = new QAction(QIcon(":/letter_d.png"), tr("Set Dvd No. ..."), this); - connect(mArchiveFilesDvdNoA, SIGNAL(triggered()), c, SLOT(editDvdNo())); + connect(mArchiveFilesDvdNoA, &QAction::triggered, c, &ArchiveController::editDvdNo); // set file type mArchiveFilesTypeA = new QAction(QIcon(":/letter_t.png"), tr("Set file type..."), this); - connect(mArchiveFilesTypeA, SIGNAL(triggered()), c, SLOT(editFileType())); + connect(mArchiveFilesTypeA, &QAction::triggered, c, &ArchiveController::editFileType); // set file no mArchiveFilesFileNoA = new QAction(QIcon(":/letter_n.png"), tr("Set File No. ..."), this); - connect(mArchiveFilesFileNoA, SIGNAL(triggered()), c, SLOT(editFileNo())); + connect(mArchiveFilesFileNoA, &QAction::triggered, c, &ArchiveController::editFileNo); // show properties mArchiveFilesPropertiesA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Properties..."), this); - connect(mArchiveFilesPropertiesA, SIGNAL(triggered()), c, SLOT(showProperties())); + connect(mArchiveFilesPropertiesA, &QAction::triggered, c, &ArchiveController::showProperties); // preview mArchiveFilesPreviewA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Preview..."), this); - connect(mArchiveFilesPreviewA, SIGNAL(triggered()), c, SLOT(showPreview())); + connect(mArchiveFilesPreviewA, &QAction::triggered, c, &ArchiveController::showPreview); // delete from archive mArchiveRemoveFilesA = new QAction(QIcon(":/delete.png"), tr("Remove..."), this); - connect(mArchiveRemoveFilesA, SIGNAL(triggered()), c->archiveFiles(), SLOT(deleteFromFiles())); + connect(mArchiveRemoveFilesA, &QAction::triggered, c->archiveFiles(), &ArchiveFiles::deleteFromFiles); //ArchiveBrowser Actions mArchiveBrowserMoveToBurnA = new QAction(QIcon(":/shackles.png"), tr("Move to burn..."), this); - connect(mArchiveBrowserMoveToBurnA, SIGNAL(triggered()), mArchiveBrowser, SLOT(moveToBurn())); + connect(mArchiveBrowserMoveToBurnA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::moveToBurn); mArchiveBrowserMoveToUSBA = new QAction(QIcon(":/clean_tampon.png"), tr("Move to USB..."), this); - connect(mArchiveBrowserMoveToUSBA, SIGNAL(triggered()), mArchiveBrowser, SLOT(moveToUSB())); + connect(mArchiveBrowserMoveToUSBA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::moveToUSB); mArchiveBrowserRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this); - connect(mArchiveBrowserRefreshA, SIGNAL(triggered()), mArchiveBrowser, SLOT(refresh())); + connect(mArchiveBrowserRefreshA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::refresh); mArchiveBrowserPlaySelectedA = new QAction(QIcon(":/dildo.png"), tr("Play selected..."), this); - connect(mArchiveBrowserPlaySelectedA, SIGNAL(triggered()), mArchiveBrowser, SLOT(playSelected())); + connect(mArchiveBrowserPlaySelectedA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::playSelected); mArchiveBrowserExpandAllA = new QAction(tr("Expand all"), this); - connect(mArchiveBrowserExpandAllA, SIGNAL(triggered()), mArchiveBrowser->archiveTree(), SLOT(expandAll())); + connect(mArchiveBrowserExpandAllA, &QAction::triggered, mArchiveBrowser->archiveTree(), &SmTreeView::expandAll); mArchiveBrowserCollapseAllA = new QAction(tr("Collapse all"), this); - connect(mArchiveBrowserCollapseAllA, SIGNAL(triggered()), mArchiveBrowser->archiveTree(), SLOT(collapseAll())); + connect(mArchiveBrowserCollapseAllA, &QAction::triggered, mArchiveBrowser->archiveTree(), &SmTreeView::collapseAll); // db analyzer dialogs // analyze actors mAnalyzeActorsA = new QAction(tr("Actors..."), this); - connect(mAnalyzeActorsA, SIGNAL(triggered()), this, SLOT(analyzeActors())); + connect(mAnalyzeActorsA, &QAction::triggered, this, &SheMov::analyzeActors); // analyze genres mAnalyzeGenresA = new QAction(tr("Genres..."), this); - connect(mAnalyzeGenresA, SIGNAL(triggered()), this, SLOT(analyzeGenres())); + connect(mAnalyzeGenresA, &QAction::triggered, this, &SheMov::analyzeGenres); // analyze series mAnalyzeSeriesA = new QAction(tr("Series..."), this); - connect(mAnalyzeSeriesA, SIGNAL(triggered()), this, SLOT(analyzeSeries())); + connect(mAnalyzeSeriesA, &QAction::triggered, this, &SheMov::analyzeSeries); // anaylze series parts mAnalyzePartsA = new QAction(tr("Series Parts..."), this); - connect(mAnalyzePartsA, SIGNAL(triggered()), this, SLOT(analyzeParts())); + connect(mAnalyzePartsA, &QAction::triggered, this, &SheMov::analyzeParts); //don't add actions with checkable(true) unless you know what you're doing! mPicActionGroup = new QActionGroup(this); @@ -1081,7 +1081,7 @@ void SheMov::newPicsDialogWithFiles(){ return; } QStringList files; - foreach(QModelIndex idx, selected){ + for(const QModelIndex &idx : selected){ files << idx.data(SmDirModel::FullPathRole).toString(); } mNewPicsDialog->clearFiles(); |