Changeset 329 for branches

Timestamp:

Aug 17, 2008, 8:23:09 PM (17 years ago)

Author:

RBRi

Message:

incorporate small fixes already done in head

Location:

branches/2.19_branch/NewView

Files:

• HelpFile.pas (modified) (3 diffs)
• MainForm.pas (modified) (2 diffs)

branches/2.19_branch/NewView/HelpFile.pas

@@ -681 +681 @@
 var
   i: longint;
+  tmpIndex: String;
 begin
   result := nil;
@@ -686 +687 @@
   for i := 0 to _Index.Count - 1 do
   begin
-    if StrStartsWithIgnoringCase( SearchText, _Index.ValuePtrs[ i ] ^ ) then
+    tmpIndex := _Index.ValuePtrs[i]^; 
+    if StrStartsWithIgnoringCase(tmpIndex, SearchText) then
     begin
       // found
@@ -730 +732 @@
       if tmpLevel = tmpTopic.ContentsLevel then
       begin
-        if StrStartsWithIgnoringCase( SearchText, tmpTopic.TitlePtr ^ ) then
+        if StrStartsWithIgnoringCase(tmpTopic.TitlePtr^, SearchText) then
         begin
           result := tmpTopic;

branches/2.19_branch/NewView/MainForm.pas

@@ -2381 +2381 @@
   Filename := THelpFile( CurrentOpenFiles[ 0 ] ).Filename;
   NamePart := ExtractFileName( Filename );
-  Result := StrStartsWithIgnoringCase('newview', NamePart);
+  Result := StrStartsWithIgnoringCase(NamePart, 'newview');
 end;
 
@@ -4551 +4551 @@
 Procedure TMainForm.IndexSearchEditOnChange (Sender: TObject);
 var
-  MatchIndex: longint;
-  IndexINdex: longint;
-  SearchText: string;
+  tmpMatchIndex : longint;
+  tmpSearchText: string;
+  i : longint;
 Begin
   if InIndexSearch then
     exit;
 
-  MatchIndex:= -1;
-  SearchText:= trim( IndexSearchEdit.Text );
-  for IndexIndex:= 0 to DisplayedIndex.Count - 1 do
-  begin
-    if StrStartsWithIgnoringCase( SearchText, DisplayedIndex[ IndexIndex ] ) then //IndexEntry ) then
+  tmpMatchIndex := -1; 
+  tmpSearchText := trim(IndexSearchEdit.Text);
+
+  for i := 0 to DisplayedIndex.Count - 1 do
+  begin
+    if StrStartsWithIgnoringCase(DisplayedIndex[i], tmpSearchText) then
     begin
-      MatchIndex:= IndexIndex;
+      tmpMatchIndex := i;
       break;
     end;
   end;
 
-  if MatchIndex = -1 then
+  if tmpMatchIndex = -1 then
     exit;
 
   InIndexSearch:= true;
 
-  if IndexListBox.ItemIndex <> MatchIndex then
-    IndexListBox.ItemIndex:= MatchIndex;
+  if IndexListBox.ItemIndex <> tmpMatchIndex then
+    IndexListBox.ItemIndex := tmpMatchIndex;
 
   InIndexSearch:= false;