chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Beta 0.9.0 Official Release Marker

Browse Source
This commit is contained in:
Mark Watkins 2012-01-07 15:30:13 +10:00
parent 00dba0a869
commit 1d12593eca
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SleepLib/machine_loader.h
View File

@ -11,7 +11,14 @@ License: GPL
#define MACHINE_LOADER_H #define MACHINE_LOADER_H
#include "profiles.h" #include "profiles.h"
#include "machine.h" #include "machine.h"
#ifdef Q_WS_WIN
// Windows just needs the headers
#include "../quazip/zlib.h"
#else
// use the system one
#include "zlib.h" #include "zlib.h"
#endif
/*! \class MachineLoader /*! \class MachineLoader
\brief Base class to derive a new Machine importer from \brief Base class to derive a new Machine importer from

1
SleepLib/profiles.cpp
View File

@ -88,7 +88,6 @@ void Profile::DataFormatError(Machine *m)
{ {
QString msg=QObject::tr("Software changes have been made that require the reimporting of the following machines data:\n\n"); QString msg=QObject::tr("Software changes have been made that require the reimporting of the following machines data:\n\n");
msg=msg+m->properties[STR_PROP_Brand]+" "+m->properties[STR_PROP_Model]+" "+m->properties[STR_PROP_Serial]; msg=msg+m->properties[STR_PROP_Brand]+" "+m->properties[STR_PROP_Model]+" "+m->properties[STR_PROP_Serial];
msg=msg+QObject::tr("\n\nThis is still only alpha software and these changes are sometimes necessary.\n\n");
msg=msg+QObject::tr("I can automatically purge this data for you, or you can cancel now and continue to run in a previous version.\n\n"); msg=msg+QObject::tr("I can automatically purge this data for you, or you can cancel now and continue to run in a previous version.\n\n");
msg=msg+QObject::tr("Would you like me to purge this data this for you so you can run the new version?"); msg=msg+QObject::tr("Would you like me to purge this data this for you so you can run the new version?");