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

Clean up some webkit leftovers in statistics/help page

Browse Source
This commit is contained in:
Mark Watkins 2018-05-29 11:30:52 +10:00
parent 3e73860351
commit 13bd8dfad9
6 changed files with 73 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sleepyhead/docs/release_notes.html
View File

@ -4,7 +4,8 @@
<p version="1.1.0-unstable-0">
<b>Changes and fixes in v1.1.0-unstable-0</b>
<list>
<li>Combined release notes and about into mega dialog, removing Webkit dependence for those parts</li>
<li>Killed off dependency on Webkit... (or as I prefer to call it "murderalized with extreme prejudice"!)</li>
<li>Combined release notes and about into mega dialog</li>
<li>Added brand new live Profile switcher and cleaned up a lot of forced restart conditions</li>
<li>[DeVilbiss] Added DV6 Import capability (Thanks Heynes and Brian)</li>
<li>[PR Dreamstation] Added spuport for newer 960T (DF3 F5V3) and 1030 (DFV3 F3V3) machines</li>

93
sleepyhead/mainwindow.cpp
View File

@ -239,6 +239,12 @@ MainWindow::MainWindow(QWidget *parent) :
ui->mainsplitter->setSizes(a);
ui->mainsplitter->setStretchFactor(0,1);
ui->mainsplitter->setStretchFactor(1,0);
QTimer::singleShot(0, this, SLOT(Startup()));
ui->backButton->setEnabled(ui->helpBrowser->backwardHistoryCount()>0);
ui->forwardButton->setEnabled(ui->helpBrowser->forwardHistoryCount()>0);
}
void MainWindow::logMessage(QString msg)
@ -1179,16 +1185,10 @@ void MainWindow::on_forwardButton_clicked()
ui->helpBrowser->forward();
}
void MainWindow::on_webView_urlChanged(const QUrl &arg1)
{
ui->urlBar->setEditText(arg1.toString());
}
void MainWindow::on_urlBar_activated(const QString &arg1)
{
Q_UNUSED(arg1);
//QUrl url(arg1);
//ui->webView->setUrl(url);
ui->helpBrowser->setText(QString("This ain't no web browser.. this needs to look up %1 in help index or something").arg(arg1));
}
void MainWindow::on_dailyButton_clicked()
@ -1205,40 +1205,6 @@ void MainWindow::on_overviewButton_clicked()
}
}
void MainWindow::on_webView_loadFinished(bool arg1)
{
Q_UNUSED(arg1);
qprogress->hide();
if (first_load) {
QTimer::singleShot(0, this, SLOT(Startup()));
first_load = false;
} else {
qstatus->setText("");
}
ui->backButton->setEnabled(ui->helpBrowser->backwardHistoryCount()>0);
ui->forwardButton->setEnabled(ui->helpBrowser->forwardHistoryCount()>0);
//connect(ui->webView->page(), SIGNAL(linkHovered(QString, QString, QString)), this, SLOT(LinkHovered(QString, QString, QString)));
}
void MainWindow::on_webView_loadStarted()
{
//disconnect(ui->webView->page(), SIGNAL(linkHovered(QString, QString, QString)), this, SLOT(LinkHovered(QString, QString, QString)));
if (!first_load) {
qstatus->setText(tr("Loading"));
qprogress->reset();
qprogress->show();
}
}
void MainWindow::on_webView_loadProgress(int progress)
{
qprogress->setValue(progress);
}
void MainWindow::aboutBoxLinkClicked(const QUrl &url)
{
QDesktopServices::openUrl(url);
@ -2016,23 +1982,6 @@ void MainWindow::on_actionView_Statistics_triggered()
ui->tabWidget->setCurrentWidget(ui->statisticsTab);
}
void MainWindow::on_webView_linkClicked(const QUrl &url)
{
QString s = url.toString();
qDebug() << "Link Clicked" << url;
if (s.toLower().startsWith("https:")) {
QDesktopServices().openUrl(url);
} else {
//ui->helpBrowser->setUrl(url);
}
}
void MainWindow::on_webView_statusBarMessage(const QString &text)
{
ui->statusbar->showMessage(text);
}
void MainWindow::LinkHovered(const QString &link, const QString &title, const QString &textContent)
{
Q_UNUSED(title);
@ -2443,11 +2392,6 @@ void MainWindow::on_statisticsButton_clicked()
}
}
void MainWindow::on_statisticsView_linkClicked(const QUrl &arg1)
{
on_recordsBox_anchorClicked(arg1);
}
void MainWindow::on_reportModeMonthly_clicked()
{
ui->statStartDate->setVisible(false);
@ -2626,3 +2570,26 @@ void MainWindow::on_recordsBox_anchorClicked(const QUrl &linkurl)
ui->tabWidget->setCurrentWidget(ui->statisticsTab);
}
}
void MainWindow::on_helpBrowser_sourceChanged(const QUrl &url)
{
ui->urlBar->setEditText(url.toString());
}
void MainWindow::on_statisticsView_anchorClicked(const QUrl &url)
{
on_recordsBox_anchorClicked(url);
}
void MainWindow::on_helpBrowser_anchorClicked(const QUrl &url)
{
QString s = url.toString();
qDebug() << "Link Clicked" << url;
if (s.toLower().startsWith("https:")) {
QDesktopServices().openUrl(url);
} else {
ui->helpBrowser->setText(QString("Loading resource %1").arg(url.toString()));
//ui->helpBrowser->setUrl(url);
}
}

24
sleepyhead/mainwindow.h
View File

@ -183,9 +183,6 @@ class MainWindow : public QMainWindow
//! \brief Go forward in the welcome browsers history
void on_forwardButton_clicked();
//! \brief Updates the URL bar to show changes to the URL
void on_webView_urlChanged(const QUrl &arg1);
//! \brief Loads a web page when enter is pressed in the URL bar
void on_urlBar_activated(const QString &arg1);
@ -195,15 +192,6 @@ class MainWindow : public QMainWindow
//! \brief Selects the Overview page and redraws the graphs
void on_overviewButton_clicked();
//! \brief called when webpage has finished loading in welcome browser
void on_webView_loadFinished(bool arg1);
//! \brief called when webpage has starts loading in welcome browser
void on_webView_loadStarted();
//! \brief Updates the progress bar in the statusbar while a page is loading
void on_webView_loadProgress(int progress);
//! \brief Display About Dialog
void on_action_About_triggered();
@ -267,14 +255,10 @@ class MainWindow : public QMainWindow
void on_actionView_Statistics_triggered();
void on_webView_linkClicked(const QUrl &arg1);
//void on_favouritesList_itemSelectionChanged();
//void on_favouritesList_itemClicked(QListWidgetItem *item);
void on_webView_statusBarMessage(const QString &text);
//! \brief Display Help WebView Link in statusbar.
void LinkHovered(const QString &link, const QString &title, const QString &textContent);
void on_tabWidget_currentChanged(int index);
@ -302,8 +286,6 @@ class MainWindow : public QMainWindow
//! \brief Populates the statistics with information.
void on_statisticsButton_clicked();
void on_statisticsView_linkClicked(const QUrl &arg1);
void on_reportModeMonthly_clicked();
void on_reportModeStandard_clicked();
@ -346,6 +328,12 @@ class MainWindow : public QMainWindow
void on_recordsBox_anchorClicked(const QUrl &linkurl);
void on_helpBrowser_sourceChanged(const QUrl &url);
void on_statisticsView_anchorClicked(const QUrl &url);
void on_helpBrowser_anchorClicked(const QUrl &url);
private:
void importCPAPBackups();
void finishCPAPImport();

26
sleepyhead/mainwindow.ui
View File

@ -926,7 +926,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<property name="documentMode">
<bool>false</bool>
@ -1164,7 +1164,7 @@
<item>
<widget class="QToolButton" name="homeButton">
<property name="text">
<string>...</string>
<string/>
</property>
<property name="icon">
<iconset resource="Resources.qrc">
@ -1176,11 +1176,33 @@
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Search Topic:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="urlBar">
<property name="editable">

22
sleepyhead/statistics.cpp
View File

@ -635,15 +635,14 @@ QString htmlHeader(bool showheader)
QPixmap bobPixmap(":/icons/bob-v3.0.png");
if (showheader) {
html += "<div align=center><table class=curved "+table_width+">"
"<td>"+userinfo+"</td>"
"<td align='right'>"
"<font size='+2'>" + STR_TR_SleepyHead + "</font><br/>"
"<font size='+1'>" + QObject::tr("Usage Statistics") + "</font>"
"</td>"
"<td align='right' width=170px>" +resizeHTMLPixmap(bobPixmap,140,140)+"<br/>"
"</td></tr></table>"
"</div><br/>";
html += "<div align=center>"
+resizeHTMLPixmap(bobPixmap,64,64)+"<br/>"
"<font size='+3'>" + STR_TR_SleepyHead + "</font><br/>"
"<font size='+2'>" + QObject::tr("Usage Statistics") + "</font><br/>"
"<font size='+1'>" + QObject::tr("(NOT approved for compliance reporting purposes)")+"<br/>";
if (!userinfo.isEmpty()) html += "<br/>"+userinfo+"<br/>";
html += "</div><br/>";
}
return html;
}
@ -653,9 +652,8 @@ QString htmlFooter(bool showinfo=true)
if (showinfo) {
html += "<hr/><div align=center><font size='-1'><i>";
html += QString(QObject::tr("This report was generated by SleepyHead (%1), <b>and has not been approved in any way for compliance or medical diagnostic purposes</b>.")).
arg(VersionString) + "<br/><br/>" +
QObject::tr("SleepyHead is free open-source software available from http://sourceforge.net/projects/SleepyHead");
html += QString(QObject::tr("This report was generated by SleepyHead v%1")).arg(ShortVersionString) + "<br/>"
+QObject::tr("SleepyHead is free open-source CPAP research software available from http://sleepyhead.jedimark.net");
html += "</i></font></div>";
}

1
sleepyhead/version.h
View File

@ -18,6 +18,7 @@ const int revision_number = 0; // bugfixes, revisions
const QString ReleaseStatus = "unstable"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);
#ifdef Q_OS_MAC
const QString PlatformString = "MacOSX";