Skip to content

Commit f41cd47

Browse files
committed
v0.4 + Improved service startup control
1 parent 864d140 commit f41cd47

9 files changed

Lines changed: 120 additions & 230 deletions

File tree

naivegui/backup/naivegui.lpi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Version Value="12"/>
55
<General>
66
<SessionStorage Value="InProjectDir"/>
7-
<Title Value="NaiveGUI v0.3"/>
7+
<Title Value="NaiveGUI v0.4"/>
88
<Scaled Value="True"/>
99
<ResourceType Value="res"/>
1010
<UseXPManifest Value="True"/>

naivegui/backup/naivegui.lps

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
<ResourceBaseClass Value="Form"/>
5252
<UnitName Value="Unit1"/>
5353
<IsVisibleTab Value="True"/>
54-
<CursorPos X="13"/>
54+
<TopLine Value="300"/>
55+
<CursorPos Y="350"/>
5556
<UsageCount Value="37"/>
5657
<Loaded Value="True"/>
5758
<LoadedDesigner Value="True"/>
@@ -89,7 +90,7 @@
8990
<UsageCount Value="22"/>
9091
</Unit>
9192
</Units>
92-
<JumpHistory HistoryIndex="27">
93+
<JumpHistory HistoryIndex="28">
9394
<Position>
9495
<Filename Value="unit1.pas"/>
9596
<Caret Line="344" Column="38" TopLine="328"/>
@@ -200,7 +201,11 @@
200201
</Position>
201202
<Position>
202203
<Filename Value="unit1.pas"/>
203-
<Caret Column="13"/>
204+
<Caret Column="12"/>
205+
</Position>
206+
<Position>
207+
<Filename Value="unit1.pas"/>
208+
<Caret Line="313" TopLine="293"/>
204209
</Position>
205210
</JumpHistory>
206211
<RunParams>

naivegui/backup/unit1.lfm

Lines changed: 92 additions & 205 deletions
Large diffs are not rendered by default.

naivegui/backup/unit1.pas

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ procedure TMainForm.CreateServerConfig;
293293
procedure TMainForm.FormCreate(Sender: TObject);
294294
var
295295
bmp: TBitmap;
296-
FShowLogTRD, FServiceStateTRD: TThread;
297296
begin
298297
MainForm.Caption := Application.Title;
299298

@@ -311,14 +310,6 @@ procedure TMainForm.FormCreate(Sender: TObject);
311310
ForceDirectories(GetUserDir + '.config/naivegui');
312311

313312
IniPropStorage1.IniFileName := GetUserDir + '.config/naivegui/naivegui.conf';
314-
315-
//Запуск потока проверки состояния сервиса (active/inactive)
316-
FServiceStateTRD := ServiceState.Create(False);
317-
FServiceStateTRD.Priority := tpNormal;
318-
319-
//Запуск поток непрерывного чтения лога
320-
FShowLogTRD := ShowLogTRD.Create(False);
321-
FShowLogTRD.Priority := tpNormal;
322313
end;
323314

324315
procedure TMainForm.FormShow(Sender: TObject);
@@ -350,6 +341,12 @@ procedure TMainForm.FormShow(Sender: TObject);
350341
HPortEdit.Text := JsonReadString(client_conf, 'inbounds[1].listen_port');
351342

352343
BypassBox.Text := JsonReadString(client_conf, 'dns.rules[0].domain_suffix[0]');
344+
345+
//Запуск потока проверки состояния сервиса (active/inactive)
346+
ServiceState.Create(False);
347+
348+
//Запуск поток непрерывного чтения лога
349+
ShowLogTRD.Create(False);
353350
end;
354351

355352
procedure TMainForm.Label10Click(Sender: TObject);

naivegui/lib/x86_64-linux/unit1.o

-168 Bytes
Binary file not shown.
-52 Bytes
Binary file not shown.

naivegui/naivegui

-32 Bytes
Binary file not shown.

naivegui/naivegui.lps

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<ResourceBaseClass Value="Form"/>
5252
<UnitName Value="Unit1"/>
5353
<IsVisibleTab Value="True"/>
54-
<CursorPos X="12"/>
54+
<CursorPos X="13"/>
5555
<UsageCount Value="37"/>
5656
<Loaded Value="True"/>
5757
<LoadedDesigner Value="True"/>
@@ -89,7 +89,7 @@
8989
<UsageCount Value="22"/>
9090
</Unit>
9191
</Units>
92-
<JumpHistory HistoryIndex="27">
92+
<JumpHistory HistoryIndex="28">
9393
<Position>
9494
<Filename Value="unit1.pas"/>
9595
<Caret Line="344" Column="38" TopLine="328"/>
@@ -200,7 +200,11 @@
200200
</Position>
201201
<Position>
202202
<Filename Value="unit1.pas"/>
203-
<Caret Column="13"/>
203+
<Caret Column="12"/>
204+
</Position>
205+
<Position>
206+
<Filename Value="unit1.pas"/>
207+
<Caret Line="313" TopLine="293"/>
204208
</Position>
205209
</JumpHistory>
206210
<RunParams>

naivegui/unit1.pas

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ procedure TMainForm.CreateServerConfig;
293293
procedure TMainForm.FormCreate(Sender: TObject);
294294
var
295295
bmp: TBitmap;
296-
FShowLogTRD, FServiceStateTRD: TThread;
297296
begin
298297
MainForm.Caption := Application.Title;
299298

@@ -311,14 +310,6 @@ procedure TMainForm.FormCreate(Sender: TObject);
311310
ForceDirectories(GetUserDir + '.config/naivegui');
312311

313312
IniPropStorage1.IniFileName := GetUserDir + '.config/naivegui/naivegui.conf';
314-
315-
//Запуск потока проверки состояния сервиса (active/inactive)
316-
FServiceStateTRD := ServiceState.Create(False);
317-
FServiceStateTRD.Priority := tpNormal;
318-
319-
//Запуск поток непрерывного чтения лога
320-
FShowLogTRD := ShowLogTRD.Create(False);
321-
FShowLogTRD.Priority := tpNormal;
322313
end;
323314

324315
procedure TMainForm.FormShow(Sender: TObject);
@@ -333,6 +324,12 @@ procedure TMainForm.FormShow(Sender: TObject);
333324
PassBtn.Width := PasswordEdit.Height;
334325
QRBtn.Width := CreateBtn.Height;
335326

327+
//Запуск потока проверки состояния сервиса (active/inactive)
328+
ServiceState.Create(False);
329+
330+
//Запуск поток непрерывного чтения лога
331+
ShowLogTRD.Create(False);
332+
336333
if not FileExists(client_conf) then Exit;
337334

338335
//Читаем параметры клиента

0 commit comments

Comments
 (0)