Changed sheep.png and bob-v3.0.png to logo.png

oscr/Graphs/gGraph.cpp

@@ -97,7 +97,7 @@ bool InitGraphGlobals()
     images["smiley"] = new QImage(":/icons/smileyface.png");
     //images["sad"] = new QImage(":/icons/sadface.png");
 
-    images["sheep"] = new QImage(":/icons/sheep.png");
+    images["logo"] = new QImage(":/icons/logo.png");
     images["brick"] = new QImage(":/icons/brick.png");
     images["nographs"] = new QImage(":/icons/nographs.png");
     images["nodata"] = new QImage(":/icons/nodata.png");

oscr/Resources.qrc

@@ -1,5 +1,15 @@
 <RCC>
     <qresource prefix="/">
+        <file>docs/0.0.gif</file>
+        <file>docs/GPLv3-en_US</file>
+        <file>docs/script.js</file>
+        <file>docs/tooltips.css</file>
+        <file>docs/countries.txt</file>
+        <file>docs/tz.txt</file>
+        <file>docs/release_notes.html</file>
+        <file>docs/schema.xml</file>
+        <file>docs/channels.xml</file>
+        <file>fonts/FreeSans.ttf</file>
         <file>icons/sdcard.png</file>
         <file>icons/preferences.png</file>
         <file>icons/overview.png</file>
@@ -8,17 +18,10 @@
         <file>icons/forward.png</file>
         <file>icons/edit-find.png</file>
         <file>icons/back.png</file>
-        <file>fonts/FreeSans.ttf</file>
         <file>icons/refresh.png</file>
         <file>icons/oximeter.png</file>
-        <file>docs/0.0.gif</file>
-        <file>docs/schema.xml</file>
-        <file>docs/channels.xml</file>
         <file>icons/last.png</file>
-        <file>docs/release_notes.html</file>
         <file>icons/save.png</file>
-        <file>docs/countries.txt</file>
-        <file>docs/tz.txt</file>
         <file>icons/arrow-end.png</file>
         <file>icons/arrow-left.png</file>
         <file>icons/arrow-right.png</file>
@@ -29,13 +32,9 @@
         <file>icons/trophy.png</file>
         <file>icons/bookmark.png</file>
         <file>icons/help.png</file>
-        <file>docs/tooltips.css</file>
         <file>icons/session-off.png</file>
         <file>icons/session-on.png</file>
-        <file>icons/bob-v3.0.png</file>
+        <file>icons/logo.png</file>
-        <file>docs/script.js</file>
-        <file>docs/sheep.png</file>
-        <file>icons/Jedimark.png</file>
         <file>icons/sdcard-lock.png</file>
         <file>icons/statistics.png</file>
         <file>icons/prs1.png</file>
@@ -52,7 +51,6 @@
         <file>icons/daily.png</file>
         <file>icons/dv64.png</file>
         <file>icons/overview-page.png</file>
-        <file>docs/GPLv3-en_US</file>
         <file>icons/fp_icon.png</file>
         <file>translations/Afrikaans.af.qm</file>
         <file>translations/Arabic.ar.qm</file>

oscr/UpdaterWindow.ui

@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>:/images/sheep.png</normaloff>:/images/sheep.png</iconset>
+    <normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -75,7 +75,7 @@
              <string/>
             </property>
             <property name="pixmap">
-             <pixmap resource="Resources.qrc">:/docs/sheep.png</pixmap>
+             <pixmap resource="Resources.qrc">:/icons/logo.png</pixmap>
             </property>
             <property name="scaledContents">
              <bool>true</bool>

oscr/aboutdialog.ui

@@ -200,7 +200,7 @@ p, li { white-space: pre-wrap; }
         <string notr="true"/>
        </property>
        <property name="pixmap">
-        <pixmap resource="Resources.qrc">:/icons/bob-v3.0.png</pixmap>
+        <pixmap resource="Resources.qrc">:/icons/logo.png</pixmap>
        </property>
        <property name="scaledContents">
         <bool>true</bool>

oscr/daily.cpp

@@ -419,7 +419,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     connect(GraphView, SIGNAL(updateRange(double,double)), this, SLOT(on_RangeUpdate(double,double)));
     connect(GraphView, SIGNAL(GraphsChanged()), this, SLOT(updateGraphCombo()));
 
-    GraphView->setEmptyImage(QPixmap(":/docs/sheep.png"));
+    GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
 }
 
 Daily::~Daily()
@@ -1363,7 +1363,7 @@ void Daily::Load(QDate date)
     }
 
     if (!cpap) {
-        GraphView->setEmptyImage(QPixmap(":/docs/sheep.png"));
+        GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
     }
     if (cpap) {
         float hours=day->hours(MT_CPAP);
@@ -1374,7 +1374,7 @@ void Daily::Load(QDate date)
                 GraphView->setEmptyImage(QPixmap(":/icons/sadface.png"));
                 isBrick=true;
             } else {
-                GraphView->setEmptyImage(QPixmap(":/docs/sheep.png"));
+                GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
             }
         }
 
@@ -1480,7 +1480,7 @@ void Daily::Load(QDate date)
                 html+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
                 if (day->size()>0) {
                     html+="<tr><td colspan=5 align='center'><font size='+3'>"+tr("Sessions all off!")+"</font></td></tr>";
-                    html+="<tr><td colspan=5 align='center><img src='qrc:/docs/sheep.png'></td></tr>";
+                    html+="<tr><td colspan=5 align='center><img src='qrc:/icons/logo.png'></td></tr>";
                     html+="<tr bgcolor='#89abcd'><td colspan=5 align='center'><i><font color=white size=+1>"+tr("Sessions exist for this day but are switched off.")+"</font></i></td></tr>\n";
                     GraphView->setEmptyText(STR_Empty_NoSessions);
                 } else {
@@ -1509,7 +1509,7 @@ void Daily::Load(QDate date)
             html+="<table cellspacing=0 cellpadding=0 border=0 height=100% width=100%>";
             html+="<tr height=25%><td align=center></td></tr>";
             html+="<tr><td align=center><font size='+3'>"+tr("\"Nothing's here!\"")+"</font></td></tr>";
-            html+="<tr><td align=center><img src='qrc:/docs/sheep.png'></td></tr>";
+            html+="<tr><td align=center><img src='qrc:/icons/logo.png'></td></tr>";
             html+="<tr height=5px><td align=center></td></tr>";
             html+="<tr bgcolor='#89abcd'><td align=center><i><font size=+1 color=white>"+tr("Bob is bored with this days lack of data.")+"</font></i></td></tr>";
             html+="<tr height=25%><td align=center></td></tr>";

oscr/help.cpp

@@ -97,7 +97,7 @@ Help::Help(QWidget *parent) :
 
 
     if (!helpLoaded) {
-        QString html = "<html><body><div align=\"center\" valign=\"center\"><img src=\"qrc://docs/sheep.png\"><br/><h2>"+tr("No documentation available")+"</h2></div></body></html>";
+        QString html = "<html><body><div align=\"center\" valign=\"center\"><img src=\"qrc://icons/logo.png\"><br/><h2>"+tr("No documentation available")+"</h2></div></body></html>";
         helpBrowser->setHtml(html);
         return;
     } else {

oscr/mainwindow.cpp

@@ -84,7 +84,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     // Nifty Notification popups in System Tray (uses Growl on Mac)
     if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) {
-        systray = new QSystemTrayIcon(QIcon(":/icons/bob-v3.0.png"), this);
+        systray = new QSystemTrayIcon(QIcon(":/icons/logo.png"), this);
         systray->show();
         systraymenu = new QMenu(this);
         systray->setContextMenu(systraymenu);
@@ -217,9 +217,10 @@ void MainWindow::SetupGUI()
 
     QTimer::singleShot(50, this, SLOT(Startup()));
 
+#ifndef helpless
     help = new Help(this);
-
     ui->tabWidget->addTab(help, tr("Help Browser"));
+#endif
 }
 
 void MainWindow::logMessage(QString msg)
@@ -447,9 +448,9 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
     p_profile->LoadMachineData(progress);
     progress->setMessage(tr("Loading profile \"%1\"").arg(profileName));
 
-    // Show the sheep?
+    // Show the logo?
-//    QPixmap sheep=QPixmap(":/docs/sheep.png").scaled(64,64);
+//    QPixmap logo=QPixmap(":/icons/logo.png").scaled(64,64);
-//    progress->setPixmap(sheep);
+//    progress->setPixmap(logo);
 
     QApplication::processEvents();
 
@@ -1075,7 +1076,7 @@ QString MainWindow::getWelcomeHTML()
            tr("<a href='http://www.cpaptalk.com'>CPAPTalk Forum</a>,") +
            tr("<a href='http://www.apneaboard.com/forums/'>Apnea Board</a>") + "</p>"
            "</td>"
-           "<td><image src='qrc:/icons/bob-v3.0.png' width=220 height=220><br/>"
+           "<td><image src='qrc:/icons/logo.png' width=220 height=220><br/>"
            "</td>"
            "</tr>"
            "<tr>"
@@ -1394,8 +1395,10 @@ void MainWindow::on_actionPrint_Report_triggered()
                 b.render(&painter, QPoint(0,0));
                 painter.end();
 
+#ifndef helpless
             } else if (ui->tabWidget->currentWidget() == help) {
                 help->print(&printer);
+#endif
             }
 
         }
@@ -1980,7 +1983,13 @@ void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible)
 
 void MainWindow::on_helpButton_clicked()
 {
+#ifndef helpless
     ui->tabWidget->setCurrentWidget(help);
+#else
+QMessageBox msgBox;
+    msgBox.setText("No help is available.");
+    msgBox.exec();
+#endif
 }
 
 void MainWindow::on_actionView_Statistics_triggered()
@@ -2056,7 +2065,7 @@ void MainWindow::doRecompressEvents()
     ProgressDialog progress(this);
     progress.setMessage("Recompressing Session Files");
     progress.setProgressMax(p_profile->daylist.size());
-    QPixmap icon = QPixmap(":/docs/sheep.png").scaled(64,64);
+    QPixmap icon = QPixmap(":/icons/logo.png").scaled(64,64);
     progress.setPixmap(icon);
     progress.open();
 
@@ -2087,7 +2096,7 @@ void MainWindow::doReprocessEvents()
     ProgressDialog progress(this);
     progress.setMessage("Recalculating summaries");
     progress.setProgressMax(p_profile->daylist.size());
-    QPixmap icon = QPixmap(":/docs/sheep.png").scaled(64,64);
+    QPixmap icon = QPixmap(":/icons/logo.png").scaled(64,64);
     progress.setPixmap(icon);
     progress.open();
 

oscr/mainwindow.ui

@@ -442,7 +442,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources.qrc">
-    <normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
+    <normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
   </property>
   <property name="iconSize">
    <size>
@@ -1314,7 +1314,7 @@ QToolBox::tab:selected  {
         </property>
         <attribute name="icon">
          <iconset resource="Resources.qrc">
-          <normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
+          <normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
         </attribute>
         <attribute name="label">
          <string>Navigation</string>

oscr/newprofile.ui

@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources.qrc">
-    <normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
+    <normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <property name="leftMargin">
@@ -850,7 +850,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Resources.qrc">:/docs/sheep.png</pixmap>
+          <pixmap resource="Resources.qrc">:/icons/logo.png</pixmap>
          </property>
          <property name="scaledContents">
           <bool>true</bool>

oscr/overview.cpp

@@ -121,7 +121,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
     GraphView->resetLayout();
     GraphView->LoadSettings("Overview"); //no trans
 
-    GraphView->setEmptyImage(QPixmap(":/docs/sheep.png"));
+    GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
 
     connect(GraphView, SIGNAL(updateCurrentTime(double)), this, SLOT(on_LineCursorUpdate(double)));
     connect(GraphView, SIGNAL(updateRange(double,double)), this, SLOT(on_RangeUpdate(double,double)));

oscr/profileselect.ui

@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Resources.qrc">
-    <normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
+    <normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
   </property>
   <property name="styleSheet">
    <string notr="true">QDialog {

oscr/profileselector.ui

@@ -130,7 +130,7 @@
              <string/>
             </property>
             <property name="pixmap">
-             <pixmap resource="Resources.qrc">:/icons/bob-v3.0.png</pixmap>
+             <pixmap resource="Resources.qrc">:/icons/logo.png</pixmap>
             </property>
             <property name="scaledContents">
              <bool>true</bool>

oscr/reports.cpp

@@ -96,7 +96,7 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date)
 
     ProgressDialog progress(mainwin);
     progress.setMessage(QObject::tr("Printing %1 Report").arg(name));
-    QPixmap icon = QPixmap(":/docs/sheep.png").scaled(64,64);
+    QPixmap icon = QPixmap(":/icons/logo.png").scaled(64,64);
     progress.setPixmap(icon);
     progress.open();
 

oscr/statistics.cpp

@@ -633,13 +633,13 @@ QString Statistics::htmlHeader(bool showheader)
     "</head>"
     "<body leftmargin=0 topmargin=5 rightmargin=0>";
 
-    QPixmap bobPixmap(":/icons/bob-v3.0.png");
+    QPixmap logoPixmap(":/icons/logo.png");
     if (showheader) {
         html += "<div align=center>"
-        +resizeHTMLPixmap(bobPixmap,64,64)+"<br/>"
+        +resizeHTMLPixmap(logoPixmap,64,64)+"<br/>"
         "<font size='+3'>" + STR_TR_SleepyHead + "</font><br/>"
         "<font size='+2'>" + tr("Usage Statistics") + "</font><br/>"
-        "<font size='+1' title=\""+tr("This is for legal reasons. Sorry, not sorry. Without manufacturer support and documentation, SleepyHead is unsuitable as a compliance/medical reporting tool.")+"\">" + tr("(NOT approved for compliance or medical reporting purposes)")+"</font><br/>";
+        "<font size='+1' title=\""+tr("This is for legal reasons. Sorry, not sorry. Without manufacturer support and documentation, OSCR is unsuitable as a compliance/medical reporting tool.")+"\">" + tr("(NOT approved for compliance or medical reporting purposes)")+"</font><br/>";
 
         if (!userinfo.isEmpty()) html += "<br/>"+userinfo+"<br/>";
         html += "</div><br/>";
@@ -989,8 +989,8 @@ QString Statistics::GenerateHTML()
         html += "<div align=center>";
 //        html += QString("<tr><td align=center>") +
         html += QString( "<p><font size=\"+3\"><br />" + tr("I can haz data?!?") + "</font></p>"+
-                "<p><img src='qrc:/icons/bob-v3.0.png' width=\"100\" height=\"100\"></p>"
+                "<p><img src='qrc:/icons/logo.png' width=\"100\" height=\"100\"></p>"
-                "<p><i>"+tr("This lonely sleepy sheep has no data :(")+"</i></p>");
+                "<p><i>"+tr("This lonely sleepy thing has no data :(")+"</i></p>");
 
 //        "</table></div>";
         html += htmlFooter(havedata);

oscr/translation.cpp

@@ -112,7 +112,7 @@ void initTranslations()
         QHBoxLayout lang_layout(&langsel);
 
         QLabel img;
-        img.setPixmap(QPixmap(":/docs/sheep.png"));
+        img.setPixmap(QPixmap(":/icons/logo.png"));
 
         QPushButton lang_okbtn("->", &langsel); // hard coded non translatable
 

oscr/welcome.ui

@@ -90,7 +90,7 @@
           <string notr="true"/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Resources.qrc">:/icons/bob-v3.0.png</pixmap>
+          <pixmap resource="Resources.qrc">:/icons/logo.png</pixmap>
          </property>
          <property name="scaledContents">
           <bool>true</bool>