From cb7a0f242b2cd236fa40a14cc8284db014597720 Mon Sep 17 00:00:00 2001 From: saalen Date: Wed, 28 Dec 2016 19:25:03 +0000 Subject: [PATCH] minor UI adjustements git-svn-id: https://svn.code.sf.net/p/ansifilter/code@50 dd54d624-933f-4370-8418-430c282f72c3 --- src/qt-gui/Makefile | 45 +++++++++--- src/qt-gui/ansifilter.ui | 16 ++--- src/qt-gui/moc_mydialog.cpp | 4 +- src/qt-gui/mydialog.cpp | 6 ++ src/qt-gui/ui_ansifilter.h | 133 ++++++++++++++++++------------------ 5 files changed, 115 insertions(+), 89 deletions(-) diff --git a/src/qt-gui/Makefile b/src/qt-gui/Makefile index bd8eaac..b84c9ab 100644 --- a/src/qt-gui/Makefile +++ b/src/qt-gui/Makefile @@ -1,9 +1,9 @@ ############################################################################# # Makefile for building: ansifilter-gui -# Generated by qmake (3.0) (Qt 5.7.0) +# Generated by qmake (3.0) (Qt 5.7.1) # Project: ansifilter-gui.pro # Template: app -# Command: /usr/lib/qt/bin/qmake -o Makefile ansifilter-gui.pro +# Command: /usr/bin/qmake -o Makefile ansifilter-gui.pro ############################################################################# MAKEFILE = Makefile @@ -16,7 +16,7 @@ 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 -Wall -W -D_REENTRANT -fPIC $(DEFINES) CXXFLAGS = -pipe -std=c++11 -O2 -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -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/lib/qt/bin/qmake +QMAKE = /usr/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d MKDIR = mkdir -p @@ -110,6 +110,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KActivities.pri \ /usr/lib/qt/mkspecs/modules/qt_KActivitiesStats.pri \ /usr/lib/qt/mkspecs/modules/qt_KaddressbookGrantlee.pri \ + /usr/lib/qt/mkspecs/modules/qt_KaddressbookImportExport.pri \ /usr/lib/qt/mkspecs/modules/qt_KAlarmCal.pri \ /usr/lib/qt/mkspecs/modules/qt_KArchive.pri \ /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ @@ -117,8 +118,11 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KBookmarks.pri \ /usr/lib/qt/mkspecs/modules/qt_KCalCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KCalUtils.pri \ + /usr/lib/qt/mkspecs/modules/qt_KCddb.pri \ + /usr/lib/qt/mkspecs/modules/qt_KChart.pri \ /usr/lib/qt/mkspecs/modules/qt_KCMUtils.pri \ /usr/lib/qt/mkspecs/modules/qt_KCodecs.pri \ + /usr/lib/qt/mkspecs/modules/qt_KCompactDisc.pri \ /usr/lib/qt/mkspecs/modules/qt_KCompletion.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigGui.pri \ @@ -134,6 +138,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KDGantt2.pri \ /usr/lib/qt/mkspecs/modules/qt_KDNSSD.pri \ /usr/lib/qt/mkspecs/modules/qt_KEmoticons.pri \ + /usr/lib/qt/mkspecs/modules/qt_KGantt.pri \ /usr/lib/qt/mkspecs/modules/qt_KGAPIBlogger.pri \ /usr/lib/qt/mkspecs/modules/qt_KGAPICalendar.pri \ /usr/lib/qt/mkspecs/modules/qt_KGAPIContacts.pri \ @@ -155,6 +160,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KIOFileWidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOGui.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_Kirigami.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri \ /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri \ @@ -182,6 +188,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/modules/qt_KService.pri \ /usr/lib/qt/mkspecs/modules/qt_KSieve.pri \ /usr/lib/qt/mkspecs/modules/qt_KSieveUi.pri \ + /usr/lib/qt/mkspecs/modules/qt_KSyntaxHighlighting.pri \ /usr/lib/qt/mkspecs/modules/qt_KTextEditor.pri \ /usr/lib/qt/mkspecs/modules/qt_KTextWidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_KTNef.pri \ @@ -310,7 +317,9 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /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 \ /usr/lib/qt/mkspecs/features/resolve_config.prf \ /usr/lib/qt/mkspecs/features/default_post.prf \ @@ -381,6 +390,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KActivities.pri \ /usr/lib/qt/mkspecs/modules/qt_KActivitiesStats.pri \ /usr/lib/qt/mkspecs/modules/qt_KaddressbookGrantlee.pri \ + /usr/lib/qt/mkspecs/modules/qt_KaddressbookImportExport.pri \ /usr/lib/qt/mkspecs/modules/qt_KAlarmCal.pri \ /usr/lib/qt/mkspecs/modules/qt_KArchive.pri \ /usr/lib/qt/mkspecs/modules/qt_KAuth.pri \ @@ -388,8 +398,11 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KBookmarks.pri \ /usr/lib/qt/mkspecs/modules/qt_KCalCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KCalUtils.pri \ + /usr/lib/qt/mkspecs/modules/qt_KCddb.pri \ + /usr/lib/qt/mkspecs/modules/qt_KChart.pri \ /usr/lib/qt/mkspecs/modules/qt_KCMUtils.pri \ /usr/lib/qt/mkspecs/modules/qt_KCodecs.pri \ + /usr/lib/qt/mkspecs/modules/qt_KCompactDisc.pri \ /usr/lib/qt/mkspecs/modules/qt_KCompletion.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigCore.pri \ /usr/lib/qt/mkspecs/modules/qt_KConfigGui.pri \ @@ -405,6 +418,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KDGantt2.pri \ /usr/lib/qt/mkspecs/modules/qt_KDNSSD.pri \ /usr/lib/qt/mkspecs/modules/qt_KEmoticons.pri \ + /usr/lib/qt/mkspecs/modules/qt_KGantt.pri \ /usr/lib/qt/mkspecs/modules/qt_KGAPIBlogger.pri \ /usr/lib/qt/mkspecs/modules/qt_KGAPICalendar.pri \ /usr/lib/qt/mkspecs/modules/qt_KGAPIContacts.pri \ @@ -426,6 +440,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KIOFileWidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOGui.pri \ /usr/lib/qt/mkspecs/modules/qt_KIOWidgets.pri \ + /usr/lib/qt/mkspecs/modules/qt_Kirigami.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri \ /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri \ /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri \ @@ -453,6 +468,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KService.pri \ /usr/lib/qt/mkspecs/modules/qt_KSieve.pri \ /usr/lib/qt/mkspecs/modules/qt_KSieveUi.pri \ + /usr/lib/qt/mkspecs/modules/qt_KSyntaxHighlighting.pri \ /usr/lib/qt/mkspecs/modules/qt_KTextEditor.pri \ /usr/lib/qt/mkspecs/modules/qt_KTextWidgets.pri \ /usr/lib/qt/mkspecs/modules/qt_KTNef.pri \ @@ -581,7 +597,9 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /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 \ /usr/lib/qt/mkspecs/features/resolve_config.prf \ /usr/lib/qt/mkspecs/features/default_post.prf \ @@ -632,6 +650,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KActivities.pri: /usr/lib/qt/mkspecs/modules/qt_KActivitiesStats.pri: /usr/lib/qt/mkspecs/modules/qt_KaddressbookGrantlee.pri: +/usr/lib/qt/mkspecs/modules/qt_KaddressbookImportExport.pri: /usr/lib/qt/mkspecs/modules/qt_KAlarmCal.pri: /usr/lib/qt/mkspecs/modules/qt_KArchive.pri: /usr/lib/qt/mkspecs/modules/qt_KAuth.pri: @@ -639,8 +658,11 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KBookmarks.pri: /usr/lib/qt/mkspecs/modules/qt_KCalCore.pri: /usr/lib/qt/mkspecs/modules/qt_KCalUtils.pri: +/usr/lib/qt/mkspecs/modules/qt_KCddb.pri: +/usr/lib/qt/mkspecs/modules/qt_KChart.pri: /usr/lib/qt/mkspecs/modules/qt_KCMUtils.pri: /usr/lib/qt/mkspecs/modules/qt_KCodecs.pri: +/usr/lib/qt/mkspecs/modules/qt_KCompactDisc.pri: /usr/lib/qt/mkspecs/modules/qt_KCompletion.pri: /usr/lib/qt/mkspecs/modules/qt_KConfigCore.pri: /usr/lib/qt/mkspecs/modules/qt_KConfigGui.pri: @@ -656,6 +678,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KDGantt2.pri: /usr/lib/qt/mkspecs/modules/qt_KDNSSD.pri: /usr/lib/qt/mkspecs/modules/qt_KEmoticons.pri: +/usr/lib/qt/mkspecs/modules/qt_KGantt.pri: /usr/lib/qt/mkspecs/modules/qt_KGAPIBlogger.pri: /usr/lib/qt/mkspecs/modules/qt_KGAPICalendar.pri: /usr/lib/qt/mkspecs/modules/qt_KGAPIContacts.pri: @@ -677,6 +700,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KIOFileWidgets.pri: /usr/lib/qt/mkspecs/modules/qt_KIOGui.pri: /usr/lib/qt/mkspecs/modules/qt_KIOWidgets.pri: +/usr/lib/qt/mkspecs/modules/qt_Kirigami.pri: /usr/lib/qt/mkspecs/modules/qt_KItemModels.pri: /usr/lib/qt/mkspecs/modules/qt_KItemViews.pri: /usr/lib/qt/mkspecs/modules/qt_KJobWidgets.pri: @@ -704,6 +728,7 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /usr/lib/qt/mkspecs/modules/qt_KService.pri: /usr/lib/qt/mkspecs/modules/qt_KSieve.pri: /usr/lib/qt/mkspecs/modules/qt_KSieveUi.pri: +/usr/lib/qt/mkspecs/modules/qt_KSyntaxHighlighting.pri: /usr/lib/qt/mkspecs/modules/qt_KTextEditor.pri: /usr/lib/qt/mkspecs/modules/qt_KTextWidgets.pri: /usr/lib/qt/mkspecs/modules/qt_KTNef.pri: @@ -832,7 +857,9 @@ Makefile: ansifilter-gui.pro /usr/lib/qt/mkspecs/linux-g++/qmake.conf /usr/lib/q /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: /usr/lib/qt/mkspecs/features/resolve_config.prf: /usr/lib/qt/mkspecs/features/default_post.prf: @@ -898,10 +925,10 @@ compiler_rcc_make_all: qrc_ansifilter.cpp compiler_rcc_clean: -$(DEL_FILE) qrc_ansifilter.cpp qrc_ansifilter.cpp: ansifilter.qrc \ - /usr/lib/qt/bin/rcc \ + /usr/bin/rcc \ ansifilter.xpm \ Actions-drop-icon.png - /usr/lib/qt/bin/rcc -name ansifilter ansifilter.qrc -o qrc_ansifilter.cpp + /usr/bin/rcc -name ansifilter ansifilter.qrc -o qrc_ansifilter.cpp compiler_moc_header_make_all: moc_mydialog.cpp compiler_moc_header_clean: @@ -914,8 +941,8 @@ moc_mydialog.cpp: ui_ansifilter.h \ ../preformatter.h \ ../stringtools.h \ mydialog.h \ - /usr/lib/qt/bin/moc - /usr/lib/qt/bin/moc $(DEFINES) -I/usr/lib/qt/mkspecs/linux-g++ -I/home/andre/Projekte/ansifilter-code/src/qt-gui -I/home/andre/Projekte/ansifilter-code/src/qt-gui -I/home/andre/Projekte/ansifilter-code/src -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/6.2.1 -I/usr/include/c++/6.2.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.2.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include-fixed -I/usr/include mydialog.h -o moc_mydialog.cpp + /usr/bin/moc + /usr/bin/moc $(DEFINES) -I/usr/lib/qt/mkspecs/linux-g++ -I/home/andre/Projekte/ansifilter-code/src/qt-gui -I/home/andre/Projekte/ansifilter-code/src/qt-gui -I/home/andre/Projekte/ansifilter-code/src -I/usr/include/qt -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtCore -I/usr/include/c++/6.2.1 -I/usr/include/c++/6.2.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.2.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include-fixed -I/usr/include mydialog.h -o moc_mydialog.cpp compiler_moc_source_make_all: compiler_moc_source_clean: @@ -923,8 +950,8 @@ compiler_uic_make_all: ui_ansifilter.h compiler_uic_clean: -$(DEL_FILE) ui_ansifilter.h ui_ansifilter.h: ansifilter.ui \ - /usr/lib/qt/bin/uic - /usr/lib/qt/bin/uic ansifilter.ui -o ui_ansifilter.h + /usr/bin/uic + /usr/bin/uic ansifilter.ui -o ui_ansifilter.h compiler_yacc_decl_make_all: compiler_yacc_decl_clean: diff --git a/src/qt-gui/ansifilter.ui b/src/qt-gui/ansifilter.ui index 459712a..9d37a54 100644 --- a/src/qt-gui/ansifilter.ui +++ b/src/qt-gui/ansifilter.ui @@ -295,10 +295,10 @@ - Enable parsing of ASCII art files. + Enable parsing of ANSI art files. - Enable ASCII art + Enable ANSI art @@ -308,7 +308,7 @@ false - ASCII art options + ANSI art options @@ -416,7 +416,7 @@ - Enable support for ASCII BIN and XBIN files. + Enable support for ANSI BIN and XBIN files. BIN/XBIN fo&rmat @@ -630,12 +630,6 @@ 0 - - - 30 - 16777215 - - Select a color map configuration file. @@ -734,7 +728,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;"> -<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:'MS Shell Dlg 2'; font-size:8pt;">Please open a file.</span></p></body></html> +<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> diff --git a/src/qt-gui/moc_mydialog.cpp b/src/qt-gui/moc_mydialog.cpp index 3d56df7..f042c5f 100644 --- a/src/qt-gui/moc_mydialog.cpp +++ b/src/qt-gui/moc_mydialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mydialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.7.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.7.1) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mydialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.7.0. It" +#error "This file was generated using the moc from 5.7.1. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/src/qt-gui/mydialog.cpp b/src/qt-gui/mydialog.cpp index b30dbfb..a09413d 100644 --- a/src/qt-gui/mydialog.cpp +++ b/src/qt-gui/mydialog.cpp @@ -83,6 +83,12 @@ MyDialog::MyDialog(QWidget * parent, Qt::WindowFlags f):QDialog(parent, f) showFile(); dlg.cbWatchFile->setEnabled(true); } + +//avoid ugly buttons in MacOS +#ifndef Q_OS_MACOS + dlg.pbSelectMapFile->setMaximumWidth(30); +#endif + plausibility(); } diff --git a/src/qt-gui/ui_ansifilter.h b/src/qt-gui/ui_ansifilter.h index b902cab..e7c4101 100644 --- a/src/qt-gui/ui_ansifilter.h +++ b/src/qt-gui/ui_ansifilter.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'ansifilter.ui' ** -** Created by: Qt User Interface Compiler version 5.7.0 +** Created by: Qt User Interface Compiler version 5.7.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -382,7 +382,6 @@ class Ui_Dialog sizePolicy8.setHeightForWidth(pbSelectMapFile->sizePolicy().hasHeightForWidth()); pbSelectMapFile->setSizePolicy(sizePolicy8); pbSelectMapFile->setMinimumSize(QSize(20, 0)); - pbSelectMapFile->setMaximumSize(QSize(30, 16777215)); horizontalLayout->addWidget(pbSelectMapFile); @@ -469,112 +468,112 @@ class Ui_Dialog void retranslateUi(QDialog *Dialog) { - Dialog->setWindowTitle(QApplication::translate("Dialog", "ANSIFilter", 0)); - groupBox->setTitle(QApplication::translate("Dialog", "ANSIFilter", 0)); + Dialog->setWindowTitle(QApplication::translate("Dialog", "ANSIFilter", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("Dialog", "ANSIFilter", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - pbFileOpen->setToolTip(QApplication::translate("Dialog", "Open a text file.", 0)); + pbFileOpen->setToolTip(QApplication::translate("Dialog", "Open a text file.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - pbFileOpen->setText(QApplication::translate("Dialog", "Open File", 0)); + pbFileOpen->setText(QApplication::translate("Dialog", "Open File", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - pbSaveAs->setToolTip(QApplication::translate("Dialog", "Save the opened file as text, HTML, LaTeX, Plain TeX, BBCode or RTF.", 0)); + pbSaveAs->setToolTip(QApplication::translate("Dialog", "Save the opened file as text, HTML, LaTeX, Plain TeX, BBCode or RTF.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - pbSaveAs->setText(QApplication::translate("Dialog", "Save as", 0)); + pbSaveAs->setText(QApplication::translate("Dialog", "Save as", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - pbClipboard->setToolTip(QApplication::translate("Dialog", "Copy opened file as plain text to clipboard", 0)); + pbClipboard->setToolTip(QApplication::translate("Dialog", "Copy opened file as plain text to clipboard", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - pbClipboard->setText(QApplication::translate("Dialog", "Copy to clipboard", 0)); + pbClipboard->setText(QApplication::translate("Dialog", "Copy to clipboard", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - lblDrop->setToolTip(QApplication::translate("Dialog", "You may drop a file on this window.", 0)); + lblDrop->setToolTip(QApplication::translate("Dialog", "You may drop a file on this window.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP lblDrop->setText(QString()); - label_4->setText(QApplication::translate("Dialog", "Output format:", 0)); + label_4->setText(QApplication::translate("Dialog", "Output format:", Q_NULLPTR)); comboFormat->clear(); comboFormat->insertItems(0, QStringList() - << QApplication::translate("Dialog", "Text", 0) - << QApplication::translate("Dialog", "HTML", 0) - << QApplication::translate("Dialog", "RTF", 0) - << QApplication::translate("Dialog", "LaTeX", 0) - << QApplication::translate("Dialog", "TeX", 0) - << QApplication::translate("Dialog", "BBCode", 0) - << QApplication::translate("Dialog", "Pango Markup", 0) + << QApplication::translate("Dialog", "Text", Q_NULLPTR) + << QApplication::translate("Dialog", "HTML", Q_NULLPTR) + << QApplication::translate("Dialog", "RTF", Q_NULLPTR) + << QApplication::translate("Dialog", "LaTeX", Q_NULLPTR) + << QApplication::translate("Dialog", "TeX", Q_NULLPTR) + << QApplication::translate("Dialog", "BBCode", Q_NULLPTR) + << QApplication::translate("Dialog", "Pango Markup", Q_NULLPTR) ); #ifndef QT_NO_TOOLTIP - cbIgnoreSequences->setToolTip(QApplication::translate("Dialog", "Show and save files ignoring the contained ANSI formatting information.", 0)); + cbIgnoreSequences->setToolTip(QApplication::translate("Dialog", "Show and save files ignoring the contained ANSI formatting information.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - cbIgnoreSequences->setText(QApplication::translate("Dialog", "Omit styling in output", 0)); + cbIgnoreSequences->setText(QApplication::translate("Dialog", "Omit styling in output", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - cbFragment->setToolTip(QApplication::translate("Dialog", "Save HTML without header and footer to paste it into existing documents.", 0)); + cbFragment->setToolTip(QApplication::translate("Dialog", "Save HTML without header and footer to paste it into existing documents.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - cbFragment->setText(QApplication::translate("Dialog", "Omit header and footer", 0)); + cbFragment->setText(QApplication::translate("Dialog", "Omit header and footer", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - cbParseAsciiArt->setToolTip(QApplication::translate("Dialog", "Enable parsing of ASCII art files.", 0)); + cbParseAsciiArt->setToolTip(QApplication::translate("Dialog", "Enable parsing of ASCII art files.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - cbParseAsciiArt->setText(QApplication::translate("Dialog", "Enable ASCII art", 0)); - gbAsciiArt->setTitle(QApplication::translate("Dialog", "ASCII art options", 0)); - lblWidth->setText(QApplication::translate("Dialog", "Width", 0)); + cbParseAsciiArt->setText(QApplication::translate("Dialog", "Enable ASCII art", Q_NULLPTR)); + gbAsciiArt->setTitle(QApplication::translate("Dialog", "ASCII art options", Q_NULLPTR)); + lblWidth->setText(QApplication::translate("Dialog", "Width", Q_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.", 0)); + sbWidth->setToolTip(QApplication::translate("Dialog", "Set the ASCII art image width (default: 80). This setting is ignored with XBIN input.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - lblHeight->setText(QApplication::translate("Dialog", "Height", 0)); + lblHeight->setText(QApplication::translate("Dialog", "Height", Q_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.", 0)); + sbHeight->setToolTip(QApplication::translate("Dialog", "Set the ASCII art image height (default: 150). This setting is ignored with XBIN input.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - rbAsciiCP437->setToolTip(QApplication::translate("Dialog", "Enable support for codepage 437 symbols and ANSI.SYS sequences.", 0)); + rbAsciiCP437->setToolTip(QApplication::translate("Dialog", "Enable support for codepage 437 symbols and ANSI.SYS sequences.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - rbAsciiCP437->setText(QApplication::translate("Dialog", "Codepage &437", 0)); + rbAsciiCP437->setText(QApplication::translate("Dialog", "Codepage &437", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - rbAsciiBin->setToolTip(QApplication::translate("Dialog", "Enable support for ASCII BIN and XBIN files.", 0)); + rbAsciiBin->setToolTip(QApplication::translate("Dialog", "Enable support for ASCII BIN and XBIN files.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - rbAsciiBin->setText(QApplication::translate("Dialog", "BIN/XBIN fo&rmat", 0)); - label_2->setText(QApplication::translate("Dialog", "Tit&le:", 0)); + rbAsciiBin->setText(QApplication::translate("Dialog", "BIN/XBIN fo&rmat", Q_NULLPTR)); + label_2->setText(QApplication::translate("Dialog", "Tit&le:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - leTitle->setToolTip(QApplication::translate("Dialog", "Set the output document title.", 0)); + leTitle->setToolTip(QApplication::translate("Dialog", "Set the output document title.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - lblEncoding->setText(QApplication::translate("Dialog", "En&coding:", 0)); + lblEncoding->setText(QApplication::translate("Dialog", "En&coding:", Q_NULLPTR)); comboEncoding->clear(); comboEncoding->insertItems(0, QStringList() - << QApplication::translate("Dialog", "ISO-8859-1", 0) - << QApplication::translate("Dialog", "ISO-8859-2", 0) - << QApplication::translate("Dialog", "ISO-8859-3", 0) - << QApplication::translate("Dialog", "ISO-8859-4", 0) - << QApplication::translate("Dialog", "ISO-8859-6", 0) - << QApplication::translate("Dialog", "ISO-8859-7", 0) - << QApplication::translate("Dialog", "ISO-8859-8", 0) - << QApplication::translate("Dialog", "ISO-8859-9", 0) - << QApplication::translate("Dialog", "ISO-8859-10", 0) - << QApplication::translate("Dialog", "ISO-8859-11", 0) - << QApplication::translate("Dialog", "ISO-8859-13", 0) - << QApplication::translate("Dialog", "ISO-8859-14", 0) - << QApplication::translate("Dialog", "ISO-8859-15", 0) - << QApplication::translate("Dialog", "UTF-8", 0) + << QApplication::translate("Dialog", "ISO-8859-1", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-2", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-3", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-4", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-6", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-7", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-8", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-9", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-10", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-11", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-13", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-14", Q_NULLPTR) + << QApplication::translate("Dialog", "ISO-8859-15", Q_NULLPTR) + << QApplication::translate("Dialog", "UTF-8", Q_NULLPTR) ); #ifndef QT_NO_TOOLTIP - comboEncoding->setToolTip(QApplication::translate("Dialog", "Set the encoding (has to match input file encoding).", 0)); + comboEncoding->setToolTip(QApplication::translate("Dialog", "Set the encoding (has to match input file encoding).", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - label_3->setText(QApplication::translate("Dialog", "Line wrap:", 0)); + label_3->setText(QApplication::translate("Dialog", "Line wrap:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - spinBoxWrap->setToolTip(QApplication::translate("Dialog", "Wrap lines after given char count (0 disables wrapping).", 0)); + spinBoxWrap->setToolTip(QApplication::translate("Dialog", "Wrap lines after given char count (0 disables wrapping).", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - comboFont->setToolTip(QApplication::translate("Dialog", "Set the output font.", 0)); + comboFont->setToolTip(QApplication::translate("Dialog", "Set the output font.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - label_5->setText(QApplication::translate("Dialog", "Color map file:", 0)); + label_5->setText(QApplication::translate("Dialog", "Color map file:", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - leColorMapPath->setToolTip(QApplication::translate("Dialog", "Color map file (see README for details). This setting is ignored with XBIN input.", 0)); + leColorMapPath->setToolTip(QApplication::translate("Dialog", "Color map file (see README for details). This setting is ignored with XBIN input.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP - pbSelectMapFile->setToolTip(QApplication::translate("Dialog", "Select a color map configuration file. ", 0)); + pbSelectMapFile->setToolTip(QApplication::translate("Dialog", "Select a color map configuration file. ", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - pbSelectMapFile->setText(QApplication::translate("Dialog", "...", 0)); + pbSelectMapFile->setText(QApplication::translate("Dialog", "...", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - pbAbout->setToolTip(QApplication::translate("Dialog", "Show information about this program.", 0)); + pbAbout->setToolTip(QApplication::translate("Dialog", "Show information about this program.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - pbAbout->setText(QApplication::translate("Dialog", "About", 0)); + pbAbout->setText(QApplication::translate("Dialog", "About", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP - pbExit->setToolTip(QApplication::translate("Dialog", "Quit this program.", 0)); + pbExit->setToolTip(QApplication::translate("Dialog", "Quit this program.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - pbExit->setText(QApplication::translate("Dialog", "Quit", 0)); + pbExit->setText(QApplication::translate("Dialog", "Quit", Q_NULLPTR)); #ifndef QT_NO_TOOLTIP textEdit->setToolTip(QString()); #endif // QT_NO_TOOLTIP @@ -582,12 +581,12 @@ class Ui_Dialog "\n" -"

Please open a file.

", 0)); - lblInFilePath->setText(QApplication::translate("Dialog", "Input file:", 0)); +"

Please open a file.

", Q_NULLPTR)); + lblInFilePath->setText(QApplication::translate("Dialog", "Input file:", Q_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.", 0)); + cbWatchFile->setToolTip(QApplication::translate("Dialog", "Update view if input file changes, Do not apply with big or fast growing input files.", Q_NULLPTR)); #endif // QT_NO_TOOLTIP - cbWatchFile->setText(QApplication::translate("Dialog", "Watch this file", 0)); + cbWatchFile->setText(QApplication::translate("Dialog", "Watch this file", Q_NULLPTR)); } // retranslateUi };