Fixed file's second time opening.

2014-04-16 22:51:54 +00:00
parent fb823b90d4
commit db601dcd85
5 changed files with 94 additions and 41 deletions
--- a/tim2view.lpi
+++ b/tim2view.lpi
@@ -114,14 +114,24 @@
    </Target>
    <SearchPaths>
      <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
+      <Libraries Value="$(LazarusDir)\..\binLibraries\$(TargetCPU)-$(TargetOS)"/>
      <OtherUnitFiles Value="bgrabitmap"/>
      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
    </SearchPaths>
    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <RelocatableUnit Value="True"/>
      <TargetCPU Value="x86_64"/>
      <TargetOS Value="linux"/>
+      <Optimizations>
+        <OptimizationLevel Value="3"/>
+      </Optimizations>
    </CodeGeneration>
    <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
      <Options>
        <Win32>
          <GraphicApplication Value="True"/>
--- a/tim2view.lps
+++ b/tim2view.lps
@@ -4,7 +4,7 @@
    <PathDelim Value="\"/>
    <Version Value="9"/>
    <BuildModes Active="Default"/>
-    <Units Count="34">
+    <Units Count="37">
      <Unit0>
        <Filename Value="tim2view.lpr"/>
        <IsPartOfProject Value="True"/>
@@ -23,8 +23,8 @@
        <UnitName Value="umain"/>
        <EditorIndex Value="0"/>
        <WindowIndex Value="0"/>
-        <TopLine Value="539"/>
-        <CursorPos X="26" Y="551"/>
+        <TopLine Value="718"/>
+        <CursorPos X="27" Y="736"/>
        <UsageCount Value="46"/>
        <Loaded Value="True"/>
        <LoadedDesigner Value="True"/>
@@ -51,10 +51,11 @@
        <Filename Value="ucommon.pas"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="ucommon"/>
-        <EditorIndex Value="1"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="2"/>
        <WindowIndex Value="0"/>
        <TopLine Value="1"/>
-        <CursorPos X="42" Y="11"/>
+        <CursorPos X="35" Y="6"/>
        <UsageCount Value="46"/>
        <Loaded Value="True"/>
      </Unit4>
@@ -98,17 +99,18 @@
        <Filename Value="uscanthread.pas"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="uscanthread"/>
+        <EditorIndex Value="1"/>
        <WindowIndex Value="0"/>
-        <TopLine Value="173"/>
-        <CursorPos X="22" Y="197"/>
+        <TopLine Value="41"/>
+        <CursorPos X="54" Y="62"/>
        <UsageCount Value="45"/>
+        <Loaded Value="True"/>
      </Unit9>
      <Unit10>
        <Filename Value="ucpucount.pas"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="ucpucount"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="3"/>
        <WindowIndex Value="0"/>
        <TopLine Value="1"/>
        <CursorPos X="23" Y="8"/>
@@ -324,6 +326,30 @@
        <CursorPos X="1" Y="1"/>
        <UsageCount Value="10"/>
      </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>
    <CustomDefines Count="1">
      <Define0 Value="UseCThreads"/>
@@ -331,7 +357,7 @@
    <General>
      <ActiveWindowIndexAtStart Value="0"/>
    </General>
-    <JumpHistory Count="19" HistoryIndex="18">
+    <JumpHistory Count="23" HistoryIndex="22">
      <Position1>
        <Filename Value="umain.pas"/>
        <Caret Line="876" Column="31" TopLine="861"/>
@@ -408,6 +434,22 @@
        <Filename Value="umain.pas"/>
        <Caret Line="524" Column="48" TopLine="516"/>
      </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>
  </ProjectSession>
  <EditorMacros Count="0"/>
--- 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}
--- 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
--- 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;