teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

improved layout of loading window

Browse source
This commit is contained in:
Marc Zinnschlag 2014-05-10 13:29:28 +02:00
parent 95d24492de
commit 79d59153c1
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/opencs/view/doc/loader.cpp
View file

@ -18,20 +18,22 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
} }
CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document) CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
: mDocument (document), mAborted (false) : mDocument (document), mAborted (false), mMessages (0)
{ {
setWindowTitle (("Opening " + document->getSavePath().filename().string()).c_str()); setWindowTitle (("Opening " + document->getSavePath().filename().string()).c_str());
QVBoxLayout *layout = new QVBoxLayout (this); setMinimumWidth (400);
mLayout = new QVBoxLayout (this);
// file progress // file progress
mFile = new QLabel (this); mFile = new QLabel (this);
layout->addWidget (mFile); mLayout->addWidget (mFile);
mFileProgress = new QProgressBar (this); mFileProgress = new QProgressBar (this);
layout->addWidget (mFileProgress); mLayout->addWidget (mFileProgress);
int size = static_cast<int> (document->getContentFiles().size())+1; int size = static_cast<int> (document->getContentFiles().size())+1;
if (document->isNew()) if (document->isNew())
@ -43,11 +45,11 @@ CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
mFileProgress->setValue (0); mFileProgress->setValue (0);
// record progress // record progress
layout->addWidget (new QLabel ("Records", this)); mLayout->addWidget (new QLabel ("Records", this));
mRecordProgress = new QProgressBar (this); mRecordProgress = new QProgressBar (this);
layout->addWidget (mRecordProgress); mLayout->addWidget (mRecordProgress);
mRecordProgress->setMinimum (0); mRecordProgress->setMinimum (0);
mRecordProgress->setTextVisible (true); mRecordProgress->setTextVisible (true);
@ -57,19 +59,14 @@ CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
mError = new QLabel (this); mError = new QLabel (this);
mError->setWordWrap (true); mError->setWordWrap (true);
layout->addWidget (mError); mLayout->addWidget (mError);
// other messages
mMessages = new QListWidget (this);
layout->addWidget (mMessages);
// buttons // buttons
mButtons = new QDialogButtonBox (QDialogButtonBox::Cancel, Qt::Horizontal, this); mButtons = new QDialogButtonBox (QDialogButtonBox::Cancel, Qt::Horizontal, this);
layout->addWidget (mButtons); mLayout->addWidget (mButtons);
setLayout (layout); setLayout (mLayout);
move (QCursor::pos()); move (QCursor::pos());
@ -105,6 +102,12 @@ void CSVDoc::LoadingDocument::abort (const std::string& error)
void CSVDoc::LoadingDocument::addMessage (const std::string& message) void CSVDoc::LoadingDocument::addMessage (const std::string& message)
{ {
if (!mMessages)
{
mMessages = new QListWidget (this);
mLayout->insertWidget (4, mMessages);
}
new QListWidgetItem (QString::fromUtf8 (message.c_str()), mMessages); new QListWidgetItem (QString::fromUtf8 (message.c_str()), mMessages);
} }

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

@ -11,6 +11,7 @@ class QLabel;
class QProgressBar; class QProgressBar;
class QDialogButtonBox; class QDialogButtonBox;
class QListWidget; class QListWidget;
class QVBoxLayout;
namespace CSMDoc namespace CSMDoc
{ {
@ -31,6 +32,7 @@ namespace CSVDoc
QDialogButtonBox *mButtons; QDialogButtonBox *mButtons;
QLabel *mError; QLabel *mError;
QListWidget *mMessages; QListWidget *mMessages;
QVBoxLayout *mLayout;
private: private: