From 98e2498afcaf5efbe0889178541da62d82ba0179 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 15 Apr 2016 11:15:07 +1000 Subject: [PATCH] Fix spelling mistake and update README.TXT a little --- README | 27 +++++++++++++++++++-------- sleepyhead/UpdaterWindow.cpp | 2 +- sleepyhead/mainwindow.cpp | 1 - sleepyhead/sleepyhead.pro | 3 +++ 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/README b/README index d838f030..3557c7f5 100644 --- a/README +++ b/README @@ -3,6 +3,10 @@ SleepyHead v1.0 branch SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. +SleepyHead is written by Mark Watkins (aka Jedimark), an Australian software developer afflicted with sleep apnea. + +SleepyHead is copyright (C) 2011-2016 Mark Watkins + Requirements: ------------- Qt5 SDK with webkit (Qt5.5 from http://qt.io/download-open-source recommended) @@ -27,13 +31,20 @@ You may need to add a -spec option to qmake to suit your platform. Adding -j3 speeds up the make command on a dual core or greater system. -Author: Mark Watkins -Copyright (C)2011-2016 Mark Watkins -Licence Stuff -------------- -This software is released under the GNU Public License version 3.0 +Software Licensing Information +------------------------------ +SleepyHead is released under the GNU GPL v3 License. Please see below for a note on giving correct attribution in redistribution of derivatives. + +It is built using Qt SDK (Open Source Edition), available from http://qt.io. + +It also uses QuaZip, by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package http://sourceforge.net/projects/quazip/ + +Redistribution of derivatives +----------------------------- +I created this software to help lessen the exploitation of others. Seeing my work being used to exploit others is incredibly un-motivational, and incredibly disrespectful of all the work I put into this project. + +If you plan on reselling any derivatives of SleepyHead, I specifically request that you give due credit and link back, mentioning clearly in your advertising material, software installer and about screens that your derivative "is based on the free and open-source software SleepyHead available from http://sleepyhead.jedimark.net, developed by Mark Watkins (C) 2011-. " + +It is not enough to reference that your derivative "is based on GPL software". -Exceptions and 3rd Party Libraries: -It uses QuaZip, by Sergey A. Tachenov, which is a C++ wrapper over Gilles Vollant's ZIP/UNZIP package.. -http://sourceforge.net/projects/quazip/ diff --git a/sleepyhead/UpdaterWindow.cpp b/sleepyhead/UpdaterWindow.cpp index d210b193..e5f37297 100644 --- a/sleepyhead/UpdaterWindow.cpp +++ b/sleepyhead/UpdaterWindow.cpp @@ -444,7 +444,7 @@ void UpdaterWindow::ParseUpdatesXML(QIODevice *dev) if (QMessageBox::question(mainwin, tr("SleepyHead Updates"), tr("New SleepyHead Updates are avilable:")+"\n\n"+ - tr("Would you like t download and install them now?"), + tr("Would you like to download and install them now?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) { StartMaintenanceTool(); diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index a3633cec..297c5c17 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -858,7 +858,6 @@ QStringList getDriveList() } #endif - return drivelist; } diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index e9c08d2f..9133c609 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -331,3 +331,6 @@ DEPENDPATH += $$PWD/../3rdparty/quazip # } # LIBS += -lquazip #} + +DISTFILES += \ + ../README