OpkMan: Improve layout, anchors and tab order. Issue #31493, patch from AlexeyT.

git-svn-id: trunk@54363 -
This commit is contained in:
juha 2017-03-07 14:29:48 +00:00
parent a5d7bbe810
commit 2ae6d28ebf
2 changed files with 492 additions and 340 deletions

File diff suppressed because it is too large Load Diff

View File

@ -44,15 +44,15 @@ type
TOptionsFrm = class(TForm) TOptionsFrm = class(TForm)
bCancel: TButton; bCancel: TButton;
bFoldersAdd: TButton; bFilesAdd: TButton;
bFilesEdit: TButton;
bFilesDelete: TButton; bFilesDelete: TButton;
bFilesEdit: TButton;
bFoldersAdd: TButton;
bFoldersDelete: TButton; bFoldersDelete: TButton;
bFoldersEdit: TButton; bFoldersEdit: TButton;
bOk: TButton; bOk: TButton;
bOpen: TButton; bOpen: TButton;
bRestore: TButton; bRestore: TButton;
bFilesAdd: TButton;
cbProxy: TCheckBox; cbProxy: TCheckBox;
cbForceDownloadExtract: TCheckBox; cbForceDownloadExtract: TCheckBox;
cbDeleteZipAfterInstall: TCheckBox; cbDeleteZipAfterInstall: TCheckBox;
@ -66,8 +66,8 @@ type
edProxyServer: TEdit; edProxyServer: TEdit;
edProxyUser: TEdit; edProxyUser: TEdit;
gbProxySettings: TGroupBox; gbProxySettings: TGroupBox;
lbFilterFiles: TLabel;
lbFilterDirs: TLabel; lbFilterDirs: TLabel;
lbFilterFiles: TLabel;
lbLastUpdate: TLabel; lbLastUpdate: TLabel;
lbSelectProfile: TLabel; lbSelectProfile: TLabel;
lbUpdates: TLabel; lbUpdates: TLabel;
@ -83,10 +83,6 @@ type
lbExcludeFiles: TListBox; lbExcludeFiles: TListBox;
lbExcludeFolders: TListBox; lbExcludeFolders: TListBox;
pnRepositories: TPanel; pnRepositories: TPanel;
pnProfilesCaptionLeft: TPanel;
pnProfilesCaptionLeft1: TPanel;
pnProfilesLeftButtons: TPanel;
pnProfilesRightButtons: TPanel;
pnProfilesRight: TPanel; pnProfilesRight: TPanel;
pnProfilesTop: TPanel; pnProfilesTop: TPanel;
pnProfiles: TPanel; pnProfiles: TPanel;
@ -415,8 +411,8 @@ begin
lbLastUpdate.Caption := rsOptions_lbLastUpdate_Caption + FormatDateTime('YYYY.MM.DD hh:mm:ss', Options.LastUpdate); lbLastUpdate.Caption := rsOptions_lbLastUpdate_Caption + FormatDateTime('YYYY.MM.DD hh:mm:ss', Options.LastUpdate);
lbDaysToShowNewPackages.Caption := rsOptions_lbDaysToShowNewPackages_Caption; lbDaysToShowNewPackages.Caption := rsOptions_lbDaysToShowNewPackages_Caption;
spDaysToShowNewPackages.Value := Options.DaysToShowNewPackages; spDaysToShowNewPackages.Value := Options.DaysToShowNewPackages;
spDaysToShowNewPackages.Top := lbDaysToShowNewPackages.Top + 1 + (lbDaysToShowNewPackages.Height - spDaysToShowNewPackages.Height) div 2; //spDaysToShowNewPackages.Top := lbDaysToShowNewPackages.Top + 1 + (lbDaysToShowNewPackages.Height - spDaysToShowNewPackages.Height) div 2;
spDaysToShowNewPackages.Left := lbDaysToShowNewPackages.Left + lbDaysToShowNewPackages.Canvas.GetTextWidth(lbDaysToShowNewPackages.Caption) + 10; //spDaysToShowNewPackages.Left := lbDaysToShowNewPackages.Left + lbDaysToShowNewPackages.Canvas.GetTextWidth(lbDaysToShowNewPackages.Caption) + 10;
tsProxy.Caption := rsOptions_tsProxy_Caption; tsProxy.Caption := rsOptions_tsProxy_Caption;
cbProxy.Caption := rsOptions_cbProxy_Caption; cbProxy.Caption := rsOptions_cbProxy_Caption;
@ -429,7 +425,7 @@ begin
gbProxySettings.Enabled := Options.ProxyEnabled; gbProxySettings.Enabled := Options.ProxyEnabled;
edProxyServer.Text := Options.ProxyServer; edProxyServer.Text := Options.ProxyServer;
seProxyPort.Value := Options.ProxyPort; seProxyPort.Value := Options.ProxyPort;
seProxyPort.Top := edProxyServer.Top + (edProxyServer.Height - seProxyPort.Height) div 2; //seProxyPort.Top := edProxyServer.Top + (edProxyServer.Height - seProxyPort.Height) div 2;
edProxyUser.Text := Options.ProxyUser; edProxyUser.Text := Options.ProxyUser;
edProxyPassword.Text := Options.ProxyPassword; edProxyPassword.Text := Options.ProxyPassword;
@ -480,7 +476,7 @@ end;
procedure TOptionsFrm.pnProfilesTopResize(Sender: TObject); procedure TOptionsFrm.pnProfilesTopResize(Sender: TObject);
begin begin
cbSelectProfile.Left := lbSelectProfile.Left + lbSelectProfile.Width + 10; //cbSelectProfile.Left := lbSelectProfile.Left + lbSelectProfile.Width + 10;
end; end;
end. end.