Fixed file's second time opening.

This commit is contained in:
meffi@lab313.ru
2014-04-16 22:51:54 +00:00
parent fb823b90d4
commit db601dcd85
5 changed files with 94 additions and 41 deletions

View File

@@ -114,14 +114,24 @@
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir);bgrabitmap"/> <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
<Libraries Value="$(LazarusDir)\..\binLibraries\$(TargetCPU)-$(TargetOS)"/>
<OtherUnitFiles Value="bgrabitmap"/> <OtherUnitFiles Value="bgrabitmap"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<CodeGeneration> <CodeGeneration>
<SmartLinkUnit Value="True"/>
<RelocatableUnit Value="True"/>
<TargetCPU Value="x86_64"/> <TargetCPU Value="x86_64"/>
<TargetOS Value="linux"/> <TargetOS Value="linux"/>
<Optimizations>
<OptimizationLevel Value="3"/>
</Optimizations>
</CodeGeneration> </CodeGeneration>
<Linking> <Linking>
<Debugging>
<GenerateDebugInfo Value="False"/>
</Debugging>
<LinkSmart Value="True"/>
<Options> <Options>
<Win32> <Win32>
<GraphicApplication Value="True"/> <GraphicApplication Value="True"/>

View File

@@ -4,7 +4,7 @@
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Version Value="9"/> <Version Value="9"/>
<BuildModes Active="Default"/> <BuildModes Active="Default"/>
<Units Count="34"> <Units Count="37">
<Unit0> <Unit0>
<Filename Value="tim2view.lpr"/> <Filename Value="tim2view.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@@ -23,8 +23,8 @@
<UnitName Value="umain"/> <UnitName Value="umain"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="539"/> <TopLine Value="718"/>
<CursorPos X="26" Y="551"/> <CursorPos X="27" Y="736"/>
<UsageCount Value="46"/> <UsageCount Value="46"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@@ -51,10 +51,11 @@
<Filename Value="ucommon.pas"/> <Filename Value="ucommon.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="ucommon"/> <UnitName Value="ucommon"/>
<EditorIndex Value="1"/> <IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<CursorPos X="42" Y="11"/> <CursorPos X="35" Y="6"/>
<UsageCount Value="46"/> <UsageCount Value="46"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit4> </Unit4>
@@ -98,17 +99,18 @@
<Filename Value="uscanthread.pas"/> <Filename Value="uscanthread.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="uscanthread"/> <UnitName Value="uscanthread"/>
<EditorIndex Value="1"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="173"/> <TopLine Value="41"/>
<CursorPos X="22" Y="197"/> <CursorPos X="54" Y="62"/>
<UsageCount Value="45"/> <UsageCount Value="45"/>
<Loaded Value="True"/>
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="ucpucount.pas"/> <Filename Value="ucpucount.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="ucpucount"/> <UnitName Value="ucpucount"/>
<IsVisibleTab Value="True"/> <EditorIndex Value="3"/>
<EditorIndex Value="2"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<CursorPos X="23" Y="8"/> <CursorPos X="23" Y="8"/>
@@ -324,6 +326,30 @@
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit33> </Unit33>
<Unit34>
<Filename Value="C:\codetyphon\fpcsrc\rtl\linux\system.pp"/>
<UnitName Value="System"/>
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="1"/>
<UsageCount Value="10"/>
</Unit34>
<Unit35>
<Filename Value="C:\codetyphon\typhon\packager\registration\lazaruspackageintf.pas"/>
<UnitName Value="LazarusPackageIntf"/>
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="1"/>
<UsageCount Value="10"/>
</Unit35>
<Unit36>
<Filename Value="C:\codetyphon\typhon\packager\registration\registerfcl.pas"/>
<UnitName Value="RegisterFCL"/>
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="59" Y="15"/>
<UsageCount Value="10"/>
</Unit36>
</Units> </Units>
<CustomDefines Count="1"> <CustomDefines Count="1">
<Define0 Value="UseCThreads"/> <Define0 Value="UseCThreads"/>
@@ -331,7 +357,7 @@
<General> <General>
<ActiveWindowIndexAtStart Value="0"/> <ActiveWindowIndexAtStart Value="0"/>
</General> </General>
<JumpHistory Count="19" HistoryIndex="18"> <JumpHistory Count="23" HistoryIndex="22">
<Position1> <Position1>
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="876" Column="31" TopLine="861"/> <Caret Line="876" Column="31" TopLine="861"/>
@@ -408,6 +434,22 @@
<Filename Value="umain.pas"/> <Filename Value="umain.pas"/>
<Caret Line="524" Column="48" TopLine="516"/> <Caret Line="524" Column="48" TopLine="516"/>
</Position19> </Position19>
<Position20>
<Filename Value="umain.pas"/>
<Caret Line="468" Column="104" TopLine="455"/>
</Position20>
<Position21>
<Filename Value="umain.pas"/>
<Caret Line="704" Column="37" TopLine="695"/>
</Position21>
<Position22>
<Filename Value="umain.pas"/>
<Caret Line="736" Column="83" TopLine="718"/>
</Position22>
<Position23>
<Filename Value="uscanthread.pas"/>
<Caret Line="197" Column="22" TopLine="173"/>
</Position23>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>
<EditorMacros Count="0"/> <EditorMacros Count="0"/>

View File

@@ -3,7 +3,7 @@ unit ucommon;
interface interface
const const
cProgramName = 'Tim2View SVN.r58 by [Lab 313] (for ' + cProgramName = 'Tim2View SVN.r61 by [Lab 313] (for ' +
{$IFDEF Linux}'Linux' + {$IFEND} {$IFDEF Linux}'Linux' + {$IFEND}
{$IFDEF Darwin}'Mac OS X' + {$IFEND} {$IFDEF Darwin}'Mac OS X' + {$IFEND}
{$IFDEF Windows}'Windows' + {$IFEND} {$IFDEF Windows}'Windows' + {$IFEND}
@@ -59,4 +59,4 @@ begin
Result := Copy(Result, 1, Length(Result) - Length(ExtractFileExt(Result))); Result := Copy(Result, 1, Length(Result) - Length(ExtractFileExt(Result)));
end; end;
end. end.

View File

@@ -4,11 +4,11 @@ object frmMain: TfrmMain
Top = 147 Top = 147
Width = 780 Width = 780
HorzScrollBar.Page = 780 HorzScrollBar.Page = 780
VertScrollBar.Page = 567 VertScrollBar.Page = 570
ActiveControl = pnlList ActiveControl = pnlList
AllowDropFiles = True AllowDropFiles = True
AutoScroll = True AutoScroll = True
ClientHeight = 567 ClientHeight = 570
ClientWidth = 780 ClientWidth = 780
Color = clBtnFace Color = clBtnFace
Font.Color = clWindowText Font.Color = clWindowText
@@ -493,11 +493,11 @@ object frmMain: TfrmMain
OnCreate = FormCreate OnCreate = FormCreate
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.2.0.3' LCLVersion = '1.3'
object pnlStatus: TPanel object pnlStatus: TPanel
Left = 0 Left = 0
Height = 30 Height = 30
Top = 537 Top = 540
Width = 780 Width = 780
Align = alBottom Align = alBottom
BevelOuter = bvLowered BevelOuter = bvLowered
@@ -537,13 +537,13 @@ object frmMain: TfrmMain
end end
object cbbFiles: TComboBox object cbbFiles: TComboBox
Left = 0 Left = 0
Height = 28 Height = 21
Top = 0 Top = 0
Width = 780 Width = 780
Align = alTop Align = alTop
DropDownCount = 30 DropDownCount = 30
Enabled = False Enabled = False
ItemHeight = 0 ItemHeight = 13
OnChange = actChangeFileExecute OnChange = actChangeFileExecute
OnCloseUp = actReturnFocusExecute OnCloseUp = actReturnFocusExecute
Style = csDropDownList Style = csDropDownList
@@ -551,33 +551,33 @@ object frmMain: TfrmMain
end end
object pnlMain: TPanel object pnlMain: TPanel
Left = 0 Left = 0
Height = 509 Height = 519
Top = 28 Top = 21
Width = 780 Width = 780
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 509 ClientHeight = 519
ClientWidth = 780 ClientWidth = 780
TabOrder = 1 TabOrder = 1
object splMain: TSplitter object splMain: TSplitter
Left = 240 Left = 240
Height = 509 Height = 519
Top = 0 Top = 0
Width = 5 Width = 5
end end
object pnlList: TPanel object pnlList: TPanel
Left = 0 Left = 0
Height = 509 Height = 519
Top = 0 Top = 0
Width = 240 Width = 240
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 509 ClientHeight = 519
ClientWidth = 240 ClientWidth = 240
TabOrder = 0 TabOrder = 0
object lvList: TListView object lvList: TListView
Left = 0 Left = 0
Height = 481 Height = 491
Top = 28 Top = 28
Width = 240 Width = 240
Align = alClient Align = alClient
@@ -646,12 +646,12 @@ object frmMain: TfrmMain
end end
object pnlImage: TPanel object pnlImage: TPanel
Left = 245 Left = 245
Height = 509 Height = 519
Top = 0 Top = 0
Width = 535 Width = 535
Align = alClient Align = alClient
BevelOuter = bvLowered BevelOuter = bvLowered
ClientHeight = 509 ClientHeight = 519
ClientWidth = 535 ClientWidth = 535
TabOrder = 1 TabOrder = 1
object splImageClut: TSplitter object splImageClut: TSplitter
@@ -667,7 +667,7 @@ object frmMain: TfrmMain
object grdCurrClut: TDrawGrid object grdCurrClut: TDrawGrid
Left = 1 Left = 1
Height = 150 Height = 150
Top = 330 Top = 345
Width = 533 Width = 533
Align = alBottom Align = alBottom
ColCount = 1 ColCount = 1
@@ -691,18 +691,18 @@ object frmMain: TfrmMain
end end
object pnlImageOptions: TPanel object pnlImageOptions: TPanel
Left = 1 Left = 1
Height = 28 Height = 23
Top = 480 Top = 495
Width = 533 Width = 533
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 28 ClientHeight = 23
ClientWidth = 533 ClientWidth = 533
TabOrder = 1 TabOrder = 1
object btnShowClut: TButton object btnShowClut: TButton
Left = 481 Left = 481
Height = 28 Height = 23
Top = 0 Top = 0
Width = 52 Width = 52
Align = alRight Align = alRight
@@ -713,12 +713,12 @@ object frmMain: TfrmMain
end end
object cbbBitMode: TComboBox object cbbBitMode: TComboBox
Left = 0 Left = 0
Height = 28 Height = 21
Top = 0 Top = 0
Width = 90 Width = 90
Align = alLeft Align = alLeft
Enabled = False Enabled = False
ItemHeight = 0 ItemHeight = 13
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
'Real' 'Real'
@@ -735,12 +735,12 @@ object frmMain: TfrmMain
end end
object cbbTranspMode: TComboBox object cbbTranspMode: TComboBox
Left = 90 Left = 90
Height = 28 Height = 21
Top = 0 Top = 0
Width = 136 Width = 136
Align = alLeft Align = alLeft
Enabled = False Enabled = False
ItemHeight = 0 ItemHeight = 13
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
'Full transparence' 'Full transparence'
@@ -756,13 +756,13 @@ object frmMain: TfrmMain
end end
object cbbCLUT: TComboBox object cbbCLUT: TComboBox
Left = 372 Left = 372
Height = 28 Height = 21
Top = 0 Top = 0
Width = 109 Width = 109
Align = alRight Align = alRight
DropDownCount = 16 DropDownCount = 16
Enabled = False Enabled = False
ItemHeight = 0 ItemHeight = 13
OnChange = actChangeClutIdxExecute OnChange = actChangeClutIdxExecute
Style = csDropDownList Style = csDropDownList
TabOrder = 3 TabOrder = 3
@@ -770,7 +770,7 @@ object frmMain: TfrmMain
end end
object imgTim: TImage object imgTim: TImage
Left = 1 Left = 1
Height = 326 Height = 341
Top = 4 Top = 4
Width = 533 Width = 533
AntialiasingMode = amOff AntialiasingMode = amOff
@@ -1024,4 +1024,4 @@ object frmMain: TfrmMain
left = 449 left = 449
top = 450 top = 450
end end
end end

View File

@@ -733,6 +733,7 @@ begin
if CheckForFileOpened(FileName) then if CheckForFileOpened(FileName) then
begin begin
cbbFiles.ItemIndex := cbbFiles.Items.IndexOf(FileName); cbbFiles.ItemIndex := cbbFiles.Items.IndexOf(FileName);
actChangeFile.Execute;
btnStopScan.Enabled := False; btnStopScan.Enabled := False;
btnStopScan.Tag := NativeInt(True); btnStopScan.Tag := NativeInt(True);
CheckButtonsAndMainMenu; CheckButtonsAndMainMenu;
@@ -975,4 +976,4 @@ begin
end; end;
end. end.