Hello community, here is the log from the commit of package ansifilter for openSUSE:Factory checked in at 2019-11-13 13:29:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ansifilter (Old) and /work/SRC/openSUSE:Factory/.ansifilter.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansifilter" Wed Nov 13 13:29:03 2019 rev:10 rq:748009 version:2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/ansifilter/ansifilter.changes 2019-11-07 23:17:56.200627154 +0100 +++ /work/SRC/openSUSE:Factory/.ansifilter.new.2990/ansifilter.changes 2019-11-13 13:29:05.343745441 +0100 @@ -1,0 +2,8 @@ +Wed Nov 13 07:09:54 UTC 2019 - [email protected] + +- Update to version 2.15: + * Added optional argument to --ignore-clear, the default setting + is now true. + * CLI: fixed -e argument description. + +------------------------------------------------------------------- Old: ---- ansifilter-2.14.tar.bz2 ansifilter-2.14.tar.bz2.asc New: ---- ansifilter-2.15.tar.bz2 ansifilter-2.15.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ansifilter.spec ++++++ --- /var/tmp/diff_new_pack.XfRRL2/_old 2019-11-13 13:29:06.271746413 +0100 +++ /var/tmp/diff_new_pack.XfRRL2/_new 2019-11-13 13:29:06.275746417 +0100 @@ -1,7 +1,7 @@ # # spec file for package ansifilter # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # Copyright (c) 2013 Pascal Bleser. # # All modifications and additions to the file contributed by third parties @@ -19,12 +19,12 @@ %bcond_without gui Name: ansifilter -Version: 2.14 +Version: 2.15 Release: 0 Summary: ANSI Terminal Escape Code Converter License: GPL-3.0-or-later Group: Development/Tools/Other -Url: http://www.andre-simon.de/ +URL: http://www.andre-simon.de/ Source: http://www.andre-simon.de/zip/ansifilter-%{version}.tar.bz2 Source2: http://www.andre-simon.de/zip/ansifilter-%{version}.tar.bz2.asc Source99: ansifilter.keyring ++++++ ansifilter-2.14.tar.bz2 -> ansifilter-2.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/ChangeLog.adoc new/ansifilter-2.15/ChangeLog.adoc --- old/ansifilter-2.14/ChangeLog.adoc 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/ChangeLog.adoc 2019-11-08 18:37:47.000000000 +0100 @@ -1,5 +1,13 @@ = Ansifilter ChangeLog +=== ansifilter 2.15 + +08.11.2019 + + - added optional argument to --ignore-clear, the default setting is now true + - GUI: improved UTF16 input path handling on Windows + - CLI: fixed -e argument description (thanks to Jens Schleusener) + === ansifilter 2.14 02.04.2019 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/README.adoc new/ansifilter-2.15/README.adoc --- old/ansifilter-2.14/README.adoc 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/README.adoc 2019-11-08 18:37:47.000000000 +0100 @@ -1,6 +1,6 @@ = ANSIFILTER MANUAL André Simon -v2.13, December 2018 +v2.15, November 2019 OSI Certified Open Source Software @@ -38,10 +38,11 @@ Format options: -a, --anchors(=self) Add HTML line anchors (opt: self referencing, assumes -l) -d, --doc-title Set HTML/LaTeX/SVG document title - -e, --encoding Set HTML/RTF encoding (must match input file encoding) + -e, --encoding=<enc> Set HTML/RTF encoding (must match input file encoding); + omit encoding information if enc=NONE -f, --fragment Omit HTML header and footer -F, --font=<font> Set HTML/RTF/SVG font face - -k, --ignore-clear Do not adhere to clear (ESC K) commands + -k, --ignore-clear(=0) Do not adhere to clear (ESC K) commands (default: true) -l, --line-numbers Print line numbers in output file -m, --map=<path> Read color mapping file (see README) -r, --style-ref=<rf> Set HTML/TeX/LaTeX/SVG stylesheet path @@ -151,7 +152,6 @@ ................................................................................ - === Contact Andre Simon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/makefile new/ansifilter-2.15/makefile --- old/ansifilter-2.14/makefile 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/makefile 2019-11-08 18:37:47.000000000 +0100 @@ -23,6 +23,7 @@ desktop_pixmaps = ${PREFIX}/share/pixmaps/ # Commands: +GZIP=gzip -9f QMAKE=qmake INSTALL_DATA=install -m644 @@ -51,7 +52,8 @@ ${MKDIR} ${DESTDIR}${man_dir} ${MKDIR} ${DESTDIR}${bin_dir} - ${INSTALL_DATA} ./man/ansifilter.1.gz ${DESTDIR}${man_dir} + ${INSTALL_DATA} ./man/ansifilter.1 ${DESTDIR}${man_dir} + -${GZIP} ${DESTDIR}${man_dir}ansifilter.1 ${INSTALL_DATA} ./README.adoc ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./ChangeLog.adoc ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/man/ansifilter.1 new/ansifilter-2.15/man/ansifilter.1 --- old/ansifilter-2.14/man/ansifilter.1 1970-01-01 01:00:00.000000000 +0100 +++ new/ansifilter-2.15/man/ansifilter.1 2019-11-08 18:37:47.000000000 +0100 @@ -0,0 +1,115 @@ +.TH ansifilter 1 "2019-10-22" "Andre Simon" "user documentation" + +.SH NAME +Ansifilter - ANSI escape code processor and converter + +.SH SYNOPSIS +.B ansifilter +[d:i:F:m:o:r:s:e:fhptvHRT] [-i input file] [-o output file] [--text] [--html] [--latex] [--tex] [--rtf] [input files] + +.SH DESCRIPTION +.B Ansifilter +is a small utility to handle text files containing ANSI terminal +escape codes. The command sequences may be stripped or be interpreted to +generate formatted output (HTML, LaTeX, TeX, RTF). +.PP +See the README file for details. +.SH File options +.IP "-i, --input=<file>" +Name of input file +.IP "-o, --output=<file>" +Name of output file +.IP "-O, --outdir=<dir>" +Name of output directory +.IP "-t, --tail" +Continue reading after end-of-file (like tail -f). Use system tail if available. + +.SH Output formats +.IP "-T, --text" +Output text (default) +.IP "-H, --html" +Output HTML +.IP "-M, --pango" +Output Pango markup +.IP "-L, --latex" +Output LaTeX +.IP "-P, --tex" +Output Plain TeX +.IP "-R, --rtf" +Output RTF +.IP "-B, --bbcode" +Output BBCode +.IP "-S, --svg" +Output SVG + +.SH Format options +.IP "-a, --anchors(=self)" +Add HTML line anchors (opt: self referencing, assumes -l) +.IP "-d, --doc-title" +Set HTML/LaTeX/SVG document title +.IP "-f, --fragment" +Omit HTML header and footer +.IP "-F, --font=<font>" +Set HTML/RTF/SVG font face +.IP "-k, --ignore-clear(=false)" +Do not adhere to clear (ESC K) commands (default: true) +.IP "-l, --line-numbers" +Print line numbers in output file +.IP "-m, --map=<path>" +Read color mapping file (see README) +.IP "-r, --style-ref=<rf>" +Set HTML/TeX/LaTeX/SVG stylesheet path +.IP "-s, --font-size=<num?>" +Set HTML/RTF/SVG font size +.IP "-e, --encoding=<enc>" +Set HTML encoding (must match input file encoding); omit encoding information if enc=NONE +.IP "-p, --plain" +Ignore ANSI formatting information +.IP "-w, --wrap=<len>" +Wrap long lines +.IP "--no-trailing-nl" +Omit trailing newline +.IP "--no-version-info" +Omit version info comment +.IP "--wrap-no-numbers" +Omit line numbers of wrapped lines (assumes -l) +.IP "--derived-styles" +Output dynamic stylesheets (HTML/SVG) + +.SH ASCII art options +.IP "--art-cp437" +Parse codepage 437 ASCII art (HTML and RTF output) +.IP "--art-bin" +Parse BIN/XBIN ASCII art (HTML output, no stdin) +.IP "--art-tundra" +Parse Tundra ANSI art (HTML output, no stdin) +.IP "--art-width" +Set ASCII art width (default 80) +.IP "--art-height" +Set ASCII art height (default 150) + +.SH "OTHER OPTIONS" +.IP "-h, --help" +print help +.IP "-v, --version" +print version and license info + +.PP +If no in- or output files are specified, stdin and stdout will be used for in- or output. +Plain text will be generated, if no output format is given. +Parsing XBIN files overrides --art-width, --art-height and --map options. +The ANSI art file formats BIN, XBIN and TND cannot be read from stdin. + +.SH Examples +File conversions: +.PP +ansifilter -i text_with_ansi.txt -o text_without_ansi.txt +.PP +tail -f server.log | ansifilter +.PP +ansifilter *.txt + +.SH AUTHORS +Andre Simon <[email protected]> +.SH SEE ALSO +More information at http://www.andre-simon.de/. Binary files old/ansifilter-2.14/man/ansifilter.1.gz and new/ansifilter-2.15/man/ansifilter.1.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/cmdlineoptions.cpp new/ansifilter-2.15/src/cmdlineoptions.cpp --- old/ansifilter-2.14/src/cmdlineoptions.cpp 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/cmdlineoptions.cpp 2019-11-08 18:37:47.000000000 +0100 @@ -69,7 +69,7 @@ { 'm', "map", Arg_parser::yes }, { 'N', "no-trailing-nl", Arg_parser::no }, { 'C', "no-version-info", Arg_parser::no }, - { 'k', "ignore-clear", Arg_parser::no }, + { 'k', "ignore-clear", Arg_parser::maybe }, { 'y', "derived-styles", Arg_parser::no }, { 'S', "svg", Arg_parser::no }, { 'Q', "width", Arg_parser::yes }, @@ -94,7 +94,7 @@ opt_asciiTundra(false), opt_omit_trailing_cr(false), opt_omit_version_info(false), - opt_ignoreClear(false), + opt_ignoreClear(true), opt_applyDynStyles(false), opt_genDynStyles(false), opt_funny_anchors(false), @@ -266,7 +266,8 @@ opt_omit_version_info=true; break; case 'k': - opt_ignoreClear=true; + if (arg.size()) + opt_ignoreClear = ( arg=="true" || arg=="1" ) ; break; case 'y': opt_applyDynStyles=true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/codegenerator.cpp new/ansifilter-2.15/src/codegenerator.cpp --- old/ansifilter-2.14/src/codegenerator.cpp 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/codegenerator.cpp 2019-11-08 18:37:47.000000000 +0100 @@ -1241,6 +1241,7 @@ || (isKSeq && !isGrepOutput) ){ i=line.length()+1; omitNewLine = isKSeq; // \n may follow K + //FIXME std::cerr << "K CASE!\n"; } else { i = 1 + ((seqEnd!=line.length())?seqEnd:i); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/codegenerator.h new/ansifilter-2.15/src/codegenerator.h --- old/ansifilter-2.14/src/codegenerator.h 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/codegenerator.h 2019-11-08 18:37:47.000000000 +0100 @@ -180,14 +180,14 @@ /** Generate a stylesheet with the styles found in the document \param outPath Output path - \return true if successfull + \return true if successful */ virtual bool printDynamicStyleFile ( const string &outPath ); /** Overrides default colours by user defined values; resets palette to default if mapPath is empty \param mapPath path of map file - \return true if parsing was successfull + \return true if parsing was successful */ bool setColorMap(const string& mapPath); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/main.cpp new/ansifilter-2.15/src/main.cpp --- old/ansifilter-2.14/src/main.cpp 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/main.cpp 2019-11-08 18:37:47.000000000 +0100 @@ -69,10 +69,11 @@ cout << "\nFormat options:\n"; cout << " -a, --anchors(=self) Add HTML line anchors (opt: self referencing, assumes -l)\n"; cout << " -d, --doc-title Set HTML/LaTeX/SVG document title\n"; - cout << " -e, --encoding Set HTML/RTF encoding (must match input file encoding)\n"; + cout << " -e, --encoding=<enc> Set HTML/RTF encoding (must match input file encoding);\n"; + cout << " omit encoding information if enc=NONE\n"; cout << " -f, --fragment Omit HTML header and footer\n"; cout << " -F, --font=<font> Set HTML/RTF/SVG font face\n"; - cout << " -k, --ignore-clear Do not adhere to clear (ESC K) commands\n"; + cout << " -k, --ignore-clear(=0) Do not adhere to clear (ESC K) commands (default: true)\n"; cout << " -l, --line-numbers Print line numbers in output file\n"; cout << " -m, --map=<path> Read color mapping file (see README)\n"; cout << " -r, --style-ref=<rf> Set HTML/TeX/LaTeX/SVG stylesheet path\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/qt-gui/Makefile new/ansifilter-2.15/src/qt-gui/Makefile --- old/ansifilter-2.14/src/qt-gui/Makefile 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/qt-gui/Makefile 2019-11-08 18:37:47.000000000 +0100 @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: ansifilter-gui -# Generated by qmake (3.1) (Qt 5.12.2) +# Generated by qmake (3.1) (Qt 5.13.2) # Project: ansifilter-gui.pro # Template: app # Command: /usr/bin/qmake -o Makefile ansifilter-gui.pro @@ -15,9 +15,9 @@ CC = gcc CXX = g++ DEFINES = -DO2 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -std=c++11 -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I. -I. -I.. -isystem /usr/include/qt -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtCore -I. -isystem /usr/include/libdrm -I. -I/usr/lib/qt/mkspecs/linux-g++ +CFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -Wall -W -D_REENTRANT -fPIC $(DEFINES) +CXXFLAGS = -pipe -std=c++11 -O2 -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -Wall -W -D_REENTRANT -fPIC $(DEFINES) +INCPATH = -I. -I. -I.. -isystem /usr/include/qt -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtCore -I. -I. -I/usr/lib/qt/mkspecs/linux-g++ QMAKE = /usr/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d @@ -40,7 +40,7 @@ DISTDIR = /home/andre/Projekte/git/ansifilter/src/qt-gui/.tmp/ansifilter-gui1.0.0 LINK = g++ LFLAGS = -Wl,-O1 -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -LIBS = $(SUBLIBS) -lQt5Widgets -lQt5Gui -lQt5Core /usr/lib/libGL.so -lpthread +LIBS = $(SUBLIBS) /usr/lib/libQt5Widgets.so /usr/lib/libQt5Gui.so /usr/lib/libQt5Core.so /usr/lib/libGL.so -lpthread AR = ar cqs RANLIB = SED = sed @@ -220,6 +220,7 @@ /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickshapes_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ @@ -253,12 +254,15 @@ /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_widgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_widgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_x11extras.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xml.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xml_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns.pri \ @@ -457,6 +461,7 @@ /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickshapes_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri \ @@ -490,12 +495,15 @@ /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_widgets.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_widgets_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_x11extras.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xml.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xml_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns.pri \ @@ -535,10 +543,7 @@ /usr/lib/qt/mkspecs/features/yacc.prf \ /usr/lib/qt/mkspecs/features/lex.prf \ ansifilter-gui.pro \ - ansifilter.qrc \ - /usr/lib/libQt5Widgets.prl \ - /usr/lib/libQt5Gui.prl \ - /usr/lib/libQt5Core.prl + ansifilter.qrc $(QMAKE) -o Makefile ansifilter-gui.pro /usr/lib/qt/mkspecs/features/spec_pre.prf: /usr/lib/qt/mkspecs/common/unix.conf: @@ -673,6 +678,7 @@ /usr/lib/qt/mkspecs/modules/qt_lib_quickcontrols2_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickshapes_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quicktemplates2_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quickwidgets_private.pri: @@ -706,12 +712,15 @@ /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_widgets.pri: /usr/lib/qt/mkspecs/modules/qt_lib_widgets_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_x11extras.pri: /usr/lib/qt/mkspecs/modules/qt_lib_x11extras_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_xkbcommon_support_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_xml.pri: /usr/lib/qt/mkspecs/modules/qt_lib_xml_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_xmlpatterns.pri: @@ -752,9 +761,6 @@ /usr/lib/qt/mkspecs/features/lex.prf: ansifilter-gui.pro: ansifilter.qrc: -/usr/lib/libQt5Widgets.prl: -/usr/lib/libQt5Gui.prl: -/usr/lib/libQt5Core.prl: qmake: FORCE @$(QMAKE) -o Makefile ansifilter-gui.pro @@ -810,7 +816,7 @@ compiler_moc_predefs_clean: -$(DEL_FILE) moc_predefs.h moc_predefs.h: /usr/lib/qt/mkspecs/features/data/dummy.cpp - g++ -pipe -std=c++11 -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt -Wall -W -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp + g++ -pipe -std=c++11 -O2 -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -Wall -W -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp compiler_moc_header_make_all: moc_mydialog.cpp compiler_moc_header_clean: @@ -824,7 +830,7 @@ ../stringtools.h \ moc_predefs.h \ /usr/bin/moc - /usr/bin/moc $(DEFINES) --include /home/andre/Projekte/git/ansifilter/src/qt-gui/moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/andre/Projekte/git/ansifilter/src/qt-gui -I/home/andre/Projekte/git/ansifilter/src/qt-gui -I/home/andre/Projekte/git/ansifilter/src -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/8.2.1 -I/usr/include/c++/8.2.1/x86_64-pc-linux-gnu -I/usr/include/c++/8.2.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/8.2.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/8.2.1/include-fixed -I/usr/include mydialog.h -o moc_mydialog.cpp + /usr/bin/moc $(DEFINES) --include /home/andre/Projekte/git/ansifilter/src/qt-gui/moc_predefs.h -I/usr/lib/qt/mkspecs/linux-g++ -I/home/andre/Projekte/git/ansifilter/src/qt-gui -I/home/andre/Projekte/git/ansifilter/src/qt-gui -I/home/andre/Projekte/git/ansifilter/src -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/9.1.0 -I/usr/include/c++/9.1.0/x86_64-pc-linux-gnu -I/usr/include/c++/9.1.0/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.1.0/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.1.0/include-fixed -I/usr/include mydialog.h -o moc_mydialog.cpp compiler_moc_objc_header_make_all: compiler_moc_objc_header_clean: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/qt-gui/moc_mydialog.cpp new/ansifilter-2.15/src/qt-gui/moc_mydialog.cpp --- old/ansifilter-2.14/src/qt-gui/moc_mydialog.cpp 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/qt-gui/moc_mydialog.cpp 2019-11-08 18:37:47.000000000 +0100 @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mydialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include <memory> #include "mydialog.h" #include <QtCore/qbytearray.h> #include <QtCore/qmetatype.h> #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mydialog.h' doesn't include <QObject>." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.2. It" +#error "This file was generated using the moc from 5.13.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/qt-gui/mydialog.cpp new/ansifilter-2.15/src/qt-gui/mydialog.cpp --- old/ansifilter-2.14/src/qt-gui/mydialog.cpp 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/qt-gui/mydialog.cpp 2019-11-08 18:37:47.000000000 +0100 @@ -26,6 +26,11 @@ #include <QtGlobal> + +#ifdef Q_OS_WIN +#include <windows.h> +#endif + #if (QT_VERSION < QT_VERSION_CHECK(5,0,0)) #include <QtWidgets/QMessageBox> #include <QtWidgets/QFileDialog> @@ -118,8 +123,8 @@ settings.setValue("linewrap", dlg.spinBoxWrap->value()); settings.setValue("width", dlg.sbWidth->value()); settings.setValue("height", dlg.sbHeight->value()); - settings.setValue("svgheight", dlg.leSvgHeight->text()); - settings.setValue("svgwidth", dlg.leSvgWidth->text()); + settings.setValue("svgheight", dlg.leSvgHeight->text()); + settings.setValue("svgwidth", dlg.leSvgWidth->text()); settings.endGroup(); settings.beginGroup("paths"); @@ -160,6 +165,7 @@ void MyDialog::openFile(const QString & path){ if (!path.isEmpty()) { inputFileName=path; + if (!dlg.cbParseAsciiArt->isChecked()){ dlg.cbWatchFile->setEnabled(true); dlg.cbWatchFile->setChecked(false); @@ -194,7 +200,6 @@ dlg.leStyleFile->setEnabled(selIdx==1|| selIdx==3 || selIdx==4|| selIdx==7); dlg.lblStyleFile->setEnabled(selIdx==1|| selIdx==3 || selIdx==4|| selIdx==7); - // dlg.gbAsciiArt->setEnabled(dlg.cbParseAsciiArt->isEnabled() && dlg.cbParseAsciiArt->isChecked()); dlg.comboAnsiFormat->setEnabled(dlg.cbParseAsciiArt->isEnabled() && dlg.cbParseAsciiArt->isChecked()); dlg.artSizeFrame->setEnabled(dlg.cbParseAsciiArt->isEnabled() && dlg.cbParseAsciiArt->isChecked()); dlg.lblHeight->setEnabled(dlg.gbAsciiArt->isEnabled()); @@ -207,8 +212,6 @@ dlg.leSvgHeight->setEnabled(selIdx==7); dlg.leSvgWidth->setEnabled(selIdx==7); dlg.lblSvgDim->setEnabled(selIdx==7); - - } ansifilter::OutputType MyDialog::getOutputType() @@ -229,7 +232,6 @@ return ansifilter::PANGO; case 7: return ansifilter::SVG; - } return ansifilter::TEXT; } @@ -274,8 +276,10 @@ QString outFileName =QFileDialog::getSaveFileName(this, tr("Save File"), outputFileName, outFileSuffix.mid(1).toUpper() + " (*" + outFileSuffix+")" ); + QString title(QFileInfo(outFileName).fileName()); + unique_ptr<ansifilter::CodeGenerator> generator(ansifilter::CodeGenerator::getInstance(getOutputType())); - generator->setTitle( (dlg.leTitle->text().isEmpty()? QFileInfo(outFileName).fileName() : dlg.leTitle->text()).toStdString()); + generator->setTitle( (dlg.leTitle->text().isEmpty()? title : dlg.leTitle->text()).toStdString()); generator->setEncoding(dlg.comboEncoding->currentText().toStdString()); generator->setFragmentCode(dlg.cbFragment->isChecked()); generator->setPlainOutput(dlg.cbIgnoreSequences->isChecked()); @@ -317,7 +321,20 @@ } this->setCursor(Qt::WaitCursor); - ansifilter::ParseError result= generator->generateFile( inputFileName.toStdString (), outFileName.toStdString () ) ; + + QString inputFileNameShort(inputFileName); + QString outFileNameShort(outFileName); + +#ifdef Q_OS_WIN + QFile file( outFileName ); + if ( file.open(QIODevice::ReadWrite) ) + { + outFileNameShort = getWindowsShortPath(outFileName); + } + inputFileNameShort = getWindowsShortPath(inputFileName); +#endif + + ansifilter::ParseError result= generator->generateFile( inputFileNameShort.toStdString (), outFileNameShort.toStdString () ) ; if (result==ansifilter::BAD_OUTPUT) { QMessageBox::warning(this, "IO Error", "Could not write output file"); } else if (result==ansifilter::BAD_INPUT) { @@ -347,7 +364,11 @@ generator->setPreformatting ( ansifilter::WRAP_SIMPLE, static_cast<unsigned int>(dlg.spinBoxWrap->value())); generator->setIgnoreClearSeq(dlg.cbIgnClearSeq->isChecked()); - QString outString = QString(generator->generateStringFromFile( inputFileName.toStdString ()).c_str() ) ; + QString inputFileNameShort(inputFileName); +#ifdef Q_OS_WIN + inputFileNameShort = getWindowsShortPath(inputFileName); +#endif + QString outString = QString(generator->generateStringFromFile( inputFileNameShort.toStdString ()).c_str() ) ; if(!outString.isEmpty()) { QClipboard *clipboard = QApplication::clipboard(); @@ -407,7 +428,11 @@ this->setCursor(Qt::WaitCursor); - string htmlStdString=generator->generateStringFromFile(inputFileName.toStdString ()); + QString inputFileNameShort(inputFileName); +#ifdef Q_OS_WIN + inputFileNameShort = getWindowsShortPath(inputFileName); +#endif + string htmlStdString=generator->generateStringFromFile(inputFileNameShort.toStdString ()); QString htmlString( htmlStdString.c_str() ); if (!htmlString.isEmpty()) { dlg.textEdit->setText(htmlString); @@ -475,3 +500,15 @@ fileWatcher.removePath(inputFileName); } +QString MyDialog::getWindowsShortPath(const QString & path){ + QString shortPath(path); +#ifdef Q_OS_WIN + int length = GetShortPathName( (const wchar_t*)path.utf16(),0,0); + wchar_t* buffer = new wchar_t[length]; + + length = GetShortPathName( (const wchar_t*)path.utf16(), buffer, length); + shortPath = QString::fromUtf16((const char16_t*)buffer, length); + delete[] buffer; +#endif + return shortPath; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/qt-gui/mydialog.h new/ansifilter-2.15/src/qt-gui/mydialog.h --- old/ansifilter-2.14/src/qt-gui/mydialog.h 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/qt-gui/mydialog.h 2019-11-08 18:37:47.000000000 +0100 @@ -61,6 +61,8 @@ void openFile(const QString & path); void showFile(); + QString getWindowsShortPath(const QString & path); + void dropEvent(QDropEvent* event); void dragEnterEvent(QDragEnterEvent *event); void dragLeaveEvent(QDragLeaveEvent* event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/qt-gui/ui_ansifilter.h new/ansifilter-2.15/src/qt-gui/ui_ansifilter.h --- old/ansifilter-2.14/src/qt-gui/ui_ansifilter.h 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/qt-gui/ui_ansifilter.h 2019-11-08 18:37:47.000000000 +0100 @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'ansifilter.ui' ** -** Created by: Qt User Interface Compiler version 5.12.2 +** Created by: Qt User Interface Compiler version 5.13.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -537,10 +537,10 @@ horizontalLayout_4->addLayout(verticalLayout); -#ifndef QT_NO_SHORTCUT +#if QT_CONFIG(shortcut) lblTitle->setBuddy(leTitle); lblEncoding->setBuddy(comboEncoding); -#endif // QT_NO_SHORTCUT +#endif // QT_CONFIG(shortcut) QWidget::setTabOrder(cbIgnoreSequences, cbFragment); QWidget::setTabOrder(cbFragment, leTitle); QWidget::setTabOrder(leTitle, comboEncoding); @@ -555,151 +555,151 @@ void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "ANSIFilter", nullptr)); - groupBox->setTitle(QApplication::translate("Dialog", "ANSIFilter", nullptr)); -#ifndef QT_NO_TOOLTIP - pbFileOpen->setToolTip(QApplication::translate("Dialog", "Open a text file.", nullptr)); -#endif // QT_NO_TOOLTIP - pbFileOpen->setText(QApplication::translate("Dialog", "Open File", nullptr)); -#ifndef QT_NO_TOOLTIP - pbSaveAs->setToolTip(QApplication::translate("Dialog", "Save the opened file as text, HTML, LaTeX, Plain TeX, BBCode or RTF.", nullptr)); -#endif // QT_NO_TOOLTIP - pbSaveAs->setText(QApplication::translate("Dialog", "Save as", nullptr)); -#ifndef QT_NO_TOOLTIP - pbClipboard->setToolTip(QApplication::translate("Dialog", "Copy opened file as plain text to clipboard", nullptr)); -#endif // QT_NO_TOOLTIP - pbClipboard->setText(QApplication::translate("Dialog", "Copy to clipboard", nullptr)); -#ifndef QT_NO_TOOLTIP - lblDrop->setToolTip(QApplication::translate("Dialog", "You may drop a file on this window.", nullptr)); -#endif // QT_NO_TOOLTIP + Dialog->setWindowTitle(QCoreApplication::translate("Dialog", "ANSIFilter", nullptr)); + groupBox->setTitle(QCoreApplication::translate("Dialog", "ANSIFilter", nullptr)); +#if QT_CONFIG(tooltip) + pbFileOpen->setToolTip(QCoreApplication::translate("Dialog", "Open a text file.", nullptr)); +#endif // QT_CONFIG(tooltip) + pbFileOpen->setText(QCoreApplication::translate("Dialog", "Open File", nullptr)); +#if QT_CONFIG(tooltip) + pbSaveAs->setToolTip(QCoreApplication::translate("Dialog", "Save the opened file as text, HTML, LaTeX, Plain TeX, BBCode or RTF.", nullptr)); +#endif // QT_CONFIG(tooltip) + pbSaveAs->setText(QCoreApplication::translate("Dialog", "Save as", nullptr)); +#if QT_CONFIG(tooltip) + pbClipboard->setToolTip(QCoreApplication::translate("Dialog", "Copy opened file as plain text to clipboard", nullptr)); +#endif // QT_CONFIG(tooltip) + pbClipboard->setText(QCoreApplication::translate("Dialog", "Copy to clipboard", nullptr)); +#if QT_CONFIG(tooltip) + lblDrop->setToolTip(QCoreApplication::translate("Dialog", "You may drop a file on this window.", nullptr)); +#endif // QT_CONFIG(tooltip) lblDrop->setText(QString()); - label_4->setText(QApplication::translate("Dialog", "Output format:", nullptr)); - comboFormat->setItemText(0, QApplication::translate("Dialog", "Text", nullptr)); - comboFormat->setItemText(1, QApplication::translate("Dialog", "HTML", nullptr)); - comboFormat->setItemText(2, QApplication::translate("Dialog", "RTF", nullptr)); - comboFormat->setItemText(3, QApplication::translate("Dialog", "LaTeX", nullptr)); - comboFormat->setItemText(4, QApplication::translate("Dialog", "TeX", nullptr)); - comboFormat->setItemText(5, QApplication::translate("Dialog", "BBCode", nullptr)); - comboFormat->setItemText(6, QApplication::translate("Dialog", "Pango Markup", nullptr)); - comboFormat->setItemText(7, QApplication::translate("Dialog", "SVG", nullptr)); - -#ifndef QT_NO_TOOLTIP - cbIgnoreSequences->setToolTip(QApplication::translate("Dialog", "Show and save files ignoring the contained ANSI formatting information.", nullptr)); -#endif // QT_NO_TOOLTIP - cbIgnoreSequences->setText(QApplication::translate("Dialog", "Omit styling in output", nullptr)); -#ifndef QT_NO_TOOLTIP - cbFragment->setToolTip(QApplication::translate("Dialog", "Save HTML without header and footer to paste it into existing documents.", nullptr)); -#endif // QT_NO_TOOLTIP - cbFragment->setText(QApplication::translate("Dialog", "Omit header and footer", nullptr)); -#ifndef QT_NO_TOOLTIP - cbOmitVersion->setToolTip(QApplication::translate("Dialog", "Do not include version info comment", nullptr)); -#endif // QT_NO_TOOLTIP - cbOmitVersion->setText(QApplication::translate("Dialog", "Omit version info", nullptr)); -#ifndef QT_NO_TOOLTIP - cbIgnClearSeq->setToolTip(QApplication::translate("Dialog", "Do not adhere to clear (ESC K) commands", nullptr)); -#endif // QT_NO_TOOLTIP - cbIgnClearSeq->setText(QApplication::translate("Dialog", "Ignore Clear Sequences", nullptr)); -#ifndef QT_NO_TOOLTIP - cbDeriveStyles->setToolTip(QApplication::translate("Dialog", "Generate Stylesheets based on the formatting information", nullptr)); -#endif // QT_NO_TOOLTIP - cbDeriveStyles->setText(QApplication::translate("Dialog", "Derive Stylesheets", nullptr)); - lblSvgDim->setText(QApplication::translate("Dialog", "SVG dim.:", nullptr)); -#ifndef QT_NO_TOOLTIP - leSvgWidth->setToolTip(QApplication::translate("Dialog", "Document width (units allowed)", nullptr)); -#endif // QT_NO_TOOLTIP - leSvgWidth->setPlaceholderText(QApplication::translate("Dialog", "300px", nullptr)); -#ifndef QT_NO_TOOLTIP - leSvgHeight->setToolTip(QApplication::translate("Dialog", "Document height (units allowed)", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_STATUSTIP + label_4->setText(QCoreApplication::translate("Dialog", "Output format:", nullptr)); + comboFormat->setItemText(0, QCoreApplication::translate("Dialog", "Text", nullptr)); + comboFormat->setItemText(1, QCoreApplication::translate("Dialog", "HTML", nullptr)); + comboFormat->setItemText(2, QCoreApplication::translate("Dialog", "RTF", nullptr)); + comboFormat->setItemText(3, QCoreApplication::translate("Dialog", "LaTeX", nullptr)); + comboFormat->setItemText(4, QCoreApplication::translate("Dialog", "TeX", nullptr)); + comboFormat->setItemText(5, QCoreApplication::translate("Dialog", "BBCode", nullptr)); + comboFormat->setItemText(6, QCoreApplication::translate("Dialog", "Pango Markup", nullptr)); + comboFormat->setItemText(7, QCoreApplication::translate("Dialog", "SVG", nullptr)); + +#if QT_CONFIG(tooltip) + cbIgnoreSequences->setToolTip(QCoreApplication::translate("Dialog", "Show and save files ignoring the contained ANSI formatting information.", nullptr)); +#endif // QT_CONFIG(tooltip) + cbIgnoreSequences->setText(QCoreApplication::translate("Dialog", "Omit styling in output", nullptr)); +#if QT_CONFIG(tooltip) + cbFragment->setToolTip(QCoreApplication::translate("Dialog", "Save HTML without header and footer to paste it into existing documents.", nullptr)); +#endif // QT_CONFIG(tooltip) + cbFragment->setText(QCoreApplication::translate("Dialog", "Omit header and footer", nullptr)); +#if QT_CONFIG(tooltip) + cbOmitVersion->setToolTip(QCoreApplication::translate("Dialog", "Do not include version info comment", nullptr)); +#endif // QT_CONFIG(tooltip) + cbOmitVersion->setText(QCoreApplication::translate("Dialog", "Omit version info", nullptr)); +#if QT_CONFIG(tooltip) + cbIgnClearSeq->setToolTip(QCoreApplication::translate("Dialog", "Do not adhere to clear (ESC K) commands", nullptr)); +#endif // QT_CONFIG(tooltip) + cbIgnClearSeq->setText(QCoreApplication::translate("Dialog", "Ignore Clear Sequences", nullptr)); +#if QT_CONFIG(tooltip) + cbDeriveStyles->setToolTip(QCoreApplication::translate("Dialog", "Generate Stylesheets based on the formatting information", nullptr)); +#endif // QT_CONFIG(tooltip) + cbDeriveStyles->setText(QCoreApplication::translate("Dialog", "Derive Stylesheets", nullptr)); + lblSvgDim->setText(QCoreApplication::translate("Dialog", "SVG dim.:", nullptr)); +#if QT_CONFIG(tooltip) + leSvgWidth->setToolTip(QCoreApplication::translate("Dialog", "Document width (units allowed)", nullptr)); +#endif // QT_CONFIG(tooltip) + leSvgWidth->setPlaceholderText(QCoreApplication::translate("Dialog", "300px", nullptr)); +#if QT_CONFIG(tooltip) + leSvgHeight->setToolTip(QCoreApplication::translate("Dialog", "Document height (units allowed)", nullptr)); +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(statustip) leSvgHeight->setStatusTip(QString()); -#endif // QT_NO_STATUSTIP - leSvgHeight->setPlaceholderText(QApplication::translate("Dialog", "450px", nullptr)); - gbAsciiArt->setTitle(QApplication::translate("Dialog", "ANSI art options", nullptr)); -#ifndef QT_NO_TOOLTIP - cbParseAsciiArt->setToolTip(QApplication::translate("Dialog", "Enable parsing of ANSI art files.", nullptr)); -#endif // QT_NO_TOOLTIP - cbParseAsciiArt->setText(QApplication::translate("Dialog", "Enable ANSI art", nullptr)); - comboAnsiFormat->setItemText(0, QApplication::translate("Dialog", "Codepage 437", nullptr)); - comboAnsiFormat->setItemText(1, QApplication::translate("Dialog", "BIN/XBIN", nullptr)); - comboAnsiFormat->setItemText(2, QApplication::translate("Dialog", "Tundra", nullptr)); - -#ifndef QT_NO_TOOLTIP - comboAnsiFormat->setToolTip(QApplication::translate("Dialog", "Select the ANSI art file format", nullptr)); -#endif // QT_NO_TOOLTIP - lblWidth->setText(QApplication::translate("Dialog", "Width", nullptr)); -#ifndef QT_NO_TOOLTIP - sbWidth->setToolTip(QApplication::translate("Dialog", "Set the ASCII art image width (default: 80). This setting is ignored with XBIN input.", nullptr)); -#endif // QT_NO_TOOLTIP - lblHeight->setText(QApplication::translate("Dialog", "Height", nullptr)); -#ifndef QT_NO_TOOLTIP - sbHeight->setToolTip(QApplication::translate("Dialog", "Set the ASCII art image height (default: 150). This setting is ignored with XBIN input.", nullptr)); -#endif // QT_NO_TOOLTIP - lblTitle->setText(QApplication::translate("Dialog", "Tit&le:", nullptr)); -#ifndef QT_NO_TOOLTIP - leTitle->setToolTip(QApplication::translate("Dialog", "Set the output document title.", nullptr)); -#endif // QT_NO_TOOLTIP - leTitle->setPlaceholderText(QApplication::translate("Dialog", "My Title", nullptr)); - lblStyleFile->setText(QApplication::translate("Dialog", "Style file:", nullptr)); -#ifndef QT_NO_TOOLTIP - leStyleFile->setToolTip(QApplication::translate("Dialog", "Enter the name of a referenced stylesheet file here.", nullptr)); -#endif // QT_NO_TOOLTIP - leStyleFile->setPlaceholderText(QApplication::translate("Dialog", "my-style.css", nullptr)); - lblEncoding->setText(QApplication::translate("Dialog", "E&ncoding:", nullptr)); - comboEncoding->setItemText(0, QApplication::translate("Dialog", "ISO-8859-1", nullptr)); - comboEncoding->setItemText(1, QApplication::translate("Dialog", "ISO-8859-2", nullptr)); - comboEncoding->setItemText(2, QApplication::translate("Dialog", "ISO-8859-3", nullptr)); - comboEncoding->setItemText(3, QApplication::translate("Dialog", "ISO-8859-4", nullptr)); - comboEncoding->setItemText(4, QApplication::translate("Dialog", "ISO-8859-6", nullptr)); - comboEncoding->setItemText(5, QApplication::translate("Dialog", "ISO-8859-7", nullptr)); - comboEncoding->setItemText(6, QApplication::translate("Dialog", "ISO-8859-8", nullptr)); - comboEncoding->setItemText(7, QApplication::translate("Dialog", "ISO-8859-9", nullptr)); - comboEncoding->setItemText(8, QApplication::translate("Dialog", "ISO-8859-10", nullptr)); - comboEncoding->setItemText(9, QApplication::translate("Dialog", "ISO-8859-11", nullptr)); - comboEncoding->setItemText(10, QApplication::translate("Dialog", "ISO-8859-13", nullptr)); - comboEncoding->setItemText(11, QApplication::translate("Dialog", "ISO-8859-14", nullptr)); - comboEncoding->setItemText(12, QApplication::translate("Dialog", "ISO-8859-15", nullptr)); - comboEncoding->setItemText(13, QApplication::translate("Dialog", "UTF-8", nullptr)); - -#ifndef QT_NO_TOOLTIP - comboEncoding->setToolTip(QApplication::translate("Dialog", "Set the encoding (has to match input file encoding).", nullptr)); -#endif // QT_NO_TOOLTIP - label_3->setText(QApplication::translate("Dialog", "Line wrap:", nullptr)); -#ifndef QT_NO_TOOLTIP - spinBoxWrap->setToolTip(QApplication::translate("Dialog", "Wrap lines after given char count (0 disables wrapping).", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_TOOLTIP - comboFont->setToolTip(QApplication::translate("Dialog", "Set the output font.", nullptr)); -#endif // QT_NO_TOOLTIP - label_5->setText(QApplication::translate("Dialog", "Color map file:", nullptr)); -#ifndef QT_NO_TOOLTIP - leColorMapPath->setToolTip(QApplication::translate("Dialog", "Color map file (see README for details). This setting is ignored with XBIN input.", nullptr)); -#endif // QT_NO_TOOLTIP -#ifndef QT_NO_TOOLTIP - pbSelectMapFile->setToolTip(QApplication::translate("Dialog", "Select a color map configuration file. ", nullptr)); -#endif // QT_NO_TOOLTIP - pbSelectMapFile->setText(QApplication::translate("Dialog", "...", nullptr)); -#ifndef QT_NO_TOOLTIP - pbAbout->setToolTip(QApplication::translate("Dialog", "Show information about this program.", nullptr)); -#endif // QT_NO_TOOLTIP - pbAbout->setText(QApplication::translate("Dialog", "About", nullptr)); -#ifndef QT_NO_TOOLTIP - pbExit->setToolTip(QApplication::translate("Dialog", "Quit this program.", nullptr)); -#endif // QT_NO_TOOLTIP - pbExit->setText(QApplication::translate("Dialog", "Quit", nullptr)); - lblInFilePath->setText(QApplication::translate("Dialog", "Input file:", nullptr)); -#ifndef QT_NO_TOOLTIP - textEdit->setToolTip(QApplication::translate("Dialog", "Output preview", nullptr)); -#endif // QT_NO_TOOLTIP - textEdit->setHtml(QApplication::translate("Dialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n" +#endif // QT_CONFIG(statustip) + leSvgHeight->setPlaceholderText(QCoreApplication::translate("Dialog", "450px", nullptr)); + gbAsciiArt->setTitle(QCoreApplication::translate("Dialog", "ANSI art options", nullptr)); +#if QT_CONFIG(tooltip) + cbParseAsciiArt->setToolTip(QCoreApplication::translate("Dialog", "Enable parsing of ANSI art files.", nullptr)); +#endif // QT_CONFIG(tooltip) + cbParseAsciiArt->setText(QCoreApplication::translate("Dialog", "Enable ANSI art", nullptr)); + comboAnsiFormat->setItemText(0, QCoreApplication::translate("Dialog", "Codepage 437", nullptr)); + comboAnsiFormat->setItemText(1, QCoreApplication::translate("Dialog", "BIN/XBIN", nullptr)); + comboAnsiFormat->setItemText(2, QCoreApplication::translate("Dialog", "Tundra", nullptr)); + +#if QT_CONFIG(tooltip) + comboAnsiFormat->setToolTip(QCoreApplication::translate("Dialog", "Select the ANSI art file format", nullptr)); +#endif // QT_CONFIG(tooltip) + lblWidth->setText(QCoreApplication::translate("Dialog", "Width", nullptr)); +#if QT_CONFIG(tooltip) + sbWidth->setToolTip(QCoreApplication::translate("Dialog", "Set the ASCII art image width (default: 80). This setting is ignored with XBIN input.", nullptr)); +#endif // QT_CONFIG(tooltip) + lblHeight->setText(QCoreApplication::translate("Dialog", "Height", nullptr)); +#if QT_CONFIG(tooltip) + sbHeight->setToolTip(QCoreApplication::translate("Dialog", "Set the ASCII art image height (default: 150). This setting is ignored with XBIN input.", nullptr)); +#endif // QT_CONFIG(tooltip) + lblTitle->setText(QCoreApplication::translate("Dialog", "Tit&le:", nullptr)); +#if QT_CONFIG(tooltip) + leTitle->setToolTip(QCoreApplication::translate("Dialog", "Set the output document title.", nullptr)); +#endif // QT_CONFIG(tooltip) + leTitle->setPlaceholderText(QCoreApplication::translate("Dialog", "My Title", nullptr)); + lblStyleFile->setText(QCoreApplication::translate("Dialog", "Style file:", nullptr)); +#if QT_CONFIG(tooltip) + leStyleFile->setToolTip(QCoreApplication::translate("Dialog", "Enter the name of a referenced stylesheet file here.", nullptr)); +#endif // QT_CONFIG(tooltip) + leStyleFile->setPlaceholderText(QCoreApplication::translate("Dialog", "my-style.css", nullptr)); + lblEncoding->setText(QCoreApplication::translate("Dialog", "E&ncoding:", nullptr)); + comboEncoding->setItemText(0, QCoreApplication::translate("Dialog", "ISO-8859-1", nullptr)); + comboEncoding->setItemText(1, QCoreApplication::translate("Dialog", "ISO-8859-2", nullptr)); + comboEncoding->setItemText(2, QCoreApplication::translate("Dialog", "ISO-8859-3", nullptr)); + comboEncoding->setItemText(3, QCoreApplication::translate("Dialog", "ISO-8859-4", nullptr)); + comboEncoding->setItemText(4, QCoreApplication::translate("Dialog", "ISO-8859-6", nullptr)); + comboEncoding->setItemText(5, QCoreApplication::translate("Dialog", "ISO-8859-7", nullptr)); + comboEncoding->setItemText(6, QCoreApplication::translate("Dialog", "ISO-8859-8", nullptr)); + comboEncoding->setItemText(7, QCoreApplication::translate("Dialog", "ISO-8859-9", nullptr)); + comboEncoding->setItemText(8, QCoreApplication::translate("Dialog", "ISO-8859-10", nullptr)); + comboEncoding->setItemText(9, QCoreApplication::translate("Dialog", "ISO-8859-11", nullptr)); + comboEncoding->setItemText(10, QCoreApplication::translate("Dialog", "ISO-8859-13", nullptr)); + comboEncoding->setItemText(11, QCoreApplication::translate("Dialog", "ISO-8859-14", nullptr)); + comboEncoding->setItemText(12, QCoreApplication::translate("Dialog", "ISO-8859-15", nullptr)); + comboEncoding->setItemText(13, QCoreApplication::translate("Dialog", "UTF-8", nullptr)); + +#if QT_CONFIG(tooltip) + comboEncoding->setToolTip(QCoreApplication::translate("Dialog", "Set the encoding (has to match input file encoding).", nullptr)); +#endif // QT_CONFIG(tooltip) + label_3->setText(QCoreApplication::translate("Dialog", "Line wrap:", nullptr)); +#if QT_CONFIG(tooltip) + spinBoxWrap->setToolTip(QCoreApplication::translate("Dialog", "Wrap lines after given char count (0 disables wrapping).", nullptr)); +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(tooltip) + comboFont->setToolTip(QCoreApplication::translate("Dialog", "Set the output font.", nullptr)); +#endif // QT_CONFIG(tooltip) + label_5->setText(QCoreApplication::translate("Dialog", "Color map file:", nullptr)); +#if QT_CONFIG(tooltip) + leColorMapPath->setToolTip(QCoreApplication::translate("Dialog", "Color map file (see README for details). This setting is ignored with XBIN input.", nullptr)); +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(tooltip) + pbSelectMapFile->setToolTip(QCoreApplication::translate("Dialog", "Select a color map configuration file. ", nullptr)); +#endif // QT_CONFIG(tooltip) + pbSelectMapFile->setText(QCoreApplication::translate("Dialog", "...", nullptr)); +#if QT_CONFIG(tooltip) + pbAbout->setToolTip(QCoreApplication::translate("Dialog", "Show information about this program.", nullptr)); +#endif // QT_CONFIG(tooltip) + pbAbout->setText(QCoreApplication::translate("Dialog", "About", nullptr)); +#if QT_CONFIG(tooltip) + pbExit->setToolTip(QCoreApplication::translate("Dialog", "Quit this program.", nullptr)); +#endif // QT_CONFIG(tooltip) + pbExit->setText(QCoreApplication::translate("Dialog", "Quit", nullptr)); + lblInFilePath->setText(QCoreApplication::translate("Dialog", "Input file:", nullptr)); +#if QT_CONFIG(tooltip) + textEdit->setToolTip(QCoreApplication::translate("Dialog", "Output preview", nullptr)); +#endif // QT_CONFIG(tooltip) + textEdit->setHtml(QCoreApplication::translate("Dialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Monospace'; font-size:10pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Noto Sans,Courier New';\">Please open a file.</span></p></body></html>", nullptr)); -#ifndef QT_NO_TOOLTIP - cbWatchFile->setToolTip(QApplication::translate("Dialog", "Update view if input file changes, Do not apply with big or fast growing input files.", nullptr)); -#endif // QT_NO_TOOLTIP - cbWatchFile->setText(QApplication::translate("Dialog", "Watch this file", nullptr)); +#if QT_CONFIG(tooltip) + cbWatchFile->setToolTip(QCoreApplication::translate("Dialog", "Update view if input file changes, Do not apply with big or fast growing input files.", nullptr)); +#endif // QT_CONFIG(tooltip) + cbWatchFile->setText(QCoreApplication::translate("Dialog", "Watch this file", nullptr)); } // retranslateUi }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/stringtools.h new/ansifilter-2.15/src/stringtools.h --- old/ansifilter-2.14/src/stringtools.h 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/stringtools.h 2019-11-08 18:37:47.000000000 +0100 @@ -65,7 +65,7 @@ /** \param val variable of specified type which will contain the numeric value \param s string containing a number \param f format specifier function (IO manipulator) - \return true if successfull */ + \return true if successful */ template <class T> bool str2num(T &val, const std::string& s, std::ios_base& (*f)(std::ios_base&)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.14/src/version.h new/ansifilter-2.15/src/version.h --- old/ansifilter-2.14/src/version.h 2019-04-03 19:38:02.000000000 +0200 +++ new/ansifilter-2.15/src/version.h 2019-11-08 18:37:47.000000000 +0100 @@ -25,7 +25,7 @@ #ifndef VERSION_H #define VERSION_H -#define ANSIFILTER_VERSION "2.14" +#define ANSIFILTER_VERSION "2.15" #define ANSIFILTER_URL "http://www.andre-simon.de/"; #define ANSIFILTER_EMAIL "[email protected]"
