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

ide: Layout designer and Icon designer now have 'search' field #772

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7406 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-06-02 11:13:18 +00:00
parent 00d55e83b7
commit e4286f57c9
15 changed files with 277 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

25
uppsrc/ide/LayDes/layfile.cpp
View file

@ -55,7 +55,7 @@ void LayDes::SaveEditPos()
p.undo[i] = pick(layout[i].undo);
p.redo[i] = pick(layout[i].redo);
}
p.layouti = layoutlist.GetCursor();
p.layouti = list.GetKey();
p.cursor = pick(cursor);
}
@ -73,8 +73,8 @@ void LayDes::RestoreEditPos()
layout[i].redo = pick(p.redo[i]);
}
}
if(p.layouti >= 0 && p.layouti < layoutlist.GetCount()) {
layoutlist.SetCursor(p.layouti);
if(p.layouti >= 0 && p.layouti < layout.GetCount()) {
GoTo(p.layouti);
LayoutCursor();
}
cursor = pick(p.cursor);
@ -83,11 +83,15 @@ void LayDes::RestoreEditPos()
void LayDes::FindLayout(const String& name, const String& item_name)
{
if(layoutlist.FindSetCursor(name) && !IsNull(item_name)) {
int q = item.Find(item_name, 1);
if(q >= 0)
SelectOne(q, 0);
}
for(int i = 0; i < layout.GetCount(); i++)
if(layout[i].name == name) {
GoTo(i);
if(!IsNull(item_name)) {
int q = item.Find(item_name, 1);
if(q >= 0)
SelectOne(q, 0);
}
}
}
bool LayDes::Load(const char *file, byte _charset)
@ -126,9 +130,10 @@ bool LayDes::Load(const char *file, byte _charset)
newfile = true;
filetime = Null;
}
search <<= Null;
SyncLayoutList();
if(layout.GetCount()) {
layoutlist.SetCursor(0);
if(list.GetCount()) {
list.SetCursor(0);
LayoutCursor();
}
RestoreEditPos();