Skip to content

Commit e451b7e

Browse files
committed
v0.2 + QR code
1 parent ec17d01 commit e451b7e

16 files changed

Lines changed: 62 additions & 30 deletions

File tree

naivegui/backup/naivegui.lps

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@
5050
<HasResources Value="True"/>
5151
<ResourceBaseClass Value="Form"/>
5252
<UnitName Value="Unit1"/>
53-
<IsVisibleTab Value="True"/>
54-
<TopLine Value="422"/>
55-
<CursorPos X="20" Y="450"/>
53+
<TopLine Value="324"/>
54+
<CursorPos X="3" Y="328"/>
5655
<UsageCount Value="37"/>
5756
<Loaded Value="True"/>
5857
<LoadedDesigner Value="True"/>
@@ -85,17 +84,16 @@
8584
<HasResources Value="True"/>
8685
<ResourceBaseClass Value="Form"/>
8786
<UnitName Value="Unit2"/>
87+
<IsVisibleTab Value="True"/>
8888
<EditorIndex Value="1"/>
89+
<TopLine Value="7"/>
90+
<CursorPos X="7" Y="7"/>
8991
<UsageCount Value="22"/>
9092
<Loaded Value="True"/>
9193
<LoadedDesigner Value="True"/>
9294
</Unit>
9395
</Units>
94-
<JumpHistory HistoryIndex="28">
95-
<Position>
96-
<Filename Value="unit1.pas"/>
97-
<Caret Line="329" Column="79" TopLine="315"/>
98-
</Position>
96+
<JumpHistory HistoryIndex="29">
9997
<Position>
10098
<Filename Value="unit1.pas"/>
10199
<Caret Column="14"/>
@@ -207,6 +205,13 @@
207205
<Filename Value="unit1.pas"/>
208206
<Caret Line="446" TopLine="441"/>
209207
</Position>
208+
<Position>
209+
<Filename Value="unit1.pas"/>
210+
<Caret Line="445" Column="24" TopLine="422"/>
211+
</Position>
212+
<Position>
213+
<Filename Value="unit2.pas"/>
214+
</Position>
210215
</JumpHistory>
211216
<RunParams>
212217
<FormatVersion Value="2"/>

naivegui/backup/unit1.lfm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ object MainForm: TMainForm
707707
AnchorSideBottom.Side = asrBottom
708708
Left = 514
709709
Height = 60
710+
Hint = 'Show QR code'
710711
Top = 8
711712
Width = 60
712713
Anchors = [akTop, akRight, akBottom]
@@ -843,6 +844,8 @@ object MainForm: TMainForm
843844
0000000000000000000000000000000000000000000000000000000000800000
844845
00FF000000FF000000FF000000FF000000FF000000FF000000FF
845846
}
847+
ShowHint = True
848+
ParentShowHint = False
846849
OnClick = QRBtnClick
847850
end
848851
object IniPropStorage1: TIniPropStorage

naivegui/backup/unit1.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,12 +437,12 @@ procedure TMainForm.QRBtnClick(Sender: TObject);
437437
if (DomainEdit.Text = '') or (UserEdit.Text = '') or (PasswordEdit.Text = '') or
438438
(SPortEdit.Text = '') or (HPortEdit.Text = '') or (BypassBox.Text = '') then Exit;
439439

440-
if not FileExists(GetUserDir + '.config/naivegui/client.json') then Exit;
440+
// if not FileExists(GetUserDir + '.config/naivegui/client.json') then Exit;
441441

442442
//Определить протокол
443443
if QUICBox.Checked then protocol := 'naive+quic://'
444444
else
445-
protocol := 'naive+https://';
445+
protocol := 'https://';
446446

447447
QRForm.BarcodeQR1.Text := protocol + UserEdit.Text + ':' +
448448
PasswordEdit.Text + '@' + DomainEdit.Text + '#NaiveGUI';

naivegui/backup/unit2.lfm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
object QRForm: TQRForm
2-
Left = 425
2+
Left = 491
33
Height = 292
4-
Top = 192
4+
Top = 122
55
Width = 302
6-
Caption = 'QR-код'
6+
Caption = 'QR code'
77
ClientHeight = 292
88
ClientWidth = 302
99
FormStyle = fsStayOnTop
1010
Position = poMainFormCenter
1111
LCLVersion = '4.4.0.0'
12+
OnShow = FormShow
1213
object BarcodeQR1: TBarcodeQR
1314
Left = 0
1415
Height = 292

naivegui/backup/unit2.pas

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ interface
1313

1414
TQRForm = class(TForm)
1515
BarcodeQR1: TBarcodeQR;
16+
procedure FormShow(Sender: TObject);
1617
private
1718

1819
public
@@ -26,5 +27,12 @@ implementation
2627

2728
{$R *.lfm}
2829

30+
{ TQRForm }
31+
32+
procedure TQRForm.FormShow(Sender: TObject);
33+
begin
34+
QRForm.Width:=QRForm.Height;
35+
end;
36+
2937
end.
3038

16 Bytes
Binary file not shown.

naivegui/lib/x86_64-linux/unit1.o

-224 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

naivegui/lib/x86_64-linux/unit2.lfm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
object QRForm: TQRForm
2-
Left = 425
2+
Left = 491
33
Height = 292
4-
Top = 192
4+
Top = 122
55
Width = 302
66
Caption = 'QR code'
77
ClientHeight = 292
88
ClientWidth = 302
99
FormStyle = fsStayOnTop
1010
Position = poMainFormCenter
1111
LCLVersion = '4.4.0.0'
12+
OnShow = FormShow
1213
object BarcodeQR1: TBarcodeQR
1314
Left = 0
1415
Height = 292

naivegui/lib/x86_64-linux/unit2.o

776 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)