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

ide: IconDes insert symbol

Browse source
This commit is contained in:
Mirek Fidler 2025-12-25 23:13:20 +01:00
parent 9a903a20d7
commit 69e5e2ba26
4 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
uppsrc/RichEdit/RichEdit.iml
View file

@ -126,6 +126,8 @@ IMAGE_ID(PageNumber)
IMAGE_ID(PageNumber__UHD)
IMAGE_ID(PageCount)
IMAGE_ID(PageCount__UHD)
IMAGE_ID(InsertSymbol__UHD)
IMAGE_ID(InsertSymbol)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,218,203,142,218,48,20,6,96,75,173,102,168,84,141,186,174,212,125,149,85,87,125,147,121,20,214,176,102,207)
@ -1195,3 +1197,24 @@ IMAGE_DATA(185,191,87,13,56,223,10,248,231,253,45,53,144,220,147,224,95,246,151,
IMAGE_DATA(51,224,31,27,240,143,13,248,199,6,252,99,3,254,177,81,90,111,111,25,237,212,42,162,93,225,31,111,11,255,254,51)
IMAGE_DATA(218,169,85,68,187,194,63,222,150,147,255,0,147,17,75,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
IMAGE_END_DATA(896, 2)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,148,219,113,195,48,12,4,85,78,202,114,255,77,36,95,158,40,30,73,33,248,192,30,201,219,25,252,217,194)
IMAGE_DATA(221,66,246,215,235,120,29,198,24,99,138,248,254,152,218,207,152,24,159,78,239,252,150,126,206,148,241,228,51,234,223,119)
IMAGE_DATA(136,81,226,242,236,52,250,121,115,79,196,101,237,152,107,50,220,251,6,215,100,186,247,13,254,66,184,247,13,126,177,127)
IMAGE_DATA(14,210,189,111,192,187,223,217,63,237,125,247,27,208,206,237,95,103,118,132,118,190,243,13,104,215,246,175,55,59,65,187)
IMAGE_DATA(182,127,189,217,13,218,247,236,254,91,123,209,190,123,102,204,164,87,79,218,249,136,92,35,233,221,151,118,126,229,109,196)
IMAGE_DATA(61,91,25,217,153,246,62,58,71,43,180,155,21,166,22,58,247,74,19,133,206,187,226,68,160,179,174,58,171,184,95,41)
IMAGE_DATA(247,74,61,232,92,61,110,64,231,107,201,79,103,107,117,63,67,143,21,115,175,210,133,206,213,203,189,122,159,171,78,116)
IMAGE_DATA(158,158,254,233,188,209,78,116,150,30,55,160,243,173,238,255,233,22,116,158,221,252,59,63,63,42,249,163,57,158,168,249)
IMAGE_DATA(254,44,189,71,238,47,205,82,74,207,157,246,31,115,255,244,156,232,206,204,254,244,254,39,47,53,212,236,177,127,6,133)
IMAGE_DATA(238,10,239,0,129,74,111,34,199,57,203,232,219,148,236,164,223,59,42,79,52,103,4,186,67,164,19,157,109,119,255,51)
IMAGE_DATA(230,157,169,207,202,153,213,123,216,255,92,61,232,188,173,55,160,51,247,120,135,232,220,43,248,111,133,206,63,179,255,158)
IMAGE_DATA(204,216,97,198,204,74,157,106,118,43,229,29,9,209,99,244,119,103,240,254,31,164,251,209,55,80,102,244,123,68,60,103)
IMAGE_DATA(150,59,100,252,142,149,252,43,221,160,87,159,158,255,29,89,121,105,122,187,191,235,68,62,71,249,6,35,250,156,123,41)
IMAGE_DATA(61,71,205,255,200,78,179,13,1,221,89,109,50,161,187,42,78,38,116,87,197,201,130,238,169,60,25,208,29,149,39,3)
IMAGE_DATA(186,163,242,100,64,119,84,158,12,232,142,202,147,1,221,81,121,50,160,59,42,79,6,116,71,229,201,128,238,168,60,89)
IMAGE_DATA(208,61,207,125,233,12,246,175,49,153,208,93,119,247,127,116,200,107,255,109,40,245,85,202,146,137,74,103,251,231,251,42)
IMAGE_DATA(101,201,228,46,15,209,119,244,78,53,247,111,174,178,80,239,90,198,94,37,247,119,144,191,115,114,183,10,116,127,122,63)
IMAGE_DATA(141,66,119,133,12,36,42,157,119,245,255,70,169,167,82,22,99,140,49,155,242,3,143,64,22,236,0,0,0,0,0,0)
IMAGE_END_DATA(576, 1)

2
uppsrc/RichEdit/Tool.cpp
View file

@ -354,7 +354,7 @@ void RichEdit::LoadImageTool(Bar& bar, dword key)
void RichEdit::InsertCharacterTool(Bar& bar, dword key)
{
bar.Add(!IsReadOnly(), t_("Insert special character.."), DiagramImg::FontSvg(), [=] { InsertCharacter(); });
bar.Add(!IsReadOnly(), t_("Insert special character.."), RichEditImg::InsertSymbol(), [=] { InsertCharacter(); });
}
void RichEdit::InsertDiagramTool(Bar& bar, dword key)

7
uppsrc/ide/IconDes/IconDes.lay
View file

@ -102,10 +102,11 @@ END_LAYOUT
LAYOUT(IconDesTextLayout, 412, 76)
ITEM(Upp::Label, dv___0, SetLabel(t_("Text")).LeftPosZ(8, 33).TopPosZ(4, 19))
ITEM(Upp::EditString, text, LeftPosZ(44, 364).TopPosZ(4, 19))
ITEM(Upp::Label, dv___2, SetLabel(t_("Font")).LeftPosZ(8, 33).TopPosZ(28, 19))
ITEM(Upp::EditString, text, LeftPosZ(44, 340).TopPosZ(4, 19))
ITEM(Upp::Button, symbol, LeftPosZ(388, 20).TopPosZ(4, 19))
ITEM(Upp::Label, dv___3, SetLabel(t_("Font")).LeftPosZ(8, 33).TopPosZ(28, 19))
ITEM(Upp::DropList, face, LeftPosZ(44, 264).TopPosZ(28, 19))
ITEM(Upp::Label, dv___4, SetLabel(t_("Height")).LeftPosZ(312, 39).TopPosZ(28, 19))
ITEM(Upp::Label, dv___5, SetLabel(t_("Height")).LeftPosZ(312, 39).TopPosZ(28, 19))
ITEM(Upp::WithDropChoice<Upp::EditIntSpin>, height, LeftPosZ(352, 56).TopPosZ(28, 19))
ITEM(Upp::Option, bold, SetLabel(t_("Bold")).LeftPosZ(8, 52).TopPosZ(52, 18))
ITEM(Upp::Option, italic, SetLabel(t_("Italic")).LeftPosZ(60, 52).TopPosZ(52, 18))

11
uppsrc/ide/IconDes/Text.cpp
View file

@ -19,6 +19,17 @@ IconDes::TextDlg::TextDlg()
height <<= 12;
for(int i = 4; i < 300; i += i < 16 ? 1 : i < 32 ? 4 : i < 48 ? 8 : 16)
height.AddList(i);
symbol.SetImage(RichEditImg::InsertSymbol());
symbol << [=] {
Font fnt;
int c = SelectFontSymbol(fnt);
if(IsNull(c))
return;
text.Insert(c);
face <<= fnt.GetFace();
WhenAction();
};
}
Font IconDes::TextDlg::GetFont()