mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-09 08:47:59 +02:00
Packager: improve usability of Open Installed Packages dialog.
git-svn-id: trunk@37421 -
This commit is contained in:
parent
5789006e91
commit
5fd2bc261d
@ -4051,8 +4051,6 @@ resourcestring
|
||||
lisOIPDescriptionDescription = '%sDescription: %s';
|
||||
lisOIPDescription = 'Description: ';
|
||||
lisOIPPleaseSelectAPackage = 'Please select a package';
|
||||
lisOIPNoPackageSelected = 'No package selected';
|
||||
lisOIPPleaseSelectAPackageToOpen = 'Please select a package to open';
|
||||
lisOIPPackageName = 'Package Name';
|
||||
lisOIPState = 'State';
|
||||
lisOIPmodified = 'modified';
|
||||
|
@ -7,13 +7,14 @@ object OpenInstalledPackagesDlg: TOpenInstalledPackagesDlg
|
||||
Caption = 'OpenInstalledPackagesDlg'
|
||||
ClientHeight = 494
|
||||
ClientWidth = 447
|
||||
OnClose = FormClose
|
||||
OnCreate = FormCreate
|
||||
Position = poScreenCenter
|
||||
LCLVersion = '1.1'
|
||||
object HintMemo: TMemo
|
||||
Left = 0
|
||||
Height = 133
|
||||
Top = 308
|
||||
Height = 121
|
||||
Top = 320
|
||||
Width = 447
|
||||
Align = alBottom
|
||||
Lines.Strings = (
|
||||
@ -25,7 +26,7 @@ object OpenInstalledPackagesDlg: TOpenInstalledPackagesDlg
|
||||
end
|
||||
object PkgListView: TListView
|
||||
Left = 0
|
||||
Height = 303
|
||||
Height = 315
|
||||
Top = 0
|
||||
Width = 447
|
||||
Align = alClient
|
||||
@ -39,7 +40,7 @@ object OpenInstalledPackagesDlg: TOpenInstalledPackagesDlg
|
||||
Cursor = crVSplit
|
||||
Left = 0
|
||||
Height = 5
|
||||
Top = 303
|
||||
Top = 315
|
||||
Width = 447
|
||||
Align = alBottom
|
||||
ResizeAnchor = akBottom
|
||||
|
@ -53,6 +53,7 @@ type
|
||||
PkgListView: TListView;
|
||||
HintMemo: TMemo;
|
||||
Splitter1: TSplitter;
|
||||
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
procedure FormCreate(Sender: TObject);
|
||||
procedure HelpButtonClick(Sender: TObject);
|
||||
procedure OpenButtonClick(Sender: TObject);
|
||||
@ -64,7 +65,6 @@ type
|
||||
public
|
||||
procedure UpdateSelection;
|
||||
procedure UpdatePackageList;
|
||||
function GetSelectedPackage: TLazPackage;
|
||||
end;
|
||||
|
||||
function ShowOpenInstalledPkgDlg(var OpenPackage: TLazPackage): TModalResult;
|
||||
@ -74,15 +74,21 @@ implementation
|
||||
{$R *.lfm}
|
||||
|
||||
function ShowOpenInstalledPkgDlg(var OpenPackage: TLazPackage): TModalResult;
|
||||
var
|
||||
OpenInstalledPackagesDlg: TOpenInstalledPackagesDlg;
|
||||
begin
|
||||
OpenInstalledPackagesDlg:=TOpenInstalledPackagesDlg.Create(nil);
|
||||
OpenInstalledPackagesDlg.UpdatePackageList;
|
||||
OpenInstalledPackagesDlg.UpdateSelection;
|
||||
Result:=OpenInstalledPackagesDlg.ShowModal;
|
||||
OpenPackage:=OpenInstalledPackagesDlg.GetSelectedPackage;
|
||||
OpenInstalledPackagesDlg.Free;
|
||||
with TOpenInstalledPackagesDlg.Create(nil) do
|
||||
try
|
||||
UpdatePackageList;
|
||||
UpdateSelection;
|
||||
Result:=ShowModal;
|
||||
if Result=mrOK then begin
|
||||
Assert(Assigned(PkgListView.Selected), 'ShowOpenInstalledPkgDlg: Nothing selected');
|
||||
OpenPackage:=TLazPackage(PkgListView.Selected.Data);
|
||||
end
|
||||
else
|
||||
OpenPackage:=nil;
|
||||
finally
|
||||
Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
{ TOpenInstalledPackagesDlg }
|
||||
@ -105,18 +111,16 @@ var
|
||||
HintStr: String;
|
||||
begin
|
||||
LI:=PkgListView.Selected;
|
||||
if LI<>nil then begin
|
||||
ButtonPanel1.OKButton.Enabled:=Assigned(LI);
|
||||
if Assigned(LI) then begin
|
||||
CurPkg:=TLazPackage(LI.Data);
|
||||
HintStr:=
|
||||
Format(lisOIPFilename, [CurPkg.Filename]);
|
||||
HintStr:=Format(lisOIPFilename, [CurPkg.Filename]);
|
||||
if CurPkg.AutoCreated then
|
||||
HintStr:=Format(lisOIPThisPackageWasAutomaticallyCreated, [HintStr+
|
||||
LineEnding]);
|
||||
HintStr:=Format(lisOIPThisPackageWasAutomaticallyCreated,[HintStr+LineEnding]);
|
||||
if CurPkg.Missing then
|
||||
HintStr:=Format(lisOIPThisPackageIsInstalledButTheLpkFileWasNotFound, [
|
||||
HintStr+LineEnding]);
|
||||
HintStr:=Format(lisOIPThisPackageIsInstalledButTheLpkFileWasNotFound,[HintStr+LineEnding]);
|
||||
HintStr:=Format(lisOIPDescriptionDescription, [HintStr+LineEnding,
|
||||
BreakString(CurPkg.Description, 60, length(lisOIPDescription))]);
|
||||
BreakString(CurPkg.Description, 60, length(lisOIPDescription))]);
|
||||
HintMemo.Text:=HintStr;
|
||||
end else begin
|
||||
HintMemo.Text:=lisOIPPleaseSelectAPackage;
|
||||
@ -125,12 +129,7 @@ end;
|
||||
|
||||
procedure TOpenInstalledPackagesDlg.OpenButtonClick(Sender: TObject);
|
||||
begin
|
||||
if PkgListView.Selected=nil then begin
|
||||
MessageDlg(lisOIPNoPackageSelected,
|
||||
lisOIPPleaseSelectAPackageToOpen,
|
||||
mtInformation,[mbCancel],0);
|
||||
exit;
|
||||
end;
|
||||
Assert(Assigned(PkgListView.Selected), 'TOpenInstalledPackagesDlg.OpenButtonClick: Nothing selected');
|
||||
ModalResult:=mrOk;
|
||||
end;
|
||||
|
||||
@ -139,7 +138,7 @@ var
|
||||
NewColumn: TListColumn;
|
||||
begin
|
||||
Caption:=lisOIPOpenLoadedPackage;
|
||||
IDEDialogLayoutList.ApplyLayout(Self,500,350);
|
||||
IDEDialogLayoutList.ApplyLayout(Self,450,450);
|
||||
|
||||
with PkgListView do begin
|
||||
ViewStyle:=vsReport;
|
||||
@ -153,10 +152,13 @@ begin
|
||||
NewColumn.Caption:=lisOIPState;
|
||||
NewColumn.Width:=300;
|
||||
end;
|
||||
|
||||
ButtonPanel1.OKButton.Caption:=lisOpen;
|
||||
ButtonPanel1.CancelButton.Caption:=lisCancel;
|
||||
ButtonPanel1.HelpButton.Caption:=lisHelp;
|
||||
ButtonPanel1.OKButton.Enabled:=False;
|
||||
end;
|
||||
|
||||
procedure TOpenInstalledPackagesDlg.FormClose(Sender: TObject; var CloseAction: TCloseAction);
|
||||
begin
|
||||
IDEDialogLayoutList.SaveLayout(Self);
|
||||
end;
|
||||
|
||||
procedure TOpenInstalledPackagesDlg.HelpButtonClick(Sender: TObject);
|
||||
@ -216,15 +218,5 @@ begin
|
||||
PkgListView.EndUpdate;
|
||||
end;
|
||||
|
||||
function TOpenInstalledPackagesDlg.GetSelectedPackage: TLazPackage;
|
||||
var
|
||||
LI: TListItem;
|
||||
begin
|
||||
Result:=nil;
|
||||
LI:=PkgListView.Selected;
|
||||
if LI=nil then exit;
|
||||
Result:=TLazPackage(LI.Data);
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user