mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 18:50:44 +00:00
Qt5 compatibility fixes, new about page
This commit is contained in:
Mark Watkins
parent
a2965c1628
commit
ae5f0c6647
@ -142,7 +142,7 @@ void GetTextExtent(QString text, int & width, int & height, QFont *font)
|
||||
mut.lock();
|
||||
#endif
|
||||
QFontMetrics fm(*font);
|
||||
//#ifdef Q_WS_WIN32
|
||||
//#ifdef Q_OS_WIN32
|
||||
QRect r=fm.tightBoundingRect(text);
|
||||
width=r.width();
|
||||
height=r.height();
|
||||
|
||||
@ -43,5 +43,6 @@
|
||||
<file>icons/sheep.png</file>
|
||||
<file>docs/update_notes.html</file>
|
||||
<file>docs/sheep.png</file>
|
||||
<file>icons/Bob Strikes Back.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@ -191,7 +191,7 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile)
|
||||
QDate d2=date.date();
|
||||
|
||||
if (d2.year()<2000) { // Nice to see CMS50 is Y2K friendly..
|
||||
d2.setYMD(d2.year()+100,d2.month(),d2.day());
|
||||
d2.setDate(d2.year()+100,d2.month(),d2.day());
|
||||
date.setDate(d2);
|
||||
}
|
||||
if (!date.isValid()) {
|
||||
|
||||
@ -116,7 +116,7 @@ bool EDFParser::Parse()
|
||||
//startDate.toTimeSpec(Qt::UTC);
|
||||
QDate d2=startDate.date();
|
||||
if (d2.year()<2000) {
|
||||
d2.setYMD(d2.year()+100,d2.month(),d2.day());
|
||||
d2.setDate(d2.year()+100,d2.month(),d2.day());
|
||||
startDate.setDate(d2);
|
||||
}
|
||||
if (!startDate.isValid()) {
|
||||
|
||||
@ -12,7 +12,7 @@ License: GPL
|
||||
#include "profiles.h"
|
||||
#include "machine.h"
|
||||
|
||||
#ifdef Q_WS_WIN
|
||||
#ifdef Q_OS_WIN
|
||||
// Windows just needs the headers
|
||||
#include "../quazip/zlib.h"
|
||||
#else
|
||||
|
||||
@ -17,7 +17,7 @@ License: GPL
|
||||
#include <QDesktopServices>
|
||||
#include <QDebug>
|
||||
#include <QSettings>
|
||||
#ifdef Q_WS_WIN32
|
||||
#ifdef Q_OS_WIN32
|
||||
#include "windows.h"
|
||||
#include "lmcons.h"
|
||||
#endif
|
||||
@ -32,7 +32,7 @@ const QString & getUserName()
|
||||
if (userName.isEmpty()) {
|
||||
userName=QObject::tr("Windows User");
|
||||
|
||||
#if defined (Q_WS_WIN32)
|
||||
#if defined (Q_OS_WIN32)
|
||||
#if defined(UNICODE)
|
||||
if (QSysInfo::WindowsVersion >= QSysInfo::WV_NT) {
|
||||
TCHAR winUserName[UNLEN + 1]; // UNLEN is defined in LMCONS.H
|
||||
@ -60,9 +60,14 @@ QString GetAppRoot()
|
||||
|
||||
QString HomeAppRoot=settings.value("Settings/AppRoot").toString();
|
||||
|
||||
// Should it go here: QDesktopServices::DataLocation ???
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
|
||||
const QString desktopFolder=QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
|
||||
#else
|
||||
const QString desktopFolder=QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
|
||||
#endif
|
||||
|
||||
if (HomeAppRoot.isEmpty())
|
||||
HomeAppRoot=QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)+"/"+AppRoot;
|
||||
HomeAppRoot=desktopFolder+"/"+AppRoot;
|
||||
|
||||
return HomeAppRoot;
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef Q_WS_WIN32
|
||||
#ifdef Q_OS_WIN32
|
||||
#include "windows.h"
|
||||
void sh_delay(int ms)
|
||||
{
|
||||
@ -46,7 +46,7 @@ Qt::DayOfWeek firstDayOfWeekFromLocale()
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef Q_WS_WIN32
|
||||
#ifdef Q_OS_WIN32
|
||||
#include <dos.h>
|
||||
#endif
|
||||
|
||||
|
||||
BIN
icons/Bob Strikes Back.png
Normal file
BIN
icons/Bob Strikes Back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 285 KiB |
7
main.cpp
7
main.cpp
@ -127,7 +127,7 @@ int main(int argc, char *argv[])
|
||||
for (int i=1;i<args.size();i++) {
|
||||
if (args[i]=="-l") force_login_screen=true;
|
||||
if (args[i]=="-p") {
|
||||
#ifdef Q_WS_WIN32
|
||||
#ifdef Q_OS_WIN32
|
||||
Sleep(1000);
|
||||
#else
|
||||
sleep(1);
|
||||
@ -252,11 +252,12 @@ int main(int argc, char *argv[])
|
||||
|
||||
qDebug() << "Selected" << QApplication::font().family();
|
||||
|
||||
//#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
|
||||
// qInstallMessageHandler(MyOutputHandler);
|
||||
//#else
|
||||
qInstallMsgHandler(MyOutputHandler);
|
||||
//#endif
|
||||
#endif
|
||||
//#endif
|
||||
MainWindow w;
|
||||
mainwin=&w;
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
#include <QPainter>
|
||||
#include <QProcess>
|
||||
#include <QFontMetrics>
|
||||
#include <QTextDocument>
|
||||
#include <cmath>
|
||||
|
||||
// Custom loaders that don't autoscan..
|
||||
@ -430,7 +431,7 @@ QString htmlHeader()
|
||||
"</head>"
|
||||
"<body leftmargin=0 topmargin=0 rightmargin=0>"
|
||||
"<div align=center><table cellpadding=3 cellspacing=0 border=0>"
|
||||
"<tr><td><img src='qrc:/icons/bob-v3.0.png' width=100px height=100px><td valign=center align=center><h1>SleepyHead v"+VersionString+"</h1><i>This is a beta software and some functionality may not work as intended yet.<br/>Please report any bugs you find to SleepyHead's SourceForge page.</i></td></tr></table>"
|
||||
"<tr><td><img src='qrc:/icons/bob-v3.0.png' width=140px height=140px><td valign=center align=center><h1>SleepyHead v"+VersionString+"</h1><i>This is a beta software and some functionality may not work as intended yet.<br/>Please report any bugs you find to SleepyHead's SourceForge page.</i></td></tr></table>"
|
||||
"</div>"
|
||||
"<hr/>");
|
||||
}
|
||||
@ -1487,16 +1488,72 @@ void MainWindow::on_action_About_triggered()
|
||||
QString gitrev=QString(GIT_REVISION);
|
||||
if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev;
|
||||
|
||||
QString msg=tr("<html><body><div align='center'><h2>SleepyHead v%1.%2.%3-%4 (%8)</h2>Build Date: %5 %6<br/>%7<br/>Data Folder: %9<hr>"
|
||||
"Copyright ©2011 Mark Watkins (jedimark) <br> \n"
|
||||
"<a href='http://sleepyhead.sourceforge.net'>http://sleepyhead.sourceforge.net</a> <hr>"
|
||||
"This software is released under the GNU Public License <br>"
|
||||
"<i>This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays."
|
||||
"</div></body></html>").arg(major_version).arg(minor_version).arg(revision_number).arg(release_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus).arg(GetAppRoot());
|
||||
QString msg=QString("<span style=\"color:#000000; font-weight:600; vertical-align:middle;\"><p><h1>SleepyHead v%1.%2.%3-%4 (%8)</h1></p><font size=+1><p>Build Date: %5 %6<br/>%7<br/>Data Folder: %9<hr>"
|
||||
"Copyright ©2012 Mark Watkins (jedimark) <br> \n"
|
||||
"<i>http://sleepyhead.sourceforge.net</i><br/>"
|
||||
"<i>http://twitter.com/jedimark64</i><br/>"
|
||||
"<p>The author wishes to express thanks to James Marshall and Rich Freeman for their assistance with this project.</p>"
|
||||
"This software is released under the GNU Public License v3.0<br>"
|
||||
"<p><i>This software comes with absolutely no warranty, either express of implied. It comes with no guarantee of fitness for any particular purpose. No guarantees are made regarding the accuracy of any data this program displays.</i></p>"
|
||||
"<p><i>This is NOT medical software, it is merely a research tool that provides a visual interpretation of data recorded by supported devices. This software is NOT suitable for medical diagnosis, CPAP complaince reporting and other similar purposes.</i></p>"
|
||||
"<p><i>The author and any associates of his accept NO responsibilty for damages, issues or non-issues resulting from the use or mis-use of this software<br/>Use this software entirely at your own risk.</i></p>"
|
||||
"<hr><p><font color=\"blue\">If you find this free software to be of use, please consider supporting the development efforts by making a monetary donation to the Author</font></p>"
|
||||
"</font></span>").arg(major_version).arg(minor_version).arg(revision_number).arg(release_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus).arg(GetAppRoot());
|
||||
|
||||
QDialog aboutbox;
|
||||
aboutbox.setWindowTitle(QObject::tr("About SleepyHead"));
|
||||
|
||||
|
||||
QVBoxLayout layout(&aboutbox);
|
||||
|
||||
QPixmap pix(":/icons/Bob Strikes Back.png");
|
||||
|
||||
QTextDocument doc(this);
|
||||
doc.setUndoRedoEnabled(false);
|
||||
doc.setHtml(msg);
|
||||
doc.setTextWidth(pix.width());
|
||||
doc.setUseDesignMetrics(true);
|
||||
|
||||
doc.setDefaultTextOption(QTextOption(Qt::AlignCenter));
|
||||
|
||||
QPainter painter(&pix);
|
||||
QBrush brush(QColor(255,255,255,192));
|
||||
painter.fillRect(pix.rect(),brush);
|
||||
painter.setRenderHint(QPainter::Antialiasing,true);
|
||||
QRect rect;
|
||||
//rect.setCoords(0,200,pix.width(),550);
|
||||
doc.drawContents(&painter,rect);
|
||||
//painter.drawText(rect,Qt::AlignCenter | Qt::TextWordWrap,msg);
|
||||
painter.end();
|
||||
|
||||
QLabel img("hello",&aboutbox);
|
||||
img.setPixmap(pix);
|
||||
img.setScaledContents(true);
|
||||
layout.insertWidget(0,&img,1);
|
||||
|
||||
QHBoxLayout layout2(&aboutbox);
|
||||
layout.insertLayout(1,&layout2,1);
|
||||
QPushButton okbtn(QObject::tr("&Close"),&aboutbox);
|
||||
aboutbox.connect(&okbtn,SIGNAL(clicked()),SLOT(reject()));
|
||||
layout2.insertWidget(1,&okbtn,1);
|
||||
|
||||
QPushButton donatebtn(QObject::tr("&Donate"),&aboutbox);
|
||||
aboutbox.connect(&donatebtn,SIGNAL(clicked()),SLOT(accept())); //hack this button to use the accepted slot, so clicking x closes like it shouldß
|
||||
layout2.insertWidget(1,&donatebtn,1);
|
||||
|
||||
QApplication::processEvents(); // MW: Needed on Mac, as the html has to finish loading
|
||||
|
||||
|
||||
if (aboutbox.exec()==QDialog::Accepted) {
|
||||
QDesktopServices::openUrl(QUrl("http://sourceforge.net/p/sleepyhead/donate"));
|
||||
//spawn browser with paypal site.
|
||||
}
|
||||
/*
|
||||
QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this);
|
||||
msgbox.setIconPixmap();
|
||||
msgbox.setTextFormat(Qt::RichText);
|
||||
msgbox.setText(msg);
|
||||
msgbox.exec();
|
||||
msgbox.exec();*/
|
||||
}
|
||||
|
||||
void MainWindow::on_actionDebug_toggled(bool checked)
|
||||
@ -2694,7 +2751,7 @@ void MainWindow::on_actionImport_ZEO_Data_triggered()
|
||||
w.setFileMode(QFileDialog::ExistingFiles);
|
||||
w.setOption(QFileDialog::ShowDirsOnly, false);
|
||||
w.setOption(QFileDialog::DontUseNativeDialog,true);
|
||||
w.setFilters(QStringList("Zeo CSV File (*.csv)"));
|
||||
w.setNameFilters(QStringList("Zeo CSV File (*.csv)"));
|
||||
|
||||
ZEOLoader zeo;
|
||||
if (w.exec()==QFileDialog::Accepted) {
|
||||
@ -2716,7 +2773,7 @@ void MainWindow::on_actionImport_RemStar_MSeries_Data_triggered()
|
||||
w.setFileMode(QFileDialog::ExistingFiles);
|
||||
w.setOption(QFileDialog::ShowDirsOnly, false);
|
||||
w.setOption(QFileDialog::DontUseNativeDialog,true);
|
||||
w.setFilters(QStringList("M-Series data file (*.bin)"));
|
||||
w.setNameFilters(QStringList("M-Series data file (*.bin)"));
|
||||
|
||||
MSeriesLoader mseries;
|
||||
if (w.exec()==QFileDialog::Accepted) {
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<enum>QTabWidget::North</enum>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="documentMode">
|
||||
<bool>false</bool>
|
||||
@ -405,7 +405,7 @@
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="tabSpacing">
|
||||
<number>0</number>
|
||||
@ -416,7 +416,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>163</width>
|
||||
<height>524</height>
|
||||
<height>532</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="palette">
|
||||
@ -744,7 +744,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>178</width>
|
||||
<height>313</height>
|
||||
<height>326</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="palette">
|
||||
@ -1461,7 +1461,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>178</width>
|
||||
<height>313</height>
|
||||
<height>326</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
@ -1545,7 +1545,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>554</width>
|
||||
<height>25</height>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
@ -1854,7 +1854,7 @@
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>actionE_xit</sender>
|
||||
<signal>activated()</signal>
|
||||
<signal>triggered()</signal>
|
||||
<receiver>MainWindow</receiver>
|
||||
<slot>close()</slot>
|
||||
<hints>
|
||||
@ -1886,7 +1886,7 @@
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>actionView_Daily</sender>
|
||||
<signal>activated()</signal>
|
||||
<signal>triggered()</signal>
|
||||
<receiver>dailyButton</receiver>
|
||||
<slot>click()</slot>
|
||||
<hints>
|
||||
@ -1902,7 +1902,7 @@
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>actionView_Overview</sender>
|
||||
<signal>activated()</signal>
|
||||
<signal>triggered()</signal>
|
||||
<receiver>overviewButton</receiver>
|
||||
<slot>click()</slot>
|
||||
<hints>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include <QCalendarWidget>
|
||||
#include <QTextCharFormat>
|
||||
#include <QSystemLocale>
|
||||
//#include <QSystemLocale>
|
||||
#include <QDebug>
|
||||
#include <QDateTimeEdit>
|
||||
#include <QCalendarWidget>
|
||||
|
||||
@ -939,7 +939,7 @@ void Oximetry::on_RefreshPortsButton_clicked()
|
||||
bool current_found=false;
|
||||
|
||||
// Windows build mixes these up
|
||||
#if defined(Q_WS_WIN32) || defined(Q_OS_MAC)
|
||||
#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
|
||||
#define qesPORTNAME portName
|
||||
#else
|
||||
#define qesPORTNAME physName
|
||||
|
||||
@ -254,7 +254,7 @@ bool QuaZip::setCurrentFile(const QString& fileName, CaseSensitivity cs)
|
||||
}
|
||||
bool sens;
|
||||
if(cs==csDefault) {
|
||||
#ifdef Q_WS_WIN
|
||||
#ifdef Q_OS_WIN
|
||||
sens=false;
|
||||
#else
|
||||
sens=true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user