Skip to content

Commit e023a9c

Browse files
Cesar4DCesar4D
committed
Merge branch 'develop'
2 parents ede05c1 + b25d3eb commit e023a9c

File tree

11 files changed

+1484
-3
lines changed

11 files changed

+1484
-3
lines changed

‎ClientWeb/Src/Main.View.dfm‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,16 @@ object MainView: TMainView
196196
ParentFont = False
197197
TabOrder = 2
198198
Adapter = TMSFNCDataGridDatabaseAdapter1
199+
CellAppearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
200+
CellAppearance.FilterMatchLayout.Font.Color = clWindowText
201+
CellAppearance.FilterMatchLayout.Font.Height = -12
202+
CellAppearance.FilterMatchLayout.Font.Name = 'Segoe UI'
203+
CellAppearance.FilterMatchLayout.Font.Style = []
204+
CellAppearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
205+
CellAppearance.FilterInverseMatchLayout.Font.Color = clWindowText
206+
CellAppearance.FilterInverseMatchLayout.Font.Height = -12
207+
CellAppearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
208+
CellAppearance.FilterInverseMatchLayout.Font.Style = []
199209
CellAppearance.BandLayout.Font.Charset = DEFAULT_CHARSET
200210
CellAppearance.BandLayout.Font.Color = clWindowText
201211
CellAppearance.BandLayout.Font.Height = -11
@@ -247,6 +257,16 @@ object MainView: TMainView
247257
ColumnCount = 7
248258
Columns = <
249259
item
260+
Appearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
261+
Appearance.FilterMatchLayout.Font.Color = clWindowText
262+
Appearance.FilterMatchLayout.Font.Height = -12
263+
Appearance.FilterMatchLayout.Font.Name = 'Segoe UI'
264+
Appearance.FilterMatchLayout.Font.Style = []
265+
Appearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
266+
Appearance.FilterInverseMatchLayout.Font.Color = clWindowText
267+
Appearance.FilterInverseMatchLayout.Font.Height = -12
268+
Appearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
269+
Appearance.FilterInverseMatchLayout.Font.Style = []
250270
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
251271
Appearance.BandLayout.Font.Color = clWindowText
252272
Appearance.BandLayout.Font.Height = -11
@@ -290,6 +310,16 @@ object MainView: TMainView
290310
Header = 'C'#243'digo'
291311
end
292312
item
313+
Appearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
314+
Appearance.FilterMatchLayout.Font.Color = clWindowText
315+
Appearance.FilterMatchLayout.Font.Height = -12
316+
Appearance.FilterMatchLayout.Font.Name = 'Segoe UI'
317+
Appearance.FilterMatchLayout.Font.Style = []
318+
Appearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
319+
Appearance.FilterInverseMatchLayout.Font.Color = clWindowText
320+
Appearance.FilterInverseMatchLayout.Font.Height = -12
321+
Appearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
322+
Appearance.FilterInverseMatchLayout.Font.Style = []
293323
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
294324
Appearance.BandLayout.Font.Color = clWindowText
295325
Appearance.BandLayout.Font.Height = -11
@@ -334,6 +364,16 @@ object MainView: TMainView
334364
Width = 90.000000000000000000
335365
end
336366
item
367+
Appearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
368+
Appearance.FilterMatchLayout.Font.Color = clWindowText
369+
Appearance.FilterMatchLayout.Font.Height = -12
370+
Appearance.FilterMatchLayout.Font.Name = 'Segoe UI'
371+
Appearance.FilterMatchLayout.Font.Style = []
372+
Appearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
373+
Appearance.FilterInverseMatchLayout.Font.Color = clWindowText
374+
Appearance.FilterInverseMatchLayout.Font.Height = -12
375+
Appearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
376+
Appearance.FilterInverseMatchLayout.Font.Style = []
337377
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
338378
Appearance.BandLayout.Font.Color = clWindowText
339379
Appearance.BandLayout.Font.Height = -11
@@ -378,6 +418,16 @@ object MainView: TMainView
378418
Width = 430.000000000000000000
379419
end
380420
item
421+
Appearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
422+
Appearance.FilterMatchLayout.Font.Color = clWindowText
423+
Appearance.FilterMatchLayout.Font.Height = -12
424+
Appearance.FilterMatchLayout.Font.Name = 'Segoe UI'
425+
Appearance.FilterMatchLayout.Font.Style = []
426+
Appearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
427+
Appearance.FilterInverseMatchLayout.Font.Color = clWindowText
428+
Appearance.FilterInverseMatchLayout.Font.Height = -12
429+
Appearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
430+
Appearance.FilterInverseMatchLayout.Font.Style = []
381431
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
382432
Appearance.BandLayout.Font.Color = clWindowText
383433
Appearance.BandLayout.Font.Height = -11
@@ -422,6 +472,16 @@ object MainView: TMainView
422472
Width = 300.000000000000000000
423473
end
424474
item
475+
Appearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
476+
Appearance.FilterMatchLayout.Font.Color = clWindowText
477+
Appearance.FilterMatchLayout.Font.Height = -12
478+
Appearance.FilterMatchLayout.Font.Name = 'Segoe UI'
479+
Appearance.FilterMatchLayout.Font.Style = []
480+
Appearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
481+
Appearance.FilterInverseMatchLayout.Font.Color = clWindowText
482+
Appearance.FilterInverseMatchLayout.Font.Height = -12
483+
Appearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
484+
Appearance.FilterInverseMatchLayout.Font.Style = []
425485
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
426486
Appearance.BandLayout.Font.Color = clWindowText
427487
Appearance.BandLayout.Font.Height = -11
@@ -467,6 +527,16 @@ object MainView: TMainView
467527
Settings = [gcsFormatting]
468528
end
469529
item
530+
Appearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
531+
Appearance.FilterMatchLayout.Font.Color = clWindowText
532+
Appearance.FilterMatchLayout.Font.Height = -12
533+
Appearance.FilterMatchLayout.Font.Name = 'Segoe UI'
534+
Appearance.FilterMatchLayout.Font.Style = []
535+
Appearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
536+
Appearance.FilterInverseMatchLayout.Font.Color = clWindowText
537+
Appearance.FilterInverseMatchLayout.Font.Height = -12
538+
Appearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
539+
Appearance.FilterInverseMatchLayout.Font.Style = []
470540
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
471541
Appearance.BandLayout.Font.Color = clWindowText
472542
Appearance.BandLayout.Font.Height = -11
@@ -515,6 +585,16 @@ object MainView: TMainView
515585
end
516586
item
517587
Type = gcitCheckBox
588+
Appearance.FilterMatchLayout.Font.Charset = DEFAULT_CHARSET
589+
Appearance.FilterMatchLayout.Font.Color = clWindowText
590+
Appearance.FilterMatchLayout.Font.Height = -12
591+
Appearance.FilterMatchLayout.Font.Name = 'Segoe UI'
592+
Appearance.FilterMatchLayout.Font.Style = []
593+
Appearance.FilterInverseMatchLayout.Font.Charset = DEFAULT_CHARSET
594+
Appearance.FilterInverseMatchLayout.Font.Color = clWindowText
595+
Appearance.FilterInverseMatchLayout.Font.Height = -12
596+
Appearance.FilterInverseMatchLayout.Font.Name = 'Segoe UI'
597+
Appearance.FilterInverseMatchLayout.Font.Style = []
518598
Appearance.BandLayout.Font.Charset = DEFAULT_CHARSET
519599
Appearance.BandLayout.Font.Color = clWindowText
520600
Appearance.BandLayout.Font.Height = -11
@@ -561,6 +641,7 @@ object MainView: TMainView
561641
Width = 95.000000000000000000
562642
end>
563643
Designer = False
644+
FilterActions = <>
564645
FilterAppearance.Font.Charset = DEFAULT_CHARSET
565646
FilterAppearance.Font.Color = clWindowText
566647
FilterAppearance.Font.Height = -11

‎DelphiWebGroup.groupproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<Projects Include="Server\Server.dproj">
1010
<Dependencies/>
1111
</Projects>
12+
<Projects Include="ServerAuth\ServerAuth.dproj">
13+
<Dependencies/>
14+
</Projects>
1215
</ItemGroup>
1316
<ProjectExtensions>
1417
<Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -35,14 +38,23 @@
3538
<Target Name="Server:Make">
3639
<MSBuild Projects="Server\Server.dproj" Targets="Make"/>
3740
</Target>
41+
<Target Name="ServerAuth">
42+
<MSBuild Projects="ServerAuth\ServerAuth.dproj"/>
43+
</Target>
44+
<Target Name="ServerAuth:Clean">
45+
<MSBuild Projects="ServerAuth\ServerAuth.dproj" Targets="Clean"/>
46+
</Target>
47+
<Target Name="ServerAuth:Make">
48+
<MSBuild Projects="ServerAuth\ServerAuth.dproj" Targets="Make"/>
49+
</Target>
3850
<Target Name="Build">
39-
<CallTarget Targets="ClientWeb;Server"/>
51+
<CallTarget Targets="ClientWeb;Server;ServerAuth"/>
4052
</Target>
4153
<Target Name="Clean">
42-
<CallTarget Targets="ClientWeb:Clean;Server:Clean"/>
54+
<CallTarget Targets="ClientWeb:Clean;Server:Clean;ServerAuth:Clean"/>
4355
</Target>
4456
<Target Name="Make">
45-
<CallTarget Targets="ClientWeb:Make;Server:Make"/>
57+
<CallTarget Targets="ClientWeb:Make;Server:Make;ServerAuth:Make"/>
4658
</Target>
4759
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
4860
</Project>

‎ServerAuth/ServerAuth.dpr‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
program ServerAuth;
2+
3+
uses
4+
Vcl.Forms,
5+
ServerAuth.Main.View in 'Src\ServerAuth.Main.View.pas' {ServerAuthMainView},
6+
ServerAuth.XData.DM in 'Src\ServerAuth.XData.DM.pas' {ServerAuthXDataDM: TDataModule},
7+
LoginService in 'Src\LoginService\LoginService.pas',
8+
LoginServiceImplementation in 'Src\LoginService\LoginServiceImplementation.pas';
9+
10+
{$R *.res}
11+
12+
begin
13+
Application.Initialize;
14+
Application.MainFormOnTaskbar := True;
15+
Application.CreateForm(TServerAuthXDataDM, ServerAuthXDataDM);
16+
Application.CreateForm(TServerAuthMainView, ServerAuthMainView);
17+
Application.Run;
18+
end.

0 commit comments

Comments
 (0)