diff options
-rw-r--r-- | filesystemwidget.cpp | 40 | ||||
-rw-r--r-- | filesystemwidget.h | 5 | ||||
-rw-r--r-- | shemov.cpp | 65 | ||||
-rw-r--r-- | shemov.h | 8 |
4 files changed, 26 insertions, 92 deletions
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp index e86db07..1592d13 100644 --- a/filesystemwidget.cpp +++ b/filesystemwidget.cpp @@ -294,46 +294,6 @@ void FilesystemWidget::renameFile(){ mFileView->edit(curIdx); } -void FilesystemWidget::renameCover(const QString &infix){ - if(mTemplate.isEmpty()){ - emit statusbarMessage(tr("No template set!")); - return; - } - QModelIndex idx = mFileView->currentIndex(); - QSortFilterProxyModel *proxy = static_cast<QSortFilterProxyModel*>(mFileView->model()); - QModelIndex real = proxy->mapToSource(idx); - QFileInfo info = mModel->fileInfo(real); - QString newFilename = QString("%1/%2.%3.%4").arg(info.absolutePath()).arg(mTemplate).arg(infix).arg(info.suffix()); - QFileInfo nf(newFilename); - if(nf.exists()){ - QString message = QString(tr("New file %1 already exists!")).arg(newFilename); - statusbarMessage(message); - return; - } - QString question = QString(tr("Really rename %1 to %2?")).arg(info.absoluteFilePath()).arg(nf.fileName()); - int retval = QMessageBox::question(this, tr("Question"), question, QMessageBox::Yes | QMessageBox::No); - if(retval == QMessageBox::Yes){ - if(QFile::rename(info.absoluteFilePath(), newFilename)){ - QString message = QString(tr("Successfully renamed %1 to %2")).arg(info.fileName()).arg(nf.fileName()); - emit statusbarMessage(message); - }else{ - QString message = QString(tr("Failed to rename %1 to %2")).arg(info.fileName()).arg(nf.fileName()); - emit statusbarMessage(message); - } - } -} - -void FilesystemWidget::setTemplate(){ - QModelIndex idx = mFileView->currentIndex(); - if(idx.column() != 0){ - idx = mFileView->model()->index(idx.row(), 0); - } - //since we only need the filename, no need to map it to anything! - QFileInfo info(idx.data().toString()); - mTemplate = info.completeBaseName().toLower(); - emit newTemplate(mTemplate); -} - void FilesystemWidget::playSelected(const QString &player){ QStringList files = selectedFiles(); if(files.isEmpty()){ diff --git a/filesystemwidget.h b/filesystemwidget.h index ed1f288..8328f64 100644 --- a/filesystemwidget.h +++ b/filesystemwidget.h @@ -46,7 +46,6 @@ class FilesystemWidget : public QWidget { signals: void windowTitle(const QString &); void statusbarMessage(const QString &); - void newTemplate(const QString &); void mounted(bool); public slots: @@ -58,9 +57,7 @@ class FilesystemWidget : public QWidget { void deleteFiles(); void toClipboard(int clipmode); void fromClipboard(); - void renameFile(); - void renameCover(const QString &infix); - void setTemplate(); + void renameFile(); void playSelected(const QString &player = QString()); void readSettings(); void writeSettings(); @@ -111,7 +111,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla 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(mFSWidget, SIGNAL(newTemplate(const QString &)), this, SLOT(setTemplate(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())); @@ -155,10 +154,6 @@ void SheMov::statusbarMessage(const QString &message){ statusBar()->showMessage(message); } -void SheMov::setTemplate(const QString &newTemplate){ - mTemplate->setText(newTemplate); -} - void SheMov::configure(){ ConfigurationDialog dlg(this); dlg.exec(); @@ -221,6 +216,20 @@ void SheMov::setFsFree(){ mFsFree->setPixmap(QPixmap::fromImage(img)); } +void SheMov::setSlide(bool toggled){ + QPixmap slidepm = QPixmap(":/chastity_belt_with_cuffs.png"); + QImage slideimg = QImage(slidepm.size(), QImage::Format_ARGB32); + QColor bgColor = QColor(Qt::red); + if(toggled){ + bgColor = QColor(Qt::green); + } + QPainter p(&slideimg); + p.setBrush(bgColor); + p.drawRect(0, 0, 20, mSlideLabel->height()); + p.drawPixmap(0, 0, slidepm); + mSlideLabel->setPixmap(QPixmap::fromImage(slideimg)); +} + void SheMov::aboutShemov(){ QString aboutLabel = QString(tr("About %1")).arg(qApp->applicationName()); QString aboutText = QString(tr("<p>%1 is a little application to keep track of your pr0n movie collection, though it isn't limited to pr0n movies.</p>")).arg(qApp->applicationName()); @@ -293,11 +302,13 @@ void SheMov::createStatusbar(){ mSelectedItems->setFrameStyle(QFrame::Panel | QFrame::Sunken); statusBar()->addPermanentWidget(selCountL); statusBar()->addPermanentWidget(mSelectedItems); - QLabel *templateL = new QLabel(tr("Template")); - mTemplate = new QLabel(tr("No template set")); - mTemplate->setFrameStyle(QFrame::Panel | QFrame::Sunken); - statusBar()->addPermanentWidget(templateL); - statusBar()->addPermanentWidget(mTemplate); + mSlideLabel = new QLabel; + mSlideLabel->setMinimumWidth(20); + mSlideLabel->setAlignment(Qt::AlignCenter); + mSlideLabel->setPixmap(QPixmap()); + mSlideLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken); + statusBar()->addPermanentWidget(mSlideLabel); + setSlide(false); QLabel *freeL = new QLabel(tr("Free space")); mFsFree = new QLabel(tr("calculating...")); mFsFree->setFrameStyle(QFrame::Panel | QFrame::Sunken); @@ -393,28 +404,6 @@ void SheMov::createActions(){ connect(mEditActorsA, SIGNAL(triggered()), mappingMapper, SLOT(map())); connect(mappingMapper, SIGNAL(mapped(QString)), this, SLOT(editMappings(QString))); - //Edit menu rename submenu - mTemplateA = new QAction(tr("Set as template"), this); - mTemplateA->setShortcut(tr("CTRL+t")); - connect(mTemplateA, SIGNAL(triggered()), mFSWidget, SLOT(setTemplate())); - mTemplateA->setData("RenameMenu"); - mRenameMapper = new QSignalMapper(this); - mRenameCoverFA = new QAction(tr("Rename to front cover"), this); - mRenameCoverFA->setShortcut(tr("CTRL+f")); - connect(mRenameCoverFA, SIGNAL(triggered()), mRenameMapper, SLOT(map())); - mRenameMapper->setMapping(mRenameCoverFA, tr("front")); - mRenameCoverFA->setData("RenameMenu"); - mRenameCoverBA = new QAction(tr("Rename to back cover"), this); - mRenameCoverBA->setShortcut(tr("CTRL+b")); - connect(mRenameCoverBA, SIGNAL(triggered()), mRenameMapper, SLOT(map())); - mRenameMapper->setMapping(mRenameCoverBA, tr("back")); - mRenameCoverBA->setData("RenameMenu"); - mRenameCoverCA = new QAction(tr("Rename to cover"), this); - connect(mRenameCoverCA, SIGNAL(triggered()), mRenameMapper, SLOT(map())); - mRenameMapper->setMapping(mRenameCoverCA, tr("cover")); - mRenameCoverCA->setData("RenameMenu"); - connect(mRenameMapper, SIGNAL(mapped(const QString &)), mFSWidget, SLOT(renameCover(const QString &))); - //Help menu QString aboutLabel = QString(tr("About %1...")).arg(qApp->applicationName()); mAboutShemovA = new QAction(aboutLabel, this); @@ -631,6 +620,7 @@ void SheMov::createActions(){ mPVSlideA->setCheckable(true); mPVSlideA->setData(PictureViewer2::SlideAction); connect(mPVSlideA, SIGNAL(toggled(bool)), mPicWidget->picView()->PV(), SLOT(slide(bool))); + connect(mPVSlideA, SIGNAL(toggled(bool)), this, SLOT(setSlide(bool))); mPicWidget->picView()->addAction(mPVSlideA); QAction *pv2Sep1 = new QAction(this); pv2Sep1->setSeparator(true); @@ -675,7 +665,6 @@ void SheMov::createMenus(){ fileMenu->addAction(mAnalyzerA); fileMenu->addAction(mMappingEditorA); fileMenu->addAction(mNewPicsA); - //fileMenu->addAction(mShowNoCoverDialogA); fileMenu->addSeparator(); fileMenu->addAction(mQuitA); menuBar()->addMenu(fileMenu); @@ -695,14 +684,6 @@ void SheMov::createMenus(){ mEditFSMenu->addAction(mCutA); mEditFSMenu->addAction(mPasteA); mEditFSMenu->addAction(mRenameA); - mRenameMenu = new QMenu(tr("&Rename..."), this); - mRenameMenu->addAction(mTemplateA); - mRenameMenu->addAction(mRenameCoverFA); - mRenameMenu->addAction(mRenameCoverBA); - mRenameMenu->addAction(mRenameCoverCA); - mRenameMenuA = new QAction(tr("&Rename to"), this); - mRenameMenuA->setMenu(mRenameMenu); - mEditFSMenu->addAction(mRenameMenuA); mEditFSMenu->addSeparator(); mEditFSMenu->addAction(mCopyA); mEditFSMenu->addAction(mCutA); @@ -811,7 +792,7 @@ void SheMov::createMenus(){ mFSWidget->fileView()->addAction(mCreateFolderA); mFSWidget->fileView()->addAction(mDeleteFilesA); mFSWidget->fileView()->addAction(mRenameA); - mFSWidget->fileView()->addAction(mRenameMenuA); + //mFSWidget->fileView()->addAction(mRenameMenuA); QAction *sep16 = new QAction(this); sep16->setSeparator(true); mFSWidget->fileView()->addAction(sep16); @@ -38,10 +38,10 @@ class SheMov : public QMainWindow { private slots: void updateSelectedCount(int count); void statusbarMessage(const QString &message); - void setTemplate(const QString &newTemplate); void configure(); void tabChanged(int newTab); void setFsFree(); + void setSlide(bool toggled); void aboutShemov(); void showStatistics(); void newMovieWizard(); @@ -72,7 +72,7 @@ class SheMov : public QMainWindow { //Statusbar Items QLabel *mSelectedItems; - QLabel *mTemplate; + QLabel *mSlideLabel; QLabel *mSelectedSize; QLabel *mFsFree; @@ -96,7 +96,6 @@ class SheMov : public QMainWindow { QAction *mRenameCoverFA; QAction *mRenameCoverBA; QAction *mRenameCoverCA; - QAction *mTemplateA; QAction *mConfigA; QAction *mAboutShemovA; QAction *mAboutQtA; @@ -105,7 +104,6 @@ class SheMov : public QMainWindow { QAction *mPlaySelectedAVA; QAction *mOpenWithMenuFSA; QAction *mOpenWithMenuAVA; - QAction *mRenameMenuA; QAction *mArchiveSelectedA; QAction *mConsistencyA; QAction *mAnalyzerA; @@ -181,7 +179,6 @@ class SheMov : public QMainWindow { QActionGroup *mPicActionGroup; //EndActions - QSignalMapper *mRenameMapper; QSignalMapper *mOpenWithMapperFS; QSignalMapper *mOpenWithMapperAV; QSignalMapper *mFilterMapper; @@ -191,7 +188,6 @@ class SheMov : public QMainWindow { QMenu *mEditPicMenu; QMenu *mOpenWithMenuFS; QMenu *mOpenWithMenuAV; - QMenu *mRenameMenu; QMenu *mTreeViewMenu; QMenu *mFSViewMenu; QMenu *mPicViewMenu; |