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

Jimbo's Mascot Improvement

Browse Source
This commit is contained in:
Mark Watkins 2011-12-29 15:43:47 +10:00
parent d9b25c55d8
commit 1d52bf2e7c
7 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources.qrc
View File

@ -39,5 +39,6 @@
<file>docs/tooltips.css</file>
<file>icons/session-off.png</file>
<file>icons/session-on.png</file>
<file>icons/bob-v3.0.png</file>
</qresource>
</RCC>

4
daily.cpp
View File

@ -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);

3
docs/index.html
View File

@ -42,8 +42,7 @@ Plus a few <a href='qrc:/docs/usage.html'>usage notes</a>, and some important in
<a href='http://www.cpaptalk.com'>CPAPTalk Forum</a>,
<a href="http://s7.zetaboards.com/Apnea_Board/index/">Apnea Board</a></p>
</td>
<td><image src='qrc:/docs/sheep.png' width=220 height=220><br/>
<div align=center>I really want a new logo!</div>
<td><image src='qrc:/icons/bob-v3.0.png' width=220 height=220><br/>
</td>
</tr>
<tr>

20
docs/tooltips.css
View File

@ -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; }

BIN
icons/bob-v3.0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

4
mainwindow.cpp
View File

@ -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()
"</head>"
"<body leftmargin=0 topmargin=0 rightmargin=0>"
"<div align=center><table cellpadding=3 cellspacing=0 border=0>"
"<tr><td><img src='qrc:/docs/sheep.png' width=100px height=100px><td valign=center align=center><h1>SleepyHead v"+VersionString+"</h1><i>This is a beta software and some functionality may not work as intended yet.<br/>Please report any bugs you find to SleepyHead's SourceForge page.</i></td></tr></table>"
"<tr><td><img src='qrc:/icons/bob-v3.0.png' width=100px height=100px><td valign=center align=center><h1>SleepyHead v"+VersionString+"</h1><i>This is a beta software and some functionality may not work as intended yet.<br/>Please report any bugs you find to SleepyHead's SourceForge page.</i></td></tr></table>"
"</div>"
"<hr/>");
}

10
mainwindow.ui
View File

@ -27,7 +27,7 @@
</property>
<property name="windowIcon">
<iconset resource="Resources.qrc">
<normaloff>:/docs/sheep.png</normaloff>:/docs/sheep.png</iconset>
<normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
</property>
<property name="iconSize">
<size>
@ -405,7 +405,7 @@
<number>1</number>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<property name="tabSpacing">
<number>0</number>
@ -515,7 +515,7 @@
</property>
<attribute name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/docs/sheep.png</normaloff>:/docs/sheep.png</iconset>
<normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
</attribute>
<attribute name="label">
<string>&amp;Navigation</string>
@ -862,8 +862,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>158</width>
<height>313</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<property name="mouseTracking">