Hello community, here is the log from the commit of package ansifilter for openSUSE:Factory checked in at 2020-01-30 09:41:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ansifilter (Old) and /work/SRC/openSUSE:Factory/.ansifilter.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansifilter" Thu Jan 30 09:41:58 2020 rev:11 rq:768442 version:2.16 Changes: -------- --- /work/SRC/openSUSE:Factory/ansifilter/ansifilter.changes 2019-11-13 13:29:05.343745441 +0100 +++ /work/SRC/openSUSE:Factory/.ansifilter.new.26092/ansifilter.changes 2020-01-30 09:42:42.677532212 +0100 @@ -1,0 +2,7 @@ +Wed Jan 29 19:32:03 UTC 2020 - [email protected] + +- Update to version 2.16: + * CLI: Added --ignore-csi option to improve UTF-8 input handling. +- Remove obsolete macros. + +------------------------------------------------------------------- Old: ---- ansifilter-2.15.tar.bz2 ansifilter-2.15.tar.bz2.asc New: ---- ansifilter-2.16.tar.bz2 ansifilter-2.16.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ansifilter.spec ++++++ --- /var/tmp/diff_new_pack.5TlQtU/_old 2020-01-30 09:42:43.301532547 +0100 +++ /var/tmp/diff_new_pack.5TlQtU/_new 2020-01-30 09:42:43.301532547 +0100 @@ -1,7 +1,7 @@ # # spec file for package ansifilter # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013 Pascal Bleser. # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %bcond_without gui Name: ansifilter -Version: 2.15 +Version: 2.16 Release: 0 Summary: ANSI Terminal Escape Code Converter License: GPL-3.0-or-later @@ -41,10 +41,6 @@ Group: Development/Tools/Other BuildRequires: libqt5-qtbase-devel Requires: %{name} = %{version} -%if 0%{?suse_version} < 1330 -Requires(post): update-desktop-files -Requires(postun): update-desktop-files -%endif %description gui This package provides a Qt Graphical User Interface to run %{name}. @@ -80,14 +76,6 @@ rm %{buildroot}%{_docdir}/%{name}/INSTALL -%if %{with gui} && 0%{?suse_version} < 1330 -%post gui -%desktop_database_post - -%postun gui -%desktop_database_postun -%endif - %files %dir %{_docdir}/%{name} %{_docdir}/%{name}/COPYING ++++++ ansifilter-2.15.tar.bz2 -> ansifilter-2.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/ChangeLog.adoc new/ansifilter-2.16/ChangeLog.adoc --- old/ansifilter-2.15/ChangeLog.adoc 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/ChangeLog.adoc 2020-01-29 19:07:27.000000000 +0100 @@ -1,5 +1,11 @@ = Ansifilter ChangeLog +=== ansifilter 2.16 + +08.01.2020 + + - CLI: added --ignore-csi option to improve UTF-8 input handling + === ansifilter 2.15 08.11.2019 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/man/ansifilter.1 new/ansifilter-2.16/man/ansifilter.1 --- old/ansifilter-2.15/man/ansifilter.1 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/man/ansifilter.1 2020-01-29 19:07:27.000000000 +0100 @@ -53,6 +53,8 @@ Set HTML/RTF/SVG font face .IP "-k, --ignore-clear(=false)" Do not adhere to clear (ESC K) commands (default: true) +.IP "-c, --ignore-csi" +Do not adhere to CSI commands (useful for UTF-8 input) .IP "-l, --line-numbers" Print line numbers in output file .IP "-m, --map=<path>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/ci_test.sh new/ansifilter-2.16/src/ci_test.sh --- old/ansifilter-2.15/src/ci_test.sh 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/ci_test.sh 2020-01-29 19:07:27.000000000 +0100 @@ -1,20 +1,46 @@ #!/bin/bash +# file needs to be saved as UTF-8! + echo "Starting sample CI verification script" + +# test case #1 + OUTPUT=`./src/ansifilter ./src/ci_test_line.col` RETVAL=$? if [ $RETVAL -eq 0 ]; then - echo "Retval is 0, OK" + echo "Retval test #1 is 0, OK" else - echo "Retval is not 0, FAIL" + echo "Retval test #1 is not 0, FAIL" exit 1 fi if [ "$OUTPUT" == "BEGIN Bold Underline Italic Blink Hide Black Red Green Yellow Blue Magenta Cyan White END" ]; then - echo "Output is correct, OK" + echo "Output test #1 is correct, OK" +else + echo "Output test #1 is not right, FAIL" + exit 1 +fi + + +# test case #2 + +OUTPUT=`echo "123Л123" | ./src/ansifilter --ignore-csi` + +RETVAL=$? + +if [ $RETVAL -eq 0 ]; then + echo "Retval test #2 is 0, OK" +else + echo "Retval test #2 is not 0, FAIL" + exit 1 +fi + +if [ "$OUTPUT" == "123Л123" ]; then + echo "Output test #2 is correct, OK" else - echo "Output is not right, FAIL" + echo "Output test #2 is not right, FAIL" exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/cmdlineoptions.cpp new/ansifilter-2.16/src/cmdlineoptions.cpp --- old/ansifilter-2.15/src/cmdlineoptions.cpp 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/cmdlineoptions.cpp 2020-01-29 19:07:27.000000000 +0100 @@ -70,6 +70,7 @@ { 'N', "no-trailing-nl", Arg_parser::no }, { 'C', "no-version-info", Arg_parser::no }, { 'k', "ignore-clear", Arg_parser::maybe }, + { 'c', "ignore-csi", Arg_parser::no }, { 'y', "derived-styles", Arg_parser::no }, { 'S', "svg", Arg_parser::no }, { 'Q', "width", Arg_parser::yes }, @@ -95,6 +96,7 @@ opt_omit_trailing_cr(false), opt_omit_version_info(false), opt_ignoreClear(true), + opt_ignoreCSI(false), opt_applyDynStyles(false), opt_genDynStyles(false), opt_funny_anchors(false), @@ -269,6 +271,9 @@ if (arg.size()) opt_ignoreClear = ( arg=="true" || arg=="1" ) ; break; + case 'c': + opt_ignoreCSI = true; + break; case 'y': opt_applyDynStyles=true; break; @@ -372,6 +377,10 @@ return opt_ignoreClear; } +bool CmdLineOptions::ignoreCSISeq() const { + return opt_ignoreCSI; +} + int CmdLineOptions::getAsciiArtWidth() const { return asciiArtWidth; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/cmdlineoptions.h new/ansifilter-2.16/src/cmdlineoptions.h --- old/ansifilter-2.15/src/cmdlineoptions.h 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/cmdlineoptions.h 2020-01-29 19:07:27.000000000 +0100 @@ -121,6 +121,9 @@ /** \return True if clear sequences (ESC K) should be ignored */ bool ignoreClearSeq() const; + /** \return True if CSI sequences should be ignored */ + bool ignoreCSISeq() const; + /** \return True if output should contain dynamic style classes instead of inline styles */ bool applyDynStyles() const; @@ -165,6 +168,7 @@ bool opt_omit_trailing_cr; bool opt_omit_version_info; bool opt_ignoreClear; + bool opt_ignoreCSI; bool opt_applyDynStyles; bool opt_genDynStyles; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/codegenerator.cpp new/ansifilter-2.16/src/codegenerator.cpp --- old/ansifilter-2.15/src/codegenerator.cpp 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/codegenerator.cpp 2020-01-29 19:07:27.000000000 +0100 @@ -111,6 +111,7 @@ readAfterEOF(false), omitTrailingCR(false), ignClearSeq(false), + ignCSISeq(false), termBuffer(NULL), curX(0), curY(0), @@ -161,6 +162,10 @@ ignClearSeq = flag; } +void CodeGenerator::setIgnoreCSISeq(bool flag) { + ignCSISeq = flag; +} + void CodeGenerator::setAsciiArtSize(int width, int height){ if (width>0) asciiArtWidth = width; if (height>0) asciiArtHeight = height; @@ -1184,7 +1189,7 @@ insertLineNumber(); } - if (cur==0x1b || cur==0x9b || cur==0xc2) { + if ( cur==0x1b || (!ignCSISeq && ( cur==0x9b || cur==0xc2)) ) { if (line.length() - i > 2){ next = line[i+1]&0xff; @@ -1283,7 +1288,7 @@ } else { ++i; } - } else if (cur==0x90 || cur==0x9d || cur==0x98 || cur==0x9e ||cur==0x9f) { + } else if (!ignCSISeq && (cur==0x90 || cur==0x9d || cur==0x98 || cur==0x9e ||cur==0x9f)) { seqEnd=i; //find string end while ( seqEnd<line.length() && (line[seqEnd]&0xff)!=0x9e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/codegenerator.h new/ansifilter-2.16/src/codegenerator.h --- old/ansifilter-2.15/src/codegenerator.h 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/codegenerator.h 2020-01-29 19:07:27.000000000 +0100 @@ -294,7 +294,9 @@ /** \param b set to true if K clear sequences should be ignored*/ void setIgnoreClearSeq(bool flag); - + /** \param b set to true if CSI sequences should be ignored*/ + void setIgnoreCSISeq(bool flag); + /** \param b set dimensions of ASCII art virtual console */ void setAsciiArtSize(int width, int height); @@ -456,6 +458,7 @@ bool readAfterEOF; ///< continue reading after EOF occoured bool omitTrailingCR; ///< do not print EOL at the end of output bool ignClearSeq; ///< ignore clear sequence ESC K + bool ignCSISeq; ///< ignore CSIs (may interfere with UTF-8 input) TDChar* termBuffer; int curX, curY, memX, memY, maxY; ///< cursor position for Codepage 437 sequences diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/main.cpp new/ansifilter-2.16/src/main.cpp --- old/ansifilter-2.15/src/main.cpp 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/main.cpp 2020-01-29 19:07:27.000000000 +0100 @@ -39,7 +39,7 @@ { cout << "\n ansifilter version " << ANSIFILTER_VERSION - << "\n Copyright (C) 2007-2019 Andre Simon <a dot simon at mailbox.org>" + << "\n Copyright (C) 2007-2020 Andre Simon <a dot simon at mailbox.org>" << "\n\n Argparser class" << "\n Copyright (C) 2006-2008 Antonio Diaz Diaz <ant_diaz at teleline.es>" << "\n\n This software is released under the terms of the GNU General " @@ -74,6 +74,7 @@ cout << " -f, --fragment Omit HTML header and footer\n"; cout << " -F, --font=<font> Set HTML/RTF/SVG font face\n"; cout << " -k, --ignore-clear(=0) Do not adhere to clear (ESC K) commands (default: true)\n"; + cout << " -c, --ignore-csi Do not adhere to CSI commands (useful for UTF-8 input)\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"; @@ -171,6 +172,8 @@ generator->setParseAsciiBin(options.parseAsciiBin()); generator->setParseAsciiTundra(options.parseAsciiTundra()); generator->setIgnoreClearSeq(options.ignoreClearSeq()); + generator->setIgnoreCSISeq(options.ignoreCSISeq()); + generator->setApplyDynStyles(options.applyDynStyles()); generator->setAsciiArtSize(options.getAsciiArtWidth(), options.getAsciiArtHeight()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/qt-gui/Makefile new/ansifilter-2.16/src/qt-gui/Makefile --- old/ansifilter-2.15/src/qt-gui/Makefile 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/qt-gui/Makefile 2020-01-29 19:07:27.000000000 +0100 @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: ansifilter-gui -# Generated by qmake (3.1) (Qt 5.13.2) +# Generated by qmake (3.1) (Qt 5.14.0) # Project: ansifilter-gui.pro # Template: app # Command: /usr/bin/qmake -o Makefile ansifilter-gui.pro @@ -15,8 +15,8 @@ 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 -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) +CFLAGS = -pipe -O2 -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES) +CXXFLAGS = -pipe -std=c++11 -O2 -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -Wall -Wextra -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 @@ -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) /usr/lib/libQt5Widgets.so /usr/lib/libQt5Gui.so /usr/lib/libQt5Core.so /usr/lib/libGL.so -lpthread +LIBS = $(SUBLIBS) /usr/lib/libQt5Widgets.so /usr/lib/libQt5Gui.so /usr/lib/libQt5Core.so -lGL -lpthread -lmd4c AR = ar cqs RANLIB = SED = sed @@ -103,6 +103,7 @@ /usr/lib/qt/mkspecs/modules/qt_KActivitiesStats.pri \ /usr/lib/qt/mkspecs/modules/qt_KArchive.pri \ /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ + /usr/lib/qt/mkspecs/modules/qt_KAuthCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KBookmarks.pri \ /usr/lib/qt/mkspecs/modules/qt_KCddb.pri \ /usr/lib/qt/mkspecs/modules/qt_KCMUtils.pri \ @@ -111,6 +112,7 @@ /usr/lib/qt/mkspecs/modules/qt_KConfigCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigGui.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KContacts.pri \ /usr/lib/qt/mkspecs/modules/qt_KCoreAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KCrash.pri \ /usr/lib/qt/mkspecs/modules/qt_KDBusAddons.pri \ @@ -211,8 +213,12 @@ /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlmodels.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlmodels_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlworkerscript.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlworkerscript_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ @@ -282,7 +288,6 @@ /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ - .qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/toolchain.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ @@ -290,6 +295,7 @@ /usr/lib/qt/mkspecs/features/default_post.prf \ /usr/lib/qt/mkspecs/features/warn_on.prf \ /usr/lib/qt/mkspecs/features/qt.prf \ + /usr/lib/qt/mkspecs/features/resources_functions.prf \ /usr/lib/qt/mkspecs/features/resources.prf \ /usr/lib/qt/mkspecs/features/moc.prf \ /usr/lib/qt/mkspecs/features/unix/opengl.prf \ @@ -344,6 +350,7 @@ /usr/lib/qt/mkspecs/modules/qt_KActivitiesStats.pri \ /usr/lib/qt/mkspecs/modules/qt_KArchive.pri \ /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ + /usr/lib/qt/mkspecs/modules/qt_KAuthCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KBookmarks.pri \ /usr/lib/qt/mkspecs/modules/qt_KCddb.pri \ /usr/lib/qt/mkspecs/modules/qt_KCMUtils.pri \ @@ -352,6 +359,7 @@ /usr/lib/qt/mkspecs/modules/qt_KConfigCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigGui.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_KContacts.pri \ /usr/lib/qt/mkspecs/modules/qt_KCoreAddons.pri \ /usr/lib/qt/mkspecs/modules/qt_KCrash.pri \ /usr/lib/qt/mkspecs/modules/qt_KDBusAddons.pri \ @@ -452,8 +460,12 @@ /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlmodels.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlmodels_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlworkerscript.pri \ + /usr/lib/qt/mkspecs/modules/qt_lib_qmlworkerscript_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \ /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \ @@ -523,7 +535,6 @@ /usr/lib/qt/mkspecs/features/qt_config.prf \ /usr/lib/qt/mkspecs/linux-g++/qmake.conf \ /usr/lib/qt/mkspecs/features/spec_post.prf \ - .qmake.stash \ /usr/lib/qt/mkspecs/features/exclusive_builds.prf \ /usr/lib/qt/mkspecs/features/toolchain.prf \ /usr/lib/qt/mkspecs/features/default_pre.prf \ @@ -531,6 +542,7 @@ /usr/lib/qt/mkspecs/features/default_post.prf \ /usr/lib/qt/mkspecs/features/warn_on.prf \ /usr/lib/qt/mkspecs/features/qt.prf \ + /usr/lib/qt/mkspecs/features/resources_functions.prf \ /usr/lib/qt/mkspecs/features/resources.prf \ /usr/lib/qt/mkspecs/features/moc.prf \ /usr/lib/qt/mkspecs/features/unix/opengl.prf \ @@ -561,6 +573,7 @@ /usr/lib/qt/mkspecs/modules/qt_KActivitiesStats.pri: /usr/lib/qt/mkspecs/modules/qt_KArchive.pri: /usr/lib/qt/mkspecs/modules/qt_KAuth.pri: +/usr/lib/qt/mkspecs/modules/qt_KAuthCore.pri: /usr/lib/qt/mkspecs/modules/qt_KBookmarks.pri: /usr/lib/qt/mkspecs/modules/qt_KCddb.pri: /usr/lib/qt/mkspecs/modules/qt_KCMUtils.pri: @@ -569,6 +582,7 @@ /usr/lib/qt/mkspecs/modules/qt_KConfigCore.pri: /usr/lib/qt/mkspecs/modules/qt_KConfigGui.pri: /usr/lib/qt/mkspecs/modules/qt_KConfigWidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_KContacts.pri: /usr/lib/qt/mkspecs/modules/qt_KCoreAddons.pri: /usr/lib/qt/mkspecs/modules/qt_KCrash.pri: /usr/lib/qt/mkspecs/modules/qt_KDBusAddons.pri: @@ -669,8 +683,12 @@ /usr/lib/qt/mkspecs/modules/qt_lib_qml_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmldebug_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_qmlmodels.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_qmlmodels_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_qmlworkerscript.pri: +/usr/lib/qt/mkspecs/modules/qt_lib_qmlworkerscript_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick.pri: /usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri: @@ -740,7 +758,6 @@ /usr/lib/qt/mkspecs/features/qt_config.prf: /usr/lib/qt/mkspecs/linux-g++/qmake.conf: /usr/lib/qt/mkspecs/features/spec_post.prf: -.qmake.stash: /usr/lib/qt/mkspecs/features/exclusive_builds.prf: /usr/lib/qt/mkspecs/features/toolchain.prf: /usr/lib/qt/mkspecs/features/default_pre.prf: @@ -748,6 +765,7 @@ /usr/lib/qt/mkspecs/features/default_post.prf: /usr/lib/qt/mkspecs/features/warn_on.prf: /usr/lib/qt/mkspecs/features/qt.prf: +/usr/lib/qt/mkspecs/features/resources_functions.prf: /usr/lib/qt/mkspecs/features/resources.prf: /usr/lib/qt/mkspecs/features/moc.prf: /usr/lib/qt/mkspecs/features/unix/opengl.prf: @@ -816,7 +834,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 -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 -Wextra -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: @@ -830,7 +848,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++/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 + /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.2.0 -I/usr/include/c++/9.2.0/x86_64-pc-linux-gnu -I/usr/include/c++/9.2.0/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.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.15/src/qt-gui/ansifilter.ui new/ansifilter-2.16/src/qt-gui/ansifilter.ui --- old/ansifilter-2.15/src/qt-gui/ansifilter.ui 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/qt-gui/ansifilter.ui 2020-01-29 19:07:27.000000000 +0100 @@ -273,53 +273,7 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="cbFragment"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Save HTML without header and footer to paste it into existing documents.</string> - </property> - <property name="text"> - <string>Omit header and footer</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="cbOmitVersion"> - <property name="toolTip"> - <string>Do not include version info comment</string> - </property> - <property name="text"> - <string>Omit version info</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="cbIgnClearSeq"> - <property name="toolTip"> - <string>Do not adhere to clear (ESC K) commands</string> - </property> - <property name="text"> - <string>Ignore Clear Sequences</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="cbDeriveStyles"> - <property name="toolTip"> - <string>Generate Stylesheets based on the formatting information</string> - </property> - <property name="text"> - <string>Derive Stylesheets</string> - </property> - </widget> - </item> - <item row="2" column="1"> + <item row="3" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <widget class="QLabel" name="lblSvgDim"> @@ -377,6 +331,65 @@ </item> </layout> </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="cbOmitVersion"> + <property name="toolTip"> + <string>Do not include version info comment</string> + </property> + <property name="text"> + <string>Omit version info</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="cbIgnClearSeq"> + <property name="toolTip"> + <string>Do not adhere to clear (ESC K) commands</string> + </property> + <property name="toolTipDuration"> + <number>-5</number> + </property> + <property name="text"> + <string>Ignore Clear Sequences</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="cbFragment"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Save HTML without header and footer to paste it into existing documents.</string> + </property> + <property name="text"> + <string>Omit header and footer</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QCheckBox" name="cbIgnCSISeq"> + <property name="toolTip"> + <string>Set this option if UTF-8 input is affected by CSI parsing</string> + </property> + <property name="text"> + <string>Ignore CSI Sequences</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QCheckBox" name="cbDeriveStyles"> + <property name="toolTip"> + <string>Generate Stylesheets based on the formatting information</string> + </property> + <property name="text"> + <string>Derive Stylesheets</string> + </property> + </widget> + </item> </layout> </item> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/qt-gui/moc_mydialog.cpp new/ansifilter-2.16/src/qt-gui/moc_mydialog.cpp --- old/ansifilter-2.15/src/qt-gui/moc_mydialog.cpp 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/qt-gui/moc_mydialog.cpp 2020-01-29 19:07:27.000000000 +0100 @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mydialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #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.13.2. It" +#error "This file was generated using the moc from 5.14.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -22,8 +22,8 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_MyDialog_t { - QByteArrayData data[21]; - char stringdata0[431]; + QByteArrayData data[22]; + char stringdata0[454]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -41,18 +41,19 @@ QT_MOC_LITERAL(6, 94, 26), // "on_pbSelectMapFile_clicked" QT_MOC_LITERAL(7, 121, 26), // "on_cbParseAsciiArt_clicked" QT_MOC_LITERAL(8, 148, 24), // "on_cbIgnClearSeq_clicked" -QT_MOC_LITERAL(9, 173, 33), // "on_cbIgnoreSequences_stateCha..." -QT_MOC_LITERAL(10, 207, 27), // "on_cbWatchFile_stateChanged" -QT_MOC_LITERAL(11, 235, 23), // "on_sbWidth_valueChanged" -QT_MOC_LITERAL(12, 259, 1), // "i" -QT_MOC_LITERAL(13, 261, 24), // "on_sbHeight_valueChanged" -QT_MOC_LITERAL(14, 286, 32), // "on_comboFont_currentIndexChanged" -QT_MOC_LITERAL(15, 319, 3), // "idx" -QT_MOC_LITERAL(16, 323, 38), // "on_comboAnsiFormat_currentInd..." -QT_MOC_LITERAL(17, 362, 36), // "on_comboEncoding_currentIndex..." -QT_MOC_LITERAL(18, 399, 13), // "onFileChanged" -QT_MOC_LITERAL(19, 413, 4), // "path" -QT_MOC_LITERAL(20, 418, 12) // "plausibility" +QT_MOC_LITERAL(9, 173, 22), // "on_cbIgnCSISeq_clicked" +QT_MOC_LITERAL(10, 196, 33), // "on_cbIgnoreSequences_stateCha..." +QT_MOC_LITERAL(11, 230, 27), // "on_cbWatchFile_stateChanged" +QT_MOC_LITERAL(12, 258, 23), // "on_sbWidth_valueChanged" +QT_MOC_LITERAL(13, 282, 1), // "i" +QT_MOC_LITERAL(14, 284, 24), // "on_sbHeight_valueChanged" +QT_MOC_LITERAL(15, 309, 32), // "on_comboFont_currentIndexChanged" +QT_MOC_LITERAL(16, 342, 3), // "idx" +QT_MOC_LITERAL(17, 346, 38), // "on_comboAnsiFormat_currentInd..." +QT_MOC_LITERAL(18, 385, 36), // "on_comboEncoding_currentIndex..." +QT_MOC_LITERAL(19, 422, 13), // "onFileChanged" +QT_MOC_LITERAL(20, 436, 4), // "path" +QT_MOC_LITERAL(21, 441, 12) // "plausibility" }, "MyDialog\0on_pbSaveAs_clicked\0\0" @@ -61,6 +62,7 @@ "on_pbSelectMapFile_clicked\0" "on_cbParseAsciiArt_clicked\0" "on_cbIgnClearSeq_clicked\0" + "on_cbIgnCSISeq_clicked\0" "on_cbIgnoreSequences_stateChanged\0" "on_cbWatchFile_stateChanged\0" "on_sbWidth_valueChanged\0i\0" @@ -78,7 +80,7 @@ 8, // revision 0, // classname 0, 0, // classinfo - 16, 14, // methods + 17, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -86,22 +88,23 @@ 0, // signalCount // slots: name, argc, parameters, tag, flags - 1, 0, 94, 2, 0x0a /* Public */, - 3, 0, 95, 2, 0x0a /* Public */, - 4, 0, 96, 2, 0x0a /* Public */, - 5, 0, 97, 2, 0x0a /* Public */, - 6, 0, 98, 2, 0x0a /* Public */, - 7, 0, 99, 2, 0x0a /* Public */, - 8, 0, 100, 2, 0x0a /* Public */, - 9, 0, 101, 2, 0x0a /* Public */, - 10, 0, 102, 2, 0x0a /* Public */, - 11, 1, 103, 2, 0x0a /* Public */, - 13, 1, 106, 2, 0x0a /* Public */, - 14, 1, 109, 2, 0x0a /* Public */, - 16, 1, 112, 2, 0x0a /* Public */, - 17, 1, 115, 2, 0x0a /* Public */, - 18, 1, 118, 2, 0x0a /* Public */, - 20, 0, 121, 2, 0x0a /* Public */, + 1, 0, 99, 2, 0x0a /* Public */, + 3, 0, 100, 2, 0x0a /* Public */, + 4, 0, 101, 2, 0x0a /* Public */, + 5, 0, 102, 2, 0x0a /* Public */, + 6, 0, 103, 2, 0x0a /* Public */, + 7, 0, 104, 2, 0x0a /* Public */, + 8, 0, 105, 2, 0x0a /* Public */, + 9, 0, 106, 2, 0x0a /* Public */, + 10, 0, 107, 2, 0x0a /* Public */, + 11, 0, 108, 2, 0x0a /* Public */, + 12, 1, 109, 2, 0x0a /* Public */, + 14, 1, 112, 2, 0x0a /* Public */, + 15, 1, 115, 2, 0x0a /* Public */, + 17, 1, 118, 2, 0x0a /* Public */, + 18, 1, 121, 2, 0x0a /* Public */, + 19, 1, 124, 2, 0x0a /* Public */, + 21, 0, 127, 2, 0x0a /* Public */, // slots: parameters QMetaType::Void, @@ -113,12 +116,13 @@ QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Int, 12, - QMetaType::Void, QMetaType::Int, 12, - QMetaType::Void, QMetaType::Int, 15, - QMetaType::Void, QMetaType::Int, 15, - QMetaType::Void, QMetaType::Int, 15, - QMetaType::Void, QMetaType::QString, 19, + QMetaType::Void, + QMetaType::Void, QMetaType::Int, 13, + QMetaType::Void, QMetaType::Int, 13, + QMetaType::Void, QMetaType::Int, 16, + QMetaType::Void, QMetaType::Int, 16, + QMetaType::Void, QMetaType::Int, 16, + QMetaType::Void, QMetaType::QString, 20, QMetaType::Void, 0 // eod @@ -137,22 +141,23 @@ case 4: _t->on_pbSelectMapFile_clicked(); break; case 5: _t->on_cbParseAsciiArt_clicked(); break; case 6: _t->on_cbIgnClearSeq_clicked(); break; - case 7: _t->on_cbIgnoreSequences_stateChanged(); break; - case 8: _t->on_cbWatchFile_stateChanged(); break; - case 9: _t->on_sbWidth_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 10: _t->on_sbHeight_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 11: _t->on_comboFont_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 12: _t->on_comboAnsiFormat_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 13: _t->on_comboEncoding_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - case 14: _t->onFileChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break; - case 15: _t->plausibility(); break; + case 7: _t->on_cbIgnCSISeq_clicked(); break; + case 8: _t->on_cbIgnoreSequences_stateChanged(); break; + case 9: _t->on_cbWatchFile_stateChanged(); break; + case 10: _t->on_sbWidth_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break; + case 11: _t->on_sbHeight_valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break; + case 12: _t->on_comboFont_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; + case 13: _t->on_comboAnsiFormat_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; + case 14: _t->on_comboEncoding_currentIndexChanged((*reinterpret_cast< int(*)>(_a[1]))); break; + case 15: _t->onFileChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 16: _t->plausibility(); break; default: ; } } } QT_INIT_METAOBJECT const QMetaObject MyDialog::staticMetaObject = { { - &QDialog::staticMetaObject, + QMetaObject::SuperData::link<QDialog::staticMetaObject>(), qt_meta_stringdata_MyDialog.data, qt_meta_data_MyDialog, qt_static_metacall, @@ -180,13 +185,13 @@ if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 16) + if (_id < 17) qt_static_metacall(this, _c, _id, _a); - _id -= 16; + _id -= 17; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 16) + if (_id < 17) *reinterpret_cast<int*>(_a[0]) = -1; - _id -= 16; + _id -= 17; } return _id; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/qt-gui/mydialog.cpp new/ansifilter-2.16/src/qt-gui/mydialog.cpp --- old/ansifilter-2.15/src/qt-gui/mydialog.cpp 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/qt-gui/mydialog.cpp 2020-01-29 19:07:27.000000000 +0100 @@ -71,6 +71,8 @@ dlg.sbWidth->setValue(settings.value("width").toInt()); dlg.sbHeight->setValue(settings.value("height").toInt()); dlg.cbIgnClearSeq->setChecked(settings.value("ignoreclearseq").toBool()); + dlg.cbIgnCSISeq->setChecked(settings.value("ignorecsiseq").toBool()); + dlg.cbDeriveStyles->setChecked(settings.value("derivestyles").toBool()); dlg.leSvgWidth->setText(settings.value("svgwidth").toString()); dlg.leSvgHeight->setText(settings.value("svgheight").toString()); @@ -112,6 +114,8 @@ settings.setValue("fragment", dlg.cbFragment->isChecked()); settings.setValue("ignoreseq", dlg.cbIgnoreSequences->isChecked()); settings.setValue("ignoreclearseq", dlg.cbIgnClearSeq->isChecked()); + settings.setValue("ignorecsiseq", dlg.cbIgnCSISeq->isChecked()); + settings.setValue("parseart", dlg.cbParseAsciiArt->isChecked()); settings.setValue("cbOmitVersion", dlg.cbOmitVersion->isChecked()); settings.setValue("derivestyles", dlg.cbDeriveStyles->isChecked()); @@ -207,6 +211,8 @@ dlg.lblWidth->setEnabled(dlg.gbAsciiArt->isEnabled()); dlg.sbWidth->setEnabled(dlg.gbAsciiArt->isEnabled()); dlg.cbIgnClearSeq->setEnabled(!dlg.cbParseAsciiArt->isChecked()); + dlg.cbIgnCSISeq->setEnabled(!dlg.cbParseAsciiArt->isChecked()); + dlg.cbWatchFile->setEnabled(!dlg.cbParseAsciiArt->isChecked()); dlg.leSvgHeight->setEnabled(selIdx==7); @@ -286,6 +292,8 @@ generator->setOmitVersionInfo(dlg.cbOmitVersion->isChecked()); generator->setIgnoreClearSeq(dlg.cbIgnClearSeq->isChecked()); + generator->setIgnoreCSISeq(dlg.cbIgnCSISeq->isChecked()); + generator->setApplyDynStyles(dlg.cbDeriveStyles->isChecked()); generator->setSVGSize(dlg.leSvgWidth->text().toStdString(), dlg.leSvgHeight->text().toStdString()); @@ -363,6 +371,7 @@ unique_ptr<ansifilter::CodeGenerator> generator(ansifilter::CodeGenerator::getInstance(ansifilter::TEXT)); generator->setPreformatting ( ansifilter::WRAP_SIMPLE, static_cast<unsigned int>(dlg.spinBoxWrap->value())); generator->setIgnoreClearSeq(dlg.cbIgnClearSeq->isChecked()); + generator->setIgnoreCSISeq(dlg.cbIgnCSISeq->isChecked()); QString inputFileNameShort(inputFileName); #ifdef Q_OS_WIN @@ -402,6 +411,7 @@ generator->setFragmentCode(false); generator->setPlainOutput(dlg.cbIgnoreSequences->isChecked()); generator->setIgnoreClearSeq(dlg.cbIgnClearSeq->isChecked()); + generator->setIgnoreCSISeq(dlg.cbIgnCSISeq->isChecked()); if (dlg.cbParseAsciiArt->isChecked()){ switch (dlg.comboAnsiFormat->currentIndex()){ @@ -446,7 +456,7 @@ QMessageBox::about(this, "ANSIFilter Information", QString("ANSIFilter GUI %1\n" - "(c) 2007-2019 Andre Simon\n\n" + "(c) 2007-2020 Andre Simon\n\n" "Built with Qt version %2\n\n" "Released under the terms of the GNU GPL license.\n\n" "andre dot simon1 at gmx dot de\n" @@ -491,6 +501,11 @@ { showFile(); } + +void MyDialog::on_cbIgnCSISeq_clicked() +{ + showFile(); +} void MyDialog::on_cbWatchFile_stateChanged() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/qt-gui/mydialog.h new/ansifilter-2.16/src/qt-gui/mydialog.h --- old/ansifilter-2.15/src/qt-gui/mydialog.h 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/qt-gui/mydialog.h 2020-01-29 19:07:27.000000000 +0100 @@ -78,7 +78,7 @@ void on_pbSelectMapFile_clicked(); void on_cbParseAsciiArt_clicked(); void on_cbIgnClearSeq_clicked(); - + void on_cbIgnCSISeq_clicked(); void on_cbIgnoreSequences_stateChanged(); void on_cbWatchFile_stateChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/qt-gui/ui_ansifilter.h new/ansifilter-2.16/src/qt-gui/ui_ansifilter.h --- old/ansifilter-2.15/src/qt-gui/ui_ansifilter.h 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/qt-gui/ui_ansifilter.h 2020-01-29 19:07:27.000000000 +0100 @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'ansifilter.ui' ** -** Created by: Qt User Interface Compiler version 5.13.2 +** Created by: Qt User Interface Compiler version 5.14.0 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -52,14 +52,15 @@ QComboBox *comboFormat; QGridLayout *gridLayout_2; QCheckBox *cbIgnoreSequences; - QCheckBox *cbFragment; - QCheckBox *cbOmitVersion; - QCheckBox *cbIgnClearSeq; - QCheckBox *cbDeriveStyles; QHBoxLayout *horizontalLayout_2; QLabel *lblSvgDim; QLineEdit *leSvgWidth; QLineEdit *leSvgHeight; + QCheckBox *cbOmitVersion; + QCheckBox *cbIgnClearSeq; + QCheckBox *cbFragment; + QCheckBox *cbIgnCSISeq; + QCheckBox *cbDeriveStyles; QSpacerItem *verticalSpacer_4; QGroupBox *gbAsciiArt; QGridLayout *gridLayout_5; @@ -225,28 +226,6 @@ gridLayout_2->addWidget(cbIgnoreSequences, 0, 0, 1, 1); - cbFragment = new QCheckBox(groupBox); - cbFragment->setObjectName(QString::fromUtf8("cbFragment")); - sizePolicy4.setHeightForWidth(cbFragment->sizePolicy().hasHeightForWidth()); - cbFragment->setSizePolicy(sizePolicy4); - - gridLayout_2->addWidget(cbFragment, 0, 1, 1, 1); - - cbOmitVersion = new QCheckBox(groupBox); - cbOmitVersion->setObjectName(QString::fromUtf8("cbOmitVersion")); - - gridLayout_2->addWidget(cbOmitVersion, 1, 0, 1, 1); - - cbIgnClearSeq = new QCheckBox(groupBox); - cbIgnClearSeq->setObjectName(QString::fromUtf8("cbIgnClearSeq")); - - gridLayout_2->addWidget(cbIgnClearSeq, 1, 1, 1, 1); - - cbDeriveStyles = new QCheckBox(groupBox); - cbDeriveStyles->setObjectName(QString::fromUtf8("cbDeriveStyles")); - - gridLayout_2->addWidget(cbDeriveStyles, 2, 0, 1, 1); - horizontalLayout_2 = new QHBoxLayout(); horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); lblSvgDim = new QLabel(groupBox); @@ -274,7 +253,35 @@ horizontalLayout_2->addWidget(leSvgHeight); - gridLayout_2->addLayout(horizontalLayout_2, 2, 1, 1, 1); + gridLayout_2->addLayout(horizontalLayout_2, 3, 1, 1, 1); + + cbOmitVersion = new QCheckBox(groupBox); + cbOmitVersion->setObjectName(QString::fromUtf8("cbOmitVersion")); + + gridLayout_2->addWidget(cbOmitVersion, 1, 0, 1, 1); + + cbIgnClearSeq = new QCheckBox(groupBox); + cbIgnClearSeq->setObjectName(QString::fromUtf8("cbIgnClearSeq")); + cbIgnClearSeq->setToolTipDuration(-5); + + gridLayout_2->addWidget(cbIgnClearSeq, 1, 1, 1, 1); + + cbFragment = new QCheckBox(groupBox); + cbFragment->setObjectName(QString::fromUtf8("cbFragment")); + sizePolicy4.setHeightForWidth(cbFragment->sizePolicy().hasHeightForWidth()); + cbFragment->setSizePolicy(sizePolicy4); + + gridLayout_2->addWidget(cbFragment, 0, 1, 1, 1); + + cbIgnCSISeq = new QCheckBox(groupBox); + cbIgnCSISeq->setObjectName(QString::fromUtf8("cbIgnCSISeq")); + + gridLayout_2->addWidget(cbIgnCSISeq, 2, 1, 1, 1); + + cbDeriveStyles = new QCheckBox(groupBox); + cbDeriveStyles->setObjectName(QString::fromUtf8("cbDeriveStyles")); + + gridLayout_2->addWidget(cbDeriveStyles, 2, 0, 1, 1); verticalLayout_2->addLayout(gridLayout_2); @@ -587,10 +594,18 @@ 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)); + lblSvgDim->setText(QCoreApplication::translate("Dialog", "SVG dim.:", nullptr)); #if QT_CONFIG(tooltip) - cbFragment->setToolTip(QCoreApplication::translate("Dialog", "Save HTML without header and footer to paste it into existing documents.", nullptr)); + leSvgWidth->setToolTip(QCoreApplication::translate("Dialog", "Document width (units allowed)", nullptr)); #endif // QT_CONFIG(tooltip) - cbFragment->setText(QCoreApplication::translate("Dialog", "Omit header and footer", nullptr)); + 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_CONFIG(statustip) + leSvgHeight->setPlaceholderText(QCoreApplication::translate("Dialog", "450px", nullptr)); #if QT_CONFIG(tooltip) cbOmitVersion->setToolTip(QCoreApplication::translate("Dialog", "Do not include version info comment", nullptr)); #endif // QT_CONFIG(tooltip) @@ -600,21 +615,17 @@ #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)); + cbFragment->setToolTip(QCoreApplication::translate("Dialog", "Save HTML without header and footer to paste it into existing documents.", nullptr)); #endif // QT_CONFIG(tooltip) - cbDeriveStyles->setText(QCoreApplication::translate("Dialog", "Derive Stylesheets", nullptr)); - lblSvgDim->setText(QCoreApplication::translate("Dialog", "SVG dim.:", nullptr)); + cbFragment->setText(QCoreApplication::translate("Dialog", "Omit header and footer", nullptr)); #if QT_CONFIG(tooltip) - leSvgWidth->setToolTip(QCoreApplication::translate("Dialog", "Document width (units allowed)", nullptr)); + cbIgnCSISeq->setToolTip(QCoreApplication::translate("Dialog", "Set this option if UTF-8 input is affected by CSI parsing", nullptr)); #endif // QT_CONFIG(tooltip) - leSvgWidth->setPlaceholderText(QCoreApplication::translate("Dialog", "300px", nullptr)); + cbIgnCSISeq->setText(QCoreApplication::translate("Dialog", "Ignore CSI Sequences", nullptr)); #if QT_CONFIG(tooltip) - leSvgHeight->setToolTip(QCoreApplication::translate("Dialog", "Document height (units allowed)", nullptr)); + cbDeriveStyles->setToolTip(QCoreApplication::translate("Dialog", "Generate Stylesheets based on the formatting information", nullptr)); #endif // QT_CONFIG(tooltip) -#if QT_CONFIG(statustip) - leSvgHeight->setStatusTip(QString()); -#endif // QT_CONFIG(statustip) - leSvgHeight->setPlaceholderText(QCoreApplication::translate("Dialog", "450px", nullptr)); + cbDeriveStyles->setText(QCoreApplication::translate("Dialog", "Derive Stylesheets", 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)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.15/src/version.h new/ansifilter-2.16/src/version.h --- old/ansifilter-2.15/src/version.h 2019-11-08 18:37:47.000000000 +0100 +++ new/ansifilter-2.16/src/version.h 2020-01-29 19:07:27.000000000 +0100 @@ -25,7 +25,7 @@ #ifndef VERSION_H #define VERSION_H -#define ANSIFILTER_VERSION "2.15" +#define ANSIFILTER_VERSION "2.16" #define ANSIFILTER_URL "http://www.andre-simon.de/"; #define ANSIFILTER_EMAIL "[email protected]"
