From e2aee8ddf71d1fdbe8f229bc31283800ab50b9d6 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 8 May 2018 05:32:16 +1000 Subject: [PATCH] Switch Records and Bookmars to QTextBrowser instead of Webkit --- .../SleepLib/loader_plugins/resmed_loader.cpp | 2 +- sleepyhead/mainwindow.cpp | 75 +++++----- sleepyhead/mainwindow.h | 12 +- sleepyhead/mainwindow.ui | 134 +++--------------- 4 files changed, 63 insertions(+), 160 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index 9f9f9e5d..024bc4df 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -2598,7 +2598,7 @@ int ResmedLoader::Open(const QString & dirpath) QFile impfile(mach->getDataPath()+"/imported_files.csv"); if (impfile.exists()) impfile.remove(); - emit updateMessage(QObject::tr("Searching for EDF Files...")); + emit updateMessage(QObject::tr("Cataloguing EDF Files...")); QApplication::processEvents(); if (isAborted()) return 0; diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 350be832..e16da5df 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -213,10 +213,8 @@ MainWindow::MainWindow(QWidget *parent) : ui->action_Sidebar_Toggle->setChecked(b); ui->toolBox->setVisible(b); - ui->recordsBox->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); ui->statisticsView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks); - ui->bookmarkView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); QString loadingtxt = "" @@ -2039,35 +2037,6 @@ void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible) AppSetting->setRightSidebarVisible(visible); } -void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl) -{ - QString link = linkurl.toString().section("=", 0, 0).toLower(); - QString data = linkurl.toString().section("=", 1).toLower(); - qDebug() << linkurl.toString() << link << data; - - if (link == "daily") { - QDate date = QDate::fromString(data, Qt::ISODate); - ui->tabWidget->setCurrentWidget(daily); - QApplication::processEvents(); - daily->LoadDate(date); - } else if (link == "overview") { - QString date1 = data.section(",", 0, 0); - QString date2 = data.section(",", 1); - - QDate d1 = QDate::fromString(date1, Qt::ISODate); - QDate d2 = QDate::fromString(date2, Qt::ISODate); - overview->setRange(d1, d2); - ui->tabWidget->setCurrentWidget(overview); - } else if (link == "import") { - // Don't run the importer directly from here because it destroys the object that called this function.. - // Schedule it instead - if (data == "cpap") QTimer::singleShot(0, mainwin, SLOT(on_importButton_clicked())); - if (data == "oximeter") QTimer::singleShot(0, mainwin, SLOT(on_oximetryButton_clicked())); - } else if (link == "statistics") { - ui->tabWidget->setCurrentWidget(ui->statisticsTab); - } -} - void MainWindow::on_helpButton_clicked() { ui->tabWidget->setCurrentWidget(ui->helpTab); @@ -2109,11 +2078,6 @@ void MainWindow::on_tabWidget_currentChanged(int index) } -void MainWindow::on_bookmarkView_linkClicked(const QUrl &arg1) -{ - on_recordsBox_linkClicked(arg1); -} - void MainWindow::on_filterBookmarks_editingFinished() { bookmarkFilter = ui->filterBookmarks->text(); @@ -2208,9 +2172,7 @@ void MainWindow::doRecompressEvents() // Load the events if they aren't loaded already sess->OpenEvents(); - sess->SetChanged(true); - sess->machine()->SaveSession(sess); if (!isopen) { @@ -2518,8 +2480,7 @@ void MainWindow::on_statisticsButton_clicked() void MainWindow::on_statisticsView_linkClicked(const QUrl &arg1) { - //qDebug() << arg1; - on_recordsBox_linkClicked(arg1); + on_recordsBox_anchorClicked(arg1); } void MainWindow::on_reportModeMonthly_clicked() @@ -2663,3 +2624,37 @@ void MainWindow::on_profilesButton_clicked() { ui->tabWidget->setCurrentWidget(profileSelector); } + +void MainWindow::on_bookmarkView_anchorClicked(const QUrl &arg1) +{ + on_recordsBox_anchorClicked(arg1); +} + +void MainWindow::on_recordsBox_anchorClicked(const QUrl &linkurl) +{ + QString link = linkurl.toString().section("=", 0, 0).toLower(); + QString data = linkurl.toString().section("=", 1).toLower(); + qDebug() << linkurl.toString() << link << data; + + if (link == "daily") { + QDate date = QDate::fromString(data, Qt::ISODate); + ui->tabWidget->setCurrentWidget(daily); + QApplication::processEvents(); + daily->LoadDate(date); + } else if (link == "overview") { + QString date1 = data.section(",", 0, 0); + QString date2 = data.section(",", 1); + + QDate d1 = QDate::fromString(date1, Qt::ISODate); + QDate d2 = QDate::fromString(date2, Qt::ISODate); + overview->setRange(d1, d2); + ui->tabWidget->setCurrentWidget(overview); + } else if (link == "import") { + // Don't run the importer directly from here because it destroys the object that called this function.. + // Schedule it instead + if (data == "cpap") QTimer::singleShot(0, mainwin, SLOT(on_importButton_clicked())); + if (data == "oximeter") QTimer::singleShot(0, mainwin, SLOT(on_oximetryButton_clicked())); + } else if (link == "statistics") { + ui->tabWidget->setCurrentWidget(ui->statisticsTab); + } +} diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index f1660abe..04fc8756 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -135,7 +135,7 @@ class MainWindow : public QMainWindow void JumpImport(); void JumpOxiWizard(); - void sendStatsUrl(QString msg) { on_recordsBox_linkClicked(QUrl(msg)); } + void sendStatsUrl(QString msg) { on_recordsBox_anchorClicked(QUrl(msg)); } //! \brief Sets up recalculation of all event summaries and flags void reprocessEvents(bool restart = false); @@ -265,9 +265,7 @@ class MainWindow : public QMainWindow void on_action_Sidebar_Toggle_toggled(bool arg1); - void on_recordsBox_linkClicked(const QUrl &arg1); - - void on_helpButton_clicked(); + void on_helpButton_clicked(); void on_actionView_Statistics_triggered(); @@ -283,8 +281,6 @@ class MainWindow : public QMainWindow void LinkHovered(const QString &link, const QString &title, const QString &textContent); void on_tabWidget_currentChanged(int index); - void on_bookmarkView_linkClicked(const QUrl &arg1); - void on_filterBookmarks_editingFinished(); void on_filterBookmarksButton_clicked(); @@ -348,6 +344,10 @@ class MainWindow : public QMainWindow void reloadProfile(); + void on_bookmarkView_anchorClicked(const QUrl &arg1); + + void on_recordsBox_anchorClicked(const QUrl &linkurl); + private: void importCPAPBackups(); void finishCPAPImport(); diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index fc848706..1511d59c 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -1407,7 +1407,7 @@ QToolBox::tab:selected { 1 - 0 + 2 0 @@ -2908,111 +2908,19 @@ border-radius: 10px; - - - - 0 - 0 - - - - - - - - - 163 - 190 - 255 - - - - - - - 163 - 190 - 255 - - - - - - - 163 - 190 - 255 - - - - - - - - - 163 - 190 - 255 - - - - - - - 163 - 190 - 255 - - - - - - - 163 - 190 - 255 - - - - - - - - - 163 - 190 - 255 - - - - - - - 163 - 190 - 255 - - - - - - - 163 - 190 - 255 - - - - - - + background: rgb(163, 190, 255) - - - about:blank - + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + false @@ -3057,19 +2965,19 @@ border-radius: 10px; 0 - - - - 10 - - + background: rgb(163, 190, 255) - - - about:blank - + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> + + + false