summaryrefslogtreecommitdiffstats
path: root/shemov.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'shemov.cpp')
-rw-r--r--shemov.cpp145
1 files changed, 23 insertions, 122 deletions
diff --git a/shemov.cpp b/shemov.cpp
index 71a6c96..6778f0d 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -18,7 +18,6 @@
#include <QSettings>
#include <QMessageBox>
#include <QSqlDatabase>
-#include <QSqlError>
#include <QImage>
#include <QPainter>
#include <QFont>
@@ -34,15 +33,9 @@
#include "filesystemwidget.h"
#include "fileview.h"
#include "configurationdialog.h"
-#include "archiveeditdialog.h"
-#include "moviemodel.h"
-#include "listmodel.h"
-#include "archiveviewwidget.h"
-#include "archiveitemeditdialog.h"
+//#include "archiveeditdialog.h"
#include "statisticsdialog.h"
#include "filesystemfileproxy.h"
-#include "moviemodelsingleton.h"
-#include "listmodelsingleton.h"
#include "pictureviewer.h"
#include "archivetreeview.h"
#include "smmodelsingleton.h"
@@ -67,29 +60,18 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
QMessageBox::critical(this, tr("Error"), tr("Could not open database. Please configure the database and restart the program"));
}
- mMovieModel = MovieModelSingleton::instance();
- mGenreModel = ListModelSingleton::instance()->model("genre");
- mActorModel = ListModelSingleton::instance()->model("actor");
-
+ //FileSystemWidget + TabWidget
mFSWidget = new FilesystemWidget;
setWindowTitle(mFSWidget->windowTitle());
-
mTab = new QTabWidget;
mTab->addTab(mFSWidget, tr("Filemanager"));
- mAVWidget = new ArchiveViewWidget(mMovieModel, mGenreModel, mActorModel);
- mTab->addTab(mAVWidget, tr("Archive"));
- connect(mAVWidget, SIGNAL(windowTitle(const QString &)), this, SLOT(newWindowTitle(const QString &)));
+
+ //ArchiveTreeView
mATree = new ArchiveTreeView;
mTab->addTab(mATree, "Tree");
connect(mATree->filesWidget(), SIGNAL(statusMessage(QString)), this, SLOT(statusbarMessage(QString)));
connect(mATree->filesWidget(), SIGNAL(sizeChanged(qint64)), this, SLOT(setSize(qint64)));
- mAEdit = new ArchiveEditDialog(this);
- mFSWidget->setArchiveDialog(mAEdit);
-
- mAItemEdit = new ArchiveItemEditDialog(this);
- mAVWidget->setEditDialog(mAItemEdit);
-
QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(mTab);
@@ -99,19 +81,15 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
setFsFree();
connect(mFSWidget->fileView()->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)), this, SLOT(updateSelectionCount(const QItemSelection &, const QItemSelection &)));
- connect(mAVWidget->fileView()->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)), this, SLOT(updateSelectionCount(const QItemSelection &, const QItemSelection &)));
connect(mFSWidget, SIGNAL(windowTitle(const QString &)), this, SLOT(newWindowTitle(const 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(mAVWidget, 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()));
- //NewMovieWizard = new NewMovieWizard(this);
-
QWidget *centralWidget = new QWidget;
centralWidget->setLayout(mainLayout);
setCentralWidget(centralWidget);
@@ -148,17 +126,6 @@ void SheMov::updateSelectionCount(const QItemSelection & /* sel */, const QItemS
mSelectedSize->setText(QString(tr("<span style=\"color:#000000\">%1</span>")).arg(l.toString((selSize))));
break;
}
- case 1:
- mSelectedItems->setText(QString::number(mAVWidget->fileView()->selectionModel()->selectedRows().count()));
- qint64 s = mAVWidget->currentSize();
- QString val;
- if(s < Q_INT64_C(4707319808)){
- val = QString("<span style=\"color:#008000\">%1</span>").arg(l.toString(s));
- }else{
- val = QString("<span style=\"color:#ff0000\">%1</span>").arg(l.toString(s));
- }
- mSelectedSize->setText(val);
- break;
}
}
@@ -183,13 +150,9 @@ void SheMov::configure(){
void SheMov::tabChanged(int newTab){
mEditFSMenuA->setVisible(newTab == 0);
- mEditArchiveMenuA->setVisible(newTab == 1);
if(newTab == 0){
setWindowTitle(mFSWidget->windowTitle());
}
- if(newTab == 1){
- setWindowTitle(mAVWidget->windowTitle());
- }
updateSelectionCount(QItemSelection(), QItemSelection());
}
@@ -324,9 +287,6 @@ void SheMov::createActions(){
connect(mRenameA, SIGNAL(triggered()), mFSWidget, SLOT(renameFile()));
mConfigA = new QAction(tr("Configure..."), this);
connect(mConfigA, SIGNAL(triggered()), this, SLOT(configure()));
- mArchiveA = new QAction(tr("Archive files..."), this);
- mArchiveA->setShortcut(tr("CTRL+a"));
- connect(mArchiveA, SIGNAL(triggered()), mFSWidget, SLOT(archiveFiles()));
//Edit menu rename submenu
mTemplateA = new QAction(tr("Set as template"), this);
@@ -351,25 +311,6 @@ void SheMov::createActions(){
mRenameCoverCA->setData("RenameMenu");
connect(mRenameMapper, SIGNAL(mapped(const QString &)), mFSWidget, SLOT(renameCover(const QString &)));
- //Edit menu (archive)
- mPlaySelectedAVA = new QAction(tr("Play selected movies..."), this);
- connect(mPlaySelectedAVA, SIGNAL(triggered()), mAVWidget, SLOT(playSelected()));
- mEditArchiveFileA = new QAction(tr("Edit file..."), this);
- mEditArchiveFileA->setShortcut(tr("CTRL+e"));
- connect(mEditArchiveFileA, SIGNAL(triggered()), mAVWidget, SLOT(editFile()));
- mCopyToPartsA = new QAction(tr("Copy data to other parts"), this);
- connect(mCopyToPartsA, SIGNAL(triggered()), mAVWidget, SLOT(copyToParts()));
- mAddMovieManuallyA = new QAction(tr("Add movie manually..."), this);
- connect(mAddMovieManuallyA, SIGNAL(triggered()), mAVWidget, SLOT(addMovie()));
- mPropertiesA = new QAction(tr("Properties..."), this);
- connect(mPropertiesA, SIGNAL(triggered()), mAVWidget, SLOT(properties()));
- mMoveBurnA = new QAction(tr("Move for burning..."), this);
- connect(mMoveBurnA, SIGNAL(triggered()), mAVWidget, SLOT(moveBurn()));
- mSetDvdA = new QAction(tr("Set DVD No. for selected..."), this);
- connect(mSetDvdA, SIGNAL(triggered()), mAVWidget, SLOT(setDvdNo()));
- mDeleteFromArchiveA = new QAction(tr("Delete from archive..."), this);
- connect(mDeleteFromArchiveA, SIGNAL(triggered()), mAVWidget, SLOT(deleteFromArchive()));
-
//Help menu
QString aboutLabel = QString(tr("About %1...")).arg(qApp->applicationName());
mAboutShemovA = new QAction(aboutLabel, this);
@@ -435,12 +376,16 @@ void SheMov::createActions(){
}
void SheMov::createMenus(){
+ //file menu
QMenu *fileMenu = new QMenu(tr("&File"), this);
fileMenu->addAction(mPlaySelectedFSA);
fileMenu->addSeparator();
fileMenu->addAction(mNewMovieWizardA);
fileMenu->addSeparator();
fileMenu->addAction(mQuitA);
+ menuBar()->addMenu(fileMenu);
+
+ //filesystem edit menu
mEditFSMenu = new QMenu(tr("&Edit"), this);
mEditFSMenu->addAction(mCdupA);
mEditFSMenu->addSeparator();
@@ -453,7 +398,6 @@ void SheMov::createMenus(){
mEditFSMenu->addAction(mCopyA);
mEditFSMenu->addAction(mMoveA);
mEditFSMenu->addAction(mRenameA);
- mEditFSMenu->addAction(mArchiveA);
mRenameMenu = new QMenu(tr("&Rename..."), this);
mRenameMenu->addAction(mTemplateA);
mRenameMenu->addAction(mRenameCoverFA);
@@ -464,22 +408,7 @@ void SheMov::createMenus(){
mEditFSMenu->addAction(mRenameMenuA);
mEditFSMenu->addSeparator();
mEditFSMenu->addAction(mConfigA);
-
- mEditArchiveMenu = new QMenu(tr("&Edit archive"), this);
- mEditArchiveMenu->addAction(mEditArchiveFileA);
- mEditArchiveMenu->addAction(mCopyToPartsA);
- mEditArchiveMenu->addSeparator();
- mEditArchiveMenu->addAction(mPropertiesA);
- mEditArchiveMenu->addSeparator();
- mEditArchiveMenu->addAction(mMoveBurnA);
- mEditArchiveMenu->addAction(mSetDvdA);
- mEditArchiveMenu->addSeparator();
- mEditArchiveMenu->addAction(mDeleteFromArchiveA);
-
- menuBar()->addMenu(fileMenu);
mEditFSMenuA = menuBar()->addMenu(mEditFSMenu);
- mEditArchiveMenuA = menuBar()->addMenu(mEditArchiveMenu);
- mEditArchiveMenuA->setVisible(false);
//TreeView view menu
mTreeViewMenu = new QMenu(tr("View"), this);
@@ -520,67 +449,39 @@ void SheMov::createMenus(){
mFSWidget->fileView()->addAction(mCopyA);
mFSWidget->fileView()->addAction(mMoveA);
mFSWidget->fileView()->addAction(mRenameMenuA);
- QAction *sep4 = new QAction(this);
- sep4->setSeparator(true);
- mFSWidget->fileView()->addAction(sep4);
- mFSWidget->fileView()->addAction(mArchiveA);
-
- //ArchiveViewWidget context menu
- /*mOpenWithMenuAV = new QMenu(tr("Open with"), this);
- mAVWidget->fileView()->addAction(mPlaySelectedAVA);
- createOpenWithMenuAV();
- mOpenWithMenuAVA = new QAction(tr("Open with"), this);
- mOpenWithMenuAVA->setMenu(mOpenWithMenuAV);
- mAVWidget->fileView()->addAction(mOpenWithMenuAVA);
- QAction *sep5 = new QAction(this);
- sep5->setSeparator(true);
- mAVWidget->fileView()->addAction(sep5);*/
- mAVWidget->fileView()->addAction(mEditArchiveFileA);
- mAVWidget->fileView()->addAction(mCopyToPartsA);
- mAVWidget->fileView()->addAction(mAddMovieManuallyA);
- mAVWidget->fileView()->addAction(mDeleteFromArchiveA);
- mAVWidget->fileView()->addAction(mSetDvdA);
- QAction *sep6 = new QAction(this);
- sep6->setSeparator(true);
- mAVWidget->fileView()->addAction(sep6);
- mAVWidget->fileView()->addAction(mMoveBurnA);
- QAction *sep7 = new QAction(this);
- sep7->setSeparator(true);
- mAVWidget->fileView()->addAction(sep7);
- mAVWidget->fileView()->addAction(mPropertiesA);
//ArchiveTreeView context menu
mATree->seriesWidget()->seriesTree()->addAction(mNewSeriesA);
mATree->seriesWidget()->seriesTree()->addAction(mDeleteFromSeriesA);
- QAction *sep8 = new QAction(this);
- sep8->setSeparator(true);
- mATree->seriesWidget()->seriesTree()->addAction(sep8);
+ QAction *sep4 = new QAction(this);
+ sep4->setSeparator(true);
+ mATree->seriesWidget()->seriesTree()->addAction(sep4);
mOpenWithMenuAV = new QMenu(tr("Open with"), this);
mATree->seriesWidget()->seriesTree()->addAction(mPlaySelectedAVA);
createOpenWithMenuAV();
mOpenWithMenuAVA = new QAction(tr("Open with"), this);
mOpenWithMenuAVA->setMenu(mOpenWithMenuAV);
mATree->seriesWidget()->seriesTree()->addAction(mOpenWithMenuAVA);
- QAction *sep9 = new QAction(this);
- sep9->setSeparator(true);
- mATree->seriesWidget()->seriesTree()->addAction(sep9);
+ QAction *sep5 = new QAction(this);
+ sep5->setSeparator(true);
+ mATree->seriesWidget()->seriesTree()->addAction(sep5);
mATree->seriesWidget()->seriesTree()->addAction(mExpandCurrentA);
mATree->seriesWidget()->seriesTree()->addAction(mExpandAllSeriesA);
mATree->seriesWidget()->seriesTree()->addAction(mCollapseAllSeriesA);
- QAction *sep12 = new QAction(this);
- sep12->setSeparator(true);
- mATree->seriesWidget()->seriesTree()->addAction(sep12);
+ QAction *sep6 = new QAction(this);
+ sep6->setSeparator(true);
+ mATree->seriesWidget()->seriesTree()->addAction(sep6);
mATree->seriesWidget()->seriesTree()->addAction(mAddCoverA);
//ArchiveTreeView fileWidget context menu
mATree->filesWidget()->filesTree()->addAction(mMoveToBurnA);
- QAction *sep10 = new QAction(this);
- sep10->setSeparator(true);
- mATree->filesWidget()->filesTree()->addAction(sep10);
+ QAction *sep7 = new QAction(this);
+ sep7->setSeparator(true);
+ mATree->filesWidget()->filesTree()->addAction(sep7);
mATree->filesWidget()->filesTree()->addAction(mSetDvdNoA);
- QAction *sep11 = new QAction(this);
- sep11->setSeparator(true);
- mATree->filesWidget()->filesTree()->addAction(sep11);
+ QAction *sep8 = new QAction(this);
+ sep8->setSeparator(true);
+ mATree->filesWidget()->filesTree()->addAction(sep8);
mATree->filesWidget()->filesTree()->addAction(mDeleteFilesFromTreeA);
}