|
@@ -60,18 +60,10 @@
|
|
<Filename Value="TurboBird.lpr"/>
|
|
<Filename Value="TurboBird.lpr"/>
|
|
<IsPartOfProject Value="True"/>
|
|
<IsPartOfProject Value="True"/>
|
|
<UnitName Value="TurboBird"/>
|
|
<UnitName Value="TurboBird"/>
|
|
- <IsVisibleTab Value="True"/>
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
- <EditorIndex Value="3"/>
|
|
|
|
- <WindowIndex Value="0"/>
|
|
|
|
- <TopLine Value="40"/>
|
|
|
|
- <CursorPos X="33" Y="32"/>
|
|
|
|
-=======
|
|
|
|
- <EditorIndex Value="1"/>
|
|
|
|
|
|
+ <EditorIndex Value="2"/>
|
|
<WindowIndex Value="0"/>
|
|
<WindowIndex Value="0"/>
|
|
<TopLine Value="1"/>
|
|
<TopLine Value="1"/>
|
|
<CursorPos X="15" Y="30"/>
|
|
<CursorPos X="15" Y="30"/>
|
|
->>>>>>> 0947e5f7346cf9e3551b602a5e5ebf7ca64098aa
|
|
|
|
<UsageCount Value="200"/>
|
|
<UsageCount Value="200"/>
|
|
<Loaded Value="True"/>
|
|
<Loaded Value="True"/>
|
|
</Unit0>
|
|
</Unit0>
|
|
@@ -82,13 +74,13 @@
|
|
<HasResources Value="True"/>
|
|
<HasResources Value="True"/>
|
|
<ResourceBaseClass Value="Form"/>
|
|
<ResourceBaseClass Value="Form"/>
|
|
<UnitName Value="main"/>
|
|
<UnitName Value="main"/>
|
|
|
|
+ <IsVisibleTab Value="True"/>
|
|
<EditorIndex Value="1"/>
|
|
<EditorIndex Value="1"/>
|
|
<WindowIndex Value="0"/>
|
|
<WindowIndex Value="0"/>
|
|
- <TopLine Value="3801"/>
|
|
|
|
- <CursorPos X="56" Y="3827"/>
|
|
|
|
|
|
+ <TopLine Value="3811"/>
|
|
|
|
+ <CursorPos X="1" Y="3828"/>
|
|
<UsageCount Value="200"/>
|
|
<UsageCount Value="200"/>
|
|
<Loaded Value="True"/>
|
|
<Loaded Value="True"/>
|
|
- <LoadedDesigner Value="True"/>
|
|
|
|
</Unit1>
|
|
</Unit1>
|
|
<Unit2>
|
|
<Unit2>
|
|
<Filename Value="createdb.pas"/>
|
|
<Filename Value="createdb.pas"/>
|
|
@@ -130,21 +122,12 @@
|
|
<UnitName Value="QueryWindow"/>
|
|
<UnitName Value="QueryWindow"/>
|
|
<EditorIndex Value="0"/>
|
|
<EditorIndex Value="0"/>
|
|
<WindowIndex Value="0"/>
|
|
<WindowIndex Value="0"/>
|
|
-<<<<<<< HEAD
|
|
|
|
- <TopLine Value="848"/>
|
|
|
|
- <CursorPos X="45" Y="858"/>
|
|
|
|
|
|
+ <TopLine Value="934"/>
|
|
|
|
+ <CursorPos X="1" Y="944"/>
|
|
<UsageCount Value="200"/>
|
|
<UsageCount Value="200"/>
|
|
<Bookmarks Count="2">
|
|
<Bookmarks Count="2">
|
|
- <Item0 X="3" Y="1035" ID="0"/>
|
|
|
|
- <Item1 X="3" Y="1851" ID="1"/>
|
|
|
|
-=======
|
|
|
|
- <TopLine Value="1"/>
|
|
|
|
- <CursorPos X="1" Y="1"/>
|
|
|
|
- <UsageCount Value="200"/>
|
|
|
|
- <Bookmarks Count="2">
|
|
|
|
- <Item0 X="3" Y="1126" ID="0"/>
|
|
|
|
- <Item1 X="3" Y="2009" ID="1"/>
|
|
|
|
->>>>>>> 0947e5f7346cf9e3551b602a5e5ebf7ca64098aa
|
|
|
|
|
|
+ <Item0 X="3" Y="1127" ID="0"/>
|
|
|
|
+ <Item1 X="3" Y="2010" ID="1"/>
|
|
</Bookmarks>
|
|
</Bookmarks>
|
|
<Loaded Value="True"/>
|
|
<Loaded Value="True"/>
|
|
<LoadedDesigner Value="True"/>
|
|
<LoadedDesigner Value="True"/>
|
|
@@ -1108,19 +1091,10 @@
|
|
<HasResources Value="True"/>
|
|
<HasResources Value="True"/>
|
|
<ResourceBaseClass Value="Form"/>
|
|
<ResourceBaseClass Value="Form"/>
|
|
<UnitName Value="Update"/>
|
|
<UnitName Value="Update"/>
|
|
-<<<<<<< HEAD
|
|
|
|
- <EditorIndex Value="2"/>
|
|
|
|
-=======
|
|
|
|
->>>>>>> 0947e5f7346cf9e3551b602a5e5ebf7ca64098aa
|
|
|
|
<WindowIndex Value="0"/>
|
|
<WindowIndex Value="0"/>
|
|
<TopLine Value="151"/>
|
|
<TopLine Value="151"/>
|
|
<CursorPos X="40" Y="171"/>
|
|
<CursorPos X="40" Y="171"/>
|
|
<UsageCount Value="23"/>
|
|
<UsageCount Value="23"/>
|
|
-<<<<<<< HEAD
|
|
|
|
- <Loaded Value="True"/>
|
|
|
|
- <LoadedDesigner Value="True"/>
|
|
|
|
-=======
|
|
|
|
->>>>>>> 0947e5f7346cf9e3551b602a5e5ebf7ca64098aa
|
|
|
|
</Unit116>
|
|
</Unit116>
|
|
<Unit117>
|
|
<Unit117>
|
|
<Filename Value="querycomplition.txt"/>
|
|
<Filename Value="querycomplition.txt"/>
|
|
@@ -1134,243 +1108,123 @@
|
|
<JumpHistory Count="30" HistoryIndex="29">
|
|
<JumpHistory Count="30" HistoryIndex="29">
|
|
<Position1>
|
|
<Position1>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
-<<<<<<< HEAD
|
|
|
|
- <Caret Line="483" Column="38" TopLine="451"/>
|
|
|
|
|
|
+ <Caret Line="232" Column="32" TopLine="204"/>
|
|
</Position1>
|
|
</Position1>
|
|
<Position2>
|
|
<Position2>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="489" Column="58" TopLine="457"/>
|
|
|
|
|
|
+ <Caret Line="443" Column="23" TopLine="412"/>
|
|
</Position2>
|
|
</Position2>
|
|
<Position3>
|
|
<Position3>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="529" Column="32" TopLine="497"/>
|
|
|
|
|
|
+ <Caret Line="483" Column="38" TopLine="451"/>
|
|
</Position3>
|
|
</Position3>
|
|
<Position4>
|
|
<Position4>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="531" Column="18" TopLine="499"/>
|
|
|
|
|
|
+ <Caret Line="489" Column="58" TopLine="457"/>
|
|
</Position4>
|
|
</Position4>
|
|
<Position5>
|
|
<Position5>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="585" Column="23" TopLine="553"/>
|
|
|
|
|
|
+ <Caret Line="529" Column="32" TopLine="497"/>
|
|
</Position5>
|
|
</Position5>
|
|
<Position6>
|
|
<Position6>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="586" Column="20" TopLine="554"/>
|
|
|
|
|
|
+ <Caret Line="531" Column="18" TopLine="499"/>
|
|
</Position6>
|
|
</Position6>
|
|
<Position7>
|
|
<Position7>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="588" Column="23" TopLine="556"/>
|
|
|
|
|
|
+ <Caret Line="585" Column="23" TopLine="553"/>
|
|
</Position7>
|
|
</Position7>
|
|
<Position8>
|
|
<Position8>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="589" Column="20" TopLine="557"/>
|
|
|
|
|
|
+ <Caret Line="586" Column="20" TopLine="554"/>
|
|
</Position8>
|
|
</Position8>
|
|
<Position9>
|
|
<Position9>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="655" Column="34" TopLine="623"/>
|
|
|
|
|
|
+ <Caret Line="588" Column="23" TopLine="556"/>
|
|
</Position9>
|
|
</Position9>
|
|
<Position10>
|
|
<Position10>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="1908" Column="33" TopLine="1896"/>
|
|
|
|
|
|
+ <Caret Line="589" Column="20" TopLine="557"/>
|
|
</Position10>
|
|
</Position10>
|
|
<Position11>
|
|
<Position11>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="34" Column="17" TopLine="29"/>
|
|
|
|
|
|
+ <Caret Line="655" Column="34" TopLine="623"/>
|
|
</Position11>
|
|
</Position11>
|
|
<Position12>
|
|
<Position12>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="1934" Column="18" TopLine="1919"/>
|
|
|
|
|
|
+ <Caret Line="904" Column="27" TopLine="775"/>
|
|
</Position12>
|
|
</Position12>
|
|
<Position13>
|
|
<Position13>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="1565" Column="23" TopLine="1544"/>
|
|
|
|
|
|
+ <Caret Line="1" Column="1" TopLine="1"/>
|
|
</Position13>
|
|
</Position13>
|
|
<Position14>
|
|
<Position14>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="62" Column="110" TopLine="57"/>
|
|
|
|
|
|
+ <Caret Line="760" Column="27" TopLine="730"/>
|
|
</Position14>
|
|
</Position14>
|
|
<Position15>
|
|
<Position15>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="206" Column="32" TopLine="177"/>
|
|
|
|
|
|
+ <Caret Line="1550" Column="3" TopLine="1521"/>
|
|
</Position15>
|
|
</Position15>
|
|
<Position16>
|
|
<Position16>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="1551" Column="65" TopLine="1544"/>
|
|
|
|
|
|
+ <Caret Line="1" Column="1" TopLine="1"/>
|
|
</Position16>
|
|
</Position16>
|
|
<Position17>
|
|
<Position17>
|
|
<Filename Value="querywindow.pas"/>
|
|
<Filename Value="querywindow.pas"/>
|
|
- <Caret Line="1549" Column="44" TopLine="1544"/>
|
|
|
|
|
|
+ <Caret Line="2134" Column="69" TopLine="2098"/>
|
|
</Position17>
|
|
</Position17>
|
|
<Position18>
|
|
<Position18>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="5" Column="45" TopLine="1"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="271" Column="5" TopLine="263"/>
|
|
</Position18>
|
|
</Position18>
|
|
<Position19>
|
|
<Position19>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="206" Column="32" TopLine="194"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="1" Column="1" TopLine="1"/>
|
|
</Position19>
|
|
</Position19>
|
|
<Position20>
|
|
<Position20>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="1556" Column="24" TopLine="1543"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="45" Column="24" TopLine="17"/>
|
|
</Position20>
|
|
</Position20>
|
|
<Position21>
|
|
<Position21>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="5" Column="45" TopLine="1"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="209" Column="30" TopLine="181"/>
|
|
</Position21>
|
|
</Position21>
|
|
<Position22>
|
|
<Position22>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="82" Column="19" TopLine="70"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="1108" Column="65" TopLine="1080"/>
|
|
</Position22>
|
|
</Position22>
|
|
<Position23>
|
|
<Position23>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="128" Column="29" TopLine="116"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="1111" Column="11" TopLine="1083"/>
|
|
</Position23>
|
|
</Position23>
|
|
<Position24>
|
|
<Position24>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="643" Column="40" TopLine="630"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="1303" Column="36" TopLine="1275"/>
|
|
</Position24>
|
|
</Position24>
|
|
<Position25>
|
|
<Position25>
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="647" Column="17" TopLine="634"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="1317" Column="57" TopLine="1289"/>
|
|
</Position25>
|
|
</Position25>
|
|
<Position26>
|
|
<Position26>
|
|
- <Filename Value="update.pas"/>
|
|
|
|
- <Caret Line="171" Column="40" TopLine="150"/>
|
|
|
|
|
|
+ <Filename Value="main.pas"/>
|
|
|
|
+ <Caret Line="1318" Column="40" TopLine="1290"/>
|
|
</Position26>
|
|
</Position26>
|
|
<Position27>
|
|
<Position27>
|
|
<Filename Value="main.pas"/>
|
|
<Filename Value="main.pas"/>
|
|
- <Caret Line="271" Column="5" TopLine="263"/>
|
|
|
|
|
|
+ <Caret Line="1320" Column="37" TopLine="1292"/>
|
|
</Position27>
|
|
</Position27>
|
|
<Position28>
|
|
<Position28>
|
|
<Filename Value="main.pas"/>
|
|
<Filename Value="main.pas"/>
|
|
- <Caret Line="1" Column="1" TopLine="1"/>
|
|
|
|
|
|
+ <Caret Line="2398" Column="11" TopLine="2370"/>
|
|
</Position28>
|
|
</Position28>
|
|
<Position29>
|
|
<Position29>
|
|
<Filename Value="main.pas"/>
|
|
<Filename Value="main.pas"/>
|
|
- <Caret Line="232" Column="13" TopLine="231"/>
|
|
|
|
|
|
+ <Caret Line="2598" Column="13" TopLine="2570"/>
|
|
</Position29>
|
|
</Position29>
|
|
<Position30>
|
|
<Position30>
|
|
<Filename Value="main.pas"/>
|
|
<Filename Value="main.pas"/>
|
|
- <Caret Line="278" Column="3" TopLine="276"/>
|
|
|
|
-=======
|
|
|
|
- <Caret Line="168" Column="27" TopLine="137"/>
|
|
|
|
- </Position1>
|
|
|
|
- <Position2>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="175" Column="24" TopLine="145"/>
|
|
|
|
- </Position2>
|
|
|
|
- <Position3>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="188" Column="21" TopLine="158"/>
|
|
|
|
- </Position3>
|
|
|
|
- <Position4>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="190" Column="13" TopLine="159"/>
|
|
|
|
- </Position4>
|
|
|
|
- <Position5>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="221" Column="35" TopLine="204"/>
|
|
|
|
- </Position5>
|
|
|
|
- <Position6>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="223" Column="9" TopLine="204"/>
|
|
|
|
- </Position6>
|
|
|
|
- <Position7>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="225" Column="9" TopLine="204"/>
|
|
|
|
- </Position7>
|
|
|
|
- <Position8>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="226" Column="9" TopLine="204"/>
|
|
|
|
- </Position8>
|
|
|
|
- <Position9>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="227" Column="27" TopLine="204"/>
|
|
|
|
- </Position9>
|
|
|
|
- <Position10>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="228" Column="9" TopLine="204"/>
|
|
|
|
- </Position10>
|
|
|
|
- <Position11>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="229" Column="9" TopLine="204"/>
|
|
|
|
- </Position11>
|
|
|
|
- <Position12>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="230" Column="27" TopLine="204"/>
|
|
|
|
- </Position12>
|
|
|
|
- <Position13>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="231" Column="9" TopLine="204"/>
|
|
|
|
- </Position13>
|
|
|
|
- <Position14>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="232" Column="32" TopLine="204"/>
|
|
|
|
- </Position14>
|
|
|
|
- <Position15>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="443" Column="23" TopLine="412"/>
|
|
|
|
- </Position15>
|
|
|
|
- <Position16>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="483" Column="38" TopLine="451"/>
|
|
|
|
- </Position16>
|
|
|
|
- <Position17>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="489" Column="58" TopLine="457"/>
|
|
|
|
- </Position17>
|
|
|
|
- <Position18>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="529" Column="32" TopLine="497"/>
|
|
|
|
- </Position18>
|
|
|
|
- <Position19>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="531" Column="18" TopLine="499"/>
|
|
|
|
- </Position19>
|
|
|
|
- <Position20>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="585" Column="23" TopLine="553"/>
|
|
|
|
- </Position20>
|
|
|
|
- <Position21>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="586" Column="20" TopLine="554"/>
|
|
|
|
- </Position21>
|
|
|
|
- <Position22>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="588" Column="23" TopLine="556"/>
|
|
|
|
- </Position22>
|
|
|
|
- <Position23>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="589" Column="20" TopLine="557"/>
|
|
|
|
- </Position23>
|
|
|
|
- <Position24>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="655" Column="34" TopLine="623"/>
|
|
|
|
- </Position24>
|
|
|
|
- <Position25>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="904" Column="27" TopLine="775"/>
|
|
|
|
- </Position25>
|
|
|
|
- <Position26>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="1" Column="1" TopLine="1"/>
|
|
|
|
- </Position26>
|
|
|
|
- <Position27>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="760" Column="27" TopLine="730"/>
|
|
|
|
- </Position27>
|
|
|
|
- <Position28>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="1550" Column="3" TopLine="1521"/>
|
|
|
|
- </Position28>
|
|
|
|
- <Position29>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="1" Column="1" TopLine="1"/>
|
|
|
|
- </Position29>
|
|
|
|
- <Position30>
|
|
|
|
- <Filename Value="querywindow.pas"/>
|
|
|
|
- <Caret Line="2134" Column="69" TopLine="2098"/>
|
|
|
|
->>>>>>> 0947e5f7346cf9e3551b602a5e5ebf7ca64098aa
|
|
|
|
|
|
+ <Caret Line="3826" Column="21" TopLine="3799"/>
|
|
</Position30>
|
|
</Position30>
|
|
</JumpHistory>
|
|
</JumpHistory>
|
|
</ProjectOptions>
|
|
</ProjectOptions>
|