Merge pull request #4 from ModOrganizer2/Develop

Stage for release 2.2.2

.gitignore

@@ -0,0 +1,5 @@
+edit
+CMakeLists.txt.user
+/msbuild.log
+/*std*.log
+/*build

CMakeLists.txt

@@ -0,0 +1,14 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+
+ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)
+
+SET(PROJ_NAME preview_base)
+
+PROJECT(${PROJ_NAME})
+
+SET(DEPENDENCIES_DIR CACHE PATH "")
+
+# hint to find qt in dependencies path
+LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
+
+ADD_SUBDIRECTORY(src)

src/CMakeLists.txt

@@ -0,0 +1,54 @@
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11)
+
+CMAKE_POLICY(SET CMP0020 NEW)
+CMAKE_POLICY(SET CMP0043 NEW)
+
+FILE(GLOB ${PROJ_NAME}_SRCS *.cpp)
+FILE(GLOB ${PROJ_NAME}_HDRS *.h)
+FILE(GLOB ${PROJ_NAME}_FORMS *.ui)
+
+
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+SET(CMAKE_AUTOMOC ON)
+SET(CMAKE_AUTOUIC ON)
+FIND_PACKAGE(Qt5Widgets REQUIRED)
+QT5_WRAP_UI(${PROJ_NAME}_UIHDRS ${${PROJ_NAME}_FORMS})
+FIND_PACKAGE(Qt5LinguistTools)
+QT5_CREATE_TRANSLATION(${PROJ_NAME}_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/${PROJ_NAME}_en.ts)
+
+SET(Boost_USE_STATIC_LIBS        ON)
+SET(Boost_USE_MULTITHREADED      ON)
+SET(Boost_USE_STATIC_RUNTIME    OFF)
+FIND_PACKAGE(Boost)
+
+IF (Boost_FOUND)
+  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+ENDIF (Boost_FOUND)
+
+SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
+GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
+
+SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
+SET(lib_path "${project_path}/../../install/libs")
+
+
+INCLUDE_DIRECTORIES(${project_path}/uibase/src)
+LINK_DIRECTORIES(${lib_path})
+
+
+ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS} ${${PROJ_NAME}_UIHDRS} ${${PROJ_NAME}_translations_qm})
+TARGET_LINK_LIBRARIES(${PROJ_NAME}
+                      Qt5::Widgets
+                      ${Boost_LIBRARIES}
+                      uibase)
+
+SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS /GL)
+SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /LARGEADDRESSAWARE /OPT:REF /OPT:ICF")
+
+###############
+## Installation
+
+INSTALL(TARGETS ${PROJ_NAME}
+        RUNTIME DESTINATION bin/plugins)
+INSTALL(FILES $<TARGET_PDB_FILE:${PROJ_NAME}>
+        DESTINATION pdb)

src/SConscript

@@ -0,0 +1,11 @@
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.AppendUnique(CPPDEFINES = [ 'PREVIEWBASE_LIBRARY' ])
+
+lib = env.SharedLibrary('previewBase', env.Glob('*.cpp'))
+env.InstallModule(lib)
+
+res = env['QT_USED_MODULES']
+Return('res')

src/previewBase.pro

@@ -10,9 +10,7 @@ TEMPLATE = lib
 CONFIG += plugins
 CONFIG += dll
 
-contains(QT_VERSION, "^5.*") {
-	QT += widgets
-}
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets gui
 
 DEFINES += PREVIEWBASE_LIBRARY
 
@@ -24,4 +22,5 @@ HEADERS += previewbase.h
 include(../plugin_template.pri)
 
 OTHER_FILES += \
-    previewbase.json
+    previewbase.json\
+    SConscript

src/preview_base_en.ts

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+<context>
+    <name>PreviewBase</name>
+    <message>
+        <location filename="previewbase.cpp" line="77"/>
+        <source>Supports previewing various types of data files</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

src/previewbase.cpp

@@ -25,6 +25,8 @@ along with Base Preview plugin.  If not, see <http://www.gnu.org/licenses/>.
 #include <QLabel>
 #include <QTextEdit>
 #include <QtPlugin>
+#include <QApplication>
+#include <QDesktopWidget>
 
 
 using namespace MOBase;
@@ -36,11 +38,22 @@ PreviewBase::PreviewBase()
   auto imageReader = std::bind(&PreviewBase::genImagePreview, this, std::placeholders::_1, std::placeholders::_2);
 
   foreach (const QByteArray &fileType, QImageReader::supportedImageFormats()) {
-    m_PreviewGenerators[QString(fileType).toLower()] = imageReader;
+    auto strFileType = QString(fileType).toLower();
+
+    // skip dds as that one is handled by the dds preview plugin.
+    if (strFileType == "dds")
+      continue;
+
+    m_PreviewGenerators[strFileType] = imageReader;
   }
 
-  m_PreviewGenerators["txt"]
-    = std::bind(&PreviewBase::genTxtPreview, this, std::placeholders::_1, std::placeholders::_2);
+  auto textReader = std::bind(&PreviewBase::genTxtPreview, this, std::placeholders::_1, std::placeholders::_2);
+  m_PreviewGenerators["txt"]  = textReader;
+  m_PreviewGenerators["ini"]  = textReader;
+  m_PreviewGenerators["json"] = textReader;
+  m_PreviewGenerators["log"]  = textReader;
+  m_PreviewGenerators["cfg"]  = textReader;
+
 
 }
 
@@ -51,7 +64,7 @@ bool PreviewBase::init(MOBase::IOrganizer*)
 
 QString PreviewBase::name() const
 {
-  return tr("Preview Base");
+  return "Preview Base";
 }
 
 QString PreviewBase::author() const
@@ -66,7 +79,7 @@ QString PreviewBase::description() const
 
 MOBase::VersionInfo PreviewBase::version() const
 {
-  return VersionInfo(0, 1, 0, VersionInfo::RELEASE_BETA);
+  return VersionInfo(1, 1, 0, VersionInfo::RELEASE_FINAL);
 }
 
 bool PreviewBase::isActive() const
@@ -82,7 +95,7 @@ QList<MOBase::PluginSetting> PreviewBase::settings() const
 std::set<QString> PreviewBase::supportedExtensions() const
 {
   std::set<QString> extensions;
-  foreach (const auto &generator, m_PreviewGenerators) {
+  for (const auto &generator : m_PreviewGenerators) {
     extensions.insert(generator.first);
   }
 
@@ -91,7 +104,7 @@ std::set<QString> PreviewBase::supportedExtensions() const
 
 QWidget *PreviewBase::genFilePreview(const QString &fileName, const QSize &maxSize) const
 {
-  auto iter = m_PreviewGenerators.find(QFileInfo(fileName).completeSuffix().toLower());
+  auto iter = m_PreviewGenerators.find(QFileInfo(fileName).suffix().toLower());
   if (iter != m_PreviewGenerators.end()) {
     return iter->second(fileName, maxSize);
   } else {
@@ -102,7 +115,16 @@ QWidget *PreviewBase::genFilePreview(const QString &fileName, const QSize &maxSi
 QWidget *PreviewBase::genImagePreview(const QString &fileName, const QSize&) const
 {
   QLabel *label = new QLabel();
-  label->setPixmap(QPixmap(fileName));
+  QPixmap pic = QPixmap(fileName);
+  QSize screenSize = QApplication::desktop()->screenGeometry().size();
+  // ensure the output image is no more than 80% of the screen height.
+  // If the aspect ratio is higher than that of the screen this would still allow the image to extend
+  // beyond the screen but it ensures you can drag the window and close it
+  int maxHeight = static_cast<int>(screenSize.height() * 0.8f);
+  if (pic.size().height() > maxHeight) {
+    pic = pic.scaledToHeight(maxHeight, Qt::SmoothTransformation);
+  }
+  label->setPixmap(pic);
   return label;
 }
 

src/previewbase_global.h

@@ -1,12 +0,0 @@
-#ifndef PREVIEWBASE_GLOBAL_H
-#define PREVIEWBASE_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(PREVIEWBASE_LIBRARY)
-#  define PREVIEWBASESHARED_EXPORT Q_DECL_EXPORT
-#else
-#  define PREVIEWBASESHARED_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // PREVIEWBASE_GLOBAL_H