diff --git a/oscr/Graphs/gGraph.cpp b/oscr/Graphs/gGraph.cpp index ebae6f6a..ffccb49a 100644 --- a/oscr/Graphs/gGraph.cpp +++ b/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"); diff --git a/oscr/Resources.qrc b/oscr/Resources.qrc index 64f50410..b2790009 100644 --- a/oscr/Resources.qrc +++ b/oscr/Resources.qrc @@ -1,5 +1,15 @@ + docs/0.0.gif + docs/GPLv3-en_US + docs/script.js + docs/tooltips.css + docs/countries.txt + docs/tz.txt + docs/release_notes.html + docs/schema.xml + docs/channels.xml + fonts/FreeSans.ttf icons/sdcard.png icons/preferences.png icons/overview.png @@ -8,17 +18,10 @@ icons/forward.png icons/edit-find.png icons/back.png - fonts/FreeSans.ttf icons/refresh.png icons/oximeter.png - docs/0.0.gif - docs/schema.xml - docs/channels.xml icons/last.png - docs/release_notes.html icons/save.png - docs/countries.txt - docs/tz.txt icons/arrow-end.png icons/arrow-left.png icons/arrow-right.png @@ -29,13 +32,9 @@ icons/trophy.png icons/bookmark.png icons/help.png - docs/tooltips.css icons/session-off.png icons/session-on.png - icons/bob-v3.0.png - docs/script.js - docs/sheep.png - icons/Jedimark.png + icons/logo.png icons/sdcard-lock.png icons/statistics.png icons/prs1.png @@ -52,7 +51,6 @@ icons/daily.png icons/dv64.png icons/overview-page.png - docs/GPLv3-en_US icons/fp_icon.png translations/Afrikaans.af.qm translations/Arabic.ar.qm diff --git a/oscr/UpdaterWindow.ui b/oscr/UpdaterWindow.ui index d2a9b3f7..e6f16296 100644 --- a/oscr/UpdaterWindow.ui +++ b/oscr/UpdaterWindow.ui @@ -15,7 +15,7 @@ - :/images/sheep.png:/images/sheep.png + :/icons/logo.png:/icons/logo.png @@ -75,7 +75,7 @@ - :/docs/sheep.png + :/icons/logo.png true diff --git a/oscr/aboutdialog.ui b/oscr/aboutdialog.ui index 9690970b..235b76df 100644 --- a/oscr/aboutdialog.ui +++ b/oscr/aboutdialog.ui @@ -200,7 +200,7 @@ p, li { white-space: pre-wrap; } - :/icons/bob-v3.0.png + :/icons/logo.png true diff --git a/oscr/daily.cpp b/oscr/daily.cpp index 37b4d3e6..a6c9f4a9 100644 --- a/oscr/daily.cpp +++ b/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+=" \n"; if (day->size()>0) { html+=""+tr("Sessions all off!")+""; - html+=""; + html+=""; html+=""+tr("Sessions exist for this day but are switched off.")+"\n"; GraphView->setEmptyText(STR_Empty_NoSessions); } else { @@ -1509,7 +1509,7 @@ void Daily::Load(QDate date) html+=""; html+=""; html+=""; - html+=""; + html+=""; html+=""; html+=""; html+=""; diff --git a/oscr/help.cpp b/oscr/help.cpp index 276c2f7a..33ef4ee0 100644 --- a/oscr/help.cpp +++ b/oscr/help.cpp @@ -97,7 +97,7 @@ Help::Help(QWidget *parent) : if (!helpLoaded) { - QString html = "

"+tr("No documentation available")+"

"; + QString html = "

"+tr("No documentation available")+"

"; helpBrowser->setHtml(html); return; } else { diff --git a/oscr/mainwindow.cpp b/oscr/mainwindow.cpp index 46964f47..86979665 100644 --- a/oscr/mainwindow.cpp +++ b/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? -// QPixmap sheep=QPixmap(":/docs/sheep.png").scaled(64,64); -// progress->setPixmap(sheep); + // Show the logo? +// QPixmap logo=QPixmap(":/icons/logo.png").scaled(64,64); +// progress->setPixmap(logo); QApplication::processEvents(); @@ -1075,7 +1076,7 @@ QString MainWindow::getWelcomeHTML() tr("CPAPTalk Forum,") + tr("Apnea Board") + "

" "" - "" "" "" @@ -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(); diff --git a/oscr/mainwindow.ui b/oscr/mainwindow.ui index 3079f6ef..e5c79e83 100644 --- a/oscr/mainwindow.ui +++ b/oscr/mainwindow.ui @@ -442,7 +442,7 @@ - :/icons/bob-v3.0.png:/icons/bob-v3.0.png + :/icons/logo.png:/icons/logo.png @@ -1314,7 +1314,7 @@ QToolBox::tab:selected { - :/icons/bob-v3.0.png:/icons/bob-v3.0.png + :/icons/logo.png:/icons/logo.png Navigation diff --git a/oscr/newprofile.ui b/oscr/newprofile.ui index 046c7135..02e1594d 100644 --- a/oscr/newprofile.ui +++ b/oscr/newprofile.ui @@ -15,7 +15,7 @@ - :/icons/bob-v3.0.png:/icons/bob-v3.0.png + :/icons/logo.png:/icons/logo.png @@ -850,7 +850,7 @@ - :/docs/sheep.png + :/icons/logo.png true diff --git a/oscr/overview.cpp b/oscr/overview.cpp index b0721036..df719854 100644 --- a/oscr/overview.cpp +++ b/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))); diff --git a/oscr/profileselect.ui b/oscr/profileselect.ui index 7f6feb3d..a61e8924 100644 --- a/oscr/profileselect.ui +++ b/oscr/profileselect.ui @@ -15,7 +15,7 @@ - :/icons/bob-v3.0.png:/icons/bob-v3.0.png + :/icons/logo.png:/icons/logo.png QDialog { diff --git a/oscr/profileselector.ui b/oscr/profileselector.ui index 12395b0b..5e549d32 100644 --- a/oscr/profileselector.ui +++ b/oscr/profileselector.ui @@ -130,7 +130,7 @@ - :/icons/bob-v3.0.png + :/icons/logo.png true diff --git a/oscr/reports.cpp b/oscr/reports.cpp index 1f2a4d74..4cf4d87f 100644 --- a/oscr/reports.cpp +++ b/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(); diff --git a/oscr/statistics.cpp b/oscr/statistics.cpp index c607cfcc..e253f9d7 100644 --- a/oscr/statistics.cpp +++ b/oscr/statistics.cpp @@ -633,13 +633,13 @@ QString Statistics::htmlHeader(bool showheader) "" ""; - QPixmap bobPixmap(":/icons/bob-v3.0.png"); + QPixmap logoPixmap(":/icons/logo.png"); if (showheader) { html += "
" - +resizeHTMLPixmap(bobPixmap,64,64)+"
" + +resizeHTMLPixmap(logoPixmap,64,64)+"
" "" + STR_TR_SleepyHead + "
" "" + tr("Usage Statistics") + "
" - "" + tr("(NOT approved for compliance or medical reporting purposes)")+"
"; + "" + tr("(NOT approved for compliance or medical reporting purposes)")+"
"; if (!userinfo.isEmpty()) html += "
"+userinfo+"
"; html += "

"; @@ -989,8 +989,8 @@ QString Statistics::GenerateHTML() html += "
"; // html += QString("
"+tr("\"Nothing's here!\"")+"
"+tr("Bob is bored with this days lack of data.")+"

" + "
" "
") + html += QString( "


" + tr("I can haz data?!?") + "

"+ - "

" - "

"+tr("This lonely sleepy sheep has no data :(")+"

"); + "

" + "

"+tr("This lonely sleepy thing has no data :(")+"

"); // "
"; html += htmlFooter(havedata); diff --git a/oscr/translation.cpp b/oscr/translation.cpp index 1cb72a3c..e65440af 100644 --- a/oscr/translation.cpp +++ b/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 diff --git a/oscr/welcome.ui b/oscr/welcome.ui index fc033342..26f71314 100644 --- a/oscr/welcome.ui +++ b/oscr/welcome.ui @@ -90,7 +90,7 @@ - :/icons/bob-v3.0.png + :/icons/logo.png true