From 267ac2864c0f64fc904a24f1612e3f859039e795 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 21 Jan 2013 05:39:01 +1000 Subject: [PATCH] Qt5 Linux build fixes, about dialog fixes --- Graphs/gGraphView.cpp | 2 +- SleepyHeadQT.pro | 9 ++--- main.cpp | 2 +- mainwindow.cpp | 79 +++++++++++++++++++++---------------------- mainwindow.h | 2 ++ version.h | 2 +- 6 files changed, 46 insertions(+), 50 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 7c8db147..7a4a978c 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1675,7 +1675,7 @@ void gGraph::mouseReleaseEvent(QMouseEvent * event) xmult=qq/double(w); if ((xx==qq) || (x==m_lastx23)) { - double zoom; + double zoom=1; if (event->button() & Qt::RightButton) { zoom=1.33; if (event->modifiers() & Qt::ControlModifier) zoom*=1.5; diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index ea929b84..9d700738 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -6,13 +6,8 @@ QT += core gui opengl network xml -contains(QT_MAJOR_VERSION,5) { - QT += webkitwidgets -} - -!contains(QT_MAJOR_VERSION,5) { - QT += webkit -} +greaterThan(QT_MAJOR_VERSION,4): QT += widgets webkitwidgets +lessThan(QT_MAJOR_VERSION,5): QT += webkit CONFIG += rtti diff --git a/main.cpp b/main.cpp index 63ef5bf9..b0e0e07e 100644 --- a/main.cpp +++ b/main.cpp @@ -5,7 +5,7 @@ */ //#include -#include +#include #include #include #include diff --git a/mainwindow.cpp b/mainwindow.cpp index 9504a933..cf20ce95 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -923,11 +923,11 @@ void MainWindow::on_summaryButton_clicked() //EventDataType bestAHI=999.0, worstAHI=0; if (cpapdays>0) { QDate first,last=lastcpap; - CPAPMode mode,cmode=MODE_UNKNOWN; - EventDataType cmin=0,cmax=0,cmaxhi=0, min,max,maxhi; - Machine *mach,*lastmach=NULL; - PRTypes lastpr, prelief=PR_UNKNOWN; - short prelset, lastprelset=-1; + CPAPMode mode=MODE_UNKNOWN,cmode=MODE_UNKNOWN; + EventDataType cmin=0,cmax=0,cmaxhi=0, min=0,max=0,maxhi=0; + Machine *mach=NULL,*lastmach=NULL; + PRTypes lastpr=PR_UNKNOWN, prelief=PR_UNKNOWN; + short prelset=0, lastprelset=-1; QDate date=lastcpap; Day * day; bool lastchanged=false; @@ -977,7 +977,7 @@ void MainWindow::on_summaryButton_clicked() rx.last=last; rx.days=days; rx.ahi=calcAHI(first,last); - rx.fl=calcFL(first,last); + rx.fl=calcFL(first,last); rx.mode=cmode; rx.min=cmin; rx.max=cmax; @@ -1027,7 +1027,7 @@ void MainWindow::on_summaryButton_clicked() rx.last=last; rx.days=days; rx.ahi=calcAHI(first,last); - rx.fl=calcFL(first,last); + rx.fl=calcFL(first,last); rx.mode=mode; rx.min=min; rx.max=max; @@ -1482,54 +1482,50 @@ void MainWindow::on_webView_loadProgress(int progress) qprogress->setValue(progress); } +void MainWindow::aboutBoxLinkClicked(const QUrl & url) +{ + QDesktopServices::openUrl(url); +} + void MainWindow::on_action_About_triggered() { QString gitrev=QString(GIT_REVISION); if (!gitrev.isEmpty()) gitrev="Revision: "+gitrev; - QString msg=QString("

SleepyHead v%1.%2.%3-%4 (%8)

Build Date: %5 %6
%7
Data Folder: %9

" +// "
" + QString msg=QString( +"" +"
" +"

SleepyHead v%1.%2.%3-%4 (%8)

Build Date: %5 %6
%7
Data Folder: %9

" "Copyright ©2012 Mark Watkins (jedimark)
\n" -"http://sleepyhead.sourceforge.net
" -"http://twitter.com/jedimark64
" -"

The author wishes to express thanks to James Marshall and Rich Freeman for their assistance with this project.

" "This software is released under the GNU Public License v3.0
" -"

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.

" +"

SleepyHead Project Page: http://sourceforge.net/projects/sleepyhead
" +"SleepyHead Wiki: http://sleepyhead.sourceforge.net
" +"Authors Twitter Feed: http://twitter.com/jedimark64

" +"
" +"

The author wishes to express thanks to James Marshall and Rich Freeman for their assistance with this project.

" +"

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.

" "

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.

" "

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
Use this software entirely at your own risk.

" -"

If you find this free software to be of use, please consider supporting the development efforts by making a monetary donation to the Author

" -"").arg(major_version).arg(minor_version).arg(revision_number).arg(release_number).arg(__DATE__).arg(__TIME__).arg(gitrev).arg(ReleaseStatus).arg(GetAppRoot()); +"

If you find this free software to be of use, please consider supporting the development efforts by making a paypal donation to the Author

" +"
" + ).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")); + aboutbox.setWindowTitle(QObject::tr("About a")); QVBoxLayout layout(&aboutbox); - QPixmap pix(":/icons/Bob Strikes Back.png"); + QWebView webview(&aboutbox); - QTextDocument doc(this); - doc.setUndoRedoEnabled(false); - doc.setHtml(msg); - doc.setTextWidth(pix.width()); - doc.setUseDesignMetrics(true); + webview.setHtml(msg); + webview.page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); + connect(&webview,SIGNAL(linkClicked(const QUrl &)),SLOT(aboutBoxLinkClicked(const QUrl &))); - 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); + layout.insertWidget(0,&webview,1); QHBoxLayout layout2(&aboutbox); layout.insertLayout(1,&layout2,1); @@ -1548,6 +1544,9 @@ void MainWindow::on_action_About_triggered() QDesktopServices::openUrl(QUrl("http://sourceforge.net/p/sleepyhead/donate")); //spawn browser with paypal site. } + + disconnect(&webview,SIGNAL(linkClicked(const QUrl &)),this,SLOT(aboutBoxLinkClicked(const QUrl &))); + /* QMessageBox msgbox(QMessageBox::Information,tr("About SleepyHead"),"",QMessageBox::Ok,this); msgbox.setIconPixmap(); @@ -2266,10 +2265,10 @@ void packEventList(EventList *el, EventDataType minval=0) { if (el->count()<2) return; EventList nel(EVL_Waveform); - EventDataType t,lastt=0; //el->data(0); - qint64 ti;//=el->time(0); + EventDataType t=0,lastt=0; //el->data(0); + qint64 ti=0;//=el->time(0); //nel.AddEvent(ti,lastt); - bool f; + bool f=false; qint64 lasttime=0; EventDataType min=999,max=0; for (quint32 i=0;icount();i++) { diff --git a/mainwindow.h b/mainwindow.h index 4d09abdb..8d6a4e64 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -298,6 +298,8 @@ private slots: void on_actionHelp_Support_Sleepyhead_Development_triggered(); + void aboutBoxLinkClicked(const QUrl & url); + private: void FreeSessions(); diff --git a/version.h b/version.h index 18e673cd..20659f38 100644 --- a/version.h +++ b/version.h @@ -17,7 +17,7 @@ const QString ReleaseStatus="beta"; const QString PlatformString="MacOSX"; #elif defined(Q_OS_WIN32) const QString PlatformString="Win32"; -#elif defined(Q_WS_X11) +#elif defined(Q_OS_LINUX) const QString PlatformString="Linux"; #endif