From 0d76c5eb9cfdb18478e003d631eec45d160c1ac8 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 13 Jun 2018 01:06:37 +1000 Subject: [PATCH] Fix a couple of spelling mistakes, try out PrecompiledHeaders --- sleepyhead/aboutdialog.ui | 6 ++-- sleepyhead/pch.h | 52 ++++++++++++++++++++++++++++++++ sleepyhead/preferencesdialog.cpp | 4 +-- sleepyhead/sleepyhead.pro | 33 ++++++++++++-------- 4 files changed, 77 insertions(+), 18 deletions(-) create mode 100644 sleepyhead/pch.h diff --git a/sleepyhead/aboutdialog.ui b/sleepyhead/aboutdialog.ui index ef5a6c42..9690970b 100644 --- a/sleepyhead/aboutdialog.ui +++ b/sleepyhead/aboutdialog.ui @@ -28,7 +28,7 @@ QTabWidget::Triangular - 2 + 0 @@ -162,8 +162,8 @@ p, li { white-space: pre-wrap; } <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:20pt;">Support SleepyHead Development</span></p> <hr /> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;"> </span></p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">All software, regardless of it's software licensing costs time, money and resources to create and maintain, especially complex applications like SleepyHead.<br /><br />The SleepyHead project was created early in 2011 by myself (<a href="http://jedimark.net"><span style=" text-decoration: underline; color:#0000ff;">Jedimark</span></a>), and has grown over the years into a seriously complex cross platform desktop application. It is the compound result of an insane amount of hard work and many, many all nighter hacking sessions, and time spent distracted from family responsibilties.</p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />There is a lot of ongoing work trying to keep SleepyHead up to date with ever changing CPAP machine variants as well as the continuously improving understanding of the undocumented data formats. I know I haven't always kept up, but I really do try my best.<br /><br />I'd like to offer a huge thankyou for those who have given donations and support along the way... you truly helped to make SleepyHead what it is today.<br /><br />If SleepyHead has benefited you and have the means to do so, please consider showing your apreciation by supportting continuing development of this software project.</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">All software, regardless of its software licensing costs time, money and resources to create and maintain, especially complex applications like SleepyHead.<br /><br />The SleepyHead project was created early in 2011 by myself (<a href="http://jedimark.net"><span style=" text-decoration: underline; color:#0000ff;">Jedimark</span></a>), and has grown over the years into a seriously complex cross platform desktop application. It is the compound result of an insane amount of hard work and many, many all nighter hacking sessions, and time spent distracted from family responsibilties.</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />There is a lot of ongoing work trying to keep SleepyHead up to date with ever changing CPAP machine variants as well as the continuously improving understanding of the undocumented data formats. I know I haven't always kept up, but I really do try my best.<br /><br />I'd like to offer a huge thankyou for those who have given donations and support along the way... you truly helped to make SleepyHead what it is today.<br /><br />If SleepyHead has benefited you and have the means to do so, please consider showing your appreciation by supporting the continued development of this software project.</p> <p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <hr /> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://sleepyhead.jedimark.net/donate.php"><span style=" font-size:11pt; font-weight:600; text-decoration: underline; color:#0000ff;"><br />Donate via Paypal</span></a><span style=" font-size:11pt;"><br /></span></p> diff --git a/sleepyhead/pch.h b/sleepyhead/pch.h new file mode 100644 index 00000000..3fbfc474 --- /dev/null +++ b/sleepyhead/pch.h @@ -0,0 +1,52 @@ +#if defined __cplusplus +/* Add C++ includes here */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 1876d9a7..e93ed282 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -689,7 +689,7 @@ bool PreferencesDialog::Save() needs_reload = true; } - if (ui->gfxEngineCombo->currentIndex() != currentGFXEngine()) { + if ((unsigned int)ui->gfxEngineCombo->currentIndex() != currentGFXEngine()) { setCurrentGFXEngine(ui->gfxEngineCombo->currentIndex()); needs_restart = true; } @@ -752,7 +752,7 @@ bool PreferencesDialog::Save() } else { recalc_events = false; } } else if (needs_restart) { if (QMessageBox::question(this, tr("Restart Required"), - tr("One or more of the changes you have made will require this application to be restarted,\nin order for these changes to come into effect.\n\nWould you like do this now?"), + tr("One or more of the changes you have made will require this application to be restarted, in order for these changes to come into effect.\n\nWould you like do this now?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { return false; } diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index c196f320..0cfdc844 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -15,7 +15,10 @@ DEFINES += QT_DEPRECATED_WARNINGS #SleepyHead requires OpenGL 2.0 support to run smoothly #On platforms where it's not available, it can still be built to work #provided the BrokenGL DEFINES flag is passed to qmake (eg, qmake [specs] /path/to/SleepyHeadQT.pro DEFINES+=BrokenGL) -#contains(DEFINES, BrokenGL) { +contains(DEFINES, BrokenGL) { + message("BrokgenGL has been disabled to test the Dynamic GFX Engine selection") + DEFINES-=BrokenGL +} # message("Building with QWidget gGraphView") # DEFINES += BROKEN_OPENGL_BUILD #} else:contains(DEFINES, NoGL) { @@ -26,7 +29,6 @@ DEFINES += QT_DEPRECATED_WARNINGS # message("Building with QGLWidget gGraphView") #} -DEFINES -= BrokenGL QT += opengl DEFINES += LOCK_RESMED_SESSIONS @@ -37,13 +39,14 @@ CONFIG += rtti # Remove this crap because it sucks CONFIG-=debug_and_release -#static { -# CONFIG += static -# QTPLUGIN += qsvg qgif qpng +contains(DEFINES, STATIC) { +static { + CONFIG += static + QTPLUGIN += qsvg qgif qpng -# DEFINES += STATIC // Equivalent to "#define STATIC" in source code -# message("Static build.") -#} + message("Static build.") +} +} TARGET = SleepyHead unix:!macx:!haiku { @@ -52,7 +55,6 @@ unix:!macx:!haiku { TEMPLATE = app - gitinfotarget.target = git_info.h gitinfotarget.depends = FORCE @@ -96,18 +98,18 @@ haiku { } CONFIG(release, debug|release) { - contains(RELEASE, 1) { - win32:QMAKE_POST_LINK += upx -k --best --overlay=strip --strip-relocs=0 --compress-icons=2 $(DESTDIR_TARGET) + contains(DEFINES, UPX_PACK_EXE) { + DEFINES-=UPX_PACK_EXE + win32:QMAKE_POST_LINK += upx -k --best --overlay=strip --strip-relocs=0 $(DESTDIR_TARGET) } } win32 { DEFINES += WINVER=0x0501 # needed for mingw to pull in appropriate dbt business...probably a better way to do this -# RC_FILE += win_icon.rc LIBS += -lsetupapi QMAKE_TARGET_PRODUCT = SleepyHead QMAKE_TARGET_COMPANY = Jedimark - QMAKE_TARGET_COPYRIGHT = Copyright (c)2018 Mark Watkins + QMAKE_TARGET_COPYRIGHT = Copyright (c)2011-2018 Mark Watkins QMAKE_TARGET_DESCRIPTION = "OpenSource CPAP Research & Review" VERSION = 1.1.0.0 @@ -124,6 +126,11 @@ win32 { # MingW needs this LIBS += -lz } + + CONFIG += precompile_header + PRECOMPILED_HEADER = pch.h + HEADERS += pch.h + } TRANSLATIONS = $$files($$PWD/../Translations/*.ts)