Changeset 127 for branches/generator/Forms

Timestamp:

Nov 30, 2017, 5:19:57 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Correctly set filename in open/save dialog.
• Modified: Improved generation of compiler code.

Location:

branches/generator/Forms

Files:

• UFormMain.lfm (modified) (6 diffs)
• UFormMain.pas (modified) (4 diffs)

branches/generator/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 1050
   Caption = 'Language generator'
-  ClientHeight = 644
+  ClientHeight = 653
   ClientWidth = 1050
   Menu = MainMenu1
@@ -11 +11 @@
   OnCloseQuery = FormCloseQuery
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.6.4.0'
   object MemoBNF: TMemo
     Left = 0
-    Height = 609
+    Height = 618
     Top = 35
     Width = 1050
@@ -39 +39 @@
       Height = 22
       Top = 5
-      Width = 47
+      Width = 124
       Align = alNone
       AutoSize = True
       BorderSpacing.Left = 22
       BorderSpacing.Top = 3
-      Caption = 'ToolBar1'
       EdgeInner = esNone
       EdgeOuter = esNone
@@ -53 +52 @@
       Transparent = True
       object ToolButton1: TToolButton
-        Left = 1
+        Left = 78
         Top = 0
         Action = ARules
       end
       object ToolButton2: TToolButton
+        Left = 101
+        Top = 0
+        Action = ABuildCompiler
+      end
+      object ToolButton3: TToolButton
+        Left = 1
+        Top = 0
+        Action = AProjectNew
+      end
+      object ToolButton4: TToolButton
         Left = 24
         Top = 0
-        Action = ABuildCompiler
+        Action = AProjectOpen
+      end
+      object ToolButton5: TToolButton
+        Left = 47
+        Top = 0
+        Action = AProjectSave
+      end
+      object ToolButton6: TToolButton
+        Left = 70
+        Height = 22
+        Top = 0
+        Width = 8
+        Caption = 'ToolButton6'
+        Style = tbsSeparator
       end
     end
@@ -66 +88 @@
   object MainMenu1: TMainMenu
     Images = Core.ImageList1
-    left = 312
+    left = 304
     top = 229
     object MenuItem2: TMenuItem
@@ -161 +183 @@
   end
   object OpenDialog1: TOpenDialog
+    DefaultExt = '.grm'
+    Filter = 'Grammer (.grm)|*.grm|All files|*.*'
     left = 748
     top = 188
   end
   object SaveDialog1: TSaveDialog
+    DefaultExt = '.grm'
+    Filter = 'Grammer (.grm)|*.grm|All files|*.*'
     left = 587
     top = 414

branches/generator/Forms/UFormMain.pas

@@ -45 +45 @@
     ToolButton1: TToolButton;
     ToolButton2: TToolButton;
+    ToolButton3: TToolButton;
+    ToolButton4: TToolButton;
+    ToolButton5: TToolButton;
+    ToolButton6: TToolButton;
     procedure ABuildCompilerExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
@@ -78 +82 @@
   SUnsavedChanges = 'Unsaved changes';
   SDoYouWantToSaveProject = 'There are unsaved changes in project. Do you want to save them?';
-  SNewGrammer = 'New grammer.xtg';
+  SNewGrammer = 'New grammer.grm';
 
   { TFormMain }
@@ -96 +100 @@
 procedure TFormMain.AProjectSaveAsExecute(Sender: TObject);
 begin
-  SaveDialog1.FileName := Core.Grammer.FileName;
+  SaveDialog1.InitialDir := ExtractFileDir(Core.Grammer.FileName);
+  SaveDialog1.FileName := ExtractFileName(Core.Grammer.FileName);
   if SaveDialog1.Execute then begin
     Core.LastOpenedFile := SaveDialog1.FileName;
@@ -192 +197 @@
   AProjectClose.Execute;
   if not Assigned(Core.Grammer) then begin
-    OpenDialog1.FileName := Core.LastOpenedFile;
+    OpenDialog1.InitialDir := ExtractFileDir(Core.LastOpenedFile);
+    OpenDialog1.FileName := ExtractFileName(Core.LastOpenedFile);
     if OpenDialog1.Execute then begin
       Core.LastOpenedFile := OpenDialog1.FileName;