Skip to content

Commit 34bd0bb

Browse files
committed
Upgraded to Lazarus IDE v3.4. Added compiled libwebp-1.4.0 dlls.
1 parent 1e4f176 commit 34bd0bb

File tree

10 files changed

+38
-21
lines changed

10 files changed

+38
-21
lines changed

files/libwebp/x64/libwebp.dll

492 KB
Binary file not shown.

files/libwebp/x86/libwebp.dll

387 KB
Binary file not shown.

src/ImageViewer.lpi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<EnableI18N Value="True"/>
2424
<OutDir Value="po_files"/>
2525
</i18n>
26+
<VersionInfo>
27+
<UseVersionInfo Value="True"/>
28+
<MajorVersionNr Value="1"/>
29+
<MinorVersionNr Value="3"/>
30+
<RevisionNr Value="9"/>
31+
<StringTable FileDescription="Image Viewer" InternalName="ImageViewer" LegalCopyright="torum" OriginalFilename="ImageViewer.exe" ProductName="Simple Image Viewer"/>
32+
</VersionInfo>
2633
<BuildModes Count="1">
2734
<Item1 Name="Default" Default="True"/>
2835
</BuildModes>

src/ImageViewer.lpr

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{$ENDIF}{$ENDIF}
99
Interfaces, // this includes the LCL widgetset
1010
Forms, UMain, Ufullscreen, UAbout,
11-
LCLTranslator, lazutf8{$ifdef windows}, Windows{$endif};
11+
LCLTranslator, lazutf8, Translations{$ifdef windows}, Windows{$endif};
1212

1313
{$R *.res}
1414

@@ -18,25 +18,32 @@
1818
procedure TranslateLCL;
1919
var
2020
Lang,FallbackLang: String;
21+
LangID: TLanguageID;
2122
begin
2223
// On windows, you have to call GetUserDefaultUILanguage() API to get UI languages.
23-
// But GetLanguageIDs calls GetUserDefaultLCID.
24+
// But GetLanguageIDs calls GetUserDefaultLCID...
2425

25-
Lang:='';
26+
Lang:='en';
2627
FallbackLang:='';
27-
LazGetLanguageIDs(Lang,FallbackLang);
28+
//LazGetLanguageIDs(Lang,FallbackLang); // This is now deprecated.
29+
LangID := GetLanguageID;
30+
Lang := LangID.LanguageID;
31+
FallbackLang:=LangID.LanguageCode;
32+
// OutputDebugString(PChar(LangID.CountryCode)); // JP
33+
// OutputDebugString(PChar(LangID.LanguageCode)); // ja
34+
// OutputDebugString(PChar(LangID.LanguageID)); // ja_JP
2835

2936
if (Lang = 'en') or (Lang = 'en_US') or (Lang = 'us')
3037
or (FallbackLang = 'us') or (FallbackLang = 'US') or (FallbackLang = 'en') then
3138
Lang := 'en';
3239

3340
if (Lang = 'ja') or (Lang = 'ja_jp') or (Lang = 'jp_JP') or (Lang = 'jp')
3441
or (FallbackLang = 'jp') or (FallbackLang = 'JP') or (FallbackLang = 'ja') then
35-
Lang := 'ja_JP';
42+
Lang := 'ja';//'ja_JP';
3643

3744
if (Lang = 'ru') or (Lang = 'ru_RU') or (Lang = 'RU')
3845
or (FallbackLang = 'ru') or (FallbackLang = 'RU') then
39-
Lang := 'ru_RU';
46+
Lang := 'ru';//'ru_RU';
4047

4148
SetDefaultLang(Lang,'','',false);
4249

src/ImageViewer.res

764 Bytes
Binary file not shown.

src/uabout.lfm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
object frmAbout: TfrmAbout
2-
Left = 1707
2+
Left = 515
33
Height = 234
4-
Top = 849
4+
Top = 336
55
Width = 320
66
BorderStyle = bsToolWindow
77
ClientHeight = 234
88
ClientWidth = 320
99
OnClose = FormClose
1010
Position = poOwnerFormCenter
11-
LCLVersion = '2.2.2.0'
11+
LCLVersion = '3.4.0.0'
1212
object Image1: TImage
1313
Left = 19
1414
Height = 90
@@ -503,10 +503,10 @@ object frmAbout: TfrmAbout
503503
Top = 144
504504
Width = 281
505505
Caption = 'https://torum.github.io/Image-viewer/'
506+
TabOrder = 2
506507
OnClick = StaticTextWebSiteClick
507508
OnMouseEnter = StaticTextWebSiteMouseEnter
508509
OnMouseLeave = StaticTextWebSiteMouseLeave
509-
TabOrder = 2
510510
end
511511
object LabelWebsite: TLabel
512512
Left = 26
@@ -524,8 +524,8 @@ object frmAbout: TfrmAbout
524524
Caption = 'Close'
525525
Default = True
526526
ModalResult = 1
527-
OnClick = ButtonCloseClick
528527
TabOrder = 3
528+
OnClick = ButtonCloseClick
529529
end
530530
object Bevel1: TBevel
531531
Left = 19

src/umain.lfm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object frmMain: TfrmMain
2727
OnShow = FormShow
2828
PopupMode = pmAuto
2929
Position = poScreenCenter
30-
LCLVersion = '2.2.4.0'
30+
LCLVersion = '3.4.0.0'
3131
object Image1: TImage
3232
Left = 0
3333
Height = 354
@@ -58,6 +58,7 @@ object frmMain: TfrmMain
5858
BorderStyle = bsNone
5959
ClientHeight = 354
6060
ClientWidth = 426
61+
ParentBackground = False
6162
TabOrder = 0
6263
Visible = False
6364
OnMouseWheelDown = ScrollBox1MouseWheelDown

src/umain.pas

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
Cocoa based 64bit apps for macOS may not be ready some time soon...
3333
3434
### TODO:
35+
* StayOnTop on/off when inFrame mode.
3536
* Blur effect on/off option. Need to find a way to enable on fullscreen with a modal window first...
3637
* WebP support.
3738
* Better zooming.
@@ -304,7 +305,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
304305
i,f:integer;
305306
configFile:string;
306307
begin
307-
FstrAppVer:='1.3.8.0';
308+
FstrAppVer:='1.3.9.0';
308309

309310
// Init Main form properties.
310311
self.Caption:=ReplaceStr(ExtractFileName(ParamStr(0)),ExtractFileExt(ParamStr(0)),'');
@@ -1703,9 +1704,9 @@ procedure TfrmMain.MenuItemSlideshowInFrameClick(Sender: TObject);
17031704
// Background blur when background color is set to clBlack.
17041705
if (Win32MajorVersion>=10) then
17051706
begin
1706-
self.color := clBlack; // Temp set to black
1707+
self.color := clBlack; // Temp set to black
17071708
DoubleBuffered := True;
1708-
EnableBlur;
1709+
EnableBlur; // TODO: make this an option.
17091710
end;
17101711

17111712
{$else}
@@ -1861,8 +1862,8 @@ procedure TfrmMain.SetCaption(strCaption:string);
18611862

18621863
procedure TfrmMain.SetStayOnTop(bln:Boolean);
18631864
{$ifdef windows}
1864-
var
1865-
BeforeBounds : TRect;
1865+
//var
1866+
//BeforeBounds : TRect;
18661867
{$endif}
18671868
begin
18681869
if bln then
@@ -1874,10 +1875,11 @@ procedure TfrmMain.SetStayOnTop(bln:Boolean);
18741875
begin
18751876
if (self.FormStyle = fsSystemStayOnTop) then
18761877
begin
1877-
18781878
{$ifdef windows}
18791879
if FisInFrame then
18801880
begin
1881+
// TODO: This is not working...
1882+
18811883
// "FormStyle:=fsNormal" causes window pos to move to 0,0 so..
18821884
//BeforeBounds:= BoundsRect;
18831885

@@ -2432,7 +2434,7 @@ procedure TfrmMain.SetFullScreen_Win32(blnOn: boolean);
24322434
FOrigWndState:= WindowState;
24332435
FOrigBounds:= BoundsRect;
24342436
// Must be this order
2435-
WindowState:=wsFullScreen; //1
2437+
WindowState:= wsFullScreen; //1
24362438
BorderStyle:= bsNone; //2
24372439
end;
24382440

@@ -2531,7 +2533,7 @@ procedure TfrmMain.EnableBlur;
25312533
const
25322534
WCA_ACCENT_POLICY = 19;
25332535
ACCENT_ENABLE_BLURBEHIND = 3;
2534-
//ACCENT_ENABLE_ACRYLICBLURBEHIND = 4;
2536+
//ACCENT_ENABLE_ACRYLICBLURBEHIND = 4; // Windows 10 April 2018 Update
25352537
DrawLeftBorder = $20;
25362538
DrawTopBorder = $40;
25372539
DrawRightBorder = $80;
@@ -2551,7 +2553,7 @@ procedure TfrmMain.EnableBlur;
25512553
begin
25522554
accent.AccentState := ACCENT_ENABLE_BLURBEHIND;
25532555
//accent.AccentState := ACCENT_ENABLE_ACRYLICBLURBEHIND;
2554-
accent.GradientColor := (100 SHL 24) or ($FFE3E0DE);
2556+
accent.GradientColor := (100 SHL 24) or ($00E3E0DE);//or ($FFE3E0DE);
25552557
accent.AccentFlags := DrawLeftBorder or DrawTopBorder or DrawRightBorder or DrawBottomBorder;
25562558

25572559
data.Attribute := WCA_ACCENT_POLICY;

0 commit comments

Comments
 (0)