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

Merge branch 'master' of https://github.com/ultimatepp/ultimatepp

Browse source
This commit is contained in:
Mirek Fidler 2023-09-27 18:09:47 +02:00
commit 74f09fa41e
6 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/IconDes/Bar.cpp
View file

@ -219,6 +219,7 @@ void IconDes::DrawBar(Bar& bar)
void IconDes::MainToolBar(Bar& bar)
{
EditBar(bar);
ToolEx(bar);
bar.Separator();
SelectBar(bar);
bar.Separator();
@ -227,7 +228,6 @@ void IconDes::MainToolBar(Bar& bar)
bar.Add(status, INT_MAX, GetStdFontCy());
bar.Break();
DrawBar(bar);
ToolEx(bar);
bar.Separator();
SettingBar(bar);
}

4
uppsrc/ide/Assist.cpp
View file

@ -336,11 +336,13 @@ bool AssistEditor::IncludeAssist()
return false;
}
Vector<String> folder, upper_folder, file, upper_file;
Index<String> done; // avoid duplicates
for(int i = 0; i < include.GetCount(); i++) {
FindFile ff(AppendFileName(AppendFileName(include[i], include_path), "*.*"));
while(ff) {
String fn = ff.GetName();
if(!ff.IsHidden()) {
if(done.Find(fn) < 0 && !ff.IsHidden()) {
done.Add(fn);
if(ff.IsFolder()) {
folder.Add(fn);
upper_folder.Add(ToUpper(fn));

2
uppsrc/ide/Common/ComDlg.cpp
View file

@ -128,7 +128,7 @@ void IdeFileIcon0(bool dir, const String& filename, Image& img)
if(ext == ".sql")
img = IdeCommonImg::Sql();
else
if(filename == "Copying")
if(findarg(filename, "Copying", "License.txt") >= 0)
img = IdeCommonImg::License();
else
if(filename == "main.conf")

8
uppsrc/ide/DirRepoDiff.cpp
View file

@ -2,6 +2,8 @@
DirRepoDiffDlg::DirRepoDiffDlg()
{
Title("Compare directories / commits");
int div = HorzLayoutZoom(4);
int cy = dir1.GetStdSize().cy;
int lcy = cy + div;
@ -155,7 +157,7 @@ void DirRepoDiffDlg::Compare()
mid = 0;
if(IsGit(i)) {
String repo = ~~mode[i];
String d = CacheFile("git-" + SHA1String(repo + "\1" + session_id));
String d = CacheFile("git-" + SHA1String(repo + "\1" + session_id + "\1" + AsString(i)));
if(!DirectoryExists(d)) {
gitd << d;
Progress pi;
@ -171,4 +173,8 @@ void DirRepoDiffDlg::Compare()
};
if(Clone(0, dir1, lmid) && Clone(1, dir2, rmid))
DirDiffDlg::Compare();
if(IsGit(0))
dir1 <<= Null;
if(IsGit(1))
dir2 <<= Null;
}

2
uppsrc/ide/IconDes/IconDes.cpp
View file

@ -69,11 +69,11 @@ void IdeIconDes::ToolEx(Bar& bar)
{
bar.Separator();
if(!IsSingleMode()) {
bar.Add("File properties..", IconDesImg::FileProperties(), THISBACK(FileProperties));
bar.Add("Usage..", IdeCommonImg::Cpp(), [=] {
String name = GetCurrentName();
TheIde()->FindDesignerItemReferences(name + "()", name);
});
bar.Add("File properties..", IconDesImg::FileProperties(), THISBACK(FileProperties));
}
}

5
uppsrc/ide/LayDes/laywin.cpp
View file

@ -31,8 +31,6 @@ void LayDes::EditBar(Bar& bar)
bar.Add(iscursor, AK_MATRIXDUPLICATE, THISBACK(Matrix));
bar.Add(islayout, "Select all", CtrlImg::select_all(), THISBACK(SelectAll))
.Key(K_CTRL_A);
bar.Add(islayout, AK_VISGEN, LayImg::Members(), THISBACK(VisGen));
bar.Add(islayout, AK_FINDSOURCE, IdeCommonImg::Cpp(), THISBACK(GotoUsing));
bar.Separator();
bar.Add(islayout && CurrentLayout().IsUndo(), "Undo", CtrlImg::undo(), THISBACK(Undo))
.Key(K_ALT_BACKSPACE)
@ -45,6 +43,9 @@ void LayDes::EditBar(Bar& bar)
.Key(K_CTRL_SUBTRACT);
bar.Add(iscursor, AK_SHOWSELECTION, THISBACK1(ShowSelection, true))
.Key(K_CTRL_ADD);
bar.Separator();
bar.Add(islayout, AK_FINDSOURCE, IdeCommonImg::Cpp(), THISBACK(GotoUsing));
bar.Add(islayout, AK_VISGEN, LayImg::Members(), THISBACK(VisGen));
}
void LayDes::MoveBar(Bar& bar)