- added hooks for getFileVersion* functions

- automatic donwload retry
- support for storing multiple download urls
- improved "query info" functionality
- some cleanup to download manager code
- external fomod installer dialog are now brought to front
- added shell... functions to have windows handle problematic situations
- added visual clue when filters are active
- esps are now automatically activated when installing a mod
- added option to never endorse a mod
- added "previous" and "next" buttons to mod info dialog
- improved the way messagedialog text is shortened
- coloring in mod info dialog now visible in other color schemes
- plugin list is now saved automatically
- vanilla bsas are now enabled even if they are not listed in the ini file
- bugfix: setting mod to maximum now doesn't try to place the mod below overwrite

1 files changed, 138 insertions, 138 deletions

diff --git a/src/logbuffer.cpp b/src/logbuffer.cpp
index 6a1857fc..c891f4c5 100644
--- a/src/logbuffer.cpp
+++ b/src/logbuffer.cpp
@@ -17,141 +17,141 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "logbuffer.h"

-#include "report.h"

-#include <QMutexLocker>

-#include <QFile>

-#include <Windows.h>

-

-QScopedPointer<LogBuffer> LogBuffer::s_Instance;

-QMutex LogBuffer::s_Mutex;

-

-

-LogBuffer::LogBuffer(int messageCount, QtMsgType minMsgType, const QString &outputFileName)

-  : QObject(NULL), m_OutFileName(outputFileName), m_ShutDown(false),

-    m_MinMsgType(minMsgType), m_NumMessages(0)

-{

-  m_Messages.resize(messageCount);

-}

-

-LogBuffer::~LogBuffer()

-{

-#if QT_VERSION >= 0x050000

-  qInstallMessageHandler(0);

-#else

-  qInstallMsgHandler(0);

-#endif

-  if (!m_ShutDown) {

-    write();

-  }

-}

-

-

-void LogBuffer::logMessage(QtMsgType type, const QString &message)

-{

-  if (type >= m_MinMsgType) {

-    m_Messages.at(m_NumMessages % m_Messages.size()) = message;

-    ++m_NumMessages;

-    if (type >= QtCriticalMsg) {

-      write();

-    }

-  }

-}

-

-

-void LogBuffer::write() const

-{

-  if (m_NumMessages == 0) {

-    return;

-  }

-

-  QFile file(m_OutFileName);

-  if (!file.open(QIODevice::WriteOnly)) {

-    reportError(tr("failed to write log to %1: %2").arg(m_OutFileName).arg(file.errorString()));

-    return;

-  }

-

-  unsigned int i = (m_NumMessages > m_Messages.size()) ? m_NumMessages - m_Messages.size()

-                                                       : 0U;

-  for (; i < m_NumMessages; ++i) {

-    file.write(m_Messages.at(i % m_Messages.size()).toUtf8());

-    file.write("\r\n");

-  }

-}

-

-

-void LogBuffer::init(int messageCount, QtMsgType minMsgType, const QString &outputFileName)

-{

-  QMutexLocker guard(&s_Mutex);

-

-  if (!s_Instance.isNull()) {

-    s_Instance.reset();

-  }

-  s_Instance.reset(new LogBuffer(messageCount, minMsgType, outputFileName));

-#if QT_VERSION >= 0x050000

-  qInstallMessageHandler(LogBuffer::log);

-#else

-  qInstallMsgHandler(LogBuffer::log);

-#endif

-}

-

-#if QT_VERSION >= 0x050000

-

-void LogBuffer::log(QtMsgType type, const QMessageLogContext &context, const QString &message)

-{

-  QMutexLocker guard(&s_Mutex);

-  if (!s_Instance.isNull()) {

-    s_Instance->logMessage(type, message);

-  }

-  fprintf(stdout, "(%s:%u, %s) %s\n", context.file, context.line, context.function, message.toLocal8Bit());

-  fflush(stdout);

-}

-

-#else

-

-void LogBuffer::log(QtMsgType type, const char *message)

-{

-  QMutexLocker guard(&s_Mutex);

-  if (!s_Instance.isNull()) {

-    s_Instance->logMessage(type, message);

-  }

-  fprintf(stdout, "%s\n", message);

-  fflush(stdout);

-}

-

-#endif

-

-void LogBuffer::writeNow()

-{

-  QMutexLocker guard(&s_Mutex);

-  if (!s_Instance.isNull()) {

-    s_Instance->write();

-  }

-}

-

-

-void LogBuffer::cleanQuit()

-{

-  QMutexLocker guard(&s_Mutex);

-  if (!s_Instance.isNull()) {

-    s_Instance->m_ShutDown = true;

-  }

-}

-

-void log(const char *format, ...)

-{

-  va_list argList;

-  va_start(argList, format);

-

-  static const int BUFFERSIZE = 1000;

-

-  char buffer[BUFFERSIZE + 1];

-  buffer[BUFFERSIZE] = '\0';

-

-  vsnprintf(buffer, BUFFERSIZE, format, argList);

-

-  qCritical("%s", buffer);

-

-  va_end(argList);

-}

-

+#include "logbuffer.h"
+#include "report.h"
+#include <QMutexLocker>
+#include <QFile>
+#include <Windows.h>
+
+QScopedPointer<LogBuffer> LogBuffer::s_Instance;
+QMutex LogBuffer::s_Mutex;
+
+
+LogBuffer::LogBuffer(int messageCount, QtMsgType minMsgType, const QString &outputFileName)
+  : QObject(NULL), m_OutFileName(outputFileName), m_ShutDown(false),
+    m_MinMsgType(minMsgType), m_NumMessages(0)
+{
+  m_Messages.resize(messageCount);
+}
+
+LogBuffer::~LogBuffer()
+{
+#if QT_VERSION >= 0x050000
+  qInstallMessageHandler(0);
+#else
+  qInstallMsgHandler(0);
+#endif
+//  if (!m_ShutDown) {
+    write();
+//  }
+}
+
+
+void LogBuffer::logMessage(QtMsgType type, const QString &message)
+{
+  if (type >= m_MinMsgType) {
+    m_Messages.at(m_NumMessages % m_Messages.size()) = message;
+    ++m_NumMessages;
+    if (type >= QtCriticalMsg) {
+      write();
+    }
+  }
+}
+
+
+void LogBuffer::write() const
+{
+  if (m_NumMessages == 0) {
+    return;
+  }
+
+  QFile file(m_OutFileName);
+  if (!file.open(QIODevice::WriteOnly)) {
+    reportError(tr("failed to write log to %1: %2").arg(m_OutFileName).arg(file.errorString()));
+    return;
+  }
+
+  unsigned int i = (m_NumMessages > m_Messages.size()) ? m_NumMessages - m_Messages.size()
+                                                       : 0U;
+  for (; i < m_NumMessages; ++i) {
+    file.write(m_Messages.at(i % m_Messages.size()).toUtf8());
+    file.write("\r\n");
+  }
+}
+
+
+void LogBuffer::init(int messageCount, QtMsgType minMsgType, const QString &outputFileName)
+{
+  QMutexLocker guard(&s_Mutex);
+
+  if (!s_Instance.isNull()) {
+    s_Instance.reset();
+  }
+  s_Instance.reset(new LogBuffer(messageCount, minMsgType, outputFileName));
+#if QT_VERSION >= 0x050000
+  qInstallMessageHandler(LogBuffer::log);
+#else
+  qInstallMsgHandler(LogBuffer::log);
+#endif
+}
+
+#if QT_VERSION >= 0x050000
+
+void LogBuffer::log(QtMsgType type, const QMessageLogContext &context, const QString &message)
+{
+  QMutexLocker guard(&s_Mutex);
+  if (!s_Instance.isNull()) {
+    s_Instance->logMessage(type, message);
+  }
+  fprintf(stdout, "(%s:%u, %s) %s\n", context.file, context.line, context.function, message.toLocal8Bit());
+  fflush(stdout);
+}
+
+#else
+
+void LogBuffer::log(QtMsgType type, const char *message)
+{
+  QMutexLocker guard(&s_Mutex);
+  if (!s_Instance.isNull()) {
+    s_Instance->logMessage(type, message);
+  }
+  fprintf(stdout, "%s\n", message);
+  fflush(stdout);
+}
+
+#endif
+
+void LogBuffer::writeNow()
+{
+  QMutexLocker guard(&s_Mutex);
+  if (!s_Instance.isNull()) {
+    s_Instance->write();
+  }
+}
+
+
+void LogBuffer::cleanQuit()
+{
+  QMutexLocker guard(&s_Mutex);
+  if (!s_Instance.isNull()) {
+    s_Instance->m_ShutDown = true;
+  }
+}
+
+void log(const char *format, ...)
+{
+  va_list argList;
+  va_start(argList, format);
+
+  static const int BUFFERSIZE = 1000;
+
+  char buffer[BUFFERSIZE + 1];
+  buffer[BUFFERSIZE] = '\0';
+
+  vsnprintf(buffer, BUFFERSIZE, format, argList);
+
+  qCritical("%s", buffer);
+
+  va_end(argList);
+}
+