From 8dfad11b7a1658ea03cfa2c85cb12991c87664ec Mon Sep 17 00:00:00 2001 From: lainz Date: Fri, 10 Apr 2020 10:08:33 -0300 Subject: [PATCH 1/3] fix dll name in windows setup script --- lazpaint/release/windows/lazpaint.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lazpaint/release/windows/lazpaint.iss b/lazpaint/release/windows/lazpaint.iss index 02246afb..84c77d86 100644 --- a/lazpaint/release/windows/lazpaint.iss +++ b/lazpaint/release/windows/lazpaint.iss @@ -98,7 +98,7 @@ Source: "{#ReleaseDir}lazpaint_x64.exe"; DestDir: "{app}"; DestName: "{#MyAppExe Source: "dcraw\dcraw32.exe"; DestDir: "{app}"; DestName: "{#DCRawExeName}"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "dcraw\dcraw_x64.exe"; DestDir: "{app}"; DestName: "{#DCRawExeName}"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "libwebp\libwebp32.dll"; DestDir: "{app}"; DestName: "{#LibWebPDllName}"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "libwebp\libwebp64.exe"; DestDir: "{app}"; DestName: "{#LibWebPDllName}"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "libwebp\libwebp64.dll"; DestDir: "{app}"; DestName: "{#LibWebPDllName}"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "{#ReleaseDir}i18n\*.po"; DestDir: "{app}\i18n"; Excludes: "i18n\lazpaint_x64.po"; Flags: ignoreversion Source: "{#ReleaseDir}models\*.*"; DestDir: "{app}\models"; Flags: ignoreversion Source: "{#ReleaseDir}readme.txt"; DestDir: "{app}"; Flags: ignoreversion From 99b2fb5593f06d11d6df9bb2948c7d5cb0df7dea Mon Sep 17 00:00:00 2001 From: johann Date: Fri, 10 Apr 2020 16:19:32 +0200 Subject: [PATCH 2/3] fix tool render update to fix scroll with middle mouse button --- lazpaint/lazpaintmainform.pas | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lazpaint/lazpaintmainform.pas b/lazpaint/lazpaintmainform.pas index ea00d874..6c5e2e17 100644 --- a/lazpaint/lazpaintmainform.pas +++ b/lazpaint/lazpaintmainform.pas @@ -864,7 +864,7 @@ TFMain = class(TForm) Zoom: TZoom; procedure PaintPictureNow; - procedure InvalidatePicture; + procedure InvalidatePicture(AInvalidateAll: boolean = true); function TryOpenFileUTF8(filenameUTF8: string; AddToRecent: Boolean=True; ALoadedImage: PImageEntry = nil; ASkipDialogIfSingleImage: boolean = false; AAllowDuplicate: boolean = false; AEntryToLoad: integer = -1): Boolean; @@ -4390,8 +4390,7 @@ procedure TFMain.OnPaintHandler; procedure TFMain.OnImageChangedHandler(AEvent: TLazPaintImageObservationEvent); begin - if Assigned(FImageView) then - FImageView.InvalidatePicture(False, FLayout.WorkArea, Point(0,0), self); + InvalidatePicture(false); if (image.Width <> FLastWidth) or (image.Height <> FLastHeight) or (image.BPP <> FLastBPP) or (image.FrameIndex <> FLastFrameIndex) then @@ -4412,7 +4411,7 @@ procedure TFMain.OnImageChangedHandler(AEvent: TLazPaintImageObservationEvent); procedure TFMain.OnImageRenderChanged(Sender: TObject); begin - InvalidatePicture; + InvalidatePicture(false); end; procedure TFMain.UpdateEditPicture(ADelayed: boolean = false); @@ -4604,10 +4603,10 @@ procedure TFMain.UpdateStatusText; Layout.StatusText := s; end; -procedure TFMain.InvalidatePicture; +procedure TFMain.InvalidatePicture(AInvalidateAll: boolean = true); begin if Assigned(FImageView) and Assigned(FLayout) then - FImageView.InvalidatePicture(True, FLayout.WorkArea, Point(0,0), self); + FImageView.InvalidatePicture(AInvalidateAll, FLayout.WorkArea, Point(0,0), self); end; function TFMain.GetUseImageBrowser: boolean; From 74618627ec022559452765de45e36e6d598a6271 Mon Sep 17 00:00:00 2001 From: johann Date: Fri, 10 Apr 2020 16:23:01 +0200 Subject: [PATCH 3/3] version 7.1.1 --- lazpaint/lazpaint.lpi | 1 + lazpaint/lazpaintembeddedpack.lpk | 2 +- lazpaint/lazpainttype.pas | 2 +- lazpaint/release/debian/linux32/DEBIAN/control | 2 +- lazpaint/release/debian/linux64/DEBIAN/control | 2 +- lazpaint/release/macOS/LazPaint.app/Contents/Info.plist | 4 ++-- lazpaint/release/macOS/makedmg.sh | 2 +- lazpaint/release/windows/lazpaint.iss | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lazpaint/lazpaint.lpi b/lazpaint/lazpaint.lpi index 25af0013..86f6e4b4 100644 --- a/lazpaint/lazpaint.lpi +++ b/lazpaint/lazpaint.lpi @@ -26,6 +26,7 @@ + diff --git a/lazpaint/lazpaintembeddedpack.lpk b/lazpaint/lazpaintembeddedpack.lpk index fb1a26a0..ab5211a6 100644 --- a/lazpaint/lazpaintembeddedpack.lpk +++ b/lazpaint/lazpaintembeddedpack.lpk @@ -26,7 +26,7 @@ - + diff --git a/lazpaint/lazpainttype.pas b/lazpaint/lazpainttype.pas index f356f817..9d1b875c 100644 --- a/lazpaint/lazpainttype.pas +++ b/lazpaint/lazpainttype.pas @@ -10,7 +10,7 @@ interface {$IFDEF LINUX}, InterfaceBase{$ENDIF}; const - LazPaintVersion = 7010000; + LazPaintVersion = 7010100; function LazPaintVersionStr: string; diff --git a/lazpaint/release/debian/linux32/DEBIAN/control b/lazpaint/release/debian/linux32/DEBIAN/control index 7dcd81f5..4eb05b8a 100644 --- a/lazpaint/release/debian/linux32/DEBIAN/control +++ b/lazpaint/release/debian/linux32/DEBIAN/control @@ -1,5 +1,5 @@ Package: lazpaint -Version: 7.1 +Version: 7.1.1 Section: base Priority: optional Architecture: i386 diff --git a/lazpaint/release/debian/linux64/DEBIAN/control b/lazpaint/release/debian/linux64/DEBIAN/control index 36cc6cf6..ffc6fef5 100644 --- a/lazpaint/release/debian/linux64/DEBIAN/control +++ b/lazpaint/release/debian/linux64/DEBIAN/control @@ -1,5 +1,5 @@ Package: lazpaint -Version: 7.1 +Version: 7.1.1 Section: base Priority: optional Architecture: amd64 diff --git a/lazpaint/release/macOS/LazPaint.app/Contents/Info.plist b/lazpaint/release/macOS/LazPaint.app/Contents/Info.plist index 58787be0..9165bb06 100644 --- a/lazpaint/release/macOS/LazPaint.app/Contents/Info.plist +++ b/lazpaint/release/macOS/LazPaint.app/Contents/Info.plist @@ -19,9 +19,9 @@ CFBundleSignature lazp CFBundleShortVersionString - 7.1 + 7.1.1 CFBundleVersion - 7.1 + 7.1.1 CSResourcesFileMapped CFBundleDocumentTypes diff --git a/lazpaint/release/macOS/makedmg.sh b/lazpaint/release/macOS/makedmg.sh index a1953781..9c6327fb 100755 --- a/lazpaint/release/macOS/makedmg.sh +++ b/lazpaint/release/macOS/makedmg.sh @@ -12,7 +12,7 @@ fi appname=LazPaint -appversion=7.1 +appversion=7.1.1 pkgversion=0 appnamenospaces=lazpaint appbundle="$appname.app" diff --git a/lazpaint/release/windows/lazpaint.iss b/lazpaint/release/windows/lazpaint.iss index 84c77d86..486a35da 100644 --- a/lazpaint/release/windows/lazpaint.iss +++ b/lazpaint/release/windows/lazpaint.iss @@ -1,7 +1,7 @@ #define MyAppName "LazPaint" #define MyAppOutputName "lazpaint" #define MyInstallerSuffix "_setup_win32_win64" -#define MyAppVersion "7.1" +#define MyAppVersion "7.1.1" #define MyAppPublisher "Circular, Fabien Wang, Lainz and others" #define MyAppURL "http://sourceforge.net/projects/lazpaint/" #define MyAppExeName "lazpaint.exe"