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

Show .htm files in HTML import file dialog (#6340).

Browse Source 
- Add "htm" as a known extension for HTML.

  - Use all the extensions of a format as file filter,
    instead of using only the default extension.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39671 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-09-13 20:42:38 +00:00
parent a55ef8346a
commit d57f66022c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/configure.py
View File

@ -569,7 +569,7 @@ def checkFormatEntries(dtl_tools):
addToRC(r'\Format dvi2 dvi DraftDVI "" "" "" "vector"')
#
checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format html html HTML H "%%" "" "document,menu=export"'])
rc_entry = [r'\Format html "html, htm" HTML H "%%" "" "document,menu=export"'])
#
checkViewerEditor('Noteedit', ['noteedit'],
rc_entry = [r'\Format noteedit not Noteedit "" "%%" "%%" "vector"'])
@ -601,7 +601,7 @@ def checkFormatEntries(dtl_tools):
\Format pstex pstex_t PSTEX "" "" "" ""
\Format wmf wmf "Windows Metafile" "" "" "" "vector"
\Format emf emf "Enhanced Metafile" "" "" "" "vector"
\Format wordhtml html "HTML (MS Word)" "" "" "" "document"
\Format wordhtml "html, htm" "HTML (MS Word)" "" "" "" "document"
''')

6
src/frontends/qt4/GuiView.cpp
View File

@ -2066,10 +2066,10 @@ void GuiView::importDocument(string const & argument)
toqstr(addPath(package().system_support().absFileName(), "examples")));
docstring filter = formats.prettyName(format);
filter += " (*.";
filter += " (*.{";
// FIXME UNICODE
filter += from_utf8(formats.extension(format));
filter += ')';
filter += from_utf8(formats.extensions(format));
filter += "})";
FileDialog::Result result =
dlg.open(toqstr(initpath), fileFilters(toqstr(filter)));