chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-09 20:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace old man Oscar logo with new big O logo

Browse Source
This commit is contained in:
Phil Olynyk 2019-04-16 13:12:26 -04:00
parent 329e59e8ea
commit c0246470f5
24 changed files with 69 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/Graphs/gGraph.cpp
View File

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

2
oscar/Graphs/gGraphView.cpp
View File

@ -331,7 +331,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
this->setMouseTracking(true);
m_emptytext = STR_Empty_NoData;
m_emptyimage = QPixmap(":/icons/logo.png");
m_emptyimage = QPixmap(":/icons/logo-md.png");
InitGraphGlobals(); // FIXME: sstangl: handle error return.
#ifdef ENABLE_THREADED_DRAWING
m_idealthreads = QThread::idealThreadCount();

5
oscar/Resources.qrc
View File

@ -36,7 +36,10 @@
<file>icons/help.png</file>
<file>icons/session-off.png</file>
<file>icons/session-on.png</file>
<file>icons/logo.png</file>
<file>icons/logo-lg.png</file>
<file>icons/logo-lm.png</file>
<file>icons/logo-md.png</file>
<file>icons/logo-sm.png</file>
<file>icons/sdcard-lock.png</file>
<file>icons/statistics.png</file>
<file>icons/prs1.png</file>

4
oscar/UpdaterWindow.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
<normaloff>:/icons/logo-sm.png</normaloff>:/icons/logo-sm.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">:/icons/logo.png</pixmap>
<pixmap resource="Resources.qrc">:/icons/logo-lm.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>

2
oscar/aboutdialog.ui
View File

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

14
oscar/daily.cpp
View File

@ -137,7 +137,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
// sleep(3);
GraphView->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
GraphView->setEmptyImage(QPixmap(":/icons/logo-md.png"));
snapGV=new gGraphView(GraphView);
snapGV->setMinimumSize(172,172);
@ -420,7 +420,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
ui->weightSpinBox->setSuffix(STR_UNIT_KG);
}
GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
GraphView->setEmptyImage(QPixmap(":/icons/logo-md.png"));
GraphView->setEmptyText(STR_Empty_NoData);
previous_date=QDate();
@ -1388,7 +1388,7 @@ void Daily::Load(QDate date)
}
if (!cpap) {
GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
GraphView->setEmptyImage(QPixmap(":/icons/logo-md.png"));
}
if (cpap) {
float hours=day->hours(MT_CPAP);
@ -1399,7 +1399,7 @@ void Daily::Load(QDate date)
GraphView->setEmptyImage(QPixmap(":/icons/sadface.png"));
isBrick=true;
} else {
GraphView->setEmptyImage(QPixmap(":/icons/logo.png"));
GraphView->setEmptyImage(QPixmap(":/icons/logo-md.png"));
}
}
@ -1505,7 +1505,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:/icons/logo.png'></td></tr>";
html+="<tr><td colspan=5 align='center><img src='qrc:/icons/logo-md.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 {
@ -1534,9 +1534,9 @@ 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:/icons/logo.png'></td></tr>";
html+="<tr><td align=center><img src='qrc:/icons/logo-md.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("Oscar is bored with this days lack of data.")+"</font></i></td></tr>";
html+="<tr bgcolor='#89abcd'><td align=center><i><font size=+1 color=white>"+tr("No data is available for this day.")+"</font></i></td></tr>";
html+="<tr height=25%><td align=center></td></tr>";
html+="</table>\n";
}

2
oscar/help.cpp
View File

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

BIN
oscar/icons/OSCAR.icns
View File

Binary file not shown.

BIN
oscar/icons/logo-lg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
oscar/icons/logo-lm.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
oscar/icons/logo-md.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
oscar/icons/logo-sm.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
oscar/icons/logo.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 KiB

After

Width:  |  Height:  |  Size: 255 KiB

BIN
oscar/icons/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 45 KiB

47
oscar/mainwindow.cpp
View File

@ -40,7 +40,7 @@
#include <SleepLib/loader_plugins/zeo_loader.h>
#include <SleepLib/loader_plugins/somnopose_loader.h>
#ifndef REMSTAR_M_SUPPORT
#ifdef REMSTAR_M_SUPPORT
#include <SleepLib/loader_plugins/mseries_loader.h>
#endif
@ -89,7 +89,7 @@ MainWindow::MainWindow(QWidget *parent) :
// Nifty Notification popups in System Tray (uses Growl on Mac)
if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) {
qDebug() << "Using System Tray for Menu";
systray = new QSystemTrayIcon(QIcon(":/icons/logo.png"), this);
systray = new QSystemTrayIcon(QIcon(":/icons/logo-sm.png"), this);
systray->show();
// seems to need the systray menu for notifications to work
systraymenu = new QMenu(this);
@ -231,6 +231,7 @@ void MainWindow::SetupGUI()
QTimer::singleShot(50, this, SLOT(Startup()));
ui->actionChange_Data_Folder->setVisible(false);
ui->action_Frequently_Asked_Questions->setVisible(false);
#ifndef helpless
help = new Help(this);
@ -482,7 +483,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
progress->setMessage(tr("Loading profile \"%1\"").arg(profileName));
// Show the logo?
// QPixmap logo=QPixmap(":/icons/logo.png").scaled(64,64);
// QPixmap logo=QPixmap(":/icons/logo-md.png").scaled(64,64);
// progress->setPixmap(logo);
QApplication::processEvents();
@ -530,6 +531,30 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
ui->tabWidget->setTabEnabled(3, !noMachines); // overview, STR_TR_Overview);
ui->tabWidget->setTabEnabled(4, !noMachines); // overview, STR_TR_Overview);
int srm = 0;
if (p_profile) {
srm = p_profile->general->statReportMode();
}
switch (srm) {
case 0:
ui->reportModeStandard->setChecked(true);
break;
case 1:
ui->reportModeMonthly->setChecked(true);
break;
case 2:
ui->reportModeRange->setChecked(true);
ui->statEndDate->setVisible(true);
ui->statStartDate->setVisible(true);
break;
default:
if (p_profile) {
p_profile->general->setStatReportMode(0);
}
break;
}
progress->close();
delete progress;
qDebug() << "Finished opening Profile";
@ -1117,7 +1142,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/logo.png' width=220 height=220><br/>"
"<td><image src='qrc:/icons/logo-lg.png' width=220 height=220><br/>"
"</td>"
"</tr>"
"<tr>"
@ -1482,7 +1507,10 @@ void MainWindow::on_action_CycleTabs_triggered()
void MainWindow::on_actionOnline_Users_Guide_triggered()
{
// QDesktopServices::openUrl(QUrl("http://sleepyhead.sourceforge.net/wiki/index.php?title=OSCAR_Users_Guide"));
QMessageBox::information(nullptr, STR_MessageBox_Information, tr("The User's Guide is not yet available"));
// QMessageBox::information(nullptr, STR_MessageBox_Information, tr("The User's Guide is not yet available"));
if (QMessageBox::question(nullptr, STR_MessageBox_Question, tr("The User's Guide will open in your default browser"),
QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Ok) == QMessageBox::Ok )
QDesktopServices::openUrl(QUrl("https://www.apneaboard.com/wiki/index.php?title=OSCAR_Help"));
}
void MainWindow::on_action_Frequently_Asked_Questions_triggered()
@ -2120,7 +2148,7 @@ void MainWindow::doRecompressEvents()
ProgressDialog progress(this);
progress.setMessage("Recompressing Session Files");
progress.setProgressMax(p_profile->daylist.size());
QPixmap icon = QPixmap(":/icons/logo.png").scaled(64,64);
QPixmap icon = QPixmap(":/icons/logo-md.png").scaled(64,64);
progress.setPixmap(icon);
progress.open();
@ -2151,7 +2179,7 @@ void MainWindow::doReprocessEvents()
ProgressDialog progress(this);
progress.setMessage("Recalculating summaries");
progress.setProgressMax(p_profile->daylist.size());
QPixmap icon = QPixmap(":/icons/logo.png").scaled(64,64);
QPixmap icon = QPixmap(":/icons/logo-md.png").scaled(64,64);
progress.setPixmap(icon);
progress.open();
@ -2278,7 +2306,10 @@ void MainWindow::on_actionImport_RemStar_MSeries_Data_triggered()
void MainWindow::on_actionSleep_Disorder_Terms_Glossary_triggered()
{
// QDesktopServices::openUrl(QUrl("http://sleepyhead.sourceforge.net/wiki/index.php?title=Glossary"));
QMessageBox::information(nullptr, STR_MessageBox_Information, tr("The Glossary is not yet implemented"));
// QMessageBox::information(nullptr, STR_MessageBox_Information, tr("The Glossary is not yet implemented"));
if (QMessageBox::question(nullptr, STR_MessageBox_Question, tr("The Glossary will open in your default browser"),
QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Ok) == QMessageBox::Ok )
QDesktopServices::openUrl(QUrl("https://www.apneaboard.com/wiki/index.php?title=Definitions"));
}
void MainWindow::on_actionHelp_Support_OSCAR_Development_triggered()

6
oscar/mainwindow.ui
View File

@ -442,7 +442,7 @@
</property>
<property name="windowIcon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
<normaloff>:/icons/logo-sm.png</normaloff>:/icons/logo-sm.png</iconset>
</property>
<property name="iconSize">
<size>
@ -1314,7 +1314,7 @@ QToolBox::tab:selected {
</property>
<attribute name="icon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
<normaloff>:/icons/logo-sm.png</normaloff>:/icons/logo-sm.png</iconset>
</attribute>
<attribute name="label">
<string>Navigation</string>
@ -2906,7 +2906,7 @@ p, li { white-space: pre-wrap; }
</widget>
<action name="action_Import_Data">
<property name="text">
<string>&amp;Import Data</string>
<string>&amp;Import SDcard Data</string>
</property>
<property name="shortcut">
<string notr="true">Shift+F2</string>

4
oscar/newprofile.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="Resources.qrc">
<normaloff>:/icons/logo.png</normaloff>:/icons/logo.png</iconset>
<normaloff>:/icons/logo-sm.png</normaloff>:/icons/logo-sm.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">:/icons/logo.png</pixmap>
<pixmap resource="Resources.qrc">:/icons/logo-lm.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>

2
oscar/overview.cpp
View File

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

2
oscar/profileselect.ui
View File

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

2
oscar/profileselector.ui
View File

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

2
oscar/reports.cpp
View File

@ -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(":/icons/logo.png").scaled(64,64);
QPixmap icon = QPixmap(":/icons/logo-md.png").scaled(64,64);
progress.setPixmap(icon);
progress.open();

4
oscar/statistics.cpp
View File

@ -633,7 +633,7 @@ QString Statistics::htmlHeader(bool showheader)
"</head>"
"<body leftmargin=0 topmargin=5 rightmargin=0>";
QPixmap logoPixmap(":/icons/logo.png");
QPixmap logoPixmap(":/icons/logo-md.png");
if (showheader) {
html += "<div align=center>"
+resizeHTMLPixmap(logoPixmap,64,64)+"<br/>"
@ -991,7 +991,7 @@ 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/logo.png' width=\"100\" height=\"100\"></p>"
"<p><img src='qrc:/icons/logo-lm.png' width=\"100\" height=\"100\"></p>"
"<p><i>"+tr("Oscar has no data to report :(")+"</i></p>");
// "</table></div>";

2
oscar/translation.cpp
View File

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

2
oscar/welcome.ui
View File

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