Changeset 63 for branches/Transpascal/Forms

Timestamp:

Oct 15, 2010, 10:04:55 AM (15 years ago)

Author:

george

Message:

• Modified: Compiled code syntax highlighting.

Location:

branches/Transpascal/Forms

Files:

• UCompiledForm.lfm (modified) (1 diff)
• UCompiledForm.pas (modified) (2 diffs)
• UMainForm.lfm (modified) (2 diffs)
• UMainForm.pas (modified) (5 diffs)
• UProjectManager.pas (modified) (2 diffs)

branches/Transpascal/Forms/UCompiledForm.lfm

@@ -733 +733 @@
     top = 62
   end
+  object SynPasSyn1: TSynPasSyn
+    CompilerMode = pcmDelphi
+    NestedComments = False
+    left = 174
+    top = 38
+  end
+  object SynCppSyn1: TSynCppSyn
+    DefaultFilter = 'Soubory C++ (*.c,*.cpp,*.h,*.hpp,*.hh)|*.c;*.cpp;*.h;*.hpp;*.hh'
+    left = 176
+    top = 85
+  end
+  object SynXMLSyn1: TSynXMLSyn
+    DefaultFilter = 'XML Dokument (*.xml,*.xsd,*.xsl,*.xslt,*.dtd)|*.xml;*.xsd;*.xsl;*.xslt;*.dtd'
+    WantBracesParsed = False
+    left = 178
+    top = 133
+  end
 end

branches/Transpascal/Forms/UCompiledForm.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, SynEdit,
-  UCoolDocking;
+  SynHighlighterMulti, SynHighlighterVB, SynHighlighterPas, SynHighlighterCpp,
+  SynHighlighterXML, UCoolDocking;
 
 type
@@ -15 +16 @@
   TCompiledForm = class(TForm)
     CoolDockClient1: TCoolDockClient;
+    SynCppSyn1: TSynCppSyn;
     SynEdit1: TSynEdit;
+    SynPasSyn1: TSynPasSyn;
+    SynXMLSyn1: TSynXMLSyn;
   private
     { private declarations }

branches/Transpascal/Forms/UMainForm.lfm

@@ -41 +41 @@
     Caption = 'ToolBar1'
     TabOrder = 2
-    object ComboBox1: TComboBox
+    object ComboBoxTargetSelection: TComboBox
       Left = 1
       Height = 21
@@ -54 +54 @@
         'XML'
       )
+      OnChange = ComboBoxTargetSelectionChange
       Style = csDropDownList
       TabOrder = 0

branches/Transpascal/Forms/UMainForm.pas

@@ -27 +27 @@
     ActionList1: TActionList;
     Button1: TButton;
-    ComboBox1: TComboBox;
+    ComboBoxTargetSelection: TComboBox;
     CoolDockClient1: TCoolDockClient;
     CoolDockMaster1: TCoolDockMaster;
@@ -43 +43 @@
     ToolBar1: TToolBar;
     procedure ComboBox1Change(Sender: TObject);
+    procedure ComboBoxTargetSelectionChange(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -79 +80 @@
   I: Integer;
 begin
-  if ComboBox1.ItemIndex = 0 then begin
+  if ComboBoxTargetSelection.ItemIndex = 0 then begin
     Compiler.Producer.Free;
     Compiler.Producer := TProducerPascal.Create;
   end else
-  if ComboBox1.ItemIndex = 1 then begin
+  if ComboBoxTargetSelection.ItemIndex = 1 then begin
     Compiler.Producer.Free;
     Compiler.Producer := TProducerC.Create;
   end else
-  if ComboBox1.ItemIndex = 2 then begin
+  if ComboBoxTargetSelection.ItemIndex = 2 then begin
     Compiler.Producer.Free;
     Compiler.Producer := TProducerAsm8051.Create;
   end else
-  if ComboBox1.ItemIndex = 3 then begin
+  if ComboBoxTargetSelection.ItemIndex = 3 then begin
     Compiler.Producer.Free;
     Compiler.Producer := TProducerTreeView.Create;
@@ -103 +104 @@
   end;
 
+  ProjectManager.TreeViewProjectChange(Self, ProjectManager.TreeViewProject.Selected);
   LoadErrorMessages;
 end;
@@ -276 +278 @@
 end;
 
+procedure TMainForm.ComboBoxTargetSelectionChange(Sender: TObject);
+begin
+  ButtonCompileClick(Self);
+end;
+
 end.

branches/Transpascal/Forms/UProjectManager.pas

@@ -46 +46 @@
         CompiledForm.SynEdit1.Lines.LoadFromFile(FileName) else
           CompiledForm.SynEdit1.Lines.Clear;
+        if ComboBoxTargetSelection.ItemIndex = 0 then
+          CompiledForm.SynEdit1.Highlighter := CompiledForm.SynPasSyn1;
+        if ComboBoxTargetSelection.ItemIndex = 1 then
+          CompiledForm.SynEdit1.Highlighter := CompiledForm.SynCppSyn1;
+        if ComboBoxTargetSelection.ItemIndex = 2 then
+          CompiledForm.SynEdit1.Highlighter := nil;
+        if ComboBoxTargetSelection.ItemIndex = 3 then
+          CompiledForm.SynEdit1.Highlighter := CompiledForm.SynXMLSyn1;
 
-      // Load code tree view
+      (*// Load code tree view
       Compiler.Producer.Free;
       Compiler.Producer := TProducerTreeView.Create;
@@ -56 +64 @@
       end;
       //CodeTreeForm.TreeView1.Assign(TProducerTreeView(Compiler.Producer).TreeView);
+      *)
     end;
   end;