Skip to content

Commit

Permalink
Set version number 0.6.2. Fix splash and info background color in dar…
Browse files Browse the repository at this point in the history
…kmode. Fix crash in Add/SubtractTable when no file is loaded.
  • Loading branch information
wp-xyz committed Mar 31, 2023
1 parent 14ace25 commit 346628e
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 89 deletions.
2 changes: 1 addition & 1 deletion source/MyDbfStudio.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<VersionInfo>
<UseVersionInfo Value="True"/>
<MinorVersionNr Value="6"/>
<RevisionNr Value="1"/>
<RevisionNr Value="2"/>
<StringTable FileDescription="Administrative tool for DBF tables." LegalCopyright="Calogiuri Enzo Antonio" ProductName="MyDbfStudio"/>
</VersionInfo>
<BuildModes Count="4">
Expand Down
Binary file modified source/img/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 69 additions & 71 deletions source/uinfo.lfm
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,18 @@ object Info: TInfo
OnCreate = FormCreate
Position = poMainFormCenter
LCLVersion = '2.3.0.0'
object Img: TImage
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 300
Top = 6
Width = 456
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
Stretch = True
end
object Version: TLabel
AnchorSideLeft.Control = Img
AnchorSideBottom.Control = Img
AnchorSideBottom.Side = asrBottom
Left = 6
Height = 15
Top = 291
Width = 41
Anchors = [akLeft, akBottom]
Caption = 'Version'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
object CloseBtn: TBitBtn
AnchorSideTop.Control = Bevel1
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Side = asrBottom
Left = 387
Left = 385
Height = 26
Top = 504
Top = 491
Width = 75
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Around = 6
BorderSpacing.Around = 8
Cancel = True
Caption = '&Close'
Default = True
Expand All @@ -67,42 +40,35 @@ object Info: TInfo
AnchorSideRight.Side = asrBottom
Left = 6
Height = 6
Top = 498
Top = 483
Width = 456
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Right = 6
Shape = bsTopLine
end
object Label1: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Img
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Left = 8
Height = 90
Top = 312
Width = 456
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
Top = 294
Width = 452
Align = alTop
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 8
Caption = 'MyDbfStudio is an administrative tool to create and manage dBase tables. It runs on Windows, Linux and other platforms supported by the Lazarus IDE.'#13#10' '#13#10'Autor: Calogiuri Enzo Antonio Aka Fog76'#13#10'Modifications in current port by W. Pamler'#13#10'Based on tDBF component by mdv and nashev:'
ParentColor = False
WordWrap = True
end
object lblIcons8: TLabel
AnchorSideLeft.Control = Label1
AnchorSideTop.Control = Label4
AnchorSideTop.Side = asrBottom
Cursor = crHandPoint
Left = 22
Left = 24
Height = 15
Top = 477
Width = 171
BorderSpacing.Left = 16
BorderSpacing.Bottom = 6
Top = 460
Width = 444
Align = alTop
BorderSpacing.Left = 24
BorderSpacing.Bottom = 8
Caption = 'https://icons8.com/icons/metro'
Font.Color = clBlue
ParentColor = False
Expand All @@ -112,17 +78,12 @@ object Info: TInfo
OnMouseLeave = URLLabelMouseLeave
end
object lblSourceForge: TLabel
AnchorSideLeft.Control = Label1
AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Label1
AnchorSideRight.Side = asrBottom
Cursor = crHandPoint
Left = 22
Left = 16
Height = 15
Top = 402
Width = 440
Anchors = [akTop, akLeft, akRight]
Top = 384
Width = 452
Align = alTop
BorderSpacing.Left = 16
Caption = 'https://sourceforge.net/projects/tdbf/'
Font.Color = clBlue
Expand All @@ -133,16 +94,53 @@ object Info: TInfo
OnMouseLeave = URLLabelMouseLeave
end
object Label4: TLabel
AnchorSideLeft.Control = Label1
AnchorSideTop.Control = lblSourceForge
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Label1
AnchorSideRight.Side = asrBottom
Left = 6
Height = 60
Top = 417
Width = 456
Anchors = [akTop, akLeft, akRight]
Caption = ' '#13#10'License: GPL/LGPL'#13#10' '#13#10'Icons provided by icons8.com, style: Windows Metro,'
Left = 8
Height = 45
Top = 415
Width = 452
Align = alTop
BorderSpacing.Left = 8
BorderSpacing.Top = 16
BorderSpacing.Right = 8
Caption = 'License: GPL/LGPL'#13#10' '#13#10'Icons provided by icons8.com, style: Windows Metro,'
end
object ImgPanel: TPanel
Left = 8
Height = 278
Top = 8
Width = 452
Align = alTop
BorderSpacing.Around = 8
BevelOuter = bvNone
ClientHeight = 278
ClientWidth = 452
Color = clWindow
ParentBackground = False
ParentColor = False
TabOrder = 1
object Img: TImage
Left = 0
Height = 263
Top = 0
Width = 452
Align = alClient
Anchors = [akTop, akLeft, akRight]
AutoSize = True
Stretch = True
end
object Version: TLabel
AnchorSideTop.Side = asrBottom
Left = 6
Height = 15
Top = 263
Width = 446
Align = alBottom
Anchors = [akLeft, akBottom]
BorderSpacing.Left = 6
Caption = 'Version12'
Font.Style = [fsBold]
ParentColor = False
ParentFont = False
end
end
end
1 change: 1 addition & 0 deletions source/uinfo.pas
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ TInfo = class(TForm)
lblIcons8: TLabel;
lblSourceForge: TLabel;
Label4: TLabel;
ImgPanel: TPanel;
Version: TLabel;
procedure CloseBtnClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
Expand Down
25 changes: 15 additions & 10 deletions source/umain.pas
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,8 @@ procedure TMain.miHelpClick(Sender: TObject);

procedure TMain.miAdd2TblsClick(Sender: TObject);
begin
if WorkSite.PageCount = 0 then
exit;
AddTables := TAddTables.Create(nil);
try
AddTables.ShowModal;
Expand All @@ -444,23 +446,24 @@ procedure TMain.miAdd2TblsClick(Sender: TObject);
end;

procedure TMain.miCloseAllClick(Sender: TObject);
Var Ind : Integer;
Var
Ind: Integer;
begin
WorkSite.BeginUpdateBounds;
WorkSite.BeginUpdateBounds;

If WorkSite.PageCount > 0 Then
If MessageDlg('Close all tabs?', mtWarning, [mbOk, mbCancel],0) = mrOk Then
For Ind := WorkSite.PageCount - 1 DownTo 0 Do
WorkSiteCloseTabClicked(WorkSite.Pages[Ind]);
If WorkSite.PageCount > 0 Then
If MessageDlg('Close all tabs?', mtWarning, [mbOk, mbCancel],0) = mrOk Then
For Ind := WorkSite.PageCount - 1 DownTo 0 Do
WorkSiteCloseTabClicked(WorkSite.Pages[Ind]);

WorkSite.EndUpdateBounds;
WorkSite.EndUpdateBounds;
end;

procedure TMain.miCloseClick(Sender: TObject);
begin
If WorkSite.PageCount > 0 Then
If WorkSite.ActivePage <> Nil Then
WorkSiteCloseTabClicked(WorkSite.ActivePage);
If WorkSite.PageCount > 0 Then
If WorkSite.ActivePage <> Nil Then
WorkSiteCloseTabClicked(WorkSite.ActivePage);
end;

procedure TMain.miEmptyTablesClick(Sender: TObject);
Expand Down Expand Up @@ -726,6 +729,8 @@ procedure TMain.miSortTableClick(Sender: TObject);

procedure TMain.miSubTablesClick(Sender: TObject);
begin
if WorkSite.PageCount = 0 then
exit;
SubTables := TSubTables.Create(nil);
try
SubTables.ShowModal;
Expand Down
13 changes: 6 additions & 7 deletions source/usplash.lfm
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,33 @@ object Splash: TSplash
Caption = 'MyDbf Studio'
ClientHeight = 300
ClientWidth = 450
Color = clWindow
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate
OnShow = FormShow
Position = poMainFormCenter
LCLVersion = '2.1.0.0'
LCLVersion = '2.3.0.0'
Scaled = False
object Img: TImage
Left = 0
Height = 300
Height = 281
Top = 0
Width = 450
Align = alClient
AutoSize = True
end
object Ver: TStaticText
AnchorSideLeft.Control = Owner
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 6
Height = 16
Top = 281
Width = 48
Width = 444
Align = alBottom
Anchors = [akLeft, akBottom]
AutoSize = True
BorderSpacing.Left = 6
BorderSpacing.Bottom = 3
Caption = 'Version: '
Color = clWhite
Color = clForm
Font.Style = [fsBold]
ParentFont = False
ParentColor = False
Expand Down

0 comments on commit 346628e

Please sign in to comment.