Skip to content
This repository has been archived by the owner on Jul 21, 2018. It is now read-only.

Commit

Permalink
minor UI adjustements
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.code.sf.net/p/ansifilter/code@50 dd54d624-933f-4370-8418-430c282f72c3
  • Loading branch information
saalen committed Dec 28, 2016
1 parent bc7278a commit cb7a0f2
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 89 deletions.
45 changes: 36 additions & 9 deletions src/qt-gui/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -110,15 +110,19 @@ 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 \
/usr/lib/qt/mkspecs/modules/qt_KBlog.pri \
/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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -381,15 +390,19 @@ 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 \
/usr/lib/qt/mkspecs/modules/qt_KBlog.pri \
/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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -632,15 +650,19 @@ 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:
/usr/lib/qt/mkspecs/modules/qt_KBlog.pri:
/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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -914,17 +941,17 @@ 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:
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:
Expand Down
16 changes: 5 additions & 11 deletions src/qt-gui/ansifilter.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@
<item>
<widget class="QCheckBox" name="cbParseAsciiArt">
<property name="toolTip">
<string>Enable parsing of ASCII art files.</string>
<string>Enable parsing of ANSI art files.</string>
</property>
<property name="text">
<string>Enable ASCII art</string>
<string>Enable ANSI art</string>
</property>
</widget>
</item>
Expand All @@ -308,7 +308,7 @@
<bool>false</bool>
</property>
<property name="title">
<string>ASCII art options</string>
<string>ANSI art options</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0" colspan="2">
Expand Down Expand Up @@ -416,7 +416,7 @@
<item row="0" column="1">
<widget class="QRadioButton" name="rbAsciiBin">
<property name="toolTip">
<string>Enable support for ASCII BIN and XBIN files.</string>
<string>Enable support for ANSI BIN and XBIN files.</string>
</property>
<property name="text">
<string>BIN/XBIN fo&amp;rmat</string>
Expand Down Expand Up @@ -630,12 +630,6 @@
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Select a color map configuration file. </string>
</property>
Expand Down Expand Up @@ -734,7 +728,7 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Please open a file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Noto Sans,Courier New';&quot;&gt;Please open a file.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down
4 changes: 2 additions & 2 deletions src/qt-gui/moc_mydialog.cpp
View file
Original file line number Diff line number Diff line change
@@ -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!
*****************************************************************************/
Expand All @@ -12,7 +12,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.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
Expand Down
6 changes: 6 additions & 0 deletions src/qt-gui/mydialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
Loading

0 comments on commit cb7a0f2

Please sign in to comment.