anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Herbert): expand the list of recognised graphics formats.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3989 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-04-12 15:25:11 +00:00
parent c23e945804
commit 3ee9f0ac7d
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,7 @@
2002-04-11 Herbert Voss <voss@perce.de>
* ControlGraphics.C: expand "browse-string" to all available formats
2002-04-11 Herbert Voss <voss@perce.de>
* ControlGraphics.C: read BoundingBox also from non (e)ps files.

16
src/frontends/controllers/ControlGraphics.C
View File

@ -46,6 +46,18 @@
using std::pair;
using std::make_pair;
using std::ifstream;
namespace {
// FIXME: currently we need the second '|' to prevent mis-interpretation!
// All supported graphic formats with their file-extension and the
// gzip-ext for zipped (e)ps-files.
string const grfx_pattern =
"*.(agr|bmp|eps|epsi|fits|gif|jpg|obj|pdf|pbm|pgm|png|"
"ppm|ps|tif|tiff|xbm|xpm|xwd|gz)|";
}
ControlGraphics::ControlGraphics(LyXView & lv, Dialogs & d)
: ControlInset<InsetGraphics, InsetGraphicsParams>(lv, d)
@ -90,8 +102,6 @@ extern string user_lyxdir;
string const ControlGraphics::Browse(string const & in_name)
{
string const title = _("Select graphics file");
// FIXME: currently we need the second '|' to prevent mis-interpretation
string const pattern = "*.(ps|eps|png|jpeg|jpg|gif|gz)|";
// Does user clipart directory exist?
string clipdir = AddName (user_lyxdir, "clipart");
@ -103,7 +113,7 @@ string const ControlGraphics::Browse(string const & in_name)
pair<string, string> dir2(_("Documents|#o#O"), string(lyxrc.document_path));
// Show the file browser dialog
return browseRelFile(&lv_, in_name, lv_.buffer()->filePath(),
title, pattern, dir1, dir2);
title, ::grfx_pattern, dir1, dir2);
}