Changeset 11


Ignore:
Timestamp:
Apr 27, 2014, 1:49:43 PM (11 years ago)
Author:
chronos
Message:
  • Added: Some new concept forms and actions.
Location:
platform/trunk
Files:
5 added
9 edited

Legend:

Unmodified
Added
Removed
  • platform/trunk/Demo/Demo.dproj

    r10 r11  
    6666    </PropertyGroup>
    6767    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
     68        <DCC_UnitSearchPath>..\;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     69        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     70        <VerInfo_Locale>1033</VerInfo_Locale>
    6871        <DCC_RemoteDebug>false</DCC_RemoteDebug>
    6972    </PropertyGroup>
     
    134137                </VersionInfoKeys>
    135138                <Excluded_Packages>
    136                     <Excluded_Packages Name="$(BDSBIN)\dcldb170.bpl">Embarcadero Database Components</Excluded_Packages>
    137                     <Excluded_Packages Name="$(BDSBIN)\dclwebsnap170.bpl">Embarcadero WebSnap Components</Excluded_Packages>
    138                     <Excluded_Packages Name="$(BDSBIN)\dclwbm170.bpl">Embarcadero InternetExpress Components</Excluded_Packages>
    139                     <Excluded_Packages Name="$(BDSBIN)\dclmid170.bpl">Embarcadero MyBase DataAccess Components</Excluded_Packages>
    140                     <Excluded_Packages Name="$(BDSBIN)\dclbindcomp170.bpl">Embarcadero LiveBindings Components</Excluded_Packages>
    141                     <Excluded_Packages Name="$(BDSBIN)\dclbindcompfmx170.bpl">Embarcadero LiveBindings Components FireMonkey</Excluded_Packages>
    142                     <Excluded_Packages Name="$(BDSBIN)\dclbindcompvcl170.bpl">Embarcadero LiveBindings Components VCL</Excluded_Packages>
    143                     <Excluded_Packages Name="$(BDSBIN)\dclbde170.bpl">Embarcadero BDE DB Components</Excluded_Packages>
    144                     <Excluded_Packages Name="$(BDSBIN)\dclib170.bpl">Embarcadero InterBase Express Components</Excluded_Packages>
    145                     <Excluded_Packages Name="$(BDSBIN)\dclado170.bpl">Embarcadero ADO DB Components</Excluded_Packages>
    146                     <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPluginInt170.bpl">DBExpress InterBase Data Explorer Integration</Excluded_Packages>
    147                     <Excluded_Packages Name="$(BDSBIN)\dclbindcompdbx170.bpl">LiveBindings Expression Components DbExpress</Excluded_Packages>
    148                     <Excluded_Packages Name="$(BDSBIN)\dcldbx170.bpl">Embarcadero dbExpress Components</Excluded_Packages>
    149                     <Excluded_Packages Name="$(BDSBIN)\dcldbxcds170.bpl">Embarcadero SimpleDataset Component (DBX)</Excluded_Packages>
    150                     <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPlugin170.bpl">DBExpress Data Explorer Integration</Excluded_Packages>
    151                     <Excluded_Packages Name="$(BDSBIN)\dclmcn170.bpl">Embarcadero DataSnap Connection Components</Excluded_Packages>
    152                     <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPluginEnt170.bpl">DBExpress Enterprise Data Explorer Integration</Excluded_Packages>
    153                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapClient170.bpl">Embarcadero DBExpress DataSnap Client Components</Excluded_Packages>
    154                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapCommon170.bpl">Embarcadero DBExpress DataSnap Common Design package</Excluded_Packages>
    155                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapIndy10ServerTransport170.bpl">Embarcadero DBExpress DataSnap Server Transport Components</Excluded_Packages>
    156                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapProviderClient170.bpl">Embarcadero DBExpress DataSnap Provider Client Components</Excluded_Packages>
    157                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapServer170.bpl">Embarcadero DBExpress DataSnap Server Components</Excluded_Packages>
    158                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapConnectors170.bpl">Embarcadero DataSnap Connector Components</Excluded_Packages>
    159                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
    160                     <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
    161                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfs17.bpl">File C:\Program Files\FastReports\LibD17\dclfs17.bpl not found</Excluded_Packages>
    162                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfrx17.bpl">File C:\Program Files\FastReports\LibD17\dclfrx17.bpl not found</Excluded_Packages>
    163                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfsDB17.bpl">File C:\Program Files\FastReports\LibD17\dclfsDB17.bpl not found</Excluded_Packages>
    164                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfrxDB17.bpl">File C:\Program Files\FastReports\LibD17\dclfrxDB17.bpl not found</Excluded_Packages>
    165                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfrxe17.bpl">File C:\Program Files\FastReports\LibD17\dclfrxe17.bpl not found</Excluded_Packages>
     139                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k180.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
     140                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp180.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
    166141                </Excluded_Packages>
    167142                <Source>
  • platform/trunk/Demo/ProjectGroupDemo.groupproj

    r10 r11  
    11<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    22    <PropertyGroup>
    3         <ProjectGuid>{7010F654-75CD-4D4D-A4CB-CC5146AD99F2}</ProjectGuid>
     3        <ProjectGuid>{899CB87A-4824-4F8D-B9AF-4A7885362224}</ProjectGuid>
    44    </PropertyGroup>
    55    <ItemGroup>
  • platform/trunk/LDPlatform.Core.dfm

    r10 r11  
    22  OldCreateOrder = False
    33  OnCreate = DataModuleCreate
    4   Height = 464
    5   Width = 582
     4  OnDestroy = DataModuleDestroy
     5  Height = 526
     6  Width = 625
    67  object ActionList1: TActionList
    78    Images = ImageList1
     
    1617      OnExecute = AQuitExecute
    1718    end
     19    object AFileOpen: TAction
     20      Caption = '&Open...'
     21      ShortCut = 16463
     22      OnExecute = AFileOpenExecute
     23    end
     24    object AFileClose: TAction
     25      Caption = 'Close'
     26    end
     27    object AFileSave: TAction
     28      Caption = 'Save'
     29      ShortCut = 16467
     30      OnExecute = AFileSaveExecute
     31    end
     32    object AFileSaveAs: TAction
     33      Caption = 'Save as...'
     34      OnExecute = AFileSaveAsExecute
     35    end
     36    object ANew: TAction
     37      Caption = 'Other...'
     38      OnExecute = ANewExecute
     39    end
     40    object AFileCloseAll: TAction
     41      Caption = 'Close all'
     42    end
     43    object AFileSaveAll: TAction
     44      Caption = 'Save all'
     45    end
     46    object AHelpAbout: TAction
     47      Caption = 'About'
     48    end
    1849  end
    1950  object ImageList1: TImageList
     
    2152    Top = 144
    2253  end
     54  object OpenDialog1: TOpenDialog
     55    Filter =
     56      'Delphi project (.dpr)|*.dpr|Delphi source (.pas)|*.pas|Delphi pa' +
     57      'ckage (.dpk)|*.dpk|Any file|*.*'
     58    Left = 432
     59    Top = 312
     60  end
     61  object SaveDialog1: TSaveDialog
     62    Left = 352
     63    Top = 312
     64  end
    2365end
  • platform/trunk/LDPlatform.Core.pas

    r10 r11  
    55uses
    66  System.SysUtils, System.Classes, Vcl.Forms, LDPlatform.FormMain, LDPlatform.FormOptions,
    7   System.Actions, Vcl.ActnList, Vcl.ImgList, Vcl.Controls;
     7  System.Actions, Vcl.ActnList, Vcl.ImgList, Vcl.Controls, LDPlatform.FormNew,
     8  Generics.Collections, Vcl.Dialogs, UProject;
    89
    910type
     11  TOpenedFile = class
     12    FileName: string;
     13  end;
     14
    1015  TCore = class(TDataModule)
    1116    ActionList1: TActionList;
     
    1318    AOptions: TAction;
    1419    AQuit: TAction;
     20    AFileOpen: TAction;
     21    AFileClose: TAction;
     22    AFileSave: TAction;
     23    AFileSaveAs: TAction;
     24    ANew: TAction;
     25    AFileCloseAll: TAction;
     26    AFileSaveAll: TAction;
     27    AHelpAbout: TAction;
     28    OpenDialog1: TOpenDialog;
     29    SaveDialog1: TSaveDialog;
    1530    procedure DataModuleCreate(Sender: TObject);
     31    procedure DataModuleDestroy(Sender: TObject);
    1632    procedure AOptionsExecute(Sender: TObject);
    1733    procedure AQuitExecute(Sender: TObject);
     34    procedure ANewExecute(Sender: TObject);
     35    procedure AFileOpenExecute(Sender: TObject);
     36    procedure AFileSaveAsExecute(Sender: TObject);
     37    procedure AFileSaveExecute(Sender: TObject);
    1838  private
    1939    { Private declarations }
    2040  public
     41    Project: TProject;
     42    OpenedFiles: TList<TOpenedFile>;
     43    FormNew: TFormNew;
    2144    FormMain: TFormMain;
    2245    FormOptions: TFormOptions;
     
    3154
    3255{$R *.dfm}
     56
     57procedure TCore.AFileOpenExecute(Sender: TObject);
     58begin
     59  if OpenDialog1.Execute then begin
     60    Project.LoadFromFile(OpenDialog1.FileName);
     61  end;
     62end;
     63
     64procedure TCore.AFileSaveAsExecute(Sender: TObject);
     65begin
     66  SaveDialog1.FileName := Project.FileName;
     67  if SaveDialog1.Execute then begin
     68    Project.SaveToFile(SaveDialog1.FileName);
     69  end;
     70end;
     71
     72procedure TCore.AFileSaveExecute(Sender: TObject);
     73begin
     74  if Project.Modified then AFileSaveAs.Execute
     75    else Project.Save; 
     76end;
     77
     78procedure TCore.ANewExecute(Sender: TObject);
     79begin
     80  try
     81    FormNew := TFormNew.Create(nil);
     82    //FormNew.Load;
     83    if FormNew.ShowModal = mrOk then begin
     84      //FormOptions.Save;
     85    end;
     86  finally
     87    FreeAndNil(FormNew);
     88  end;
     89end;
    3390
    3491procedure TCore.AOptionsExecute(Sender: TObject);
     
    52109procedure TCore.DataModuleCreate(Sender: TObject);
    53110begin
     111  Project := TProject.Create;
     112  OpenedFiles := TList<TOpenedFile>.Create;
    54113  Application.CreateForm(TFormMain, FormMain);
    55114  FormMain.Show;
    56115end;
    57116
     117procedure TCore.DataModuleDestroy(Sender: TObject);
     118begin
     119  Project.Free;
     120  OpenedFiles.Free;
     121end;
     122
    58123end.
  • platform/trunk/LDPlatform.FormMain.dfm

    r10 r11  
    2828    object File1: TMenuItem
    2929      Caption = 'File'
     30      object MenuItemNew: TMenuItem
     31        Caption = 'New'
     32        object N1: TMenuItem
     33          Caption = '-'
     34        end
     35        object Options2: TMenuItem
     36          Action = Core.ANew
     37        end
     38      end
     39      object Open1: TMenuItem
     40        Action = Core.AFileOpen
     41      end
     42      object Reopen1: TMenuItem
     43        Caption = 'Reopen'
     44        object TMenuItem
     45        end
     46      end
     47      object Save1: TMenuItem
     48        Action = Core.AFileSave
     49      end
     50      object Saveas1: TMenuItem
     51        Action = Core.AFileSaveAs
     52      end
     53      object Saveall1: TMenuItem
     54        Action = Core.AFileSaveAll
     55      end
     56      object Close1: TMenuItem
     57        Action = Core.AFileClose
     58      end
     59      object Closeall1: TMenuItem
     60        Action = Core.AFileCloseAll
     61      end
     62      object N2: TMenuItem
     63        Caption = '-'
     64      end
    3065      object Quit1: TMenuItem
    3166        Action = Core.AQuit
     
    3873      end
    3974    end
     75    object Help1: TMenuItem
     76      Caption = 'Help'
     77      object About1: TMenuItem
     78        Action = Core.AHelpAbout
     79      end
     80    end
    4081  end
    4182end
  • platform/trunk/LDPlatform.FormMain.pas

    r10 r11  
    1818    Options1: TMenuItem;
    1919    Quit1: TMenuItem;
     20    MenuItemNew: TMenuItem;
     21    N1: TMenuItem;
     22    Options2: TMenuItem;
     23    N2: TMenuItem;
     24    Open1: TMenuItem;
     25    Save1: TMenuItem;
     26    Saveas1: TMenuItem;
     27    Saveall1: TMenuItem;
     28    Close1: TMenuItem;
     29    Closeall1: TMenuItem;
     30    Reopen1: TMenuItem;
     31    Help1: TMenuItem;
     32    About1: TMenuItem;
    2033  private
    2134    { Private declarations }
  • platform/trunk/LDPlatform.dpk

    r10 r11  
    2626{$DEFINE DEBUG}
    2727{$ENDIF IMPLICITBUILDING}
     28{$DESIGNONLY}
    2829{$IMPLICITBUILD ON}
    2930
     
    3132  rtl,
    3233  vcl,
    33   vclactnband;
     34  vclactnband,
     35  xmlrtl;
    3436
    3537contains
     
    3739  LDPlatform.FormOptions in 'LDPlatform.FormOptions.pas' {FormOptions},
    3840  ULDPlatform in 'ULDPlatform.pas',
    39   LDPlatform.Core in 'LDPlatform.Core.pas' {Core: TDataModule};
     41  LDPlatform.Core in 'LDPlatform.Core.pas' {Core: TDataModule},
     42  LDPlatform.FormNew in 'LDPlatform.FormNew.pas' {FormNew},
     43  UProject in 'UProject.pas',
     44  LDPlatform.FormSource in 'LDPlatform.FormSource.pas' {FormSource};
    4045
    4146end.
  • platform/trunk/LDPlatform.dproj

    r10 r11  
    4646    </PropertyGroup>
    4747    <PropertyGroup Condition="'$(Base)'!=''">
     48        <DesignOnlyPackage>true</DesignOnlyPackage>
    4849        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
    4950        <GenPackage>true</GenPackage>
     
    7576    </PropertyGroup>
    7677    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
     78        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     79        <VerInfo_Locale>1033</VerInfo_Locale>
    7780        <DCC_RemoteDebug>false</DCC_RemoteDebug>
    7881    </PropertyGroup>
     
    9093        <DCCReference Include="vcl.dcp"/>
    9194        <DCCReference Include="vclactnband.dcp"/>
     95        <DCCReference Include="xmlrtl.dcp"/>
    9296        <DCCReference Include="LDPlatform.FormMain.pas">
    9397            <Form>FormMain</Form>
     
    102106            <FormType>dfm</FormType>
    103107            <DesignClass>TDataModule</DesignClass>
     108        </DCCReference>
     109        <DCCReference Include="LDPlatform.FormNew.pas">
     110            <Form>FormNew</Form>
     111            <FormType>dfm</FormType>
     112        </DCCReference>
     113        <DCCReference Include="UProject.pas"/>
     114        <DCCReference Include="LDPlatform.FormSource.pas">
     115            <Form>FormSource</Form>
     116            <FormType>dfm</FormType>
    104117        </DCCReference>
    105118        <BuildConfiguration Include="Release">
     
    159172                </VersionInfoKeys>
    160173                <Excluded_Packages>
    161                     <Excluded_Packages Name="$(BDSBIN)\dcldb170.bpl">Embarcadero Database Components</Excluded_Packages>
    162                     <Excluded_Packages Name="$(BDSBIN)\dclwebsnap170.bpl">Embarcadero WebSnap Components</Excluded_Packages>
    163                     <Excluded_Packages Name="$(BDSBIN)\dclwbm170.bpl">Embarcadero InternetExpress Components</Excluded_Packages>
    164                     <Excluded_Packages Name="$(BDSBIN)\dclmid170.bpl">Embarcadero MyBase DataAccess Components</Excluded_Packages>
    165                     <Excluded_Packages Name="$(BDSBIN)\dclbindcomp170.bpl">Embarcadero LiveBindings Components</Excluded_Packages>
    166                     <Excluded_Packages Name="$(BDSBIN)\dclbindcompfmx170.bpl">Embarcadero LiveBindings Components FireMonkey</Excluded_Packages>
    167                     <Excluded_Packages Name="$(BDSBIN)\dclbindcompvcl170.bpl">Embarcadero LiveBindings Components VCL</Excluded_Packages>
    168                     <Excluded_Packages Name="$(BDSBIN)\dclbde170.bpl">Embarcadero BDE DB Components</Excluded_Packages>
    169                     <Excluded_Packages Name="$(BDSBIN)\dclib170.bpl">Embarcadero InterBase Express Components</Excluded_Packages>
    170                     <Excluded_Packages Name="$(BDSBIN)\dclado170.bpl">Embarcadero ADO DB Components</Excluded_Packages>
    171                     <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPluginInt170.bpl">DBExpress InterBase Data Explorer Integration</Excluded_Packages>
    172                     <Excluded_Packages Name="$(BDSBIN)\dclbindcompdbx170.bpl">LiveBindings Expression Components DbExpress</Excluded_Packages>
    173                     <Excluded_Packages Name="$(BDSBIN)\dcldbx170.bpl">Embarcadero dbExpress Components</Excluded_Packages>
    174                     <Excluded_Packages Name="$(BDSBIN)\dcldbxcds170.bpl">Embarcadero SimpleDataset Component (DBX)</Excluded_Packages>
    175                     <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPlugin170.bpl">DBExpress Data Explorer Integration</Excluded_Packages>
    176                     <Excluded_Packages Name="$(BDSBIN)\dclmcn170.bpl">Embarcadero DataSnap Connection Components</Excluded_Packages>
    177                     <Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPluginEnt170.bpl">DBExpress Enterprise Data Explorer Integration</Excluded_Packages>
    178                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapClient170.bpl">Embarcadero DBExpress DataSnap Client Components</Excluded_Packages>
    179                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapCommon170.bpl">Embarcadero DBExpress DataSnap Common Design package</Excluded_Packages>
    180                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapIndy10ServerTransport170.bpl">Embarcadero DBExpress DataSnap Server Transport Components</Excluded_Packages>
    181                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapProviderClient170.bpl">Embarcadero DBExpress DataSnap Provider Client Components</Excluded_Packages>
    182                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapServer170.bpl">Embarcadero DBExpress DataSnap Server Components</Excluded_Packages>
    183                     <Excluded_Packages Name="$(BDSBIN)\dclDataSnapConnectors170.bpl">Embarcadero DataSnap Connector Components</Excluded_Packages>
    184                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
    185                     <Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
    186                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfs17.bpl">File C:\Program Files\FastReports\LibD17\dclfs17.bpl not found</Excluded_Packages>
    187                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfrx17.bpl">File C:\Program Files\FastReports\LibD17\dclfrx17.bpl not found</Excluded_Packages>
    188                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfsDB17.bpl">File C:\Program Files\FastReports\LibD17\dclfsDB17.bpl not found</Excluded_Packages>
    189                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfrxDB17.bpl">File C:\Program Files\FastReports\LibD17\dclfrxDB17.bpl not found</Excluded_Packages>
    190                     <Excluded_Packages Name="C:\Program Files\FastReports\LibD17\dclfrxe17.bpl">File C:\Program Files\FastReports\LibD17\dclfrxe17.bpl not found</Excluded_Packages>
     174                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k180.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
     175                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp180.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
    191176                </Excluded_Packages>
    192177            </Delphi.Personality>
  • platform/trunk/ULDPlatform.pas

    r10 r11  
    1515    Core: TCore;
    1616    procedure Show;
     17    constructor Create(AOwnere: TComponent); override;
     18    destructor Destroy; override;
    1719  published
    1820  end;
     
    2931{ TLDPlatform }
    3032
    31 procedure TLDPlatform.Show;
     33constructor TLDPlatform.Create(AOwnere: TComponent);
    3234begin
     35  inherited;
    3336  Core := TCore.Create(Self);
    3437end;
    3538
     39destructor TLDPlatform.Destroy;
     40begin
     41  inherited;
     42end;
     43
     44procedure TLDPlatform.Show;
     45begin
     46end;
     47
    3648end.
Note: See TracChangeset for help on using the changeset viewer.