Merge pull request Mudlet#3398 from Mudlet/release-4.6

Merge release-4.6 branch into development

CI/appveyor.after_success.ps1

@@ -8,7 +8,9 @@ windeployqt.exe --release mudlet.exe
 
 Remove-Item * -include *.cpp, *.o
 
-if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $Env:MUDLET_VERSION_BUILD.StartsWith('-public-test-build')) {
+$public_test_build = if ($Env:MUDLET_VERSION_BUILD) { $public_test_build } else { $FALSE }
+
+if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $public_test_build) {
   cmd /c 7z a Mudlet-%VERSION%%MUDLET_VERSION_BUILD%-windows.zip "%APPVEYOR_BUILD_FOLDER%\src\release\*"
 
   Set-Variable -Name "uri" -Value "https://make.mudlet.org/snapshots/Mudlet-$env:VERSION$env:MUDLET_VERSION_BUILD-windows.zip";
@@ -18,7 +20,7 @@ if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $Env:MUDLET_VERSION_BUILD.Sta
 
   $DEPLOY_URL = Get-Content -Path $outFile -Raw
 } else {
-  if ($Env:MUDLET_VERSION_BUILD.StartsWith('-public-test-build')) {
+  if ($public_test_build) {
     Write-Output "=== Creating a Public Test build ==="
   } else {
     Write-Output "=== Creating a Release build ==="
@@ -45,14 +47,14 @@ if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $Env:MUDLET_VERSION_BUILD.Sta
   Move-Item $Env:APPVEYOR_BUILD_FOLDER\src\release\* $SQUIRRELWINBIN
 
   Write-Output "=== Creating Nuget package ==="
-  if ($Env:MUDLET_VERSION_BUILD.StartsWith('-public-test-build')) {
+  if ($public_test_build) {
     # allow public test builds to be installed side by side with the release builds
     (Get-Content C:\projects\installers\windows\mudlet.nuspec).replace('<id>Mudlet</id>', '<id>Mudlet.PublicTestBuild</id>') | Set-Content C:\projects\installers\windows\mudlet.nuspec
   }
   nuget pack C:\projects\installers\windows\mudlet.nuspec -Version $($Env:VERSION) -BasePath $SQUIRRELWIN -OutputDirectory $SQUIRRELWIN
 
   Write-Output "=== Creating installers from Nuget package ==="
-  if ($Env:MUDLET_VERSION_BUILD.StartsWith('-public-test-build')) {
+  if ($public_test_build) {
     $TestBuildString = ".PublicTestBuild"
   } else {
     $TestBuildString = ""
@@ -72,7 +74,7 @@ if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $Env:MUDLET_VERSION_BUILD.Sta
   Tree C:\projects\squirreloutput
   Write-Output "=== Done printing"
 
-  if ($Env:MUDLET_VERSION_BUILD.StartsWith('-public-test-build')) {
+  if ($public_test_build) {
     Write-Output "=== Uploading public test build to make.mudlet.org ==="
     Set-Variable -Name "uri" -Value "https://make.mudlet.org/snapshots/Mudlet-$env:VERSION$env:MUDLET_VERSION_BUILD-windows.zip";
     Set-Variable -Name "inFile" -Value "${Env:APPVEYOR_BUILD_FOLDER}\src\release\Setup.exe";
@@ -116,7 +118,7 @@ if ("$Env:APPVEYOR_REPO_TAG" -eq "false" -and -Not $Env:MUDLET_VERSION_BUILD.Sta
   dblsqd login -e "https://api.dblsqd.com/v1/jsonrpc" -u "${Env:DBLSQD_USER}" -p "${Env:DBLSQD_PASS}"
 
   Write-Output "=== Registering release with Dblsqd ==="
-  if ($Env:MUDLET_VERSION_BUILD.StartsWith('-public-test-build')) {
+  if ($public_test_build) {
     dblsqd release -a mudlet -c public-test-build -m "(test release message here)" "${Env:MUDLET_VERSION_BUILD}"
     dblsqd push -a mudlet -c public-test-build -r "${Env:MUDLET_VERSION_BUILD}" -s mudlet --type "standalone" --attach win:x86 "${DEPLOY_URL}"
   } else {

CMakeLists.txt

@@ -79,7 +79,7 @@ endif()
 # To insure consistency please ensure the SAME of the first two values are also
 # assigned to the "VERSION" and "BUILD" variables in the native qmake project
 # file, which is NOW called: ./src/mudlet.pro
-set(APP_VERSION 4.5.2)
+set(APP_VERSION 4.6.1)
 if(DEFINED ENV{MUDLET_VERSION_BUILD} AND NOT $ENV{MUDLET_VERSION_BUILD} STREQUAL "")
   set(APP_BUILD $ENV{MUDLET_VERSION_BUILD})
 else()

src/dlgNotepad.cpp

@@ -26,6 +26,7 @@
 
 #include "pre_guard.h"
 #include <QDir>
+#include <QTextCodec>
 #include "post_guard.h"
 
 using namespace std::chrono;

src/lua-function-list.json

@@ -330,6 +330,7 @@
     "setOverline": "setOverline([windowName], boolean)",
     "setPopup": "setPopup(windowName, {lua code}, {hints})",
     "setProfileIcon": "setProfileIcon(iconPath)",
+    "setProfileStyleSheet": "setProfileStyleSheet(stylesheet)",
     "setReverse": "setReverse([windowName], boolean)",
     "setRoomArea": "setRoomArea(roomID, newAreaID or newAreaName)",
     "setRoomChar": "setRoomChar(roomID, character)",
@@ -397,7 +398,7 @@
     "unHighlightRoom": "unHighlightRoom(roomID)",
     "uninstallModule": "uninstallModule(name)",
     "uninstallPackage": "uninstallPackage(name)",
-    "unzip": "unzip(path,location)",
+    "unzipAsync": "unzipAsync(path, location)",
     "updateMap": "updateMap()",
     "wrapLine": "wrapLine(windowName, lineNumber)"
 }

src/mudlet-lua/lua/geyser/GeyserContainer.lua

@@ -160,18 +160,12 @@ function Geyser.Container:show (auto)
   else
     self.hidden = false
   end
-  -- If my container is hidden I stay hidden and put my setting to auto_hidden
-  if self.container.hidden or self.container.auto_hidden then
-    self.auto_hidden = true 
-    return false 
-  end
   if not self.hidden and not self.auto_hidden then
     self:show_impl()
   end
   for _, v in pairs(self.windowList) do
     v:show(true)
   end
-  return true
 end
 
 function Geyser.Container:show_impl()

src/mudlet-lua/lua/geyser/GeyserLabel.lua

@@ -609,9 +609,16 @@ function Geyser.Label:new (cons, container)
   setmetatable(me, self)
   self.__index = self
   me.windowname = me.windowname or me.container.windowname or "main"
-  -- Create the label using primitives
-  createLabel(me.windowname, me.name, me:get_x(), me:get_y(),
-  me:get_width(), me:get_height(), me.fillBg)
+
+  -- workaround for createLabel possibly being overwritten and not understanding the new parent argument
+  -- see https://github.com/Mudlet/Mudlet/issues/3393
+  if me.windowname == "main" then
+    createLabel(me.name, me:get_x(), me:get_y(),
+      me:get_width(), me:get_height(), me.fillBg)
+  else
+    createLabel(me.windowname, me.name, me:get_x(), me:get_y(),
+      me:get_width(), me:get_height(), me.fillBg)
+  end
 
   -- parse any given format string and set sensible defaults
   me:processFormatString(cons.format)
@@ -686,10 +693,10 @@ function Geyser.Label:new (cons, container)
   if me.onLeave then
     me:setOnLeave(me.onLeave, me.args)
   end
-  
+
   -- Set clickthrough if included in constructor
   if cons.clickthrough then me:enableClickthrough() end
-  
+
   --print("  New in " .. self.name .. " : " .. me.name)
   return me
 end

src/mudlet.pro

@@ -99,7 +99,7 @@ TEMPLATE = app
 ########################## Version and Build setting ###########################
 # Set the current Mudlet Version, unfortunately the Qt documentation suggests
 # that only a #.#.# form without any other alphanumberic suffixes is required:
-VERSION = 4.5.2
+VERSION = 4.6.1
 
 # if you are distributing modified code, it would be useful if you
 # put something distinguishing into the MUDLET_VERSION_BUILD environment
@@ -737,6 +737,7 @@ LUA_GEYSER.files = \
     $${PWD}/mudlet-lua/lua/geyser/GeyserReposition.lua \
     $${PWD}/mudlet-lua/lua/geyser/GeyserSetConstraints.lua \
     $${PWD}/mudlet-lua/lua/geyser/GeyserTests.lua \
+    $${PWD}/mudlet-lua/lua/geyser/GeyserUserWindow.lua \
     $${PWD}/mudlet-lua/lua/geyser/GeyserUtil.lua \
     $${PWD}/mudlet-lua/lua/geyser/GeyserVBox.lua \
     $${PWD}/mudlet-lua/lua/geyser/GeyserWindow.lua