[Initranslator-svncheckins] SF.net SVN: initranslator: [93] translator/trunk/src

[<pe...@us...>]

Revision: 93
Author:   peter3
Date:     2006-08-21 12:42:11 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/initranslator/?rev=93&view=rev

Log Message:
-----------
- Minor cleanup

Modified Paths:
--------------
    translator/trunk/src/AppOptions.pas
    translator/trunk/src/MainFrm.pas
Modified: translator/trunk/src/AppOptions.pas
===================================================================
--- translator/trunk/src/AppOptions.pas	2006-08-17 22:18:19 UTC (rev 92)
+++ translator/trunk/src/AppOptions.pas	2006-08-21 19:42:11 UTC (rev 93)
@@ -186,6 +186,7 @@
     property Header:TTntStrings read FHeader write SetHeader;
     property Footer:TTntStrings read FFooter write SetFooter;
 
+
     // find replace
     property FindText: WideString read FFindText write FFindText;
     property ReplaceText: WideString read FReplaceText write FReplaceText;
@@ -502,6 +503,11 @@
     GlobalPath := ini.ReadBool('General', 'GlobalPath', GlobalPath);
     UseTranslationEverywhere := ini.ReadBool('General', 'UseTranslationEverywhere', UseTranslationEverywhere);
     AutoFocusTranslation := ini.ReadBool('General', 'AutoFocusTranslation', AutoFocusTranslation);
+    Theme := ini.ReadString('General', 'Theme', Theme);
+    DictIgnoreNonEmpty := ini.ReadBool('General', 'DictIgnoreNonEmpty', false);
+    DictEditFilter := ini.ReadInteger('General', 'DictEditFilter', 0);
+    ShowFullNameInColumns := ini.ReadBool('General', 'ShowFullNameInColumns', ShowFullNameInColumns);
+
     FilterIndex := ini.ReadInteger('Files', 'FilterIndex', FilterIndex);
     LanguageFile := ini.ReadString('Files', 'LanguageFile', LanguageFile);
     HelpFile := ini.ReadString('Files', 'HelpFile', HelpFile);
@@ -512,19 +518,12 @@
     OrigEncoding := ini.ReadInteger('Files', 'OrigEncoding', OrigEncoding);
     DefaultTransEncoding := ini.ReadInteger('Files', 'DefaultTransEncoding', TransEncoding);
     DefaultOrigEncoding  := ini.ReadInteger('Files', 'DefaultOrigEncoding', OrigEncoding);
-
     MonitorFiles := ini.ReadBool('Files', 'MonitorFiles', MonitorFiles);
 
     Header.Text := Tnt_WideStringReplace(ini.ReadString('UserData','Header',''), #2, #13#10, [rfReplaceAll]);
     Footer.Text := Tnt_WideStringReplace(ini.ReadString('UserData','Footer',''), #2, #13#10, [rfReplaceAll]);
 
-    Theme := ini.ReadString('General', 'Theme', Theme);
-    DictIgnoreNonEmpty := ini.ReadBool('General', 'DictIgnoreNonEmpty', false);
-    DictEditFilter := ini.ReadInteger('General', 'DictEditFilter', 0);
-
-
     PinCommentWindow := ini.ReadBool('Comments', 'PinCommentWindow', PinCommentWindow);
-    ShowFullNameInColumns := ini.ReadBool('General', 'ShowFullNameInColumns', ShowFullNameInColumns);
 
     // find/replace dialog
     FindText := ini.ReadString('FindReplace', 'FindText', FindText);
@@ -612,6 +611,10 @@
     ini.WriteBool('General', 'GlobalPath', GlobalPath);
     ini.WriteBool('General', 'UseTranslationEverywhere', UseTranslationEverywhere);
     ini.WriteBool('General', 'AutoFocusTranslation', AutoFocusTranslation);
+    ini.WriteString('General', 'Theme', Theme);
+    ini.WriteBool('General', 'DictIgnoreNonEmpty', DictIgnoreNonEmpty);
+    ini.WriteInteger('General', 'DictEditFilter', DictEditFilter);
+    ini.WriteBool('General', 'ShowFullNameInColumns', ShowFullNameInColumns);
 
     ini.WriteInteger('Files', 'FilterIndex', FilterIndex);
     ini.WriteString('Files', 'LanguageFile', LanguageFile);
@@ -628,12 +631,6 @@
     ini.WriteString('UserData', 'Header', Tnt_WideStringReplace(Header.Text, #13#10,#2,[rfReplaceAll]));
     ini.WriteString('UserData', 'Footer', Tnt_WideStringReplace(Footer.Text, #13#10,#2,[rfReplaceAll]));
 
-    ini.WriteString('General', 'Theme', Theme);
-    ini.WriteBool('General', 'DictIgnoreNonEmpty', DictIgnoreNonEmpty);
-    ini.WriteInteger('General', 'DictEditFilter', DictEditFilter);
-
-    ini.WriteBool('General', 'ShowFullNameInColumns', ShowFullNameInColumns);
-
     ini.WriteBool('Comments', 'PinCommentWindow', PinCommentWindow);
     // find replace dialog
     ini.WriteString('FindReplace', 'FindText', FindText);
@@ -645,10 +642,12 @@
     ini.WriteBool('FindReplace', 'SearchUp', SearchUp);
     ini.WriteBool('FindReplace', 'FuzzySearch', FuzzySearch);
     ini.WriteInteger('FindReplace', 'FindInIndex', FindInIndex);
+
     ini.WriteString('Trim', 'TrimWhat', TrimWhat);
     ini.WriteInteger('Trim', 'TrimWhere', TrimWhere);
     ini.WriteInteger('Trim', 'TrimHow', TrimHow);
     ini.WriteBool('Trim', 'TrimWhiteSpace', TrimWhiteSpace);
+
     ini.WriteString('MisMatch', 'Items', MisMatchItems);
     ini.WriteBool('MisMatch', 'MisMatchLeadingSpaces', MisMatchLeadingSpaces);
     ini.WriteBool('MisMatch', 'MisMatchTrailingSpaces', MisMatchTrailingSpaces);

Modified: translator/trunk/src/MainFrm.pas
===================================================================
--- translator/trunk/src/MainFrm.pas	2006-08-17 22:18:19 UTC (rev 92)
+++ translator/trunk/src/MainFrm.pas	2006-08-21 19:42:11 UTC (rev 93)
@@ -2565,24 +2565,30 @@
   Sender: TCustomListView; Item: TListItem; State: TCustomDrawState;
   Stage: TCustomDrawStage; var DefaultDraw: boolean);
 begin
-  DefaultDraw := true;
   if (Item <> nil) and (Stage = cdPrePaint) then
   begin
-    if not FTranslateFile.Items[Item.Index].Translated then
+    Sender.Canvas.Font := TListView(Sender).Font;
+    if [cdsFocused] *  State <> [] then
     begin
+      Sender.Canvas.Brush.Color := clHighlight;
+      Sender.Canvas.Font.Color := clHighlightText;
+    end
+    else if not FTranslateFile.Items[Item.Index].Translated then
+    begin
       Sender.Canvas.Brush.Color := GlobalAppOptions.ColorUntranslated;
-      Sender.Canvas.Font.COlor := GlobalAppOptions.ColorFontUntranslated;
+      Sender.Canvas.Font.Color := GlobalAppOptions.ColorFontUntranslated;
     end
     else if Odd(Item.Index) then
     begin
       Sender.Canvas.Brush.Color := GlobalAppOptions.ColorEvenRow;
-      Sender.Canvas.Font.COlor := GlobalAppOptions.ColorFontEvenRow;
+      Sender.Canvas.Font.Color := GlobalAppOptions.ColorFontEvenRow;
     end
     else
     begin
       Sender.Canvas.Brush.Color := GlobalAppOptions.ColorOddRow;
       Sender.Canvas.Font.Color := GlobalAppOptions.ColorFontOddRow;
     end;
+    DefaultDraw := true;;
   end;
 end;
 
@@ -4061,5 +4067,6 @@
   lvTranslateStrings.Selected := Value;
 end;
 
+
 end.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.