Skip to content

Commit 6851144

Browse files
committed
Merge branch 'develop'
2 parents d23d3a9 + 9fb3a18 commit 6851144

File tree

9 files changed

+338
-649
lines changed

9 files changed

+338
-649
lines changed

ClientWeb/Src/Login.View.dfm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
object LoginView: TLoginView
22
Width = 640
33
Height = 480
4+
Caption = 'DelphiWeb - Login'
5+
OnCreate = WebFormCreate
6+
OnShow = WebFormShow
47
object WebLabel1: TWebLabel
58
Left = 192
69
Top = 80
@@ -19,7 +22,9 @@ object LoginView: TLoginView
1922
ChildOrder = 1
2023
ElementID = 'edtEmail'
2124
HeightPercent = 100.000000000000000000
25+
Text = 'admin'
2226
WidthPercent = 100.000000000000000000
27+
OnKeyPress = edtLoginKeyPress
2328
end
2429
object edtSenha: TWebEdit
2530
Left = 232
@@ -29,9 +34,11 @@ object LoginView: TLoginView
2934
ChildOrder = 2
3035
ElementID = 'edtPassword'
3136
HeightPercent = 100.000000000000000000
37+
Text = 'admin'
3238
WidthPercent = 100.000000000000000000
39+
OnKeyPress = edtSenhaKeyPress
3340
end
34-
object WebButton1: TWebButton
41+
object btnEntrar: TWebButton
3542
Left = 232
3643
Top = 272
3744
Width = 96
@@ -41,7 +48,7 @@ object LoginView: TLoginView
4148
ElementID = 'btnEntrar'
4249
HeightPercent = 100.000000000000000000
4350
WidthPercent = 100.000000000000000000
44-
OnClick = WebButton1Click
51+
OnClick = btnEntrarClick
4552
end
4653
object ckLembrarMe: TWebCheckBox
4754
Left = 224

ClientWeb/Src/Login.View.pas

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,35 @@
33
interface
44

55
uses
6-
System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
7-
WEBLib.Forms, WEBLib.Dialogs, Vcl.Controls, Vcl.StdCtrls, WEBLib.StdCtrls,
6+
System.SysUtils,
7+
System.Classes,
8+
JS,
9+
Web,
10+
WEBLib.Graphics,
11+
WEBLib.Controls,
12+
WEBLib.Forms,
13+
WEBLib.Dialogs,
14+
Vcl.Controls,
15+
Vcl.StdCtrls,
16+
WEBLib.StdCtrls,
817
Main.View;
918

1019
type
1120
TLoginView = class(TWebForm)
1221
WebLabel1: TWebLabel;
1322
edtLogin: TWebEdit;
1423
edtSenha: TWebEdit;
15-
WebButton1: TWebButton;
24+
btnEntrar: TWebButton;
1625
ckLembrarMe: TWebCheckBox;
17-
procedure WebButton1Click(Sender: TObject);
26+
procedure btnEntrarClick(Sender: TObject);
27+
procedure WebFormShow(Sender: TObject);
28+
procedure edtLoginKeyPress(Sender: TObject; var Key: Char);
29+
procedure edtSenhaKeyPress(Sender: TObject; var Key: Char);
30+
procedure WebFormCreate(Sender: TObject);
1831
private
19-
{ Private declarations }
32+
2033
public
21-
{ Public declarations }
34+
2235
end;
2336

2437
var
@@ -28,7 +41,30 @@ implementation
2841

2942
{$R *.dfm}
3043

31-
procedure TLoginView.WebButton1Click(Sender: TObject);
44+
procedure TLoginView.WebFormCreate(Sender: TObject);
45+
begin
46+
Application.ThemeColor := clGrayText;
47+
Application.Themed := True;
48+
end;
49+
50+
procedure TLoginView.WebFormShow(Sender: TObject);
51+
begin
52+
edtLogin.SetFocus;
53+
end;
54+
55+
procedure TLoginView.edtLoginKeyPress(Sender: TObject; var Key: Char);
56+
begin
57+
if Key = #13 then
58+
edtSenha.SetFocus;
59+
end;
60+
61+
procedure TLoginView.edtSenhaKeyPress(Sender: TObject; var Key: Char);
62+
begin
63+
if Key = #13 then
64+
btnEntrar.Click;
65+
end;
66+
67+
procedure TLoginView.btnEntrarClick(Sender: TObject);
3268
begin
3369
if edtLogin.Text <> 'admin' then
3470
begin

ClientWeb/Src/Main.View.dfm

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,57 @@ object MainView: TMainView
1111
HeightPercent = 100.000000000000000000
1212
WidthPercent = 100.000000000000000000
1313
end
14+
object lbImportant: TWebLabel
15+
Left = 64
16+
Top = 248
17+
Width = 63
18+
Height = 15
19+
Caption = 'lbImportant'
20+
ElementID = 'lbImportant'
21+
HeightPercent = 100.000000000000000000
22+
WidthPercent = 100.000000000000000000
23+
OnClick = lbImportantClick
24+
end
25+
object lbWarning: TWebLabel
26+
Left = 72
27+
Top = 288
28+
Width = 55
29+
Height = 15
30+
Caption = 'lbWarning'
31+
ElementID = 'lbWarning'
32+
HeightPercent = 100.000000000000000000
33+
WidthPercent = 100.000000000000000000
34+
OnClick = lbWarningClick
35+
end
36+
object lbInformational: TWebLabel
37+
Left = 64
38+
Top = 328
39+
Width = 82
40+
Height = 15
41+
Caption = 'lbInformational'
42+
ElementID = 'lbInformational'
43+
HeightPercent = 100.000000000000000000
44+
WidthPercent = 100.000000000000000000
45+
OnClick = lbInformationalClick
46+
end
47+
object WebMessageDlg1: TWebMessageDlg
48+
Left = 232
49+
Top = 279
50+
Width = 24
51+
Height = 24
52+
Buttons = []
53+
CustomButtons = <
54+
item
55+
Caption = 'Sim'
56+
ElementClassName = 'text-warning'
57+
end
58+
item
59+
Caption = 'N'#227'o'
60+
ElementClassName = 'text-info'
61+
end>
62+
Opacity = 0.200000000000000000
63+
ElementButtonClassName = 'bg-black'
64+
ElementDialogClassName = 'bg-dark-subtle'
65+
ElementTitleClassName = 'bg-black'
66+
end
1467
end

0 commit comments

Comments
 (0)