From 1d52bf2e7c5327e55df09cd2858124e7acadfcec Mon Sep 17 00:00:00 2001
From: Mark Watkins
Date: Thu, 29 Dec 2011 15:43:47 +1000
Subject: [PATCH] Jimbo's Mascot Improvement
---
Resources.qrc | 1 +
daily.cpp | 4 ++--
docs/index.html | 3 +--
docs/tooltips.css | 20 --------------------
icons/bob-v3.0.png | Bin 0 -> 31654 bytes
mainwindow.cpp | 4 ++--
mainwindow.ui | 10 +++++-----
7 files changed, 11 insertions(+), 31 deletions(-)
create mode 100644 icons/bob-v3.0.png
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 0000000000000000000000000000000000000000..656ad330396a9a42409a651d926b2adc037ed255
GIT binary patch
literal 31654
zcmZU)18^l>)HWL1nApa|wr$(CZQDGt?M&=sVojWhlZkC7_q^YK|F3So|MTAe+ui>NAYyFE`2V@g$N2wm&ByrP8~uOY@c)SaKUabB
z3&8O){_j`{z#R%A3WI26_Xa480$ki3u{)XKp-rn2!WN#pUGLIWKTSF_U7Jyd~umy
z^>(VV295g}G`x3J?6}VI7u>(L9eanRrNGJ=fe|63A-_XVG6g51Q^Ift!}oGQ?`NjgI^U8?+6M4yM=-w`50g`qHtnx8sfrl!_p@RjI9qbaKqfB
zDU(YazNNZB4uTzuM-hoq4Q2$P0uK+h$3lSO{(3oZ=E8S#b8B=z*Wlr837>LkFR{i2
zlppen0qoM_z-@z|gTK>Nj<&49h)|_ys02j)f^2rRg^->*FPf*!s4-HCl%yhtjd7yI
z%*fG_69wKXb9p`MKc3qAekxachNGJ5mSudYj@CsqxELIlNvp@
zCWsEl2@!^JA9VaD6uO&%AExlhCHCs3^E3Q2?Ms&6ctl1D+{O
zL&RGen==p@65TpLj3SZ-K9?lSkvKMdwp^p#?eUXtKQXflk&`jZXuHRojg9Re?r
z4?mE08!*!WF>5U1Fr^^bKQ-b<$+x5cPDesOxw$w6v?>dY`HE+s`_bL>>-4GLIcsK~
z=e9TB)0!#0R%4JE%S4y^`C5lFS#>p_LJ#pn8|GG;=J4(LzE9rh;bje70Y(}2gUCs&
z@3Bd1nl!iRQ+Nb7#wZk(&UM4D6wglE*_k=;b;__gAz6yNV>ble>#Fm3da)jI1(sx`
zP*Ud`sWx4Oa;IX0D;Ra()LsRSq&k>$LX?99f+HtBAt3=ZJ1Mk|NLt5;>7IF~+3#GR
z0ZWnp5rcEnN%YDbAKDL@zjA>#tV17WFJQ;<0s`vy7>5;Um{YM})Q|P*>gta3`fjZ@
zyLF@YxEJ4^Pzo|_sxYJ5{oi(fTdgZ)cM$c6%Qm@UHrRumhsLsb=sAZPqo`|q1EemXVBGmgsit%q9a9GTUiy>)%|>4@(rd?ncOn%
z^hC$z703u?CdF5{;z*LiKrTDPa;
z5lufmP+gK7{y|8@C(`XHfEcipdp~b^(oj>6|FvixnbPy5KKds$&c69JC_txKZ#Dy9
z&(8ENPP;p7+8%?ABP3d-E=#wpsj4dK=y)M!$wv0Layx4F+j(u9+NAX4+39)p?Hn6#
z4`B1U{f$*sTl;Sy82qUCJUDaAtr0d37I?dPIJdH@YA6brxUv!kg)Ps$DFe~zn_Nl)
zg$Vb8)S;E2=Z?SUkw2F#jPgC`&U+%eKz&$?$U(A{nNl;NMExF2maLKLZx?CKAN%GG
zthl6rcYUwD@NBp$kkE{JIirtTXLg#pp?~__9!1nL8K*F>Gn0eUQ$=!9o2Rv-QNvkj
zq1mZNRIDU|_|x_?nZgq0lbT`M7^iqDlc7V|=-7sS7Z?gKO<-CMv(Jx@w;%U&$W=!vE)I?qSRAemAWWo6+r^*wOTSL&uHcJKz8T#Dnj
z-Xj8ahG0qHf@^{q!H1!s^cb+d?*+eyX)1C}eopmp`nL5?6?{MUOIN7qJzsXC#-#k3
zk&4dX=EuJs&GE}VqYX0x_Lm#*b_z7NX4^52QZ(1NTU+@9Qn!kdTqGlG4^Gd=Ac6Uh
zX&D(TzE5^N28<1TZ?t<(*d!1Nk@4yk^}8pg2}OmCQM2HeJԨQj?{O?_LrqeZy
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 |