Skip to content

Commit baa7d0f

Browse files
committed
v1.2.18
Fixed a few bugs and tested Linux and Windows.
1 parent 1d3bbda commit baa7d0f

File tree

7 files changed

+94
-76
lines changed

7 files changed

+94
-76
lines changed

ImageViewer.lpi

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<CONFIG>
33
<ProjectOptions>
4-
<Version Value="11"/>
4+
<Version Value="12"/>
55
<PathDelim Value="\"/>
66
<General>
7+
<Flags>
8+
<CompatibilityMode Value="True"/>
9+
</Flags>
710
<SessionStorage Value="InProjectDir"/>
8-
<MainUnit Value="0"/>
911
<Title Value="ImageViewer"/>
1012
<Scaled Value="True"/>
1113
<ResourceType Value="res"/>
@@ -89,6 +91,7 @@
8991
<Linking>
9092
<Debugging>
9193
<GenerateDebugInfo Value="False"/>
94+
<DebugInfoType Value="dsDwarf2Set"/>
9295
</Debugging>
9396
<Options>
9497
<Win32>

ImageViewer.lpr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ procedure TranslateLCL;
5858
or (FallbackLang = 'ru') or (FallbackLang = 'RU') then
5959
Lang := 'ru_RU';
6060

61-
SetDefaultLang(Lang,'',false);
61+
SetDefaultLang(Lang,'','',false);
6262

6363
end;
6464

ImageViewer.res

44 Bytes
Binary file not shown.

ufullscreen.lfm

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
object frmFullscreen: TfrmFullscreen
22
Left = 2246
3-
Height = 301
4-
Top = 771
5-
Width = 400
3+
Height = 241
4+
Top = 1437
5+
Width = 320
66
Align = alClient
77
AlphaBlend = True
88
BorderIcons = []
99
BorderStyle = bsNone
1010
Caption = 'Fullscreen'
11-
ClientHeight = 301
12-
ClientWidth = 400
11+
ClientHeight = 241
12+
ClientWidth = 320
1313
Color = clBlack
14-
DesignTimePPI = 120
1514
OnClose = FormClose
1615
OnCloseQuery = FormCloseQuery
1716
OnCreate = FormCreate
@@ -24,12 +23,12 @@ object frmFullscreen: TfrmFullscreen
2423
OnShow = FormShow
2524
PopupMenu = PopupMenu1
2625
Position = poOwnerFormCenter
27-
LCLVersion = '2.0.10.0'
26+
LCLVersion = '2.2.0.4'
2827
object Image1: TImage
2928
Left = 0
30-
Height = 301
29+
Height = 241
3130
Top = 0
32-
Width = 400
31+
Width = 320
3332
AntialiasingMode = amOn
3433
Align = alClient
3534
AutoSize = True
@@ -47,21 +46,21 @@ object frmFullscreen: TfrmFullscreen
4746
Enabled = False
4847
Interval = 1
4948
OnTimer = TimerFadeOutTimer
50-
Left = 336
51-
Top = 16
49+
Left = 269
50+
Top = 13
5251
end
5352
object TimerFadeIn: TTimer
5453
Enabled = False
5554
Interval = 1
5655
OnTimer = TimerFadeInTimer
57-
Left = 280
58-
Top = 16
56+
Left = 224
57+
Top = 13
5958
end
6059
object PopupMenu1: TPopupMenu
6160
OnPopup = PopupMenu1Popup
6261
OnClose = PopupMenu1Close
63-
Left = 176
64-
Top = 136
62+
Left = 141
63+
Top = 109
6564
object MenuItemPlayback: TMenuItem
6665
Caption = '&Playback'
6766
object MenuItemNext: TMenuItem
@@ -150,13 +149,13 @@ object frmFullscreen: TfrmFullscreen
150149
Enabled = False
151150
Interval = 3000
152151
OnTimer = TimerIntervalTimer
153-
Left = 16
154-
Top = 16
152+
Left = 13
153+
Top = 13
155154
end
156155
object IdleTimerMouseHide: TIdleTimer
157156
AutoEnabled = True
158157
OnTimer = IdleTimerMouseHideTimer
159-
Left = 23
160-
Top = 255
158+
Left = 18
159+
Top = 204
161160
end
162161
end

ufullscreen.pas

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ procedure TfrmFullscreen.FormClose(Sender: TObject;
375375

376376
IdleTimerMouseHide.Enabled:=false;
377377
Screen.Cursor:=crDefault;
378+
Self.Cursor:=crDefault;
378379

379380
// Apply chagens in options.
380381
frmMain.OptTransitEffect := FEffect;
@@ -1109,6 +1110,7 @@ procedure TfrmFullscreen.Image1MouseMove(Sender: TObject; Shift: TShiftState;
11091110
X, Y: Integer);
11101111
begin
11111112
Screen.Cursor:= crDefault;
1113+
Self.Cursor:=crDefault;
11121114
if FisInFrame then
11131115
begin
11141116
If FisMoving then
@@ -1633,6 +1635,7 @@ procedure TfrmFullscreen.FormMouseMove(Sender: TObject; Shift: TShiftState; X,
16331635
Y: Integer);
16341636
begin
16351637
Screen.Cursor:= crDefault;
1638+
Self.Cursor:=crDefault;
16361639
// Do the same at Image1.
16371640
end;
16381641

@@ -1659,6 +1662,7 @@ procedure TfrmFullscreen.IdleTimerMouseHideTimer(Sender: TObject);
16591662
if not FisPopupMenuShowing then
16601663
begin
16611664
Screen.Cursor:= crNone;
1665+
Self.Cursor:=crNone;
16621666
end;
16631667
end;
16641668

umain.lfm

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
object frmMain: TfrmMain
2-
Left = 977
3-
Height = 301
4-
Top = 765
5-
Width = 400
2+
Left = 1683
3+
Height = 241
4+
Top = 1067
5+
Width = 320
66
AlphaBlend = True
77
AlphaBlendValue = 20
88
Caption = 'Image Viewer Main'
9-
ClientHeight = 301
10-
ClientWidth = 400
9+
ClientHeight = 241
10+
ClientWidth = 320
1111
Color = clSilver
12-
DesignTimePPI = 120
1312
OnActivate = FormActivate
1413
OnCloseQuery = FormCloseQuery
1514
OnCreate = FormCreate
@@ -20,12 +19,12 @@ object frmMain: TfrmMain
2019
OnShow = FormShow
2120
PopupMode = pmAuto
2221
Position = poScreenCenter
23-
LCLVersion = '2.0.10.0'
22+
LCLVersion = '2.2.2.0'
2423
object Image1: TImage
2524
Left = 0
26-
Height = 301
25+
Height = 241
2726
Top = 0
28-
Width = 400
27+
Width = 320
2928
Align = alClient
3029
AutoSize = True
3130
Center = True
@@ -39,35 +38,35 @@ object frmMain: TfrmMain
3938
end
4039
object ScrollBox1: TScrollBox
4140
Left = 0
42-
Height = 301
41+
Height = 241
4342
Top = 0
44-
Width = 400
45-
HorzScrollBar.Page = 131
43+
Width = 320
44+
HorzScrollBar.Page = 320
4645
HorzScrollBar.Tracking = True
47-
VertScrollBar.Page = 131
46+
VertScrollBar.Page = 241
4847
VertScrollBar.Tracking = True
4948
Align = alClient
5049
BorderStyle = bsNone
51-
ClientHeight = 301
52-
ClientWidth = 400
50+
ClientHeight = 241
51+
ClientWidth = 320
5352
TabOrder = 0
5453
Visible = False
5554
OnMouseWheelDown = ScrollBox1MouseWheelDown
5655
OnMouseWheelUp = ScrollBox1MouseWheelUp
5756
object PaintBox1: TPaintBox
5857
Left = 0
59-
Height = 301
58+
Height = 241
6059
Top = 0
61-
Width = 400
60+
Width = 320
6261
OnPaint = PaintBox1Paint
6362
end
6463
end
6564
object TimerEffectStart: TTimer
6665
Enabled = False
6766
Interval = 1
6867
OnTimer = TimerEffectStartTimer
69-
Left = 176
70-
Top = 128
68+
Left = 141
69+
Top = 102
7170
end
7271
object TrayIcon1: TTrayIcon
7372
PopUpMenu = PopupMenuSystem
@@ -9438,13 +9437,13 @@ object frmMain: TfrmMain
94389437
426082
94399438
}
94409439
OnDblClick = TrayIcon1DblClick
9441-
Left = 353
9442-
Top = 248
9440+
Left = 282
9441+
Top = 198
94439442
end
94449443
object PopupMenuMain: TPopupMenu
94459444
OnPopup = PopupMenuMainPopup
9446-
Left = 248
9447-
Top = 128
9445+
Left = 198
9446+
Top = 102
94489447
object MenuItemNext: TMenuItem
94499448
Caption = 'Next'
94509449
ShortCut = 39
@@ -9522,27 +9521,27 @@ object frmMain: TfrmMain
95229521
ExceptionDialog = aedOkMessageBox
95239522
ShowMainForm = False
95249523
OnException = ApplicationProperties1Exception
9525-
Left = 353
9526-
Top = 16
9524+
Left = 282
9525+
Top = 13
95279526
end
95289527
object OpenPictureDialog1: TOpenPictureDialog
95299528
Title = 'Open picture(s)'
95309529
Filter = 'Graphic (*.jpeg;*.jpg;*.jpe;*.png;*.gif)|*.jpeg;*.jpg;*.jpe;*.png;*.gif|Portable Network Graphic (*.png)|*.png|Joint Picture Expert Group (*.jpeg;*.jpg;*.jpe;*.jfif)|*.jpeg;*.jpg;*.jpe;*.jfif|Graphics Interchange Format (*.gif)|*.gif'
9531-
Options = [ofAllowMultiSelect, ofFileMustExist, ofNoTestFileCreate, ofEnableSizing, ofDontAddToRecent, ofAutoPreview]
9532-
Left = 64
9533-
Top = 24
9530+
Options = [ofFileMustExist, ofNoTestFileCreate, ofEnableSizing, ofDontAddToRecent, ofAutoPreview]
9531+
Left = 51
9532+
Top = 19
95349533
end
95359534
object XMLConfig: TXMLConfig
95369535
StartEmpty = False
95379536
RootName = 'Application'
95389537
ReadOnly = False
9539-
Left = 105
9540-
Top = 208
9538+
Left = 84
9539+
Top = 166
95419540
end
95429541
object PopupMenuSystem: TPopupMenu
95439542
OnPopup = PopupMenuSystemPopup
9544-
Left = 288
9545-
Top = 248
9543+
Left = 230
9544+
Top = 198
95469545
object MenuItemSysAbout: TMenuItem
95479546
Caption = 'About'
95489547
OnClick = MenuItemSysAboutClick

0 commit comments

Comments
 (0)