diff --git a/Resources.qrc b/Resources.qrc index 6e7cab40..266b9433 100644 --- a/Resources.qrc +++ b/Resources.qrc @@ -39,5 +39,6 @@ docs/tooltips.css icons/session-off.png icons/session-on.png + icons/bob-v3.0.png diff --git a/daily.cpp b/daily.cpp index 8f7baebe..7ef9edc1 100644 --- a/daily.cpp +++ b/daily.cpp @@ -356,13 +356,13 @@ void Daily::Link_clicked(const QUrl &url) Session *sess=day->find(sid); if (!sess) return; + int i=ui->webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-ui->webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); sess->setEnabled(!sess->enabled()); // Messy, this rewrites both summary & events.. TODO: Write just the session summary file day->machine->Save(); // Reload day - int i=ui->webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-ui->webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); this->LoadDate(previous_date); ui->webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, ui->webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); return; @@ -371,11 +371,11 @@ void Daily::Link_clicked(const QUrl &url) Session *sess=day->find(sid); if (!sess) return; + int i=ui->webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-ui->webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); sess->setEnabled(!sess->enabled()); // Messy, this rewrites both summary & events.. TODO: Write just the session summary file day->machine->Save(); - int i=ui->webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-ui->webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); // Reload day this->LoadDate(previous_date); ui->webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, ui->webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); diff --git a/docs/index.html b/docs/index.html index 79c7af29..6b612d3e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,8 +42,7 @@ Plus a few usage notes, and some important in CPAPTalk Forum, Apnea Board

-
-
I really want a new logo!
+
diff --git a/docs/tooltips.css b/docs/tooltips.css index 541614b2..92c1a24d 100644 --- a/docs/tooltips.css +++ b/docs/tooltips.css @@ -40,26 +40,6 @@ border-radius: 5px 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); } -.info3 { -position:relative; -} -.info3 span { -position:absolute; -left:-999em; -} -.info3:hover span { -left:0px; -top:+20px; -/*padding:5px 10px; */ -padding:1px 1px; -z-index:24; -border:2px solid #000; -background:#ffc; -color:#000; -border-radius: 5px 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; -box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -} - a:link, a:visited { color: inherit; text-decoration: none; font-weight: normal;} a:hover { background-color: inherit; color: blue; text-decoration:none; font-weight: normal; } diff --git a/icons/bob-v3.0.png b/icons/bob-v3.0.png new file mode 100644 index 00000000..656ad330 Binary files /dev/null and b/icons/bob-v3.0.png differ diff --git a/mainwindow.cpp b/mainwindow.cpp index e80a121f..81a24723 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -127,7 +127,7 @@ MainWindow::MainWindow(QWidget *parent) : // Nifty Notification popups in System Tray (uses Growl on Mac) if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) { - systray=new QSystemTrayIcon(QIcon(":/docs/sheep.png"),this); + systray=new QSystemTrayIcon(QIcon(":/icons/bob-v3.0.png"),this); systray->show(); systraymenu=new QMenu(this); systray->setContextMenu(systraymenu); @@ -386,7 +386,7 @@ QString htmlHeader() "" "" "
" -"

SleepyHead v"+VersionString+"

This is a beta software and some functionality may not work as intended yet.
Please report any bugs you find to SleepyHead's SourceForge page.
" +"

SleepyHead v"+VersionString+"

This is a beta software and some functionality may not work as intended yet.
Please report any bugs you find to SleepyHead's SourceForge page.
" "
" "
"); } diff --git a/mainwindow.ui b/mainwindow.ui index 8f15161e..6654f6ae 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -27,7 +27,7 @@ - :/docs/sheep.png:/docs/sheep.png + :/icons/bob-v3.0.png:/icons/bob-v3.0.png @@ -405,7 +405,7 @@ 1 - 1 + 0 0 @@ -515,7 +515,7 @@ - :/docs/sheep.png:/docs/sheep.png + :/icons/bob-v3.0.png:/icons/bob-v3.0.png &Navigation @@ -862,8 +862,8 @@ 0 0 - 158 - 313 + 98 + 28