From bac6fe431150bb5706fe0fb349e753b8fe08c12e Mon Sep 17 00:00:00 2001 From: Arno Date: Tue, 3 Apr 2018 07:52:56 +0200 Subject: Good riddance Filesystem Widget! Get rid of FilesystemWidget and helper classes. The SmDirWatcher was useful, once, I guess, nice to implement it by foot, but with the current workflow it isn't needed any more. --- shemov.cpp | 358 +------------------------------------------------------------ 1 file changed, 5 insertions(+), 353 deletions(-) (limited to 'shemov.cpp') diff --git a/shemov.cpp b/shemov.cpp index 50a0c17..4af3a72 100644 --- a/shemov.cpp +++ b/shemov.cpp @@ -19,9 +19,6 @@ #include #include "shemov.h" -#include "filesystemwidget.h" -#include "filesystemfileproxy.h" -#include "fileview.h" #include "configurationdialog.h" #include "statisticsdialog.h" #include "smglobals.h" @@ -32,15 +29,15 @@ #include "dbanalyzer.h" #include "newpicsdialog.h" #include "pictureswidget.h" -#include "smdirmodel.h" #include "archiveview.h" #include "archivecontroller.h" #include "archivebrowser.h" #include "searchdialog.h" #include "randomtab.h" #include "fswidget.h" +#include "helper.h" -SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags), mOpenWithGroupFS(0), mOpenWithGroupAV(0) { +SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) /*, mOpenWithGroupFS(0), mOpenWithGroupAV(0) */ { //application icon qApp->setWindowIcon(QIcon(":/shemov.png")); createPalette(); @@ -56,12 +53,7 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla //FileSystemWidget + TabWidget splash.showMessage(tr("Constructing Filemanager..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); - mFSWidget = new FilesystemWidget; - SmGlobals::instance()->registerWidget("FSWidget", mFSWidget); - setWindowTitle(mFSWidget->windowTitle()); mTab = new QTabWidget; - mTab->addTab(mFSWidget, tr("Filemanager")); - connect(this, &SheMov::configChanged, mFSWidget, &FilesystemWidget::configChanged); mFileWidget = new FSWidget; mTab->addTab(mFileWidget, tr("FS")); connect(mFileWidget, &FSWidget::message, this, &SheMov::statusbarMessage); @@ -107,14 +99,10 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla connect(mRandomTab, &RandomTab::configure, this, &SheMov::configure); mTab->addTab(mRandomTab, tr("Random")); - //newmoviewizard + dbanalyzer + newpicsdialog + searchdialog + //misc dialogs splash.showMessage(tr("Creating misc. Dialogs..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); - mNewMovieWizard = new NewMovieWizard(this); - mNewMovieWizard->setMinimumWidth(1024); ArchiveController *c = SmGlobals::instance()->archiveController(); - connect(mNewMovieWizard, &NewMovieWizard::accepted, c->archiveTreeModel(), &ArchiveModel::refresh); - mNewPicsDialog = new NewPicsDialog(this); mSearchDialog = new SearchDialog(this); connect(mSearchDialog, &SearchDialog::searchResultClicked, this, &SheMov::searchResult); @@ -136,22 +124,10 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla splash.showMessage(tr("Finishing..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); - 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::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(this, &SheMov::configChanged, mFileWidget, &FSWidget::readSettings); - connect(mFSWidget, &FilesystemWidget::mounted, this, &SheMov::checkMount); QWidget *centralWidget = new QWidget; centralWidget->setLayout(mainLayout); @@ -159,21 +135,14 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla show(); splash.finish(this); - mFSWidget->readSettings(); - mFSWidget->fileView()->setFocus(Qt::ActiveWindowFocusReason); mPicWidget->readSettings(); mArchive->readSettings(); mArchiveBrowser->readConfig(); readSettings(); - // craptastic... We can't center until it's painted, - // hence this indirection :( - mFSWidget->centerCurrent(); setWindowState(Qt::WindowMaximized); } void SheMov::closeEvent(QCloseEvent *event){ - mFSWidget->writeSettings(); - mFSWidget->pictureViewer()->close(); mPicWidget->picViewer2()->writeSettings(); mPicWidget->writeSettings(); mArchive->writeSettings(); @@ -196,35 +165,25 @@ void SheMov::statusbarMessage(const QString &message){ void SheMov::configure(){ ConfigurationDialog dlg(this); dlg.exec(); - createOpenWithMenuFS(); createPalette(); emit configChanged(); } void SheMov::tabChanged(int newTab){ - mEditFSMenuA->setVisible(newTab == FileManager); mEditPicMenuA->setVisible(newTab == Pictures); - mViewFSMenuA->setVisible(newTab == FileManager); mViewPicMenuA->setVisible(newTab == Pictures); mArchiveViewMenuA->setVisible(newTab == Movies); mArchiveMenuA->setVisible(newTab == Movies); - mCdupA->setEnabled(newTab == FileManager); - mBackDirA->setEnabled(newTab == FileManager); mPicActionGroup->setEnabled(newTab == Pictures); mPVSelectAllA->disconnect(); mPVShowNPDialogA->setEnabled(newTab == FileManager); mPVAddToNPA->setEnabled(newTab == FileManager); - mNewPicsA->setEnabled(newTab == FileManager); - mNewMovieWizardA->setEnabled(newTab == FileManager); mArchiveBrowserViewMenuA->setVisible(newTab == ArchiveBrowserTab); mRandomEditMenuA->setVisible(newTab == RandomDisp); statusbarMessage(QString()); ArchiveController *c = SmGlobals::instance()->archiveController(); switch(newTab){ case FileManager: - connect(mPVSelectAllA, &QAction::triggered, mFSWidget, &FilesystemWidget::selectAllPV); - mFSWidget->fileView()->selectedFilesChanged(); - mFSWidget->setWindowTitle(); break; case Movies: c->fileSelectionChanged(QItemSelection(), QItemSelection()); @@ -298,35 +257,6 @@ void SheMov::showStatistics(){ dlg.exec(); } -void SheMov::newMovieWizard(){ - mNewMovieWizard->restart(); - mNewMovieWizard->show(); -} - -void SheMov::newMovieWizardWithFiles(){ - QModelIndexList selected = mFSWidget->fileView()->selectionModel()->selectedRows(); - if(selected.isEmpty()){ - return; - } - mNewMovieWizard->restart(); - mNewMovieWizard->infoPage()->setCurrentDir(mFSWidget->currentDir()); - for(const QModelIndex &sel : selected){ - mNewMovieWizard->infoPage()->addFile(sel.data(SmDirModel::FullPathRole).toString()); - mNewMovieWizard->infoPage()->guessOld(sel.data(SmDirModel::FullPathRole).toString()); - } - QSettings s; - bool autoAddCovers = s.value("ui/autoaddcovers", false).toBool(); - QString coverPath = s.value("paths/coverpath").toString(); - if(autoAddCovers && !coverPath.isEmpty()){ - QDir coverDir(coverPath); - for(const QFileInfo &fi : coverDir.entryInfoList(QDir::Files)){ - mNewMovieWizard->infoPage()->addFile(fi.absoluteFilePath()); - } - } - mNewMovieWizard->infoPage()->selectFirst(); - mNewMovieWizard->show(); -} - void SheMov::setSize(qint64 size){ QLocale l; QString val; @@ -392,38 +322,8 @@ void SheMov::createStatusbar(){ } void SheMov::createActions(){ - //File menu - mPlaySelectedFSA = new QAction(tr("Play selected movies..."), this); - 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); - QAction *playTimesA = new QAction(actString, this); - connect(playTimesA, &QAction::triggered, [=] { mFSWidget->playSelectedRepeat(i); }); - mOpenTimesFSAG->addAction(playTimesA); - } - mOpenTimesFSAG->addAction(createSeparator()); - QString infiniteTimes = QString(tr("Play %1 times")).arg(QChar(0x221E)); // infinite - mPlaySelectedInfTimesA = new QAction(infiniteTimes, this); - 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, &QAction::triggered, this, &SheMov::newMovieWizard); - mArchiveSelectedMovsA = new QAction(QIcon(":/butt_plug.png"), tr("Archive selected movies..."), this); - connect(mArchiveSelectedMovsA, &QAction::triggered, this, &SheMov::newMovieWizardWithFiles); - mArchiveSelectedPicsA = new QAction(QIcon(":/hourglass_figure.png"), tr("Archive selected pics..."), this); - connect(mArchiveSelectedPicsA, &QAction::triggered, this, &SheMov::newPicsDialogWithFiles); - mArchivePicsInDirA = new QAction(QIcon(":/higheels.png"), tr("Archive all pics..."), this); - connect(mArchivePicsInDirA, &QAction::triggered, this, &SheMov::newPicsDialogWithDir); mConsistencyA = new QAction(tr("Check consisteny..."), this); connect(mConsistencyA, &QAction::triggered, this, &SheMov::checkConsistency); - mNewPicsA = new QAction(tr("Archive pics...."), this); - connect(mNewPicsA, &QAction::triggered, this, &SheMov::newPicsDialog); - mUnpackA = new QAction(QIcon(":/dog_hood.png"), tr("Unpack..."), this); - connect(mUnpackA, &QAction::triggered, mFSWidget, &FilesystemWidget::unpack); - mUntarA = new QAction(QIcon(":/clean_tampon.png"), tr("Untar"), this); - connect(mUntarA, &QAction::triggered, mFSWidget, &FilesystemWidget::untar); mSearchDialogA = new QAction(tr("Search..."), this); mSearchDialogA->setShortcut(tr("CTRL+f")); connect(mSearchDialogA, &QAction::triggered, mSearchDialog, &SearchDialog::show); @@ -432,57 +332,8 @@ void SheMov::createActions(){ mQuitA = new QAction(tr("Quit"), this); mQuitA->setShortcut(tr("CTRL+q")); connect(mQuitA, &QAction::triggered, qApp, &QApplication::closeAllWindows); - - //Edit menu (FS) - mCdupA = new QAction(QIcon(":/up_dick.png"), tr("Go up"), this); - connect(mCdupA, &QAction::triggered, mFSWidget, &FilesystemWidget::parentDir); - mBackDirA = new QAction(QIcon(":/back_dick.png"), tr("Go back"), this); - connect(mBackDirA, &QAction::triggered, mFSWidget, &FilesystemWidget::goBack); - mGotoArchiveA = new QAction(tr("Goto archive..."), this); - 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, &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, &QAction::triggered, mFSWidget->fileView(), &FileView::unmarkFiles); - mCreateFolderA = new QAction(QIcon(":/folder.png"), tr("New folder..."), this); - mCreateFolderA->setShortcut(tr("CTRL+n")); - 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, &QAction::triggered, mFSWidget, &FilesystemWidget::deleteFiles); - mCopyA = new QAction(tr("Copy"), this); - mCopyA->setShortcut(tr("CTRL+c")); - connect(mCopyA, &QAction::triggered, [=] {mFSWidget->toClipboard(FilesystemWidget::Copy); }); - mCutA = new QAction(tr("Cut"), this); - mCutA->setShortcut(tr("CTRL+x")); - connect(mCutA, &QAction::triggered, [=] {mFSWidget->toClipboard(FilesystemWidget::Cut); }); - mPasteA = new QAction(tr("Paste"), this); - mPasteA->setShortcut(tr("Ctrl+v")); - connect(mPasteA, &QAction::triggered, mFSWidget, &FilesystemWidget::fromClipboard); - mRenameA = new QAction(QIcon(":/rename.png"), tr("Rename..."), this); - mRenameA->setShortcut(tr("CTRL+r")); - connect(mRenameA, &QAction::triggered, mFSWidget, &FilesystemWidget::renameFile); - mMountDvdA = new QAction(QIcon(":/diaper.png"), tr("(Un)mount DVD drive"), this); - mMountDvdA->setCheckable(true); - connect(mMountDvdA, &QAction::triggered, mFSWidget, &FilesystemWidget::dvdMount); mConfigA = new QAction(QIcon(":/chastity_belt.png"), tr("Configure..."), this); connect(mConfigA, &QAction::triggered, this, &SheMov::configure); - mMoveToArchiveA = new QAction(tr("Move to archive"), this); - connect(mMoveToArchiveA, &QAction::triggered, mFSWidget, &FilesystemWidget::moveToArchive); - - //View menu (FS) - mRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this); - connect(mRefreshA, &QAction::triggered, mFSWidget->fileModel(), &SmDirModel::refresh); - mFSViewPropertiesA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Properties..."), this); - connect(mFSViewPropertiesA, &QAction::triggered, mFSWidget->fileView(), &FileView::properties); - mFSPreviewA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Preview..."), this); - connect(mFSPreviewA, &QAction::triggered, mFSWidget, &FilesystemWidget::preview); - mFSResizeA = new QAction(QIcon(":/analstretcher.png"), tr("Resize"), this); - connect(mFSResizeA, &QAction::triggered, mFSWidget, &FilesystemWidget::resizeFileView); //Help menu QString aboutLabel = QString(tr("About %1...")).arg(qApp->applicationName()); @@ -494,9 +345,6 @@ void SheMov::createActions(){ connect(mStatisticsA, &QAction::triggered, this, &SheMov::showStatistics); //headers - mFileSysHeaderGroup = new QActionGroup(this); - createHeaderMapper(qobject_cast(mFSWidget->fileModel()), mFSWidget->fileView(), mFileSysHeaderGroup); - mFSWidget->fileView()->setHeaderGroup(mFileSysHeaderGroup); mPicsTreeHeaderGroup = new QActionGroup(this); SmTreeModel *picFilesModel = static_cast(SmGlobals::instance()->model("PicFiles")); createHeaderMapper(picFilesModel, mPicWidget->picView(), mPicsTreeHeaderGroup); @@ -722,52 +570,13 @@ void SheMov::createActions(){ } void SheMov::createMenus(){ - //file menu - QMenu *fileMenu = new QMenu(tr("&File"), this); - fileMenu->addAction(mNewMovieWizardA); - fileMenu->addAction(mNewPicsA); - fileMenu->addAction(mSearchDialogA); - fileMenu->addSeparator(); - fileMenu->addAction(mConsistencyA); + //FIXME! + //fileMenu->addAction(mConsistencyA); QMenu *analyzeMenu = new QMenu(tr("Analyze"), this); analyzeMenu->addAction(mAnalyzeActorsA); analyzeMenu->addAction(mAnalyzeGenresA); analyzeMenu->addAction(mAnalyzeSeriesA); analyzeMenu->addAction(mAnalyzePartsA); - fileMenu->addMenu(analyzeMenu); - fileMenu->addSeparator(); - fileMenu->addAction(mQuitA); - menuBar()->addMenu(fileMenu); - - //filesystem edit menu - mEditFSMenu = new QMenu(tr("&Edit"), this); - mEditFSMenu->addAction(mCdupA); - mEditFSMenu->addAction(mBackDirA); - mEditFSMenu->addAction(mGotoArchiveA); - mEditFSMenu->addSeparator(); - mEditFSMenu->addAction(mMarkFilesA); - mEditFSMenu->addAction(mUnmarkFilesA); - mEditFSMenu->addSeparator(); - mEditFSMenu->addAction(mCreateFolderA); - mEditFSMenu->addAction(mDeleteFilesA); - mEditFSMenu->addSeparator(); - mEditFSMenu->addAction(mCopyA); - mEditFSMenu->addAction(mCutA); - mEditFSMenu->addAction(mPasteA); - mEditFSMenu->addAction(mRenameA); - mEditFSMenu->addSeparator(); - mEditFSMenu->addAction(mCopyA); - mEditFSMenu->addAction(mCutA); - mEditFSMenu->addAction(mPasteA); - mEditFSMenu->addSeparator(); - mEditFSMenu->addAction(mMountDvdA); - mEditFSMenu->addAction(mUnpackA); - mEditFSMenu->addAction(mUntarA); - mEditFSMenu->addSeparator(); - mEditFSMenu->addAction(mMoveToArchiveA); - mEditFSMenu->addSeparator(); - mEditFSMenu->addAction(mConfigA); - mEditFSMenuA = menuBar()->addMenu(mEditFSMenu); //Pictures edit menu mEditPicMenu = new QMenu(tr("&Edit"), this); @@ -779,18 +588,6 @@ void SheMov::createMenus(){ mArchiveEditMenu = new QMenu(tr("&Edit"), this); mArchiveMenuA = menuBar()->addMenu(mArchiveEditMenu); - //FileSystem view menu - mFSViewMenu = new QMenu(tr("&View"), this); - mFSViewMenu->addSeparator(); - QMenu *fsHeaderMenu = new QMenu(tr("Show headers"), this); - fsHeaderMenu->addActions(mFileSysHeaderGroup->actions()); - mFSViewMenu->addMenu(fsHeaderMenu); - mFSViewMenu->addSeparator(); - mFSViewMenu->addAction(mFSResizeA); - mFSViewMenu->addSeparator(); - mFSViewMenu->addAction(mRefreshA); - mViewFSMenuA = menuBar()->addMenu(mFSViewMenu); - //Pictures view menu mPicViewMenu = new QMenu(tr("&View"), this); mPicViewMenu->addAction(mPVToggleA); @@ -836,57 +633,6 @@ void SheMov::createMenus(){ helpMenu->addAction(mStatisticsA); menuBar()->addMenu(helpMenu); - // FilesystemWidget context menu - mOpenWithMenuFS = new QMenu(tr("Open with"), this); - mFSWidget->fileView()->addAction(mPlaySelectedFSA); - createOpenWithMenuFS(); - mOpenWithMenuFSA = new QAction(tr("Open with"), this); - mOpenWithMenuFSA->setMenu(mOpenWithMenuFS); - mFSWidget->fileView()->addAction(mOpenWithMenuFSA); - - mPlaySelectedTimesMenuFS = new QMenu(tr("Play repeat..."), this); - mPlaySelectedTimesMenuFS->addActions(mOpenTimesFSAG->actions()); - mPlaySelectedTimesMenuFSA = new QAction(tr("Play repeat..."), this); - mPlaySelectedTimesMenuFSA->setMenu(mPlaySelectedTimesMenuFS); - mFSWidget->fileView()->addAction(mPlaySelectedTimesMenuFSA); - - mFSWidget->fileView()->addAction(createSeparator()); - - mFSWidget->fileView()->addAction(mCdupA); - mFSWidget->fileView()->addAction(mBackDirA); - mFSWidget->fileView()->addAction(mGotoArchiveA); - mFSWidget->fileView()->addAction(createSeparator()); - - mFSWidget->fileView()->addAction(mMarkFilesA); //Menu text: Select files... - mFSWidget->fileView()->addAction(mUnmarkFilesA); //Menu text: Deselect all files - mFSWidget->fileView()->addAction(createSeparator()); - - mFSWidget->fileView()->addAction(mCreateFolderA); - mFSWidget->fileView()->addAction(mDeleteFilesA); - mFSWidget->fileView()->addAction(mRenameA); - mFSWidget->fileView()->addAction(createSeparator()); - - mFSWidget->fileView()->addAction(mCopyA); - mFSWidget->fileView()->addAction(mCutA); - mFSWidget->fileView()->addAction(mPasteA); - mFSWidget->fileView()->addAction(createSeparator()); - - mFSWidget->fileView()->addAction(mMoveToArchiveA); - mFSWidget->fileView()->addAction(createSeparator()); - - mFSWidget->fileView()->addAction(mRefreshA); - mFSWidget->fileView()->addAction(createSeparator()); - - mFSWidget->fileView()->addAction(mArchiveSelectedPicsA); - mFSWidget->fileView()->addAction(mArchivePicsInDirA); - mFSWidget->fileView()->addAction(mArchiveSelectedMovsA); - mFSWidget->fileView()->addAction(createSeparator()); - mFSWidget->fileView()->addAction(mUnpackA); - mFSWidget->fileView()->addAction(mUntarA); - mFSWidget->fileView()->addAction(createSeparator()); - mFSWidget->fileView()->addAction(mFSPreviewA); - mFSWidget->fileView()->addAction(mFSViewPropertiesA); - // Movie archive ArchiveController *c = SmGlobals::instance()->archiveController(); c->addActionForTree(mArchiveViewRenameA); @@ -944,44 +690,7 @@ void SheMov::createMenus(){ mRandomEditMenuA = menuBar()->insertMenu(mArchiveMenuA, mRandomEditMenu); } -void SheMov::createOpenWithMenuFS(){ - if(mOpenWithGroupFS){ - for(QAction *a : mOpenWithGroupFS->actions()){ - mOpenWithMenuFS->removeAction(a); - } - mOpenWithGroupFS->deleteLater(); - } - mOpenWithGroupFS = new QActionGroup(this); - QSettings s; - QStringList moviePlayers = s.value("programs_movieviewer/data").toHash().keys(); - moviePlayers.sort(); - for(QString p : moviePlayers){ - QAction *a = new QAction(p, mOpenWithGroupFS); - connect(a, &QAction::triggered, [=] { mFSWidget->playSelected(p); }); - mOpenWithMenuFS->addAction(a); - } -} - void SheMov::createToolBar(){ - mFSWidget->toolBar()->addAction(mBackDirA); - mFSWidget->toolBar()->addAction(mCdupA); - mFSWidget->toolBar()->addSeparator(); - mFSWidget->toolBar()->addAction(mUnpackA); - mFSWidget->toolBar()->addSeparator(); - mFSWidget->toolBar()->addAction(mCreateFolderA); - mFSWidget->toolBar()->addAction(mRenameA); - mFSWidget->toolBar()->addAction(mDeleteFilesA); - mFSWidget->toolBar()->addAction(mRefreshA); - mFSWidget->toolBar()->addSeparator(); - mFSWidget->toolBar()->addAction(mArchiveSelectedMovsA); - mFSWidget->toolBar()->addAction(mArchiveSelectedPicsA); - mFSWidget->toolBar()->addSeparator(); - mFSWidget->toolBar()->addAction(mFSPreviewA); - mFSWidget->toolBar()->addAction(mFSViewPropertiesA); - mFSWidget->toolBar()->addAction(mFSResizeA); - mFSWidget->toolBar()->addSeparator(); - mFSWidget->toolBar()->addAction(mConfigA); - mArchive->toolBar()->addAction(mArchiveFilesQualityA); mArchive->toolBar()->addAction(mArchiveFilesDvdNoA); mArchive->toolBar()->addAction(mArchiveFilesTypeA); @@ -1015,15 +724,6 @@ void SheMov::readSettings(){ } tabChanged(currentTab); QString dvdMount = s.value("paths/dvdmount").toString(); - if(dvdMount.isEmpty()){ - mMountDvdA->setEnabled(false); - }else{ - if(mFSWidget->isMounted()){ - mMountDvdA->setChecked(true); - }else{ - mMountDvdA->setChecked(false); - } - } createPalette(); } @@ -1083,36 +783,6 @@ void SheMov::toggleHover(QObject *object){ } } -void SheMov::checkMount(bool mounted){ - mMountDvdA->setChecked(mounted); -} - -void SheMov::newPicsDialog(){ - mNewPicsDialog->exec(); -} - -void SheMov::newPicsDialogWithFiles(){ - QModelIndexList selected = mFSWidget->fileView()->selectionModel()->selectedRows(); - if(selected.isEmpty()){ - return; - } - QStringList files; - for(const QModelIndex &idx : selected){ - files << idx.data(SmDirModel::FullPathRole).toString(); - } - mNewPicsDialog->clearFiles(); - mNewPicsDialog->addFiles(files); - mNewPicsDialog->exec(); -} - -void SheMov::newPicsDialogWithDir(){ - QString dir = mFSWidget->currentDir(); - mNewPicsDialog->clearFiles(); - mNewPicsDialog->setDir(dir); - SmGlobals::instance()->pictureViewer()->show(); - mNewPicsDialog->exec(); -} - void SheMov::searchResult(int seriesPartId){ mSearchDialog->hide(); mTab->setCurrentIndex(Movies); @@ -1120,21 +790,3 @@ void SheMov::searchResult(int seriesPartId){ c->archiveTree()->setFocus(); c->setSeriesPart(seriesPartId); } - -void SheMov::gotoArchive(){ - const QModelIndexList idxs = mFSWidget->fileView()->selectionModel()->selectedRows(SmDirModel::Md5sum); - if(idxs.isEmpty()){ - return; - } - QModelIndex first = idxs.first(); - if(first.data(SmDirModel::PresentRole).toInt() == SmDirModel::InNone){ - return; - } - QString md5Sum = first.data(SmDirModel::Md5sumRole).toString(); - ArchiveController *c = SmGlobals::instance()->archiveController(); - int seriesPartId = c->archiveTreeModel()->seriesPartIdFromMd5(md5Sum); - if(seriesPartId != -1){ - c->setSeriesPart(seriesPartId); - mTab->setCurrentIndex(Movies); - } -} -- cgit v1.2.3-70-g09d2