Merge remote-tracking branch 'maqifrnswa/feature1325'

apps/opencs/editor.cpp

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

apps/opencs/view/doc/loader.cpp

@@ -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);
-}
+}