From db601dcd8572774f96d05a8da421c0470e0fcc78 Mon Sep 17 00:00:00 2001 From: "meffi@lab313.ru" Date: Wed, 16 Apr 2014 22:51:54 +0000 Subject: [PATCH] Fixed file's second time opening. --- tim2view.lpi | 10 +++++++++ tim2view.lps | 62 +++++++++++++++++++++++++++++++++++++++++++--------- ucommon.pas | 4 ++-- umain.lfm | 56 +++++++++++++++++++++++------------------------ umain.pas | 3 ++- 5 files changed, 94 insertions(+), 41 deletions(-) diff --git a/tim2view.lpi b/tim2view.lpi index 788ca9c..f2585a5 100644 --- a/tim2view.lpi +++ b/tim2view.lpi @@ -114,14 +114,24 @@ + + + + + + + + + + diff --git a/tim2view.lps b/tim2view.lps index 1b2cbc9..6f8feb1 100644 --- a/tim2view.lps +++ b/tim2view.lps @@ -4,7 +4,7 @@ - + @@ -23,8 +23,8 @@ - - + + @@ -51,10 +51,11 @@ - + + - + @@ -98,17 +99,18 @@ + - - + + + - - + @@ -324,6 +326,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -331,7 +357,7 @@ - + @@ -408,6 +434,22 @@ + + + + + + + + + + + + + + + + diff --git a/ucommon.pas b/ucommon.pas index 1318dae..44844ef 100644 --- a/ucommon.pas +++ b/ucommon.pas @@ -3,7 +3,7 @@ unit ucommon; interface const - cProgramName = 'Tim2View SVN.r58 by [Lab 313] (for ' + + cProgramName = 'Tim2View SVN.r61 by [Lab 313] (for ' + {$IFDEF Linux}'Linux' + {$IFEND} {$IFDEF Darwin}'Mac OS X' + {$IFEND} {$IFDEF Windows}'Windows' + {$IFEND} @@ -59,4 +59,4 @@ begin Result := Copy(Result, 1, Length(Result) - Length(ExtractFileExt(Result))); end; -end. \ No newline at end of file +end. diff --git a/umain.lfm b/umain.lfm index 173f511..6aea1a3 100644 --- a/umain.lfm +++ b/umain.lfm @@ -4,11 +4,11 @@ object frmMain: TfrmMain Top = 147 Width = 780 HorzScrollBar.Page = 780 - VertScrollBar.Page = 567 + VertScrollBar.Page = 570 ActiveControl = pnlList AllowDropFiles = True AutoScroll = True - ClientHeight = 567 + ClientHeight = 570 ClientWidth = 780 Color = clBtnFace Font.Color = clWindowText @@ -493,11 +493,11 @@ object frmMain: TfrmMain OnCreate = FormCreate OnDropFiles = FormDropFiles Position = poScreenCenter - LCLVersion = '1.2.0.3' + LCLVersion = '1.3' object pnlStatus: TPanel Left = 0 Height = 30 - Top = 537 + Top = 540 Width = 780 Align = alBottom BevelOuter = bvLowered @@ -537,13 +537,13 @@ object frmMain: TfrmMain end object cbbFiles: TComboBox Left = 0 - Height = 28 + Height = 21 Top = 0 Width = 780 Align = alTop DropDownCount = 30 Enabled = False - ItemHeight = 0 + ItemHeight = 13 OnChange = actChangeFileExecute OnCloseUp = actReturnFocusExecute Style = csDropDownList @@ -551,33 +551,33 @@ object frmMain: TfrmMain end object pnlMain: TPanel Left = 0 - Height = 509 - Top = 28 + Height = 519 + Top = 21 Width = 780 Align = alClient BevelOuter = bvNone - ClientHeight = 509 + ClientHeight = 519 ClientWidth = 780 TabOrder = 1 object splMain: TSplitter Left = 240 - Height = 509 + Height = 519 Top = 0 Width = 5 end object pnlList: TPanel Left = 0 - Height = 509 + Height = 519 Top = 0 Width = 240 Align = alLeft BevelOuter = bvNone - ClientHeight = 509 + ClientHeight = 519 ClientWidth = 240 TabOrder = 0 object lvList: TListView Left = 0 - Height = 481 + Height = 491 Top = 28 Width = 240 Align = alClient @@ -646,12 +646,12 @@ object frmMain: TfrmMain end object pnlImage: TPanel Left = 245 - Height = 509 + Height = 519 Top = 0 Width = 535 Align = alClient BevelOuter = bvLowered - ClientHeight = 509 + ClientHeight = 519 ClientWidth = 535 TabOrder = 1 object splImageClut: TSplitter @@ -667,7 +667,7 @@ object frmMain: TfrmMain object grdCurrClut: TDrawGrid Left = 1 Height = 150 - Top = 330 + Top = 345 Width = 533 Align = alBottom ColCount = 1 @@ -691,18 +691,18 @@ object frmMain: TfrmMain end object pnlImageOptions: TPanel Left = 1 - Height = 28 - Top = 480 + Height = 23 + Top = 495 Width = 533 Align = alBottom AutoSize = True BevelOuter = bvNone - ClientHeight = 28 + ClientHeight = 23 ClientWidth = 533 TabOrder = 1 object btnShowClut: TButton Left = 481 - Height = 28 + Height = 23 Top = 0 Width = 52 Align = alRight @@ -713,12 +713,12 @@ object frmMain: TfrmMain end object cbbBitMode: TComboBox Left = 0 - Height = 28 + Height = 21 Top = 0 Width = 90 Align = alLeft Enabled = False - ItemHeight = 0 + ItemHeight = 13 ItemIndex = 0 Items.Strings = ( 'Real' @@ -735,12 +735,12 @@ object frmMain: TfrmMain end object cbbTranspMode: TComboBox Left = 90 - Height = 28 + Height = 21 Top = 0 Width = 136 Align = alLeft Enabled = False - ItemHeight = 0 + ItemHeight = 13 ItemIndex = 0 Items.Strings = ( 'Full transparence' @@ -756,13 +756,13 @@ object frmMain: TfrmMain end object cbbCLUT: TComboBox Left = 372 - Height = 28 + Height = 21 Top = 0 Width = 109 Align = alRight DropDownCount = 16 Enabled = False - ItemHeight = 0 + ItemHeight = 13 OnChange = actChangeClutIdxExecute Style = csDropDownList TabOrder = 3 @@ -770,7 +770,7 @@ object frmMain: TfrmMain end object imgTim: TImage Left = 1 - Height = 326 + Height = 341 Top = 4 Width = 533 AntialiasingMode = amOff @@ -1024,4 +1024,4 @@ object frmMain: TfrmMain left = 449 top = 450 end -end \ No newline at end of file +end diff --git a/umain.pas b/umain.pas index 9b86562..1907d69 100644 --- a/umain.pas +++ b/umain.pas @@ -733,6 +733,7 @@ begin if CheckForFileOpened(FileName) then begin cbbFiles.ItemIndex := cbbFiles.Items.IndexOf(FileName); + actChangeFile.Execute; btnStopScan.Enabled := False; btnStopScan.Tag := NativeInt(True); CheckButtonsAndMainMenu; @@ -975,4 +976,4 @@ begin end; end. - \ No newline at end of file +