10000 Merge branch 'develop' · Code4Delphi/Delphi-AI-Developer@203c879 · GitHub
[go: up one dir, main page]

Skip to content

Commit 203c879

Browse files
committed
Merge branch 'develop'
2 parents 7624d13 + f04238d commit 203c879

File tree

6 files changed

+338
-266
lines changed

6 files changed

+338
-266
lines changed

Package/DelphiAIDeveloper.dproj

Lines changed: 331 additions & 240 deletions
Large diffs are not rendered by default.

Package/DelphiAIDeveloper.res

0 Bytes
Binary file not shown.

Src/Consts/DelphiAIDev.Consts.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ interface
55
type
66
TConsts = class
77
public const
8-
SEMANTIC_VERSION = '2.3.0';
8+
SEMANTIC_VERSION = '2.3.1';
99
SEMANTIC_VERSION_LB = 'Version: ' + SEMANTIC_VERSION;
1010
WIN_CONTROL_FOCU_NIL = nil;
1111
DELPHI_AI_DEVELOPER_DPROJ = 'DelphiAIDeveloper.dproj';

Src/Settings/DelphiAIDev.Settings.View.dfm

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
156156
Margins.Right = 0
157157
Margins.Bottom = 1
158158
Align = alLeft
159-
Caption = 'IAs on-line'
159+
Caption = 'AI on-line'
160160
TabOrder = 1
161161
OnClick = btnIAsOnlineClick
162162
end
@@ -171,7 +171,7 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
171171
Margins.Right = 0
172172
Margins.Bottom = 1
173173
Align = alLeft
174-
Caption = 'IAs off-Line'
174+
Caption = 'AI off-Line'
175175
TabOrder = 2
176176
OnClick = btnIAsOfflineClick
177177
end
@@ -207,14 +207,10 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
207207
Top = 33 10000
208208
Width = 667
209209
Height = 521
210-
ActivePage = TabSheet4
210+
ActivePage = TabSheet1
211211
TabOrder = 1
212212
object TabSheet1: TTabSheet
213213
Caption = 'Preferences'
214-
ExplicitLeft = 0
215-
ExplicitTop = 0
216-
ExplicitWidth = 0
217-
ExplicitHeight = 0
218214
object pnPreferencesBack: TPanel
219215
Left = 0
220216
Top = 0
@@ -326,12 +322,8 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
326322
end
327323
end
328324
object TabSheet2: TTabSheet
329-
Caption = 'IAs on-line'
325+
Caption = 'AI on-line'
330326
ImageIndex = 1
331-
ExplicitLeft = 0
332-
ExplicitTop = 0
333-
ExplicitWidth = 0
334-
ExplicitHeight = 0
335327
object pnIAsOnLineBack: TPanel
336328
Left = 0
337329
Top = 0
@@ -872,12 +864,8 @@ object DelphiAIDevSettingsView: TDelphiAIDevSettingsView
872864
end
873865
end
874866
object TabSheet3: TTabSheet
875-
Caption = 'IAs off-Line'
867+
Caption = 'AI off-Line'
876868
ImageIndex = 2
877-
ExplicitLeft = 0
878-
ExplicitTop = 0
879-
ExplicitWidth = 0
880-
ExplicitHeight = 0
881869
object pnIAsOffLineBack: TPanel
882870
Left = 0
883871
Top = 0

Src/Settings/DelphiAIDev.Settings.View.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ procedure TDelphiAIDevSettingsView.FormKeyDown(Sender: TObject; var Key: Word; S
270270

271271
procedure TDelphiAIDevSettingsView.lbLinkGpt01Click(Sender: TObject);
272272
begin
273-
//**Several
273+
//**SEVERAL
274274
TUtils.OpenLink(TLabel(Sender).Hint.Trim);
275275
end;
276276

Src/Utils/DelphiAIDev.Utils.pas

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ TUtils = class
2929
class function ShowMsgInternal(const AMsg, ADetails: string; const AIcon: TC4DIcon;
3030
const AButtons: TC4DButtons; const ABtnFocu: TC4DBtnFocu; const AWinControlFocu: TWinControl): Boolean;
3131
public
32-
class procedure TryGetValueJson<T>(const AJSONObject: TJSONObject; const AKey: string; AResult: T);
3332
class function GetExceptionMessage(const E: Exception): string;
3433
class function StrToDefaultsQuestionsKind(Value: string): TC4DQuestionKind;
3534
class function StrToDriverID(Value: string): TC4DDriverID;
@@ -149,12 +148,6 @@ implementation
149148
DelphiAIDev.View.Dialog,
150149
DelphiAIDev.WaitingScreen;
151150

152-
class procedure TUtils.TryGetValueJson<T>(const AJSONObject: TJSONObject; const AKey: string; AResult: T);
153-
begin
154-
if AJSONObject.GetValue(AKey) <> nil then
155-
AResult := AJSONObject.GetValue<T>(AKey);
156-
end;
157-
158151
class function TUtils.GetExceptionMessage(const E: Exception): string;
159152
begin
160153
Result := E.Message;

0 commit comments

Comments
 (0)
0