Skip to content

Commit b314515

Browse files
CoolmanCZCoolmanCZ
committed
Merge remote-tracking branch 'upstream/master'
2 parents 9886bff + dc1e66a commit b314515

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1132
-1252
lines changed

‎Makefile‎

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ $(OutFile): build_info \
253253
$(OutDir_Draw)Draw.a \
254254
$(OutDir_PdfDraw)PdfInit.o \
255255
$(OutDir_PdfDraw)PdfDraw.a \
256-
$(OutDir_Painter)PainterInit.o \
257256
$(OutDir_Painter)Painter.a \
258257
$(OutDir_plugin_pcre)pcre.a \
259258
$(OutDir_CtrlCore)CtrlCore.a \
@@ -374,7 +373,6 @@ $(OutFile): build_info \
374373
$(OutDir_Draw)Draw.a \
375374
$(OutDir_PdfDraw)PdfInit.o \
376375
$(OutDir_PdfDraw)PdfDraw.a \
377-
$(OutDir_Painter)PainterInit.o \
378376
$(OutDir_Painter)Painter.a \
379377
$(OutDir_plugin_pcre)pcre.a \
380378
$(OutDir_CtrlCore)CtrlCore.a \
@@ -66332,110 +66330,6 @@ $(OutDir_Painter)PaintPainting.o: $(UPPDIR1)Painter/PaintPainting.cpp \
6633266330
$(UPPDIR1)uppconfig.h
6633366331
$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_Painter) $(UPPDIR1)Painter/PaintPainting.cpp -o $(OutDir_Painter)PaintPainting.o
6633466332

66335-
$(OutDir_Painter)PainterInit.o: $(UPPDIR1)Painter/PainterInit.icpp \
66336-
$(UPPDIR1)Core/Algo.h \
66337-
$(UPPDIR1)Core/App.h \
66338-
$(UPPDIR1)Core/AString.hpp \
66339-
$(UPPDIR1)Core/Atomic.h \
66340-
$(UPPDIR1)Core/BiCont.h \
66341-
$(UPPDIR1)Core/Callback.h \
66342-
$(UPPDIR1)Core/CallbackN.i \
66343-
$(UPPDIR1)Core/CallbackNP.i \
66344-
$(UPPDIR1)Core/CallbackR.i \
66345-
$(UPPDIR1)Core/CharSet.h \
66346-
$(UPPDIR1)Core/CharSet.i \
66347-
$(UPPDIR1)Core/CoAlgo.h \
66348-
$(UPPDIR1)Core/Color.h \
66349-
$(UPPDIR1)Core/Complex.h \
66350-
$(UPPDIR1)Core/config.h \
66351-
$(UPPDIR1)Core/Convert.h \
66352-
$(UPPDIR1)Core/Convert.hpp \
66353-
$(UPPDIR1)Core/Core.h \
66354-
$(UPPDIR1)Core/CoSort.h \
66355-
$(UPPDIR1)Core/CoWork.h \
66356-
$(UPPDIR1)Core/Defs.h \
66357-
$(UPPDIR1)Core/Diag.h \
66358-
$(UPPDIR1)Core/FileMapping.h \
66359-
$(UPPDIR1)Core/FilterStream.h \
66360-
$(UPPDIR1)Core/FixedMap.h \
66361-
$(UPPDIR1)Core/Fn.h \
66362-
$(UPPDIR1)Core/Format.h \
66363-
$(UPPDIR1)Core/Function.h \
66364-
$(UPPDIR1)Core/Gtypes.h \
66365-
$(UPPDIR1)Core/Hash.h \
66366-
$(UPPDIR1)Core/Heap.h \
66367-
$(UPPDIR1)Core/HttpStatusCode.i \
66368-
$(UPPDIR1)Core/Huge.h \
66369-
$(UPPDIR1)Core/i18n.h \
66370-
$(UPPDIR1)Core/Index.h \
66371-
$(UPPDIR1)Core/Index.hpp \
66372-
$(UPPDIR1)Core/Inet.h \
66373-
$(UPPDIR1)Core/InMap.hpp \
66374-
$(UPPDIR1)Core/InVector.h \
66375-
$(UPPDIR1)Core/InVector.hpp \
66376-
$(UPPDIR1)Core/JSON.h \
66377-
$(UPPDIR1)Core/Lang.h \
66378-
$(UPPDIR1)Core/Lang_s.h \
66379-
$(UPPDIR1)Core/LocalProcess.h \
66380-
$(UPPDIR1)Core/Map.h \
66381-
$(UPPDIR1)Core/Map.hpp \
66382-
$(UPPDIR1)Core/Mem.h \
66383-
$(UPPDIR1)Core/Mt.h \
66384-
$(UPPDIR1)Core/Obsolete.h \
66385-
$(UPPDIR1)Core/Ops.h \
66386-
$(UPPDIR1)Core/Other.h \
66387-
$(UPPDIR1)Core/Other.hpp \
66388-
$(UPPDIR1)Core/Parser.h \
66389-
$(UPPDIR1)Core/Path.h \
66390-
$(UPPDIR1)Core/Profile.h \
66391-
$(UPPDIR1)Core/Ptr.h \
66392-
$(UPPDIR1)Core/Range.h \
66393-
$(UPPDIR1)Core/Sort.h \
66394-
$(UPPDIR1)Core/Sorted.h \
66395-
$(UPPDIR1)Core/SplitMerge.h \
66396-
$(UPPDIR1)Core/Stream.h \
66397-
$(UPPDIR1)Core/String.h \
66398-
$(UPPDIR1)Core/t_.h \
66399-
$(UPPDIR1)Core/TimeDate.h \
66400-
$(UPPDIR1)Core/Topic.h \
66401-
$(UPPDIR1)Core/Topt.h \
66402-
$(UPPDIR1)Core/Tuple.h \
66403-
$(UPPDIR1)Core/Utf.hpp \
66404-
$(UPPDIR1)Core/Util.h \
66405-
$(UPPDIR1)Core/Uuid.h \
66406-
$(UPPDIR1)Core/Value.h \
66407-
$(UPPDIR1)Core/Value.hpp \
66408-
$(UPPDIR1)Core/ValueCache.h \
66409-
$(UPPDIR1)Core/ValueUtil.h \
66410-
$(UPPDIR1)Core/ValueUtil.hpp \
66411-
$(UPPDIR1)Core/Vcont.h \
66412-
$(UPPDIR1)Core/Vcont.hpp \
66413-
$(UPPDIR1)Core/Win32Util.h \
66414-
$(UPPDIR1)Core/XML.h \
66415-
$(UPPDIR1)Core/Xmlize.h \
66416-
$(UPPDIR1)Core/Xmlize.hpp \
66417-
$(UPPDIR1)Core/z.h \
66418-
$(UPPDIR1)Draw/Cham.h \
66419-
$(UPPDIR1)Draw/DDARasterizer.h \
66420-
$(UPPDIR1)Draw/Display.h \
66421-
$(UPPDIR1)Draw/Draw.h \
66422-
$(UPPDIR1)Draw/DrawImg.iml \
66423-
$(UPPDIR1)Draw/FontInt.h \
66424-
$(UPPDIR1)Draw/Image.h \
66425-
$(UPPDIR1)Draw/ImageOp.h \
66426-
$(UPPDIR1)Draw/iml_header.h \
66427-
$(UPPDIR1)Draw/Raster.h \
66428-
$(UPPDIR1)Draw/SDraw.h \
66429-
$(UPPDIR1)Draw/SIMD.h \
66430-
$(UPPDIR1)Painter/BufferPainter.h \
66431-
$(UPPDIR1)Painter/LinearPath.h \
66432-
$(UPPDIR1)Painter/Painter.h \
66433-
$(UPPDIR1)Painter/Painter.hpp \
66434-
$(UPPDIR1)Painter/PainterInit.icpp \
66435-
$(UPPDIR1)Painter/Painting.h \
66436-
$(UPPDIR1)uppconfig.h
66437-
$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_Painter) $(UPPDIR1)Painter/PainterInit.icpp -o $(OutDir_Painter)PainterInit.o
66438-
6643966333
$(OutDir_Painter)Xform2D.o: $(UPPDIR1)Painter/Xform2D.cpp \
6644066334
$(UPPDIR1)Core/Algo.h \
6644166335
$(UPPDIR1)Core/App.h \

‎Makefile.in‎

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ $(OutFile): build_info \
253253
$(OutDir_Draw)Draw.a \
254254
$(OutDir_PdfDraw)PdfInit.o \
255255
$(OutDir_PdfDraw)PdfDraw.a \
256-
$(OutDir_Painter)PainterInit.o \
257256
$(OutDir_Painter)Painter.a \
258257
$(OutDir_plugin_pcre)pcre.a \
259258
$(OutDir_CtrlCore)CtrlCore.a \
@@ -374,7 +373,6 @@ $(OutFile): build_info \
374373
$(OutDir_Draw)Draw.a \
375374
$(OutDir_PdfDraw)PdfInit.o \
376375
$(OutDir_PdfDraw)PdfDraw.a \
377-
$(OutDir_Painter)PainterInit.o \
378376
$(OutDir_Painter)Painter.a \
379377
$(OutDir_plugin_pcre)pcre.a \
380378
$(OutDir_CtrlCore)CtrlCore.a \
@@ -66332,110 +66330,6 @@ $(OutDir_Painter)PaintPainting.o: $(UPPDIR1)Painter/PaintPainting.cpp \
6633266330
$(UPPDIR1)uppconfig.h
6633366331
$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_Painter) $(UPPDIR1)Painter/PaintPainting.cpp -o $(OutDir_Painter)PaintPainting.o
6633466332

66335-
$(OutDir_Painter)PainterInit.o: $(UPPDIR1)Painter/PainterInit.icpp \
66336-
$(UPPDIR1)Core/Algo.h \
66337-
$(UPPDIR1)Core/App.h \
66338-
$(UPPDIR1)Core/AString.hpp \
66339-
$(UPPDIR1)Core/Atomic.h \
66340-
$(UPPDIR1)Core/BiCont.h \
66341-
$(UPPDIR1)Core/Callback.h \
66342-
$(UPPDIR1)Core/CallbackN.i \
66343-
$(UPPDIR1)Core/CallbackNP.i \
66344-
$(UPPDIR1)Core/CallbackR.i \
66345-
$(UPPDIR1)Core/CharSet.h \
66346-
$(UPPDIR1)Core/CharSet.i \
66347-
$(UPPDIR1)Core/CoAlgo.h \
66348-
$(UPPDIR1)Core/Color.h \
66349-
$(UPPDIR1)Core/Complex.h \
66350-
$(UPPDIR1)Core/config.h \
66351-
$(UPPDIR1)Core/Convert.h \
66352-
$(UPPDIR1)Core/Convert.hpp \
66353-
$(UPPDIR1)Core/Core.h \
66354-
$(UPPDIR1)Core/CoSort.h \
66355-
$(UPPDIR1)Core/CoWork.h \
66356-
$(UPPDIR1)Core/Defs.h \
66357-
$(UPPDIR1)Core/Diag.h \
66358-
$(UPPDIR1)Core/FileMapping.h \
66359-
$(UPPDIR1)Core/FilterStream.h \
66360-
$(UPPDIR1)Core/FixedMap.h \
66361-
$(UPPDIR1)Core/Fn.h \
66362-
$(UPPDIR1)Core/Format.h \
66363-
$(UPPDIR1)Core/Function.h \
66364-
$(UPPDIR1)Core/Gtypes.h \
66365-
$(UPPDIR1)Core/Hash.h \
66366-
$(UPPDIR1)Core/Heap.h \
66367-
$(UPPDIR1)Core/HttpStatusCode.i \
66368-
$(UPPDIR1)Core/Huge.h \
66369-
$(UPPDIR1)Core/i18n.h \
66370-
$(UPPDIR1)Core/Index.h \
66371-
$(UPPDIR1)Core/Index.hpp \
66372-
$(UPPDIR1)Core/Inet.h \
66373-
$(UPPDIR1)Core/InMap.hpp \
66374-
$(UPPDIR1)Core/InVector.h \
66375-
$(UPPDIR1)Core/InVector.hpp \
66376-
$(UPPDIR1)Core/JSON.h \
66377-
$(UPPDIR1)Core/Lang.h \
66378-
$(UPPDIR1)Core/Lang_s.h \
66379-
$(UPPDIR1)Core/LocalProcess.h \
66380-
$(UPPDIR1)Core/Map.h \
66381-
$(UPPDIR1)Core/Map.hpp \
66382-
$(UPPDIR1)Core/Mem.h \
66383-
$(UPPDIR1)Core/Mt.h \
66384-
$(UPPDIR1)Core/Obsolete.h \
66385-
$(UPPDIR1)Core/Ops.h \
66386-
$(UPPDIR1)Core/Other.h \
66387-
$(UPPDIR1)Core/Other.hpp \
66388-
$(UPPDIR1)Core/Parser.h \
66389-
$(UPPDIR1)Core/Path.h \
66390-
$(UPPDIR1)Core/Profile.h \
66391-
$(UPPDIR1)Core/Ptr.h \
66392-
$(UPPDIR1)Core/Range.h \
66393-
$(UPPDIR1)Core/Sort.h \
66394-
$(UPPDIR1)Core/Sorted.h \
66395-
$(UPPDIR1)Core/SplitMerge.h \
66396-
$(UPPDIR1)Core/Stream.h \
66397-
$(UPPDIR1)Core/String.h \
66398-
$(UPPDIR1)Core/t_.h \
66399-
$(UPPDIR1)Core/TimeDate.h \
66400-
$(UPPDIR1)Core/Topic.h \
66401-
$(UPPDIR1)Core/Topt.h \
66402-
$(UPPDIR1)Core/Tuple.h \
66403-
$(UPPDIR1)Core/Utf.hpp \
66404-
$(UPPDIR1)Core/Util.h \
66405-
$(UPPDIR1)Core/Uuid.h \
66406-
$(UPPDIR1)Core/Value.h \
66407-
$(UPPDIR1)Core/Value.hpp \
66408-
$(UPPDIR1)Core/ValueCache.h \
66409-
$(UPPDIR1)Core/ValueUtil.h \
66410-
$(UPPDIR1)Core/ValueUtil.hpp \
66411-
$(UPPDIR1)Core/Vcont.h \
66412-
$(UPPDIR1)Core/Vcont.hpp \
66413-
$(UPPDIR1)Core/Win32Util.h \
66414-
$(UPPDIR1)Core/XML.h \
66415-
$(UPPDIR1)Core/Xmlize.h \
66416-
$(UPPDIR1)Core/Xmlize.hpp \
66417-
$(UPPDIR1)Core/z.h \
66418-
$(UPPDIR1)Draw/Cham.h \
66419-
$(UPPDIR1)Draw/DDARasterizer.h \
66420-
$(UPPDIR1)Draw/Display.h \
66421-
$(UPPDIR1)Draw/Draw.h \
66422-
$(UPPDIR1)Draw/DrawImg.iml \
66423-
$(UPPDIR1)Draw/FontInt.h \
66424-
$(UPPDIR1)Draw/Image.h \
66425-
$(UPPDIR1)Draw/ImageOp.h \
66426-
$(UPPDIR1)Draw/iml_header.h \
66427-
$(UPPDIR1)Draw/Raster.h \
66428-
$(UPPDIR1)Draw/SDraw.h \
66429-
$(UPPDIR1)Draw/SIMD.h \
66430-
$(UPPDIR1)Painter/BufferPainter.h \
66431-
$(UPPDIR1)Painter/LinearPath.h \
66432-
$(UPPDIR1)Painter/Painter.h \
66433-
$(UPPDIR1)Painter/Painter.hpp \
66434-
$(UPPDIR1)Painter/PainterInit.icpp \
66435-
$(UPPDIR1)Painter/Painting.h \
66436-
$(UPPDIR1)uppconfig.h
66437-
$(CXX) -c -x c++ $(CXXFLAGS) $(CINC) $(Macro_Painter) $(UPPDIR1)Painter/PainterInit.icpp -o $(OutDir_Painter)PainterInit.o
66438-
6643966333
$(OutDir_Painter)Xform2D.o: $(UPPDIR1)Painter/Xform2D.cpp \
6644066334
$(UPPDIR1)Core/Algo.h \
6644166335
$(UPPDIR1)Core/App.h \

‎reference/build_info/build_info.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ const char *bm_MACHINE = bmMACHINE;
1515
const char *bm_USER = bmUSER;
1616

1717
const char *bm_GIT_BRANCH =
18-
#ifdef bmGIT_HASH
18+
#ifdef bm_GIT_BRANCH
1919
bmGIT_BRANCH
2020
#else
2121
""
2222
#endif
2323
;
2424
const char *bm_GIT_REVCOUNT =
25-
#ifdef bmGIT_HASH
25+
#ifdef bmGIT_REVCOUNT
2626
bmGIT_REVCOUNT
2727
#else
2828
""
2929
#endif
3030
;
3131
const char *bm_GIT_HASH =
32-
#ifdef bmGIT_HASH
32+
#ifdef bm_GIT_HASH
3333
bmGIT_HASH
3434
#else
3535
""

‎tutorial/Gui24/Gui24.t‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ plPL("Moja aplikacja")
1414
ptPT("Minha aplica\303\247\303\243o")
1515
ruRU("\320\234\320\276\320\265 \320\277\321\200\320\270\320\273\320\276\320\266\320\265\320\275\320\270\320\265")
1616
trTR("Benim ba\305\237vurum")
17-
zhCN("\346\210\221\347\232\204\346\207\211\347\224\250\347\250\213\345\272\217")
17+
zhCN("\346\210\221\347\232\204\345\272\224\347\224\250\347\250\213\345\272\217")
18+
zhTW("\346\210\221\347\232\204\346\207\211\347\224\250\347\250\213\345\274\217")
1819

1920
T_("Hello translation engine!")
2021
csCZ("Ahoj p\305\231eklada\304\215i!")
@@ -27,4 +28,5 @@ plPL("Witaj silniku translacji!")
2728
ptPT("Ol\303\241 motor de tradu\303\247\303\243o!")
2829
ruRU("\320\237\321\200\320\270\320\262\320\265\321\202 \320\264\320\262\320\270\320\266\320\276\320\272 \320\277\320\265\321\200\320\265\320\262\320\276\320\264\320\260!")
2930
trTR("Merhaba \303\247eviri motoru!")
30-
zhCN("\346\202\250\345\245\275\347\277\273\350\255\257\345\274\225\346\223\216\357\274\201")
31+
zhCN("\346\202\250\345\245\275\347\277\273\350\257\221\345\274\225\346\223\216\357\274\201")
32+
zhTW("\346\202\250\345\245\275\347\277\273\350\255\257\345\274\225\346\223\216\357\274\201")

‎tutorial/Gui24/main.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ struct MyAppWindow : TopWindow {
1313

1414
void Paint(Draw& w) override {
1515
w.DrawRect(GetSize(), SLtYellow);
16-
w.DrawText(20, 20, t_("Hello translation engine!"), Arial(30), Blue);
16+
w.DrawText(20, 20, t_("Hello translation engine!"), Arial(30), SBlue);
1717
}
1818
};
1919

@@ -34,7 +34,8 @@ GUI_APP_MAIN
3434
// SetLanguage("pt-pt"); // Portuguese
3535
// SetLanguage("ru-ru"); // Russian
3636
// SetLanguage("tr-tr"); // Turkish
37-
// SetLanguage("zh-cn"); // Traditional Chinese
37+
// SetLanguage("zh-cn"); // Simplified Chinese
38+
// SetLanguage("zh-tw"); // Traditional Chinese
3839

3940
MyAppWindow().Run();
4041
}

‎uppbox/uppweb/www.tpp/Roadmap_en-us.tpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ topic "Roadmap";
2626
[2 $$0,0#00000000000000000000000000000000:Default]
2727
[{_}
2828
[s2;%% Release history&]
29-
[s3;%% 2025.1rc (Mar 2024)&]
30-
[s5;%% &]
29+
[s3;%% 2025.1 (rev. 17799) (Mar 2025)&]
30+
[s5;%% [*/ Current stable release]&]
31+
[s5;*/%% &]
3132
[s0; [* Core]&]
3233
[s0;* &]
3334
[s0;i150;O0; In Posix .log files moved to .local/state/u`+`+/log&]
@@ -110,7 +111,6 @@ options&]
110111
[s5;%% &]
111112
[s5;%% &]
112113
[s3;%% 2024.1.1 (rev. 17490) (Dec 2024)&]
113-
[s0;%% [*/ Current stable release]&]
114114
[s0;*/%% &]
115115
[s0;%% [* Core]&]
116116
[s0;%% &]

0 commit comments

Comments
 (0)