Merge pull request #7 from ModOrganizer2/Develop

Stage for Release 2.2.0

CMakeLists.txt

@@ -10,10 +10,6 @@ SET(DEPENDENCIES_DIR CACHE PATH "")
 
 LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
 
-#FILE(GLOB_RECURSE PYTHON_ROOT ${DEPENDENCIES_DIR}/Python*/python.vcxproj)
-FILE(GLOB_RECURSE PYTHON_ROOT ${DEPENDENCIES_DIR}/pyconfig.h.in)
-GET_FILENAME_COMPONENT(PYTHON_ROOT ${PYTHON_ROOT} DIRECTORY)
-
 MESSAGE(${PYTHON_ROOT})
 
 ADD_SUBDIRECTORY(src)

appveyor.yml

@@ -0,0 +1,23 @@
+version: 1.0.{build}
+skip_branch_with_pr: true
+image: Visual Studio 2017
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw=
+build_script:
+- cmd: >-
+    git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null
+
+    mkdir c:\projects\modorganizer-build -type directory
+
+    cd c:\projects\modorganizer-umbrella
+
+    C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME%
+on_success:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 success $env:WEBHOOK_URL
+on_failure:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 failure $env:WEBHOOK_URL

src/CMakeLists.txt

@@ -5,7 +5,7 @@ FIND_PACKAGE(Qt5LinguistTools)
 INCLUDE(PyQt5TranslationMacros.cmake)
 PYQT5_CREATE_TRANSLATION(configurator_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/pyCfg_en.ts)
 
-SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
+SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super")
 GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
 
 SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")

src/pyCfg.py

@@ -394,10 +394,12 @@ class IniEdit(mobase.IPluginTool):
         return mobase.VersionInfo(1, 1, 0, 0)
 
     def isActive(self):
-        return True
+        return self.__organizer.pluginSetting(self.name(), "enabled");
 
     def settings(self):
-        return []
+        return [
+          mobase.PluginSetting("enabled", self.__tr("Enable plugin"), False)
+          ]
 
     def displayName(self):
         return self.__tr("Configurator")

src/pyCfg_en.ts

@@ -3,103 +3,108 @@
 <context>
     <name>IniEdit</name>
     <message>
-        <location filename="pyCfg.py" line="392"/>
+        <location filename="pyCfg.py" line="391"/>
         <source>Plugin to allow easier customization of game settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="404"/>
+        <location filename="pyCfg.py" line="405"/>
         <source>Configurator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="407"/>
+        <location filename="pyCfg.py" line="408"/>
         <source>Modify game Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="473"/>
+        <location filename="pyCfg.py" line="474"/>
         <source>unexpected section {0} in {1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="481"/>
+        <location filename="pyCfg.py" line="482"/>
         <source>unknown ini setting {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="486"/>
+        <location filename="pyCfg.py" line="487"/>
         <source>{0} in wrong ini file ({1}, should be {2})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="503"/>
+        <location filename="pyCfg.py" line="504"/>
         <source>Invalid configuration file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="503"/>
+        <location filename="pyCfg.py" line="504"/>
         <source>Your configuration files contains an invalid value: {0}={1} (in section {2}).
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="503"/>
+        <location filename="pyCfg.py" line="504"/>
         <source>Please note that the game probably won&apos;t report an error, it will just ignore this setting.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="503"/>
+        <location filename="pyCfg.py" line="504"/>
         <source>Please note that even if someone told you to use this setting, that doesn&apos;t mean they know what they&apos;re talking about.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="503"/>
+        <location filename="pyCfg.py" line="504"/>
         <source>BUT, if you know for a fact this is a valid setting, then please contact me at sherb@gmx.net.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="pyCfg.py" line="401"/>
+        <source>Enable plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="pyCfg.py" line="110"/>
+        <location filename="pyCfg.py" line="109"/>
         <source>Unsaved changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="110"/>
+        <location filename="pyCfg.py" line="109"/>
         <source>There are unsaved changes. Do you want to save before closing the dialog?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="126"/>
+        <location filename="pyCfg.py" line="125"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="126"/>
+        <location filename="pyCfg.py" line="125"/>
         <source>Basic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="216"/>
+        <location filename="pyCfg.py" line="215"/>
         <source>true</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="216"/>
+        <location filename="pyCfg.py" line="215"/>
         <source>false</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="302"/>
+        <location filename="pyCfg.py" line="301"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pyCfg.py" line="355"/>
+        <location filename="pyCfg.py" line="354"/>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>