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

Make statistics page honour application font setting

Browse Source
This commit is contained in:
Mark Watkins 2014-05-28 23:09:03 +10:00
parent d82a041db0
commit 1ab66deb59
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sleepyhead/mainwindow.cpp
View File

@ -1363,7 +1363,7 @@ void MainWindow::on_actionPrint_Report_triggered()
Report::PrintReport(oximetry->graphView(), STR_TR_Oximetry); Report::PrintReport(oximetry->graphView(), STR_TR_Oximetry);
} }
} else { } else {
QPrinter printer; QPrinter printer(QPrinter::HighResolution);
#ifdef Q_WS_X11 #ifdef Q_WS_X11
printer.setPrinterName("Print to File (PDF)"); printer.setPrinterName("Print to File (PDF)");
printer.setOutputFormat(QPrinter::PdfFormat); printer.setOutputFormat(QPrinter::PdfFormat);
@ -1387,8 +1387,7 @@ void MainWindow::on_actionPrint_Report_triggered()
printer.setOrientation(QPrinter::Portrait); printer.setOrientation(QPrinter::Portrait);
printer.setFullPage(false); // This has nothing to do with scaling printer.setFullPage(false); // This has nothing to do with scaling
printer.setNumCopies(1); printer.setNumCopies(1);
printer.setPageMargins(10, 10, 10, 10, QPrinter::Millimeter); printer.setPageMargins(0, 0, 0, 0, QPrinter::Millimeter);
QPrintDialog pdlg(&printer, this); QPrintDialog pdlg(&printer, this);
if (pdlg.exec() == QPrintDialog::Accepted) { if (pdlg.exec() == QPrintDialog::Accepted) {

17
sleepyhead/statistics.cpp
View File

@ -134,8 +134,11 @@ QString htmlHeader()
return QString("<html><head>" return QString("<html><head>"
"</head>" "</head>"
"<style type='text/css'>" "<style type='text/css'>"
"<!--h1,p,a,td,body { font-family: 'FreeSans', 'Sans Serif' } --/>" "p,a,td,body { font-family: '"+QApplication::font().family()+"'; }"
"p,a,td,body { font-size: 14px }" "p,a,td,body { font-size: "+QString::number(QApplication::font().pointSize() + 2)+"px; }"
// "h1,p,a,td,body { font-family: '"+PREF["Fonts_Application_Name"].toString()+"' }"
// "p,a,td,body { font-size: '"+PREF["Fonts_Application_Size"].toString()+"pts' }"
"table.curved {" "table.curved {"
"border: 1px solid gray;" "border: 1px solid gray;"
"border-radius:10px;" "border-radius:10px;"
@ -167,8 +170,8 @@ QString htmlHeader()
"<div align=center><table class=curved>" // cellpadding=3 cellspacing=0 border=0 "<div align=center><table class=curved>" // cellpadding=3 cellspacing=0 border=0
"<td>"+userinfo+"</td>" "<td>"+userinfo+"</td>"
"<td align='right'>" "<td align='right'>"
"<h1>" + STR_TR_SleepyHead + "</h1><br/>" "<font size='+2'>" + STR_TR_SleepyHead + "</font><br/>"
"<font size='+3'>" + QObject::tr("Usage Statistics") + "</font>" "<font size='+1'>" + QObject::tr("Usage Statistics") + "</font>"
"</td>" "</td>"
"<td align='right' width=170px><img src='qrc:/icons/bob-v3.0.png' height=140px><br/>" "<td align='right' width=170px><img src='qrc:/icons/bob-v3.0.png' height=140px><br/>"
"</td></tr></table>" "</td></tr></table>"
@ -616,7 +619,7 @@ QString Statistics::GenerateHTML()
int days = PROFILE.countDays(row.type, first, last); int days = PROFILE.countDays(row.type, first, last);
skipsection = (days == 0); skipsection = (days == 0);
if (days > 0) { if (days > 0) {
html+=QString("<tr bgcolor='%1'><th colspan=%2 align=center><font size=+3>%3</font></th></tr>\n"). html+=QString("<tr bgcolor='%1'><th colspan=%2 align=center><font size=+2>%3</font></th></tr>\n").
arg(heading_color).arg(periods.size()+1).arg(row.src); arg(heading_color).arg(periods.size()+1).arg(row.src);
} }
continue; continue;
@ -1047,7 +1050,7 @@ QString Statistics::GenerateHTML()
html += "<div align=center><br/>"; html += "<div align=center><br/>";
html += QString("<table class=curved>"); //cellpadding=2 cellspacing=0 border=1 html += QString("<table class=curved>"); //cellpadding=2 cellspacing=0 border=1
html += "<thead>"; html += "<thead>";
html += "<tr bgcolor='"+heading_color+"'><th colspan=10 align=center><font size=+3>" + tr("Changes to Prescription Settings") + "</font></th></tr>"; html += "<tr bgcolor='"+heading_color+"'><th colspan=10 align=center><font size=+2>" + tr("Changes to Prescription Settings") + "</font></th></tr>";
QString extratxt; QString extratxt;
@ -1215,7 +1218,7 @@ QString Statistics::GenerateHTML()
html += QString("<table class=curved style=\"page-break-before:auto;\">"); html += QString("<table class=curved style=\"page-break-before:auto;\">");
html += "<thead>"; html += "<thead>";
html += "<tr bgcolor='"+heading_color+"'><td colspan=5 align=center><font size=+3>" + tr("Machine Information") + "</font></td></tr>"; html += "<tr bgcolor='"+heading_color+"'><td colspan=5 align=center><font size=+2>" + tr("Machine Information") + "</font></td></tr>";
html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>") html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>")
.arg(STR_TR_Brand) .arg(STR_TR_Brand)