mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 17:15:32 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'maqifrnswa/feature1325'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-01-02 18:14:42 +01:00
commit bdc28c0523
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/editor.cpp
View file

@ -236,6 +236,7 @@ void CS::Editor::showSettings()
if (mSettings.isHidden())
mSettings.show();
mSettings.move (QCursor::pos());
mSettings.raise();
mSettings.activateWindow();
}

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

@ -104,7 +104,7 @@ void CSVDoc::LoadingDocument::nextRecord (int records)
void CSVDoc::LoadingDocument::abort (const std::string& error)
{
mAborted = true;
mError->setText (QString::fromUtf8 (("Loading failed: " + error).c_str()));
mError->setText (QString::fromUtf8 (("<font color=red>Loading failed: " + error + "</font>").c_str()));
mButtons->setStandardButtons (QDialogButtonBox::Close);
}
@ -199,4 +199,4 @@ void CSVDoc::Loader::loadMessage (CSMDoc::Document *document, const std::string&
if (iter!=mDocuments.end())
iter->second->addMessage (message);
}
}