[Initranslator-svncheckins] SF.net SVN: initranslator: [96] translator/trunk/src
Brought to you by:
peter3
Menu
▾
▴
[Initranslator-svncheckins] SF.net SVN: initranslator: [96] translator/trunk/src
|
From: <pe...@us...> - 2006-09-10 19:46:38
|
Revision: 96
http://svn.sourceforge.net/initranslator/?rev=96&view=rev
Author: peter3
Date: 2006-09-10 12:46:19 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
- Some changes to support XP style
- clicking the "Test" button in the ExToolsFrm generates an AV when the command is empty
Modified Paths:
--------------
translator/trunk/src/AppUtils.pas
translator/trunk/src/BaseForm.pas
translator/trunk/src/DictEditFrm.dfm
translator/trunk/src/EditItemFrm.dfm
translator/trunk/src/ExtToolsFrm.pas
translator/trunk/src/FindReplaceFrm.dfm
translator/trunk/src/MainFrm.pas
translator/trunk/src/MsDictBuild/MSDictBuild.dpr
translator/trunk/src/MsDictBuild/MainFrm.dfm
translator/trunk/src/OptionsFrm.dfm
translator/trunk/src/OptionsFrm.pas
translator/trunk/src/TrimFrm.dfm
translator/trunk/src/translator.dpr
translator/trunk/src/translator.res
Modified: translator/trunk/src/AppUtils.pas
===================================================================
--- translator/trunk/src/AppUtils.pas 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/AppUtils.pas 2006-09-10 19:46:19 UTC (rev 96)
@@ -60,12 +60,13 @@
function ValueFromIndex(S: TStrings; i: integer): AnsiString; overload;
function strtok(Search, Delim: WideString): WideString;
+procedure SetXPComboStyle(AControl:TControl);
implementation
uses
- Windows, Forms, Dialogs, Math, Registry,
+ Windows, Forms, Dialogs, Math, Registry, StdCtrls,
WideIniFiles, Menus, Consts, ShFolder,
- CommonUtils, ShlObj, ActiveX,
+ CommonUtils, ShlObj, ActiveX, TbxUxThemes,
TntWindows, TntSysUtils, TntWideStrUtils;
var
@@ -534,6 +535,27 @@
{$ENDIF JOPTSET}
{$UNDEF JOPTSET}
+type
+ TAccessComboBox = class(TCustomComboBox);
+
+procedure SetXPComboStyle(AControl:TControl);
+var i:integer;
+begin
+ if (AControl is TWinControl) then
+ for i := 0 to TWinControl(AControl).ControlCount - 1 do
+ begin
+ if TWinControl(AControl).Controls[i] is TCustomComboBox then
+ begin
+ if IsAppThemed {Win32PlatformIsXP} then
+ TAccessComboBox(TWinControl(AControl).Controls[i]).BevelKind := bkNone
+ else
+ TAccessComboBox(TWinControl(AControl).Controls[i]).BevelKind := bkFlat;
+ end;
+ if TWinControl(AControl).Controls[i] is TWinControl then
+ SetXPComboStyle(TWinControl(TWinControl(AControl).Controls[i]));
+ end;
+end;
+
initialization
finalization
Modified: translator/trunk/src/BaseForm.pas
===================================================================
--- translator/trunk/src/BaseForm.pas 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/BaseForm.pas 2006-09-10 19:46:19 UTC (rev 96)
@@ -61,6 +61,7 @@
end;
GlobalLanguageFile.TranslateObject(Self, ClassName);
LoadFormPos;
+ SetXPComboStyle(Self);
end;
function TfrmBase.CloseQuery: Boolean;
Modified: translator/trunk/src/DictEditFrm.dfm
===================================================================
--- translator/trunk/src/DictEditFrm.dfm 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/DictEditFrm.dfm 2006-09-10 19:46:19 UTC (rev 96)
@@ -48,7 +48,6 @@
Width = 408
Height = 21
Hint = 'The current original string'
- BevelKind = bkFlat
Anchors = [akLeft, akTop, akRight]
ItemHeight = 13
Sorted = True
@@ -153,7 +152,6 @@
Width = 184
Height = 21
Hint = 'CHange the selection to see different subsets of the dictionary'
- BevelKind = bkTile
Style = csDropDownList
Anchors = [akLeft, akRight, akBottom]
ItemHeight = 13
Modified: translator/trunk/src/EditItemFrm.dfm
===================================================================
--- translator/trunk/src/EditItemFrm.dfm 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/EditItemFrm.dfm 2006-09-10 19:46:19 UTC (rev 96)
@@ -72,7 +72,6 @@
Width = 430
Height = 21
BevelInner = bvNone
- BevelKind = bkFlat
BevelOuter = bvRaised
Anchors = [akLeft, akTop, akRight]
ItemHeight = 13
Modified: translator/trunk/src/ExtToolsFrm.pas
===================================================================
--- translator/trunk/src/ExtToolsFrm.pas 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/ExtToolsFrm.pas 2006-09-10 19:46:19 UTC (rev 96)
@@ -465,7 +465,7 @@
acDelete.Enabled := (lbContents.ItemIndex >= 0) and (lbContents.ItemIndex < FTools.Count);
acMoveUp.Enabled := lbContents.ItemIndex > 0;
acMoveDown.Enabled := lbContents.ItemIndex < FTools.Count - 1;
- acTest.Enabled := btnDelete.Enabled and Assigned(OnTestClick);
+ acTest.Enabled := btnDelete.Enabled and Assigned(OnTestClick) and (edCommand.Text <> '');
acClear.Enabled := edShortCut.ShortCut <> 0;
PropagateEnabled(pnlEditTool, acDelete.Enabled);
acWait.Enabled := not acUseShellexecute.Checked;
Modified: translator/trunk/src/FindReplaceFrm.dfm
===================================================================
--- translator/trunk/src/FindReplaceFrm.dfm 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/FindReplaceFrm.dfm 2006-09-10 19:46:19 UTC (rev 96)
@@ -73,7 +73,6 @@
Height = 21
Hint = 'The text to search for'
BevelInner = bvNone
- BevelKind = bkFlat
BevelOuter = bvRaised
ItemHeight = 13
TabOrder = 0
@@ -109,7 +108,6 @@
Height = 21
Hint = 'The text to replace the found text with'
BevelInner = bvNone
- BevelKind = bkFlat
BevelOuter = bvRaised
ItemHeight = 13
TabOrder = 1
@@ -131,14 +129,13 @@
Height = 21
Hint = 'Select the field(s) to search in'
BevelInner = bvNone
- BevelKind = bkFlat
BevelOuter = bvRaised
Style = csDropDownList
ItemHeight = 13
ItemIndex = 0
TabOrder = 6
Text = 'Original'
- Items.WideStrings = (
+ Items.Strings = (
'Original'
'Translation'
'Both')
Modified: translator/trunk/src/MainFrm.pas
===================================================================
--- translator/trunk/src/MainFrm.pas 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/MainFrm.pas 2006-09-10 19:46:19 UTC (rev 96)
@@ -606,7 +606,6 @@
DictEditFrm, ColorsFrm;
{$R *.dfm}
-{$R manifest.res} // for XP theme support
{ TfrmMain }
// frmMain support routines
@@ -890,7 +889,7 @@
WaitCursor;
Result := Encoding;
- if NotifyChanging(NOTIFY_ITEM_FILE_OPEN, Ord(false), Integer(PWideChar(Filename))) then
+ if not NotifyChanging(NOTIFY_ITEM_FILE_OPEN, Ord(false), Integer(PWideChar(Filename))) then
Exit;
if not CheckModified then
Exit;
@@ -930,7 +929,7 @@
begin
WaitCursor;
Result := Encoding;
- if NotifyChanging(NOTIFY_ITEM_FILE_OPEN, Ord(true), Integer(PWideChar(Filename))) then
+ if not NotifyChanging(NOTIFY_ITEM_FILE_OPEN, Ord(true), Integer(PWideChar(Filename))) then
Exit;
if not CheckModified then
Exit;
@@ -983,7 +982,7 @@
WaitCursor;
- if NotifyChanging(NOTIFY_ITEM_FILE_SAVE, Ord(true), Integer(PWideChar(Filename))) then
+ if not NotifyChanging(NOTIFY_ITEM_FILE_SAVE, Ord(true), Integer(PWideChar(Filename))) then
begin
Result := false;
Exit;
@@ -1054,9 +1053,9 @@
Result := SaveOrigAs(FileName, Encoding);
Exit;
end;
-
+
WaitCursor;
- if NotifyChanging(NOTIFY_ITEM_FILE_SAVE, Ord(false), Integer(PWideChar(Filename))) then
+ if not NotifyChanging(NOTIFY_ITEM_FILE_SAVE, Ord(false), Integer(PWideChar(Filename))) then
begin
Result := false;
Exit;
@@ -1500,7 +1499,12 @@
function TfrmMain.GetFilename(const Filename: WideString): WideString;
begin
if GlobalAppOptions.GlobalPath and (FLastFolder <> '') then
- Result := WideIncludeTrailingPathDelimiter(FLastFolder) + WideExtractFileName(Filename)
+ begin
+ if Filename = '' then
+ Result := WideIncludeTrailingPathDelimiter(FLastFolder) + '*.*'
+ else
+ Result := WideIncludeTrailingPathDelimiter(FLastFolder) + WideExtractFileName(Filename);
+ end
else
Result := Filename;
Result := WideExcludeTrailingPathDelimiter(Result);
@@ -2397,14 +2401,14 @@
Exit;
Translation := RemoveQuotes(trimCRLFRight(reTranslation.Text));
NotifyChanged(NOTIFY_ITEM_TRANS_CHANGE, Integer(PWideChar(Translation)), 0);
- Translated := MyWideDequotedStr(Translation, TransQuote) <> '';
- lvTranslateStrings.Invalidate;
- if GlobalAppOptions.UseTranslationEverywhere then
- begin
- reTranslation.Modified := false; // avoid infinite recursion
- acReplaceEverywhere.Execute;
- end;
- Modified := true;
+ Translated := MyWideDequotedStr(Translation, TransQuote) <> '';
+ lvTranslateStrings.Invalidate;
+ if GlobalAppOptions.UseTranslationEverywhere then
+ begin
+ reTranslation.Modified := false; // avoid infinite recursion
+ acReplaceEverywhere.Execute;
+ end;
+ Modified := true;
end;
UpdateStatus;
end
@@ -3269,7 +3273,8 @@
procedure TfrmMain.acImportExecute(Sender: TObject);
begin
WaitCursor;
- if not NotifyChanging(NOTIFY_ITEM_IMPORT, 0, 0) then Exit;
+ if not NotifyChanging(NOTIFY_ITEM_IMPORT, 0, 0) then
+ Exit;
SaveEditChanges;
// (FTranslateFile.Items as ITranslationItems)._AddRef;
if not CheckModified then
@@ -3304,7 +3309,8 @@
begin
// (FTranslateFile.Items as ITranslationItems)._AddRef;
WaitCursor;
- if not NotifyChanging(NOTIFY_ITEM_EXPORT, 0, 0) then Exit;
+ if not NotifyChanging(NOTIFY_ITEM_EXPORT, 0, 0) then
+ Exit;
if TfrmImportExport.Edit(FTranslateFile.Items, FTranslateFile.Orphans, WideExtractFilePath(Application.ExeName) + 'plugins',
false, FImportIndex, Dummy) then
begin
@@ -3468,7 +3474,8 @@
var
i, j: integer;
begin
- if not NotifyChanging(NOTIFY_ITEM_SPELLCHECK, 0, 0) then Exit;
+ if not NotifyChanging(NOTIFY_ITEM_SPELLCHECK, 0, 0) then
+ Exit;
CreateSpellChecker;
adSpellChecker.StartSequenceCheck;
try
@@ -3835,7 +3842,8 @@
AIndex, i: integer;
FOldSort: TTranslateSortType;
begin
- if not NotifyChanging(NOTIFY_ITEM_NEW_ITEM, Integer(AItem), 0) then Exit;
+ if not NotifyChanging(NOTIFY_ITEM_NEW_ITEM, Integer(AItem), 0) then
+ Exit;
FOldSort := FTranslateFile.Items.Sort;
try
FTranslateFile.Items.Sort := stIndex;
@@ -3887,7 +3895,8 @@
begin
if (Index >= 0) and (Index < FTranslateFile.Items.Count) then
begin
- if not NotifyChanging(NOTIFY_ITEM_DEL_ITEM, Index, 0) then Exit;
+ if not NotifyChanging(NOTIFY_ITEM_DEL_ITEM, Index, 0) then
+ Exit;
FTranslateFile.Items.Delete(Index);
NotifyChanged(NOTIFY_ITEM_DEL_ITEM, Index, 0);
end;
@@ -3972,7 +3981,8 @@
begin
Index := SelectedListItem.Index;
AItem := FTranslateFile.Items[Index];
- if not NotifyChanging(NOTIFY_ITEM_EDIT_ITEM, Integer(AItem), 0) then Exit;
+ if not NotifyChanging(NOTIFY_ITEM_EDIT_ITEM, Integer(AItem), 0) then
+ Exit;
ANewItem := FTranslateFile.Items.CreateItem;
ASections := TTntStringlist.Create;
try
Modified: translator/trunk/src/MsDictBuild/MSDictBuild.dpr
===================================================================
--- translator/trunk/src/MsDictBuild/MSDictBuild.dpr 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/MsDictBuild/MSDictBuild.dpr 2006-09-10 19:46:19 UTC (rev 96)
@@ -4,6 +4,8 @@
Forms,
MainFrm in 'MainFrm.pas' {frmMain};
+// for XP theme support
+{$R 'manifest.res' 'manifest.rc'}
{$R *.res}
begin
Modified: translator/trunk/src/MsDictBuild/MainFrm.dfm
===================================================================
--- translator/trunk/src/MsDictBuild/MainFrm.dfm 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/MsDictBuild/MainFrm.dfm 2006-09-10 19:46:19 UTC (rev 96)
@@ -15,7 +15,7 @@
OnCreate = FormCreate
DesignSize = (
524
- 390)
+ 383)
PixelsPerInch = 96
TextHeight = 13
object Label1: TTntLabel
@@ -195,7 +195,7 @@
end
object StatusBar1: TStatusBar
Left = 0
- Top = 371
+ Top = 364
Width = 524
Height = 19
Panels = <
Modified: translator/trunk/src/OptionsFrm.dfm
===================================================================
--- translator/trunk/src/OptionsFrm.dfm 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/OptionsFrm.dfm 2006-09-10 19:46:19 UTC (rev 96)
@@ -1,7 +1,7 @@
object frmOptions: TfrmOptions
Left = 316
Top = 175
- ActiveControl = chkGlobalPath
+ ActiveControl = chkShowQuotes
BorderStyle = bsDialog
Caption = 'Preferences'
ClientHeight = 449
@@ -29,18 +29,18 @@
end
object btnOK: TTntButton
Left = 303
- Top = 415
+ Top = 413
Width = 80
Height = 23
Anchors = [akRight, akBottom]
Caption = 'OK'
Default = True
ModalResult = 1
- TabOrder = 0
+ TabOrder = 1
end
object btnCancel: TTntButton
Left = 387
- Top = 415
+ Top = 413
Width = 80
Height = 23
Anchors = [akRight, akBottom]
@@ -51,13 +51,13 @@
end
object btnColors: TTntButton
Left = 20
- Top = 415
+ Top = 413
Width = 80
Height = 23
Hint = 'Select a new font for the list and edit fields'
Anchors = [akLeft, akBottom]
Caption = 'Color&s...'
- TabOrder = 1
+ TabOrder = 0
OnClick = btnColorsClick
end
object pcSettings: TTntPageControl
@@ -65,7 +65,7 @@
Top = 2
Width = 477
Height = 387
- ActivePage = tsAdvanced
+ ActivePage = tsGeneral
Anchors = [akLeft, akTop, akRight, akBottom]
TabOrder = 3
object tsGeneral: TTntTabSheet
@@ -76,7 +76,7 @@
object Label1: TTntLabel
Left = 16
Top = 239
- Width = 50
+ Width = 51
Height = 13
Anchors = [akLeft, akRight, akBottom]
Caption = '&Language:'
@@ -85,7 +85,7 @@
object Label2: TTntLabel
Left = 16
Top = 287
- Width = 24
+ Width = 25
Height = 13
Anchors = [akLeft, akRight, akBottom]
Caption = '&Help:'
@@ -93,12 +93,20 @@
end
object Bevel1: TBevel
Left = 1
- Top = 192
+ Top = 148
Width = 466
Height = 3
Anchors = [akLeft, akTop, akRight]
Shape = bsTopLine
end
+ object Bevel5: TBevel
+ Left = 1
+ Top = 219
+ Width = 466
+ Height = 3
+ Anchors = [akLeft, akTop, akRight]
+ Shape = bsTopLine
+ end
object chkShowQuotes: TTntCheckBox
Left = 16
Top = 16
@@ -110,7 +118,7 @@
end
object btnFont: TTntButton
Left = 355
- Top = 206
+ Top = 172
Width = 80
Height = 23
Hint = 'Select a new font for the list and edit fields'
@@ -218,7 +226,7 @@
end
object pnlFontPreview: TTntPanel
Left = 16
- Top = 206
+ Top = 172
Width = 329
Height = 25
Anchors = [akLeft, akRight, akBottom]
@@ -306,12 +314,19 @@
Anchors = [akLeft, akTop, akRight]
Shape = bsTopLine
end
+ object Bevel4: TBevel
+ Left = 1
+ Top = 95
+ Width = 466
+ Height = 3
+ Anchors = [akLeft, akTop, akRight]
+ Shape = bsTopLine
+ end
object cbDefaultTransEncoding: TTntComboBox
Left = 247
Top = 32
Width = 190
Height = 21
- BevelKind = bkFlat
Style = csDropDownList
ItemHeight = 13
ItemIndex = 0
@@ -423,7 +438,7 @@
Font.Style = []
Device = fdBoth
Options = []
- Left = 310
- Top = 176
+ Left = 350
+ Top = 120
end
end
Modified: translator/trunk/src/OptionsFrm.pas
===================================================================
--- translator/trunk/src/OptionsFrm.pas 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/OptionsFrm.pas 2006-09-10 19:46:19 UTC (rev 96)
@@ -72,6 +72,8 @@
reHeader: TTntRichEdit;
reFooter: TTntRichEdit;
Bevel3: TBevel;
+ Bevel4: TBevel;
+ Bevel5: TBevel;
procedure chkShowToolTipsClick(Sender: TObject);
procedure chkReturnToSaveClick(Sender: TObject);
procedure btnLanguageClick(Sender: TObject);
Modified: translator/trunk/src/TrimFrm.dfm
===================================================================
--- translator/trunk/src/TrimFrm.dfm 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/TrimFrm.dfm 2006-09-10 19:46:19 UTC (rev 96)
@@ -45,14 +45,13 @@
Top = 112
Width = 373
Height = 21
- BevelKind = bkFlat
Style = csDropDownList
Anchors = [akLeft, akTop, akRight]
ItemHeight = 13
ItemIndex = 2
TabOrder = 2
Text = 'Both'
- Items.WideStrings = (
+ Items.Strings = (
'Original'
'Translation'
'Both')
@@ -62,14 +61,13 @@
Top = 160
Width = 373
Height = 21
- BevelKind = bkFlat
Style = csDropDownList
Anchors = [akLeft, akTop, akRight]
ItemHeight = 13
ItemIndex = 2
TabOrder = 3
Text = 'Both'
- Items.WideStrings = (
+ Items.Strings = (
'Leading'
'Trailing'
'Both')
Modified: translator/trunk/src/translator.dpr
===================================================================
--- translator/trunk/src/translator.dpr 2006-09-10 17:07:21 UTC (rev 95)
+++ translator/trunk/src/translator.dpr 2006-09-10 19:46:19 UTC (rev 96)
@@ -58,6 +58,7 @@
ColorsFrm in 'ColorsFrm.pas' {frmColors: TTntForm};
{$R *.res}
+{$R 'manifest.res' 'manifest.rc'}
begin
Application.Initialize;
Modified: translator/trunk/src/translator.res
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
