Skip to content

Commit 5e2c8b5

Browse files
ansgarbeckeransgarbecker
committed
chore: remove notification for no longer created build updates
1 parent 288b346 commit 5e2c8b5

File tree

6 files changed

+45
-265
lines changed

6 files changed

+45
-265
lines changed

‎source/apphelpers.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3752,7 +3752,7 @@ constructor TAppSettings.Create;
37523752
InitSetting(asCSVImportParseMethod, 'CSVImportParseMethod', 0);
37533753
InitSetting(asCSVKeepDialogOpen, 'CSVKeepDialogOpen', 0, False);
37543754
InitSetting(asUpdatecheck, 'Updatecheck', 0, False);
3755-
InitSetting(asUpdatecheckBuilds, 'UpdatecheckBuilds', 0, False);
3755+
// Removed: InitSetting(asUpdatecheckBuilds, 'UpdatecheckBuilds', 0, False);
37563756
InitSetting(asUpdatecheckInterval, 'UpdatecheckInterval', 3);
37573757
InitSetting(asUpdatecheckLastrun, 'UpdatecheckLastrun', 0, False, DateToStr(DateTimeNever));
37583758
InitSetting(asUpdateCheckWindowWidth, 'UpdateCheckWindowWidth', 400);

‎source/main.pas‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,11 +2179,9 @@ procedure TMainForm.AfterFormCreate;
21792179
frm.btnCancel.Caption := _('Skip');
21802180
try
21812181
frm.ReadCheckFile;
2182-
// Show the dialog if release is available, or - when wanted - build checks are activated
2183-
if (AppSettings.ReadBool(asUpdatecheckBuilds) and frm.btnBuild.Enabled)
2184-
or frm.LinkLabelRelease.Enabled then begin
2182+
// Show the dialog if release is available
2183+
if frm.LinkLabelRelease.Enabled then
21852184
frm.ShowModal;
2186-
end;
21872185
except
21882186
on E:Exception do
21892187
LogSQL(f_('Error when checking for updates: %s', [E.Message]));

‎source/preferences.lfm‎

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ object frmPreferences: TfrmPreferences
1111
Constraints.MinWidth = 375
1212
DesignTimePPI = 120
1313
Position = poMainFormCenter
14-
LCLVersion = '4.2.0.0'
1514
OnClose = FormClose
1615
OnCreate = FormCreate
1716
OnDestroy = FormDestroy
@@ -177,22 +176,6 @@ object frmPreferences: TfrmPreferences
177176
Text = '1'
178177
OnChange = Modified
179178
end
180-
object chkUpdateCheckBuilds: TCheckBox
181-
AnchorSideLeft.Control = editUpdatecheckInterval
182-
AnchorSideLeft.Side = asrBottom
183-
AnchorSideTop.Control = chkRestoreLastDB
184-
AnchorSideTop.Side = asrBottom
185-
Left = 557
186-
Height = 24
187-
Top = 100
188-
Width = 290
189-
Anchors = [akTop, akLeft, akRight]
190-
BorderSpacing.Around = 6
191-
Caption = 'Also check for updated nightly builds'
192-
Enabled = False
193-
TabOrder = 5
194-
OnClick = Modified
195-
end
196179
object chkDoStatistics: TCheckBox
197180
AnchorSideTop.Control = editUpdatecheckInterval
198181
AnchorSideTop.Side = asrBottom
@@ -204,7 +187,7 @@ object frmPreferences: TfrmPreferences
204187
Anchors = [akTop, akLeft, akRight]
205188
BorderSpacing.Around = 6
206189
Caption = 'Send usage statistics'
207-
TabOrder = 6
190+
TabOrder = 5
208191
OnClick = Modified
209192
end
210193
object chkAllowMultiInstances: TCheckBox
@@ -229,7 +212,7 @@ object frmPreferences: TfrmPreferences
229212
Width = 251
230213
BorderSpacing.Around = 6
231214
Caption = 'Display bars in various list columns'
232-
TabOrder = 8
215+
TabOrder = 7
233216
OnClick = Modified
234217
end
235218
object editMySQLBinaries: TEditButton
@@ -249,7 +232,7 @@ object frmPreferences: TfrmPreferences
249232
MaxLength = 0
250233
NumGlyphs = 1
251234
PasswordChar = #0
252-
TabOrder = 9
235+
TabOrder = 8
253236
Text = 'editMySQLBinaries'
254237
TextHint = 'Find mysql.exe directory'
255238
OnButtonClick = editMySQLBinariesRightButtonClick
@@ -270,7 +253,7 @@ object frmPreferences: TfrmPreferences
270253
BorderSpacing.Around = 6
271254
ItemHeight = 20
272255
Style = csDropDownList
273-
TabOrder = 11
256+
TabOrder = 10
274257
OnClick = Modified
275258
end
276259
object editCustomSnippetsDirectory: TEditButton
@@ -290,7 +273,7 @@ object frmPreferences: TfrmPreferences
290273
MaxLength = 0
291274
NumGlyphs = 1
292275
PasswordChar = #0
293-
TabOrder = 10
276+
TabOrder = 9
294277
Text = 'editCustomSnippetsDirectory'
295278
TextHint = 'Set custom directory for SQL snippet files'
296279
OnButtonClick = editCustomSnippetsDirectoryRightButtonClick
@@ -310,7 +293,7 @@ object frmPreferences: TfrmPreferences
310293
BorderSpacing.Around = 6
311294
ItemHeight = 20
312295
Style = csDropDownList
313-
TabOrder = 12
296+
TabOrder = 11
314297
OnChange = comboGUIFontChange
315298
end
316299
object editGUIFontSize: TEdit
@@ -327,7 +310,7 @@ object frmPreferences: TfrmPreferences
327310
Anchors = [akTop, akRight]
328311
BorderSpacing.Around = 6
329312
NumbersOnly = True
330-
TabOrder = 13
313+
TabOrder = 12
331314
Text = '8'
332315
OnChange = Modified
333316
end
@@ -341,7 +324,7 @@ object frmPreferences: TfrmPreferences
341324
Anchors = [akTop, akLeft, akRight]
342325
BorderSpacing.Around = 6
343326
Caption = 'Use Ctrl+Mousewheel for zooming'
344-
TabOrder = 7
327+
TabOrder = 6
345328
OnClick = Modified
346329
end
347330
object comboTheme: TComboBox
@@ -358,7 +341,7 @@ object frmPreferences: TfrmPreferences
358341
ItemHeight = 20
359342
Sorted = True
360343
Style = csDropDownList
361-
TabOrder = 14
344+
TabOrder = 13
362345
end
363346
object comboIconPack: TComboBox
364347
AnchorSideTop.Control = comboTheme
@@ -373,7 +356,7 @@ object frmPreferences: TfrmPreferences
373356
BorderSpacing.Around = 6
374357
ItemHeight = 20
375358
Style = csDropDownList
376-
TabOrder = 16
359+
TabOrder = 15
377360
OnChange = Modified
378361
end
379362
object comboWebSearchBaseUrl: TComboBox
@@ -398,7 +381,7 @@ object frmPreferences: TfrmPreferences
398381
'https://www.bing.com/search?q=%query'
399382
'https://www.google.com/search?q=%query'
400383
)
401-
TabOrder = 17
384+
TabOrder = 16
402385
Text = 'comboWebSearchBaseUrl'
403386
OnChange = Modified
404387
end
@@ -414,7 +397,7 @@ object frmPreferences: TfrmPreferences
414397
Anchors = [akTop, akRight]
415398
BorderSpacing.Around = 6
416399
Caption = 'Preview'
417-
TabOrder = 15
400+
TabOrder = 14
418401
end
419402
end
420403
object tabLogging: TTabSheet

‎source/preferences.pas‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ TfrmPreferences = class(TExtForm)
6161
chkRestoreLastDB: TCheckBox;
6262
chkUpdatecheck: TCheckBox;
6363
editUpdatecheckInterval: TEdit;
64-
chkUpdateCheckBuilds: TCheckBox;
6564
SynSQLSynSQLSample: TSynSQLSyn;
6665
btnRestoreDefaults: TButton;
6766
lblMaxTotalRows: TLabel;
@@ -341,7 +340,6 @@ procedure TfrmPreferences.Apply(Sender: TObject);
341340
AppSettings.WriteInt(asDataFontSize, MakeInt(editDataFontSize.Text));
342341
AppSettings.WriteBool(asLogToFile, chkLogToFile.Checked);
343342
AppSettings.WriteBool(asUpdatecheck, chkUpdatecheck.Checked);
344-
AppSettings.WriteBool(asUpdatecheckBuilds, chkUpdatecheckBuilds.Checked);
345343
AppSettings.WriteInt(asUpdatecheckInterval, MakeInt(editUpdatecheckInterval.Text));
346344
AppSettings.WriteBool(asDoUsageStatistics, chkDoStatistics.Checked);
347345
AppSettings.WriteBool(asWheelZoom, chkWheelZoom.Checked);
@@ -682,7 +680,6 @@ procedure TfrmPreferences.FormShow(Sender: TObject);
682680
chkAllowMultiInstances.Checked := AppSettings.ReadBool(asAllowMultipleInstances);
683681
chkRestoreLastDB.Checked := AppSettings.ReadBool(asRestoreLastUsedDB);
684682
chkUpdatecheck.Checked := AppSettings.ReadBool(asUpdatecheck);
685-
chkUpdatecheckBuilds.Checked := AppSettings.ReadBool(asUpdatecheckBuilds);
686683
editUpdatecheckInterval.Text := AppSettings.ReadInt(asUpdatecheckInterval).ToString;
687684
chkUpdatecheckClick(Sender);
688685
chkDoStatistics.Checked := AppSettings.ReadBool(asDoUsageStatistics);
@@ -919,7 +916,6 @@ procedure TfrmPreferences.editCustomSnippetsDirectoryRightButtonClick(Sender: TO
919916
procedure TfrmPreferences.chkUpdatecheckClick(Sender: TObject);
920917
begin
921918
editUpdatecheckInterval.Enabled := chkUpdatecheck.Checked;
922-
chkUpdatecheckBuilds.Enabled := chkUpdatecheck.Checked;
923919
Modified(Sender);
924920
end;
925921

‎source/updatecheck.lfm‎

Lines changed: 26 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
object frmUpdateCheck: TfrmUpdateCheck
22
Left = 0
3-
Height = 505
3+
Height = 300
44
Top = 0
55
Width = 450
66
Caption = 'Check for updates ...'
7-
ClientHeight = 505
7+
ClientHeight = 300
88
ClientWidth = 450
99
Color = clBtnFace
10-
Constraints.MinHeight = 500
10+
Constraints.MinHeight = 300
1111
Constraints.MinWidth = 375
1212
DesignTimePPI = 120
1313
Position = poOwnerFormCenter
14-
OnClose = FormClose
1514
OnCreate = FormCreate
1615
OnDestroy = FormDestroy
1716
OnShow = FormShow
1817
object lblStatus: TLabel
1918
AnchorSideLeft.Control = Owner
20-
AnchorSideTop.Control = groupBuild
2119
AnchorSideTop.Side = asrBottom
2220
AnchorSideRight.Control = btnCancel
2321
AnchorSideBottom.Control = Owner
2422
AnchorSideBottom.Side = asrBottom
2523
Left = 6
26-
Height = 31
27-
Top = 468
28-
Width = 300
29-
Anchors = [akTop, akLeft, akRight, akBottom]
30-
AutoSize = False
24+
Height = 20
25+
Top = 274
26+
Width = 57
27+
Anchors = [akLeft, akBottom]
3128
BorderSpacing.Around = 6
3229
Caption = 'lblStatus'
3330
Layout = tlCenter
@@ -40,119 +37,45 @@ object frmUpdateCheck: TfrmUpdateCheck
4037
AnchorSideBottom.Side = asrBottom
4138
Left = 312
4239
Height = 31
43-
Top = 468
40+
Top = 263
4441
Width = 132
4542
Anchors = [akRight, akBottom]
4643
BorderSpacing.Around = 6
4744
Cancel = True
4845
Caption = 'Cancel'
4946
Default = True
5047
ModalResult = 2
51-
TabOrder = 3
52-
end
53-
object groupBuild: TGroupBox
54-
AnchorSideLeft.Control = Owner
55-
AnchorSideTop.Control = groupRelease
56-
AnchorSideTop.Side = asrBottom
57-
AnchorSideRight.Control = Owner
58-
AnchorSideRight.Side = asrBottom
59-
AnchorSideBottom.Control = btnCancel
60-
Left = 6
61-
Height = 230
62-
Top = 232
63-
Width = 438
64-
Anchors = [akTop, akLeft, akRight, akBottom]
65-
BorderSpacing.Around = 6
66-
Caption = 'Nightly build'
67-
ClientHeight = 205
68-
ClientWidth = 434
69-
ParentBackground = False
7048
TabOrder = 2
71-
object btnBuild: TButton
72-
AnchorSideLeft.Control = groupBuild
73-
AnchorSideRight.Control = groupBuild
74-
AnchorSideRight.Side = asrBottom
75-
AnchorSideBottom.Control = groupBuild
76-
AnchorSideBottom.Side = asrBottom
77-
Left = 6
78-
Height = 31
79-
Top = 168
80-
Width = 422
81-
Anchors = [akLeft, akRight, akBottom]
82-
BorderSpacing.Around = 6
83-
Caption = 'Download nightly build'
84-
Enabled = False
85-
ModalResult = 1
86-
TabOrder = 2
87-
Visible = False
88-
OnClick = btnBuildClick
89-
end
90-
object memoBuild: TMemo
91-
AnchorSideLeft.Control = groupBuild
92-
AnchorSideTop.Control = groupBuild
93-
AnchorSideRight.Control = groupBuild
94-
AnchorSideRight.Side = asrBottom
95-
AnchorSideBottom.Control = btnChangelog
96-
Left = 6
97-
Height = 119
98-
Top = 6
99-
Width = 422
100-
Anchors = [akTop, akLeft, akRight, akBottom]
101-
BorderSpacing.Around = 6
102-
BorderStyle = bsNone
103-
Color = clBtnFace
104-
Font.Color = clWindowText
105-
Font.Height = -15
106-
Font.Name = 'Courier New'
107-
Lines.Strings = (
108-
'memoBuild'
109-
)
110-
ParentFont = False
111-
ReadOnly = True
112-
ScrollBars = ssVertical
113-
TabOrder = 0
114-
Visible = False
115-
WordWrap = False
116-
end
117-
object btnChangelog: TButton
118-
AnchorSideLeft.Control = groupBuild
119-
AnchorSideRight.Control = groupBuild
120-
AnchorSideRight.Side = asrBottom
121-
AnchorSideBottom.Control = btnBuild
122-
Left = 6
123-
Height = 31
124-
Top = 131
125-
Width = 422
126-
Anchors = [akLeft, akRight, akBottom]
127-
BorderSpacing.Around = 6
128-
Caption = 'View changelog'
129-
TabOrder = 1
130-
OnClick = btnChangelogClick
131-
end
13249
end
13350
object groupRelease: TGroupBox
13451
AnchorSideLeft.Control = Owner
13552
AnchorSideTop.Control = btnDonate
13653
AnchorSideTop.Side = asrBottom
13754
AnchorSideRight.Control = Owner
13855
AnchorSideRight.Side = asrBottom
56+
AnchorSideBottom.Control = btnCancel
13957
Left = 6
140-
Height = 122
58+
Height = 153
14159
Top = 104
14260
Width = 438
143-
Anchors = [akTop, akLeft, akRight]
61+
Anchors = [akTop, akLeft, akRight, akBottom]
14462
BorderSpacing.Around = 6
14563
Caption = 'Official release'
146-
ClientHeight = 97
64+
ClientHeight = 128
14765
ClientWidth = 434
14866
Enabled = False
14967
ParentBackground = False
15068
TabOrder = 1
15169
object memoRelease: TMemo
152-
Left = 8
153-
Height = 59
154-
Top = 5
155-
Width = 417
70+
AnchorSideLeft.Control = groupRelease
71+
AnchorSideTop.Control = groupRelease
72+
AnchorSideRight.Control = groupRelease
73+
AnchorSideRight.Side = asrBottom
74+
AnchorSideBottom.Control = LinkLabelRelease
75+
Left = 6
76+
Height = 90
77+
Top = 6
78+
Width = 422
15679
Anchors = [akTop, akLeft, akRight, akBottom]
15780
BorderSpacing.Around = 6
15881
BorderStyle = bsNone
@@ -165,10 +88,13 @@ object frmUpdateCheck: TfrmUpdateCheck
16588
TabOrder = 0
16689
end
16790
object LinkLabelRelease: TLabel
91+
AnchorSideLeft.Control = groupRelease
92+
AnchorSideBottom.Control = groupRelease
93+
AnchorSideBottom.Side = asrBottom
16894
Cursor = crHandPoint
169-
Left = 8
95+
Left = 6
17096
Height = 20
171-
Top = 72
97+
Top = 102
17298
Width = 151
17399
Anchors = [akLeft, akBottom]
174100
BorderSpacing.Around = 6

0 commit comments

Comments
 (0)