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-02-10 12:53:23 +01:00
commit 7fdc98b0c7
9 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/Button/Button.cpp
View file

@ -25,7 +25,7 @@ struct ButtonApp : TopWindow {
{
count = 0;
button <<= THISBACK(Click);
button.SetLabel("&I'm an Ultimate++ button!");
button.SetLabel("&I'm an U++ button!");
Add(button.VCenterPos(20).HCenterPos(200));
Add(label.BottomPos(0, 20).HCenterPos(200));
label.SetAlign(ALIGN_CENTER);

3
uppbox/MakeInstall6/Main.cpp
View file

@ -88,7 +88,7 @@ CONSOLE_APP_MAIN
RealizeDirectory(tmp);
RealizeDirectory("u:/upload");
CopyFolder(bin, upptmp, false);
CopyFolder(bin + "/win32", upptmp + "/bin");
SaveFile(upptmp + "/dbghelp.dll", LoadFile(bin + "/win32_dlls/dbghelp.dll"));
@ -113,6 +113,7 @@ and Windows 7 64 or 32 with latest patches for compiled applications.)--");
CopyFolders(upp, upptmp, uppsrc + "/assemblies");
SaveFile(upptmp + "/uppsrc/guiplatform.h", "");
SaveFile(upptmp + "/uppsrc/uppconfig.h", LoadFile(uppsrc + "/uppconfig.h"));
SaveFile(upptmp + "/uppsrc/.clang-format", LoadFile(upp + "/.clang-format"));
SaveFile(upptmp + "/uppsrc/ide/version.h", "#define IDE_VERSION \"" + version + "\"\r\n");
Make("ide", "theide.exe");
Make("umk", "umk.exe");

3
uppbox/MakePosixInstall/Main.cpp
View file

@ -96,7 +96,7 @@ CONSOLE_APP_MAIN
DeleteFolderDeep(release);
RealizeDirectory(release);
String uppsrc = upp_src + "/uppsrc";
String dstsrc = release + "/uppsrc";
@ -106,6 +106,7 @@ CONSOLE_APP_MAIN
SaveFile(dstsrc + "/guiplatform.h", "");
SaveFile(dstsrc + "/uppconfig.h", LoadFile(uppsrc + "/uppconfig.h"));
SaveFile(release + "/uppsrc/.clang-format", LoadFile(upp_src + "/.clang-format"));
SaveFile(dstsrc + "/ide/version.h", "#define IDE_VERSION \"" + version + "\"\r\n");
RealizeDirectory(release + "/.config");

8
uppbox/MakePosixInstall/scripts.cpp
View file

@ -12,11 +12,11 @@ AskContinue()
uname=`uname`
if [ -x "$(command -v apt-get)" ]; then
DEP="apt-get install g++ clang git make libgtk-3-dev libnotify-dev libbz2-dev libssl-dev xdotool clang-format"
elif [ -x "$(command -v yum)" ]; then
DEP="yum install gcc-c++ clang git make gtk3-devel libnotify-devel bzip2-devel freetype-devel openssl-devel"
DEP="apt-get install g++ clang clang-format git make libgtk-3-dev libnotify-dev libbz2-dev libssl-dev xdotool"
elif [ -x "$(command -v dnf)" ]; then
DEP="dnf install gcc-c++ clang git make gtk3-devel libnotify-devel bzip2-devel freetype-devel openssl-devel"
DEP="dnf install gcc-c++ clang clang-tools-extra git make gtk3-devel libnotify-devel bzip2-devel freetype-devel openssl-devel"
elif [ -x "$(command -v yum)" ]; then
DEP="yum install gcc-c++ clang clang-tools-extra git make gtk3-devel libnotify-devel bzip2-devel freetype-devel openssl-devel"
elif [ -x "$(command -v urpmi)" ]; then
DEP="urpmi install gcc-c++ clang git make gtk3-devel libnotify-devel bzip2-devel freetype-devel openssl-devel"
elif [ -x "$(command -v zypper)" ]; then

2
uppsrc/CodeEditor/CLogic.cpp
View file

@ -129,7 +129,7 @@ void CSyntax::IndentInsert0(CodeEditor& e, int chr, int count, bool reformat)
int cl = e.GetCursorLine();
WString l = e.GetWLine(cl);
if(chr != '{' && chr != '}' || count > 1) {
e.InsertChar(chr, 1, true);
e.InsertChar(chr, count, true);
return;
}
const wchar *s;

2
uppsrc/CodeEditor/CodeEditor.cpp
View file

@ -343,7 +343,7 @@ void CodeEditor::IndentInsert(int chr, int count) {
if(s)
s->IndentInsert(*this, chr, count);
else
InsertChar(chr, count);
InsertChar(chr, count, true);
}
void CodeEditor::Make(Event<String&> op)

2
uppsrc/CodeEditor/PythonSyntax.cpp
View file

@ -80,7 +80,7 @@ void PythonSyntax::IndentInsert(CodeEditor& editor, int chr, int count)
}
}
if(count > 0)
editor.InsertChar(chr, count);
editor.InsertChar(chr, count, true);
}
bool PythonSyntax::LineHasColon(const WString& line)

2
uppsrc/CodeEditor/Syntax.cpp
View file

@ -16,7 +16,7 @@ void EditorSyntax::Serialize(Stream& s)
void EditorSyntax::IndentInsert(CodeEditor& editor, int chr, int count)
{
editor.InsertChar(chr, count);
editor.InsertChar(chr, count, true);
}
bool EditorSyntax::CheckBrackets(CodeEditor& e, int64& bpos0, int64& bpos)

2
uppsrc/CodeEditor/TagSyntax.cpp
View file

@ -276,7 +276,7 @@ void TagSyntax::IndentInsert(CodeEditor& editor, int chr, int count)
if(status == SCRIPT)
script.IndentInsert(editor, chr, count);
else
editor.InsertChar(chr, count);
editor.InsertChar(chr, count, true);
}
bool TagSyntax::CheckBrackets(CodeEditor& e, int64& bpos0, int64& bpos)