From 9dc2528dfdb04f18641602cfd24c09cb9b119107 Mon Sep 17 00:00:00 2001 From: Arno Date: Mon, 8 Jul 2013 22:09:36 +0200 Subject: Make new archive work Well, this is a huge commit. Should be severals, but who knew... First and foremost feature: Make NewMovieWizard work with the experimental model. This change obsoleted a lot of code. Also, the old archive won't work with with the new Wizward... There are most probably many other features I forgot about. --- smglobals.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'smglobals.cpp') diff --git a/smglobals.cpp b/smglobals.cpp index 9946e28..16c1e50 100644 --- a/smglobals.cpp +++ b/smglobals.cpp @@ -31,6 +31,7 @@ #include "picfilesmodel.h" #include "configurationdialog.h" #include "framecache.h" +#include "archivecontroller.h" SmGlobals *SmGlobals::mInstance = 0; @@ -142,7 +143,7 @@ QSize SmGlobals::cursorSize() { return mCursorSize; } -SmGlobals::SmGlobals() : mPictureViewer(0), mFrameCache(0){ +SmGlobals::SmGlobals() : mPictureViewer(0), mFrameCache(0), mArchiveController(0){ mIcons.insert("Dildo", ":/dildo.png"); mIcons.insert("Dick to left", ":/back_dick.png"); mIcons.insert("Dick pointing up", ":/up_dick.png"); @@ -175,4 +176,8 @@ SmGlobals::SmGlobals() : mPictureViewer(0), mFrameCache(0){ mIcons.insert("Used tampon", ":/used_tampon.png"); mIcons.insert("Clean tampon", ":/clean_tampon.png"); mDvdSize = Q_INT64_C(4707319808) - 20 * 1024 *1024; + mFiletypeMap.insert(ArchiveFilesModel::Movie, tr("Movie")); + mFiletypeMap.insert(ArchiveFilesModel::FrontCover, tr("Front Cover")); + mFiletypeMap.insert(ArchiveFilesModel::BackCover, tr("Back Cover")); + mFiletypeMap.insert(ArchiveFilesModel::GeneralCover, tr("General Cover")); } -- cgit v1.2.3-70-g09d2