github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-21 14:15:25 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Filtering by nests in select package dialog

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15604 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-12-17 14:14:10 +00:00
parent e2f1a13ed8
commit 5587360d40
2 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

51
uppsrc/ide/SelectPkg.cpp
View file

@ -195,11 +195,7 @@ SelectPackageDlg::SelectPackageDlg(const char *title, bool selectvars_, bool mai
newu <<= THISBACK(OnNew);
filter <<= THISBACK(OnFilter);
filter.Add(MAIN|FIRST, "Main packages of first nest");
filter.Add(MAIN, "All main packages");
filter.Add(FIRST, "All packages of first nest");
filter.Add(0, "All packages");
filter <<= main ? MAIN|FIRST : 0;
filter <<= main ? MAIN|NEST : 0;
progress.Hide();
brief <<= THISBACK(SyncBrief);
search.NullText("Search (Ctrl+K)", StdFont().Italic(), SColorDisabled());
@ -219,6 +215,21 @@ SelectPackageDlg::SelectPackageDlg(const char *title, bool selectvars_, bool mai
help << [&] { LaunchWebBrowser("https://www.ultimatepp.org/app$ide$PackagesAssembliesAndNests$en-us.html"); };
}
void SelectPackageDlg::SyncFilter()
{
filter.ClearList();
Vector<String> upp = GetUppDirs();
if(upp.GetCount() == 0)
return;
for(int i = 0; i < upp.GetCount(); i++) {
String fn = GetFileName(upp[i]);
filter.Add(NEST|MAIN|i, "Main packages of " + fn);
filter.Add(NEST|i, "All packages of " + fn);
}
filter.Add(MAIN, "All main packages");
filter.Add(0, "All packages");
}
bool SelectPackageDlg::Key(dword key, int count)
{
if(key == K_ALT_ENTER) {
@ -522,20 +533,25 @@ void SelectPackageDlg::SyncList(const String& find)
String s = ~search;
int f = ~filter;
Index<String> added;
for(int i = 0; i < min((f & FIRST) ? 1 : data.GetCount(), data.GetCount()); i++) {
const ArrayMap<String, PkData>& nest = data[i];
for(int i = 0; i < nest.GetCount(); i++) {
const PkData& d = nest[i];
if(!nest.IsUnlinked(i) &&
d.ispackage &&
(!(f & MAIN) || d.main) &&
ToUpper(d.package + d.description + d.nest).Find(s) >= 0 &&
added.Find(d.package) < 0) {
packages.Add() = d;
added.Add(d.package);
int from = 0;
int to = data.GetCount() - 1;
if(f & NEST)
from = to = f & NEST_MASK;
if(to < data.GetCount())
for(int i = from; i <= to; i++) {
const ArrayMap<String, PkData>& nest = data[i];
for(int i = 0; i < nest.GetCount(); i++) {
const PkData& d = nest[i];
if(!nest.IsUnlinked(i) &&
d.ispackage &&
(!(f & MAIN) || d.main) &&
ToUpper(d.package + d.description + d.nest).Find(s) >= 0 &&
added.Find(d.package) < 0) {
packages.Add() = d;
added.Add(d.package);
}
}
}
}
Sort(packages);
alist.Clear();
clist.Clear();
@ -587,6 +603,7 @@ String SelectPackageDlg::CachePath(const char *vn) const
void SelectPackageDlg::Load(const String& find)
{
SyncFilter();
if(selectvars && !base.IsCursor())
return;
if(loading) { // If we are called recursively from ProcessEvents, stop current loading and change loadi

3
uppsrc/ide/UppDlg.h
View file

@ -203,6 +203,7 @@ struct SelectPackageDlg : public WithSelectPackageLayout<TopWindow> {
void ListCursor();
void ChangeDescription();
void SyncFilter();
void ScanFolder(const String& path, ArrayMap<String, PkData>& nd,
const String& nest, Index<String>& dir_exists,
const String& prefix);
@ -223,7 +224,7 @@ struct SelectPackageDlg : public WithSelectPackageLayout<TopWindow> {
void MovePackage(bool copy);
enum {
MAIN = 1, FIRST = 2
MAIN = 0x1000, NEST = 0x2000, NEST_MASK = 0xfff
};
};