Skip to content

Commit 371cc07

Browse files
Cesar4DCesar4D
committed
refactor/chamada-reopen-view-e-thema
1 parent 210f547 commit 371cc07

8 files changed

+11
-30
lines changed

‎Src/Consts/C4D.Wizard.Consts.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface
88
type
99
TC4DConsts = class
1010
public const
11-
SEMANTIC_VERSION = '1.18.0';
11+
SEMANTIC_VERSION = '1.19.0';
1212
SEMANTIC_VERSION_LB = 'Version: ' + SEMANTIC_VERSION;
1313
NAME_FOLDER_GIT = '.git\';
1414
WIN_CONTROL_FOCU_NIL = nil;

‎Src/IDE/MainMenu/C4D.Wizard.IDE.MainMenu.OpenExternal.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function TC4DWizardIDEMainMenuOpenExternal.CreateMenusOpenExternal: IC4DWizardID
6464
begin
6565
Self.CreateItemMenuMain;
6666
Self.CreateSubMenu(FMenuItemOpenExternal, 'C4DOpenExternalMenuItemCad1', 'Customize...', Self.CustomizeClick);
67-
Self.CreateSubMenu(FMenuItemOpenExternal, 'C4DOpenExternalSeparator01', '-', {$IF CompilerVersion = 30.0} TNotifyEvent(nil) {$ELSE} nil {$ENDIF});
67+
Self.CreateSubMenu(FMenuItemOpenExternal, 'C4DOpenExternalSeparator01', '-', {$IF CompilerVersion = 30} TNotifyEvent(nil) {$ELSE} nil {$ENDIF});
6868

6969
FList.Clear;
7070
TC4DWizardOpenExternalModel.New.ReadIniFile(

‎Src/IDE/PopupMenu/C4D.Wizard.IDE.PopupMenu.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ procedure TC4DWizardIDEPopupMenuNotifier.OnExecuteViewExeInExplorer(const MenuCo
179179

180180
function TC4DWizardIDEPopupMenuNotifier.AddItemInMenu(const ACaption: string): IOTAProjectManagerMenu;
181181
begin
182-
Result := TC4DWizardIDEPopupMenuItem.New({$IF CompilerVersion = 30.0} TC4DWizardMenuContextList(nil) {$ELSE} nil {$ENDIF});
182+
Result := TC4DWizardIDEPopupMenuItem.New({$IF CompilerVersion = 30} TC4DWizardMenuContextList(nil) {$ELSE} nil {$ENDIF});
183183
Result.Caption := ACaption;
184184
Result.Verb := ACaption;
185185
Result.Parent := '';

‎Src/Notes/C4D.Wizard.Notes.View.dfm

-18
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ object C4DWizardNotesView: TC4DWizardNotesView
1212
Font.Name = 'Tahoma'
1313
Font.Style = []
1414
KeyPreview = True
15-
OldCreateOrder = False
1615
Position = poScreenCenter
1716
ShowHint = True
1817
OnActivate = FormActivate
1918
OnClose = FormClose
2019
OnShow = FormShow
21-
PixelsPerInch = 96
2220
TextHeight = 13
2321
object pnBack: TPanel
2422
Left = 0
@@ -64,8 +62,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
6462
PopupMenu = PopupMenu1
6563
ScrollBars = ssVertical
6664
TabOrder = 0
67-
Zoom = 100
68-
ExplicitTop = 3
6965
end
7066
end
7167
object pnTop: TPanel
@@ -85,8 +81,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
8581
Padding.Right = 2
8682
Padding.Bottom = 2
8783
TabOrder = 1
88-
ExplicitLeft = -5
89-
ExplicitTop = 494
9084
object Bevel2: TBevel
9185
AlignWithMargins = True
9286
Left = 326
@@ -132,7 +126,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
132126
ShowHint = True
133127
TabOrder = 0
134128
OnClick = btnColorClick
135-
ExplicitLeft = 83
136129
end
137130
object cBoxSizeFont: TComboBox
138131
AlignWithMargins = True
@@ -166,7 +159,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
166159
'48'
167160
'72'
168161
'96')
169-
ExplicitLeft = 132
170162
end
171163
object btnAlignmentLeft: TButton
172164
AlignWithMargins = True
@@ -186,7 +178,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
186178
ShowHint = True
187179
TabOrder = 3
188180
OnClick = btnAlignmentLeftClick
189-
ExplicitLeft = 329
190181
end
191182
object btnAlignmentCenter: TButton
192183
AlignWithMargins = True
@@ -206,7 +197,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
206197
ShowHint = True
207198
TabOrder = 2
208199
OnClick = btnAlignmentCenterClick
209-
ExplicitLeft = 354
210200
end
211201
object btnAlignmentRight: TButton
212202
AlignWithMargins = True
@@ -226,7 +216,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
226216
ShowHint = True
227217
TabOrder = 4
228218
OnClick = btnAlignmentRightClick
229-
ExplicitLeft = 379
230219
end
231220
object btnUnderline: TButton
232221
AlignWithMargins = True
@@ -247,7 +236,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
247236
ShowHint = True
248237
TabOrder = 5
249238
OnClick = btnUnderlineClick
250-
ExplicitLeft = 274
251239
end
252240
object btnItalic: TButton
253241
AlignWithMargins = True
@@ -267,7 +255,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
267255
ShowHint = True
268256
TabOrder = 6
269257
OnClick = btnItalicClick
270-
ExplicitLeft = 249
271258
end
272259
object btnBold: TButton
273260
AlignWithMargins = True
@@ -287,7 +274,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
287274
ShowHint = True
288275
TabOrder = 7
289276
OnClick = btnBoldClick
290-
ExplicitLeft = 224
291277
end
292278
object btnFont: TButton
293279
AlignWithMargins = True
@@ -308,7 +294,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
308294
ShowHint = True
309295
TabOrder = 8
310296
OnClick = btnFontClick
311-
ExplicitLeft = 108
312297
end
313298
object btnOpen: TButton
314299
AlignWithMargins = True
@@ -386,7 +371,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
386371
ShowHint = True
387372
TabOrder = 12
388373
OnClick = btnStrikethroughClick
389-
ExplicitLeft = 299
390374
end
391375
object btnFontSizeDecrease: TButton
392376
AlignWithMargins = True
@@ -406,7 +390,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
406390
ShowHint = True
407391
TabOrder = 13
408392
OnClick = btnFontSizeDecreaseClick
409-
ExplicitLeft = 169
410393
end
411394
object btnFontSizeIncrease: TButton
412395
AlignWithMargins = True
@@ -426,7 +409,6 @@ object C4DWizardNotesView: TC4DWizardNotesView
426409
ShowHint = True
427410
TabOrder = 14
428411
OnClick = btnFontSizeIncreaseClick
429-
ExplicitLeft = 194
430412
end
431413
end
432414
object ImageList1: TImageList

‎Src/Notes/C4D.Wizard.Notes.View.pas

+1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ procedure TC4DWizardNotesView.FormShow(Sender: TObject);
153153

154154
procedure TC4DWizardNotesView.FormActivate(Sender: TObject);
155155
begin
156+
//inherited;
156157
//RichEdit.Font.Color := TC4DWizardUtilsOTA.ActiveThemeColorDefaul;
157158
//Self.ReadFromFile;
158159
end;

‎Src/Reopen/C4D.Wizard.Reopen.View.dfm

-3
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ object C4DWizardReopenView: TC4DWizardReopenView
1212
Font.Name = 'Tahoma'
1313
Font.Style = []
1414
KeyPreview = True
15-
OldCreateOrder = False
1615
Position = poScreenCenter
1716
OnClose = FormClose
1817
OnCreate = FormCreate
1918
OnKeyDown = FormKeyDown
2019
OnResize = FormResize
2120
OnShow = FormShow
22-
PixelsPerInch = 96
2321
TextHeight = 13
2422
object pnTudo: TPanel
2523
Left = 0
@@ -93,7 +91,6 @@ object C4DWizardReopenView: TC4DWizardReopenView
9391
Images = ImageList1
9492
TabOrder = 0
9593
OnClick = btnSearchClick
96-
ExplicitLeft = 807
9794
end
9895
object edtSearch: TEdit
9996
AlignWithMargins = True

‎Src/Reopen/C4D.Wizard.Reopen.View.pas

+2
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ constructor TC4DWizardReopenView.Create(AOwner: TComponent);
204204

205205
procedure TC4DWizardReopenView.FormCreate(Sender: TObject);
206206
begin
207+
inherited;
207208
FtvGroupWidthExpanded := IfThen(tvGroup.Width > 2, tvGroup.Width, 130);
208209
FpnOpenPeriodWidthExpanded := IfThen(pnOpenPeriod.Width > 2, pnOpenPeriod.Width, 268);
209210
FUtilsListView := TC4DWizardUtilsListView.New(ListViewHistory);
@@ -272,6 +273,7 @@ procedure TC4DWizardReopenView.StatusBar1DblClick(Sender: TObject);
272273
procedure TC4DWizardReopenView.FormClose(Sender: TObject; var Action: TCloseAction);
273274
begin
274275
Self.GroupClear;
276+
inherited;
275277
end;
276278

277279
procedure TC4DWizardReopenView.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);

‎Src/Utils/C4D.Wizard.Utils.OTA.pas

+5-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ TC4DWizardUtilsOTA = class
4141
class function ActiveThemeColorDefaul: TColor;
4242
class function ActiveThemeIsDark: Boolean;
4343
class function GetIOTAFormEditor(const AIOTAModule: IOTAModule): IOTAFormEditor;
44-
{$IF CompilerVersion >= 32.0} //Tokyo
44+
{$IF CompilerVersion > 32} //Tokyo
4545
class function GetIOTAIDEThemingServices: IOTAIDEThemingServices;
4646
class function GetIOTAIDEThemingServices250: IOTAIDEThemingServices250;
4747
{$ENDIF}
@@ -421,7 +421,7 @@ class function TC4DWizardUtilsOTA.CheckIfExistFileInCurrentsProjectGroups(const
421421
end;
422422

423423
class procedure TC4DWizardUtilsOTA.IDEThemingAll(AFormClass: TCustomFormClass; AForm: TForm);
424-
{$IF CompilerVersion >= 32.0}
424+
{$IF CompilerVersion > 32}
425425
var
426426
i: Integer;
427427
LIOTAIDEThemingServices250: IOTAIDEThemingServices250;
@@ -430,7 +430,7 @@ class procedure TC4DWizardUtilsOTA.IDEThemingAll(AFormClass: TCustomFormClass; A
430430
AForm.Constraints.MinHeight := AForm.Height;
431431
AForm.Constraints.MinWidth := AForm.Width;
432432

433-
{$IF CompilerVersion >= 32.0}
433+
{$IF CompilerVersion > 32}
434434
LIOTAIDEThemingServices250 := Self.GetIOTAIDEThemingServices250;
435435
LIOTAIDEThemingServices250.RegisterFormClass(AFormClass);
436436
LIOTAIDEThemingServices250.ApplyTheme(AForm);
@@ -456,7 +456,7 @@ class function TC4DWizardUtilsOTA.ActiveThemeIsDark: Boolean;
456456
const
457457
THEME_DARK = 'dark';
458458
begin
459-
{$IF CompilerVersion >= 32.0}
459+
{$IF CompilerVersion > 32}
460460
Result := Self.GetIOTAIDEThemingServices.ActiveTheme.ToLower.Equals(THEME_DARK);
461461
{$ELSE}
462462
Result := False;
@@ -485,8 +485,7 @@ class function TC4DWizardUtilsOTA.GetIOTAFormEditor(const AIOTAModule: IOTAModul
485485
end;
486486
end;
487487

488-
{$IF CompilerVersion >= 32.0}
489-
488+
{$IF CompilerVersion > 32}
490489
class function TC4DWizardUtilsOTA.GetIOTAIDEThemingServices: IOTAIDEThemingServices;
491490
begin
492491
if(not Supports(BorlandIDEServices, IOTAIDEThemingServices, Result))then

0 commit comments

Comments
 (0)