Changeset 6

Timestamp:

Aug 2, 2012, 4:43:10 PM (12 years ago)

Author:

chronos

Message:

• Added: Empty application settings form. Modules will register custom settings subforms.

Location:

trunk

Files:

• Studio/UCore.pas (modified) (1 diff)
• StudioPackage/Forms/UFormMain.lfm (modified) (6 diffs)
• StudioPackage/Forms/UFormMain.lrt (modified) (2 diffs)
• StudioPackage/Forms/UFormMain.pas (modified) (6 diffs)
• StudioPackage/Forms/UFormSettings.lfm (added)
• StudioPackage/Forms/UFormSettings.lrt (added)
• StudioPackage/Forms/UFormSettings.pas (added)
• StudioPackage/LibreDevelopStudio.lpk (modified) (2 diffs)
• StudioPackage/LibreDevelopStudio.pas (modified) (1 diff)
• StudioPackage/UDataModule.pas (modified) (2 diffs)

trunk/Studio/UCore.pas

@@ -57 +57 @@
 begin
   TLDStudioAPI(ModuleManager.API).MainForm := FormMain;
-  TLDStudioAPI(ModuleManager.API).MainMenu := FormMain.MainMenu1;
+  TLDStudioAPI(ModuleManager.API).MainMenu := FormMain.MainMenu;
   RegisterModules;
 end;

trunk/StudioPackage/Forms/UFormMain.lfm

@@ -7 +7 @@
   ClientHeight = 501
   ClientWidth = 747
-  Menu = MainMenu1
+  Menu = MainMenu
   OnShow = FormShow
   LCLVersion = '1.1'
@@ -23 +23 @@
     Width = 747
     Caption = 'ToolBar1'
-    Images = ImageList1
+    Images = ImageListMain
     TabOrder = 1
     object ToolButton1: TToolButton
@@ -114 +114 @@
     end
   end
-  object MainMenu1: TMainMenu
-    Images = ImageList1
-    left = 48
-    top = 64
+  object MainMenu: TMainMenu
+    Images = ImageListMain
+    left = 80
+    top = 48
     object MenuItem1: TMenuItem
       Caption = 'Project'
@@ -520 +520 @@
       end
     end
+    object MenuItem20: TMenuItem
+      Caption = 'Build'
+      object MenuItem21: TMenuItem
+        Action = ABuild
+      end
+      object MenuItem22: TMenuItem
+        Action = ARun
+      end
+      object MenuItem23: TMenuItem
+        Action = AStop
+      end
+      object MenuItem24: TMenuItem
+        Action = ARebuild
+      end
+      object MenuItem25: TMenuItem
+        Action = ABuildClean
+      end
+    end
     object MenuItem16: TMenuItem
       Caption = 'Tools'
+      object MenuItem19: TMenuItem
+        Action = AViewSettings
+      end
     end
     object MenuItem17: TMenuItem
@@ -533 +554 @@
     end
   end
-  object ActionList1: TActionList
-    Images = ImageList1
-    left = 48
-    top = 120
+  object ActionListMain: TActionList
+    Images = ImageListMain
+    left = 80
+    top = 104
     object AProjectNew: TAction
       Category = 'Project'
@@ -616 +637 @@
       OnExecute = AViewProjectManagerExecute
     end
+    object AViewSettings: TAction
+      Category = 'View'
+      Caption = 'Settings'
+      ImageIndex = 10
+      OnExecute = AViewSettingsExecute
+    end
+    object ABuild: TAction
+      Category = 'Build'
+      Caption = 'Build'
+    end
+    object ARun: TAction
+      Category = 'Build'
+      Caption = 'Run'
+    end
+    object AStop: TAction
+      Category = 'Build'
+      Caption = 'Stop'
+    end
+    object ARebuild: TAction
+      Category = 'Build'
+      Caption = 'Rebuild'
+    end
+    object ABuildClean: TAction
+      Category = 'Build'
+      Caption = 'Clean'
+    end
   end
-  object ImageList1: TImageList
-    left = 48
-    top = 176
+  object ImageListMain: TImageList
+    left = 80
+    top = 160
     Bitmap = {
       4C69160000001000000010000000000000000000000000000000000000000000

trunk/StudioPackage/Forms/UFormMain.lrt

@@ -8 +8 @@
 TFORMMAIN.MENUITEM13.CAPTION=-
 TFORMMAIN.MENUITEM2.CAPTION=Edit
+TFORMMAIN.MENUITEM20.CAPTION=Build
 TFORMMAIN.MENUITEM16.CAPTION=Tools
 TFORMMAIN.MENUITEM17.CAPTION=View
@@ -34 +35 @@
 TFORMMAIN.AEXIT.HINT=Exit application
 TFORMMAIN.AVIEWPROJECTMANAGER.CAPTION=Project manager
+TFORMMAIN.AVIEWSETTINGS.CAPTION=Settings
+TFORMMAIN.ABUILD.CAPTION=Build
+TFORMMAIN.ARUN.CAPTION=Run
+TFORMMAIN.ASTOP.CAPTION=Stop
+TFORMMAIN.AREBUILD.CAPTION=Rebuild
+TFORMMAIN.ABUILDCLEAN.CAPTION=Clean

trunk/StudioPackage/Forms/UFormMain.pas

@@ -16 +16 @@
     AClipboardCopy: TAction;
     AClipboardPaste: TAction;
+    ABuild: TAction;
+    ABuildClean: TAction;
+    ARebuild: TAction;
+    AStop: TAction;
+    ARun: TAction;
+    AViewSettings: TAction;
     AViewProjectManager: TAction;
     AExit: TAction;
@@ -26 +32 @@
     AProjectOpen: TAction;
     AProjectNew: TAction;
-    ActionList1: TActionList;
-    ImageList1: TImageList;
-    MainMenu1: TMainMenu;
+    ActionListMain: TActionList;
+    ImageListMain: TImageList;
+    MainMenu: TMainMenu;
     MenuItem1: TMenuItem;
     MenuItem10: TMenuItem;
@@ -39 +45 @@
     MenuItem17: TMenuItem;
     MenuItem18: TMenuItem;
+    MenuItem19: TMenuItem;
     MenuItem2: TMenuItem;
+    MenuItem20: TMenuItem;
+    MenuItem21: TMenuItem;
+    MenuItem22: TMenuItem;
+    MenuItem23: TMenuItem;
+    MenuItem24: TMenuItem;
+    MenuItem25: TMenuItem;
     MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
@@ -65 +78 @@
     procedure AExitExecute(Sender: TObject);
     procedure AViewProjectManagerExecute(Sender: TObject);
+    procedure AViewSettingsExecute(Sender: TObject);
     procedure FormShow(Sender: TObject);
   private
@@ -80 +94 @@
 
 uses
-  UFormProject, UFormSourceCode;
+  UFormProject, UFormSourceCode, UFormSettings;
 
 { TFormMain }
@@ -92 +106 @@
 begin
   FormProject.Show;
+end;
+
+procedure TFormMain.AViewSettingsExecute(Sender: TObject);
+begin
+  FormSettings.ShowModal;
 end;
 

trunk/StudioPackage/LibreDevelopStudio.lpk

@@ -23 +23 @@
       </Other>
     </CompilerOptions>
-    <Files Count="5">
+    <Files Count="6">
       <Item1>
         <Filename Value="Forms\UFormMain.pas"/>
@@ -44 +44 @@
         <UnitName Value="UFormSourceCode"/>
       </Item5>
+      <Item6>
+        <Filename Value="Forms\UFormSettings.pas"/>
+        <UnitName Value="UFormSettings"/>
+      </Item6>
     </Files>
     <i18n>

trunk/StudioPackage/LibreDevelopStudio.pas

@@ -9 +9 @@
 uses
   UFormMain, UProject, UDataModule, UFormProject, UFormSourceCode, 
-  LazarusPackageIntf;
+  UFormSettings, LazarusPackageIntf;
 
 implementation

trunk/StudioPackage/UDataModule.pas

@@ -29 +29 @@
 
 uses
-  UFormSourceCode, UFormMain, UFormProject;
+  UFormSourceCode, UFormMain, UFormProject, UFormSettings;
 
 { TDataModule1 }
@@ -38 +38 @@
   Application.CreateForm(TFormProject, FormProject);
   Application.CreateForm(TFormSourceCode, FormSourceCode);
+  Application.CreateForm(TFormSettings, FormSettings);
 end;