mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 07:53:53 +00:00
Code Issues Releases Wiki Activity

added basic loading GUI

Browse source
This commit is contained in:
Marc Zinnschlag 2014-04-29 14:17:25 +02:00
parent ddb0496dca
commit 5f1d2f72f6
9 changed files with 111 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/CMakeLists.txt
View file

@ -44,7 +44,7 @@ opencs_units_noqt (model/tools
opencs_units (view/doc
viewmanager view operations operation subview startup filedialog newgame
filewidget adjusterwidget
filewidget adjusterwidget loader
)

7
apps/opencs/model/doc/documentmanager.cpp
View file

@ -27,8 +27,8 @@ CSMDoc::DocumentManager::DocumentManager (const Files::ConfigurationManager& con
this, SLOT (documentLoaded (Document *)));
connect (&mLoader, SIGNAL (documentNotLoaded (Document *, const std::string&)),
this, SLOT (documentNotLoaded (Document *, const std::string&)));
connect (this, SIGNAL (loadRequest (Document *, bool)),
&mLoader, SLOT (loadDocument (Document *, bool)));
connect (this, SIGNAL (loadRequest (CSMDoc::Document *, bool)),
&mLoader, SLOT (loadDocument (CSMDoc::Document *, bool)));
}
CSMDoc::DocumentManager::~DocumentManager()
@ -75,10 +75,11 @@ void CSMDoc::DocumentManager::setResourceDir (const boost::filesystem::path& par
void CSMDoc::DocumentManager::documentLoaded (Document *document)
{
emit documentAdded (document);
emit loadingStopped (document, true, "");
}
void CSMDoc::DocumentManager::documentNotLoaded (Document *document, const std::string& error)
{
// emit loadingStopped (document, false, error);
removeDocument (document);
/// \todo report error
}

5
apps/opencs/model/doc/documentmanager.hpp
View file

@ -65,9 +65,12 @@ namespace CSMDoc
void documentAdded (CSMDoc::Document *document);
void loadRequest (Document *document, bool _new);
void loadRequest (CSMDoc::Document *document, bool _new);
void lastDocumentDeleted();
void loadingStopped (CSMDoc::Document *document, bool completed,
const std::string& error);
};
}

2
apps/opencs/model/doc/loader.cpp
View file

@ -46,7 +46,7 @@ void CSMDoc::Loader::load()
}
}
void CSMDoc::Loader::loadDocument (Document *document, bool new_)
void CSMDoc::Loader::loadDocument (CSMDoc::Document *document, bool new_)
{
mDocuments.push_back (std::make_pair (document, new_));
}

2
apps/opencs/model/doc/loader.hpp
View file

@ -31,7 +31,7 @@ namespace CSMDoc
public slots:
void loadDocument (Document *document, bool new_);
void loadDocument (CSMDoc::Document *document, bool new_);
///< The ownership of \a document is not transferred.
/// \param new_ Do not load the last content file in the files list specified in
/// \a document and instead create it in an appropriate way.

44
apps/opencs/view/doc/loader.cpp Normal file
View file

@ -0,0 +1,44 @@
#include "loader.hpp"
#include "../../model/doc/document.hpp"
CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
{
setWindowTitle (("Loading " + document->getSavePath().filename().string()).c_str());
show();
}
CSVDoc::Loader::Loader()
{
}
CSVDoc::Loader::~Loader()
{
for (std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter (mDocuments.begin());
iter!=mDocuments.end(); ++iter)
delete iter->second;
}
void CSVDoc::Loader::add (CSMDoc::Document *document, bool new_)
{
mDocuments.insert (std::make_pair (document, new LoadingDocument (document)));
}
void CSVDoc::Loader::loadingStopped (CSMDoc::Document *document, bool completed,
const std::string& error)
{
if (completed || error.empty())
{
for (std::map<CSMDoc::Document *, LoadingDocument *>::iterator iter (mDocuments.begin());
iter!=mDocuments.end(); ++iter)
if (iter->first==document)
{
delete iter->second;
mDocuments.erase (iter);
break;
}
}
}

46
apps/opencs/view/doc/loader.hpp Normal file
View file

@ -0,0 +1,46 @@
#ifndef CSV_DOC_LOADER_H
#define CSV_DOC_LOADER_H
#include <map>
#include <QObject>
#include <QWidget>
namespace CSMDoc
{
class Document;
}
namespace CSVDoc
{
class LoadingDocument : public QWidget
{
Q_OBJECT
public:
LoadingDocument (CSMDoc::Document *document);
};
class Loader : public QObject
{
Q_OBJECT
std::map<CSMDoc::Document *, LoadingDocument *> mDocuments;
public:
Loader();
virtual ~Loader();
public slots:
void add (CSMDoc::Document *document, bool new_);
void loadingStopped (CSMDoc::Document *document, bool completed,
const std::string& error);
};
}
#endif

7
apps/opencs/view/doc/viewmanager.cpp
View file

@ -86,6 +86,13 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
connect (&CSMSettings::UserSettings::instance(), SIGNAL (signalUpdateEditorSetting (const QString &, const QString &)),
this, SLOT (slotUpdateEditorSetting (const QString &, const QString &)));
connect (&mDocumentManager, SIGNAL (loadRequest (CSMDoc::Document *, bool)),
&mLoader, SLOT (add (CSMDoc::Document *, bool)));
connect (
&mDocumentManager, SIGNAL (loadingStopped (CSMDoc::Document *, bool, const std::string&)),
&mLoader, SLOT (loadingStopped (CSMDoc::Document *, bool, const std::string&)));
}
CSVDoc::ViewManager::~ViewManager()

3
apps/opencs/view/doc/viewmanager.hpp
View file

@ -5,6 +5,8 @@
#include <QObject>
#include "loader.hpp"
namespace CSMDoc
{
class Document;
@ -29,6 +31,7 @@ namespace CSVDoc
CSVWorld::CommandDelegateFactoryCollection *mDelegateFactories;
bool mExitOnSaveStateChange;
bool mUserWarned;
Loader mLoader;
// not implemented
ViewManager (const ViewManager&);