Browse Source

Delphi IDE: use the appropriate registry key; add some versioning for the syntax coloring definitions.

git-svn-id: file:///var/svn/tigccpp/trunk@1348 9552661e-59e3-4036-b4f2-dbe53926924f
debrouxl 15 years ago
parent
commit
e5d61ab490
4 changed files with 33 additions and 10 deletions
  1. 2 1
      tigcc/ide/IDE.dpr
  2. 1 1
      tigcc/ide/MainUnit.dfm
  3. 18 1
      tigcc/ide/MainUnit.pas
  4. 12 7
      tigcc/ide/PreferencesUnit.pas

+ 2 - 1
tigcc/ide/IDE.dpr

@@ -63,7 +63,8 @@ uses
 	LinkDLLUnit in 'LinkDLLUnit.pas',
 	FolderUnit in 'FolderUnit.pas',
 	LinkUnit in 'LinkUnit.pas',
-	CalcUnit in 'CalcUnit.pas';
+	CalcUnit in 'CalcUnit.pas',
+	HTMLHelpUnit in '..\components\HTMLHelpUnit.pas';
 
 {$R *.RES}
 

+ 1 - 1
tigcc/ide/MainUnit.dfm

@@ -5524,7 +5524,7 @@ object MainForm: TMainForm
       FF0FE0000000000000000000000000000000000000000000000000000000}
   end
   object DocFile: THTMLHelp
-    FileName = 'TiGccLib.chm'
+    FileName = 'Tigcc.chm'
     WindowType = 'mainwin'
     MaximizeOnShow = False
     Left = 408

+ 18 - 1
tigcc/ide/MainUnit.pas

@@ -414,9 +414,13 @@ type
 		NoHideEditor: Boolean;
 		PreviousNode: TTreeNode;
 		SyntaxCBackup: TSyntaxColoring;
+		SyntaxCReset: Boolean;
 		SyntaxAsmGNUBackup: TSyntaxColoring;
+		SyntaxAsmGNUReset: Boolean;
 		SyntaxAsmBackup: TSyntaxColoring;
+		SyntaxAsmReset: Boolean;
 		SyntaxQuillBackup: TSyntaxColoring;
+		SyntaxQuillReset: Boolean;
 		Closing: Boolean;
 		ProgSize: Integer;
 		OptimizeInfo: TLinkLibOptimizeInfo;
@@ -695,12 +699,13 @@ begin
 		Application.OnException := AppException;
 		WindowState := wsMaximized;
 		RecentFiles := TStringList.Create;
+		DocFile := THTMLHelp.Create(Self);
 		ToolsList := TToolsList.Create (Self, TToolsListItem);
 		TIGCCFolder := ExtractFilePath (ParamStr (0));
 		Delete (TIGCCFolder, Pos (UpperCase (IDELocation), UpperCase (TIGCCFolder)), Length (TIGCCFolder));
 		with TRegistry.Create do try
 			RootKey := HKey_Local_Machine;
-			if OpenKeyReadOnly ('\Software\TIGCC Team\TIGCC') then try
+			if OpenKeyReadOnly ('\Software\GCC4TI Team\GCC4TI') then try
 				if ValueExists ('Program Folder') then
 					TIGCCFolder := ReadString ('Program Folder');
 			except end;
@@ -3239,6 +3244,9 @@ begin
 					SyntaxCopy.Assign (SyntaxC);
 					Strm.WriteComponent (SyntaxCopy);
 					WriteBinaryData ('Editor C Syntax Coloring', Strm.Memory^, Strm.Size);
+					if (SyntaxCReset) then begin
+						WriteInteger ('Editor C Syntax Coloring Version', 1);
+					end;
 				finally
 					SyntaxCopy.Free;
 				end;
@@ -3248,6 +3256,9 @@ begin
 					SyntaxCopy.Assign (SyntaxAsmGNU);
 					Strm.WriteComponent (SyntaxCopy);
 					WriteBinaryData ('Editor GNU ASM Syntax Coloring', Strm.Memory^, Strm.Size);
+					if (SyntaxAsmGNUReset) then begin
+						WriteInteger ('Editor GNU ASM Syntax Coloring Version', 1);
+					end;
 				finally
 					SyntaxCopy.Free;
 				end;
@@ -3258,6 +3269,9 @@ begin
 						SyntaxCopy.Assign (SyntaxAsm);
 						Strm.WriteComponent (SyntaxCopy);
 						WriteBinaryData ('Editor ASM Syntax Coloring', Strm.Memory^, Strm.Size);
+						if (SyntaxAsmReset) then begin
+							WriteInteger ('Editor ASM Syntax Coloring Version', 1);
+						end;
 					finally
 						SyntaxCopy.Free;
 					end;
@@ -3269,6 +3283,9 @@ begin
 						SyntaxCopy.Assign (SyntaxQuill);
 						Strm.WriteComponent (SyntaxCopy);
 						WriteBinaryData ('Editor Quill Syntax Coloring', Strm.Memory^, Strm.Size);
+						if (SyntaxQuillReset) then begin
+							WriteInteger ('Editor Quill Syntax Coloring Version', 1);
+						end;
 					finally
 						SyntaxCopy.Free;
 					end;

+ 12 - 7
tigcc/ide/PreferencesUnit.pas

@@ -456,14 +456,19 @@ end;
 
 procedure TPreferencesForm.ResetButtonClick(Sender: TObject);
 begin
-	if Syntax = SyntaxC then
-		Syntax.Assign (MainForm.SyntaxCBackup)
-	else if Syntax = SyntaxAsmGNU then
-		Syntax.Assign (MainForm.SyntaxAsmGNUBackup)
-	else if Syntax = SyntaxAsm then
-		Syntax.Assign (MainForm.SyntaxAsmBackup)
-	else if Syntax = SyntaxQuill then
+	if Syntax = SyntaxC then begin
+		Syntax.Assign (MainForm.SyntaxCBackup);
+		MainForm.SyntaxCReset := True;
+	end else if Syntax = SyntaxAsmGNU then begin
+		Syntax.Assign (MainForm.SyntaxAsmGNUBackup);
+		MainForm.SyntaxAsmGNUReset := True;
+	end else if Syntax = SyntaxAsm then begin
+		Syntax.Assign (MainForm.SyntaxAsmBackup);
+		MainForm.SyntaxAsmReset := True;
+	end else if Syntax = SyntaxQuill then begin
 		Syntax.Assign (MainForm.SyntaxQuillBackup);
+		MainForm.SyntaxQuillReset := True;
+	end;
 	LanguageSelectionBoxChange (Sender);
 end;