Ide: UppHub main packages now displays with main package with link icon.

git-svn-id: svn://ultimatepp.org/upp/trunk@15672 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2021-01-16 20:46:53 +00:00
parent 47ffa654c5
commit 201d2670ca
3 changed files with 674 additions and 661 deletions

View file

@ -606,8 +606,12 @@ void SelectPackageDlg::SyncList(const String& find)
for(int i = 0; i < packages.GetCount(); i++) {
const PkInfo& pkg = packages[i];
Image icon = pkg.icon;
if(IsNull(icon))
icon = pkg.main ? IdeImg::MainPackage() : pkg.upphub ? IdeImg::HubPackage() : IdeImg::Package();
if(IsNull(icon)) {
if(pkg.main)
icon = pkg.upphub ? IdeImg::HubMainPackage() : IdeImg::MainPackage();
else
icon = pkg.upphub ? IdeImg::HubPackage() : IdeImg::Package();
}
nest_list.Add(pkg.nest);
clist.Add(pkg.package, DPI(icon, 16));
alist.Add(pkg.package, GetFileName(pkg.nest), pkg.description, icon);

File diff suppressed because it is too large Load diff

View file

@ -6,7 +6,7 @@ LAYOUT(SelectPackageLayout, 812, 476)
ITEM(Upp::Option, brief, SetLabel(t_("Brief list")).Tip(t_("If set, displays simplify packages list. Otherwise, the detailed list is shown.")).RightPosZ(332, 68).BottomPosZ(7, 20))
ITEM(Upp::ProgressIndicator, progress, HSizePosZ(4, 4).BottomPosZ(33, 7))
ITEM(Upp::Button, help, SetLabel(t_("?")).Tip(t_("Learn more about packages, assemblies and nests.. (Highly recommended for all U++ beginners)")).RightPosZ(308, 20).BottomPosZ(6, 22))
ITEM(Upp::Button, upphub, SetLabel(t_("UppHub")).Tip(t_("Create new package in the currently selected assembly..")).RightPosZ(236, 68).BottomPosZ(6, 22))
ITEM(Upp::Button, upphub, SetLabel(t_("UppHub")).Tip(t_("Download additional packages from the internet..")).RightPosZ(236, 68).BottomPosZ(6, 22))
ITEM(Upp::Button, newu, SetLabel(t_("&New package")).Tip(t_("Create new package in the currently selected assembly..")).RightPosZ(142, 90).BottomPosZ(6, 22))
ITEM(Upp::Button, ok, SetLabel(t_("OK")).Tip(t_("Open selected package")).RightPosZ(74, 64).BottomPosZ(6, 22))
ITEM(Upp::Button, cancel, SetLabel(t_("Cancel")).Tip(t_("Cancel package selection")).RightPosZ(6, 64).BottomPosZ(6, 22))