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

RichText, RichEdit: Added SVG support

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12811 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-03-06 11:49:57 +00:00
parent d03c43c5d1
commit a0a3011b37
8 changed files with 80 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
uppsrc/RichEdit/Clip.cpp
View file

@ -1,4 +1,5 @@
#include "RichEdit.h"
#include <Painter/Painter.h>
namespace Upp {
@ -13,7 +14,7 @@ void RichEdit::InsertImage()
}
String data = LoadFile(fn);
StringStream ss(data);
if(!StreamRaster::OpenAny(ss)) {
if(!StreamRaster::OpenAny(ss) && !IsSVG(data)) {
Exclamation(NFormat(t_("Unsupported image format in file [* \1%s\1]."), ~imagefs));
return;
}
@ -32,12 +33,14 @@ bool RichEdit::Accept(PasteClip& d, RichText& clip, String& fmt)
Vector<String> s = GetFiles(d);
if(s.GetCount()) {
String fn = s[0];
String ext = ToUpper(GetFileExt(fn));
if(ext == ".PNG" || ext == ".JPG" || ext == ".JPEG" || ext == ".GIF" || ext == ".TIF" || ext == ".TIFF") {
if(d.Accept()) {
if(StreamRaster::LoadFileAny(fn)) {
String ext = ToLower(GetFileExt(fn));
if(findarg(ext, ".png", ".jpg", ".jpeg", ".gif", ".tif", ".tiff", ".svg") >= 0) {
if(d.Accept() && GetFileLength(fn) < 17000000) {
String data = LoadFile(fn);
StringStream ss(data);
if(StreamRaster::OpenAny(ss) || ext == ".svg" && IsSVG(LoadFile(fn))) {
RichPara p;
p.Cat(CreateRawImageObject(LoadFile(fn)), formatinfo);
p.Cat(CreateRawImageObject(data), formatinfo);
clip.Cat(p);
fmt = "files";
}
@ -48,6 +51,12 @@ bool RichEdit::Accept(PasteClip& d, RichText& clip, String& fmt)
}
d.Reject();
}
if(d.Accept("image/x-inkscape-svg")) {
RichPara p;
p.Cat(CreateRawImageObject(~d), formatinfo);
clip.Cat(p);
fmt = "files";
}
if(d.Accept("text/QTF")) {
fmt = "text/QTF";
clip = ParseQTF(~d, 0, context);

2
uppsrc/RichEdit/Editor.cpp
View file

@ -736,7 +736,7 @@ RichEdit::RichEdit()
ClearModify();
Finish();
imagefs.Type("Images (*.png *.gif *.jpg *.bmp)", "*.png *.gif *.jpg *.bmp");
imagefs.Type("Images (*.png *.gif *.jpg *.bmp *.svg)", "*.png *.gif *.jpg *.bmp *.svg");
singleline = false;