Merge pull request #8 from mabudrais/master

sorting strings in syncompeltion

.gitignore

@@ -0,0 +1,167 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*.o
+*.reg
+*.ppu
+*.exe
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store

TurboBird.lpi

@@ -60,7 +60,7 @@
         <Filename Value="TurboBird.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TurboBird"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="25" Y="5"/>
@@ -117,15 +117,14 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="QueryWindow"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1896"/>
-        <CursorPos X="3" Y="920"/>
+        <TopLine Value="859"/>
+        <CursorPos X="32" Y="870"/>
         <UsageCount Value="200"/>
         <Bookmarks Count="2">
-          <Item0 X="3" Y="1032" ID="0"/>
-          <Item1 X="3" Y="1857" ID="1"/>
+          <Item0 X="3" Y="1034" ID="0"/>
+          <Item1 X="3" Y="1850" ID="1"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -727,7 +726,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="37"/>
         <CursorPos X="31" Y="63"/>
-        <UsageCount Value="186"/>
+        <UsageCount Value="187"/>
       </Unit71>
       <Unit72>
         <Filename Value="../../lazarus/lazarus/lcl/include/menuitem.inc"/>
@@ -753,7 +752,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="51" Y="14"/>
-        <UsageCount Value="157"/>
+        <UsageCount Value="158"/>
       </Unit74>
       <Unit75>
         <Filename Value="/usr/lib/lazarus/0.9.30/lcl/comctrls.pp"/>
@@ -946,7 +945,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="64"/>
         <CursorPos X="16" Y="66"/>
-        <UsageCount Value="125"/>
+        <UsageCount Value="126"/>
       </Unit98>
       <Unit99>
         <Filename Value="../../FromInternet/fpc2.4/fpc-2.4.4/packages/ibase/src/ibase60dyn.pp"/>
@@ -981,7 +980,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="15" Y="255"/>
-        <UsageCount Value="112"/>
+        <UsageCount Value="113"/>
       </Unit102>
       <Unit103>
         <Filename Value="/usr/share/fpcsrc/2.6.0/rtl/inc/systemh.inc"/>
@@ -1015,7 +1014,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="58"/>
+        <UsageCount Value="59"/>
       </Unit106>
       <Unit107>
         <Filename Value="../../../lazarus/lcl/interfaces/win32/win32object.inc"/>
@@ -1089,10 +1088,13 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Update"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="151"/>
-        <CursorPos X="40" Y="171"/>
-        <UsageCount Value="22"/>
+        <TopLine Value="1"/>
+        <CursorPos X="32" Y="9"/>
+        <UsageCount Value="23"/>
+        <Loaded Value="True"/>
       </Unit116>
       <Unit117>
         <Filename Value="querycomplition.txt"/>
@@ -1106,123 +1108,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="1866" Column="10" TopLine="1861"/>
+        <Caret Line="230" Column="27" TopLine="204"/>
       </Position1>
       <Position2>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="231" Column="9" TopLine="204"/>
       </Position2>
       <Position3>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="89" Column="13" TopLine="58"/>
+        <Caret Line="232" Column="32" TopLine="204"/>
       </Position3>
       <Position4>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="91" Column="13" TopLine="60"/>
+        <Caret Line="443" Column="23" TopLine="412"/>
       </Position4>
       <Position5>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="132" Column="23" TopLine="101"/>
+        <Caret Line="483" Column="38" TopLine="451"/>
       </Position5>
       <Position6>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="133" Column="23" TopLine="102"/>
+        <Caret Line="489" Column="58" TopLine="457"/>
       </Position6>
       <Position7>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="168" Column="27" TopLine="137"/>
+        <Caret Line="529" Column="32" TopLine="497"/>
       </Position7>
       <Position8>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="175" Column="24" TopLine="145"/>
+        <Caret Line="531" Column="18" TopLine="499"/>
       </Position8>
       <Position9>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="188" Column="21" TopLine="158"/>
+        <Caret Line="585" Column="23" TopLine="553"/>
       </Position9>
       <Position10>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="190" Column="13" TopLine="159"/>
+        <Caret Line="586" Column="20" TopLine="554"/>
       </Position10>
       <Position11>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="221" Column="35" TopLine="204"/>
+        <Caret Line="588" Column="23" TopLine="556"/>
       </Position11>
       <Position12>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="223" Column="9" TopLine="204"/>
+        <Caret Line="589" Column="20" TopLine="557"/>
       </Position12>
       <Position13>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="225" Column="9" TopLine="204"/>
+        <Caret Line="655" Column="34" TopLine="623"/>
       </Position13>
       <Position14>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="226" Column="9" TopLine="204"/>
+        <Caret Line="1908" Column="33" TopLine="1896"/>
       </Position14>
       <Position15>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="227" Column="27" TopLine="204"/>
+        <Caret Line="34" Column="17" TopLine="29"/>
       </Position15>
       <Position16>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="228" Column="9" TopLine="204"/>
+        <Caret Line="1934" Column="18" TopLine="1919"/>
       </Position16>
       <Position17>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="229" Column="9" TopLine="204"/>
+        <Caret Line="1565" Column="23" TopLine="1544"/>
       </Position17>
       <Position18>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="230" Column="27" TopLine="204"/>
+        <Caret Line="62" Column="110" TopLine="57"/>
       </Position18>
       <Position19>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="231" Column="9" TopLine="204"/>
+        <Caret Line="206" Column="32" TopLine="177"/>
       </Position19>
       <Position20>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="232" Column="32" TopLine="204"/>
+        <Caret Line="1551" Column="65" TopLine="1544"/>
       </Position20>
       <Position21>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="443" Column="23" TopLine="412"/>
+        <Caret Line="1549" Column="44" TopLine="1544"/>
       </Position21>
       <Position22>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="483" Column="38" TopLine="451"/>
+        <Caret Line="5" Column="45" TopLine="1"/>
       </Position22>
       <Position23>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="489" Column="58" TopLine="457"/>
+        <Caret Line="206" Column="32" TopLine="194"/>
       </Position23>
       <Position24>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="529" Column="32" TopLine="497"/>
+        <Caret Line="1556" Column="24" TopLine="1543"/>
       </Position24>
       <Position25>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="531" Column="18" TopLine="499"/>
+        <Caret Line="5" Column="45" TopLine="1"/>
       </Position25>
       <Position26>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="585" Column="23" TopLine="553"/>
+        <Caret Line="82" Column="19" TopLine="70"/>
       </Position26>
       <Position27>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="586" Column="20" TopLine="554"/>
+        <Caret Line="128" Column="29" TopLine="116"/>
       </Position27>
       <Position28>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="588" Column="23" TopLine="556"/>
+        <Caret Line="643" Column="40" TopLine="630"/>
       </Position28>
       <Position29>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="589" Column="20" TopLine="557"/>
+        <Caret Line="647" Column="17" TopLine="634"/>
       </Position29>
       <Position30>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="655" Column="34" TopLine="623"/>
+        <Filename Value="update.pas"/>
+        <Caret Line="171" Column="40" TopLine="150"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>

querycompletion.txt

@@ -0,0 +1,6 @@
+create
+table
+Select
+From
+INTEGER
+FLOAT

querywindow.pas

@@ -203,6 +203,7 @@ type
       var SQLSegment: string; var IsDDL: Boolean): Boolean;
     procedure QueryAfterScroll(DataSet: TDataSet);
     procedure CallExecuteQuery(aQueryType: Integer);
+    procedure sortsyncompletion;
     procedure ThreadTerminated(Sender: TObject);
     procedure EnableButtons;
 
@@ -868,6 +869,7 @@ begin
   // Get current database tables to be hilighted in SQL query editor
   SynSQLSyn1.TableNames.CommaText:= fmMain.GetTableNames(dbIndex);
   SynCompletion1.ItemList.AddStrings(SynSQLSyn1.TableNames);
+  sortsyncompletion;
 end;
 
 (************* Is Selectable (Check statement type Select, Update, Alter, etc) *******************)
@@ -1546,22 +1548,13 @@ var
   str:string;
 begin
   if FileExists('querycompletion.txt') then
-  begin
-    AssignFile(F,'querycompletion.txt');
-    Reset(F);
-    while not EOF(F) do
-    begin
-      ReadLn(F,str);
-      SynCompletion1.ItemList.Add(str);
-    end;
-    CloseFile(F);
-  end
+    SynCompletion1.ItemList.LoadFromFile('querycompletion.txt')
   else
   begin
     SynCompletion1.ItemList.CommaText:= 'create,table,Select,From,INTEGER,FLOAT';
     SynCompletion1.ItemList.SaveToFile('querycompletion.txt');
   end;
-
+      sortsyncompletion;
 end;
 
 procedure TfmQueryWindow.FormShow(Sender: TObject);
@@ -1885,6 +1878,21 @@ begin
   EnableButtons;
 end;
 
+procedure TfmQueryWindow.sortsyncompletion;
+var
+  sortinglis:TStringList;
+  i:Integer;
+begin
+  sortinglis:=TStringList.Create;
+    for i:=0 to SynCompletion1.ItemList.Count-1 do
+        sortinglis.Add(SynCompletion1.ItemList.Strings[i]);
+    sortinglis.Sort;
+    SynCompletion1.ItemList.Clear;
+    for i:=0 to sortinglis.Count-1 do
+    SynCompletion1.ItemList.Add(sortinglis.Strings[i]);
+
+end;
+
 procedure TfmQueryWindow.ThreadTerminated(Sender: TObject);
 begin
   // Raise exception if an error occured during thread execution (Open)