From 4f2a7dc972cc6c4bb9a22950b49a6877313a0bb1 Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Thu, 16 Feb 2017 22:44:37 +0100 Subject: [PATCH] Remove default stylesheet from planner output Remove the default stylesheet ("Courier" 13pt) from the planner output QTextEdit. Remove the content of the html property of the QTextEdit because we overwrite it when doing setHtml. After printing copy the original dive notes string displayed_dive.notes back to the QTextEdit Advantages: Display is according to font settings. ctrl - mousewheel for zoom always works. Drawbacks: Printing font is same as display font but can be adjusted by zooming before. Signed-off-by: Stefan Fuchs --- desktop-widgets/mainwindow.cpp | 2 +- desktop-widgets/plannerDetails.ui | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 194147639..50b3d24ac 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -892,7 +892,7 @@ void MainWindow::printPlan() plannerDetails()->divePlanOutput()->setHtml(withDisclaimer); plannerDetails()->divePlanOutput()->print(&printer); - plannerDetails()->divePlanOutput()->setHtml(diveplan); + plannerDetails()->divePlanOutput()->setHtml(displayed_dive.notes); #endif } diff --git a/desktop-widgets/plannerDetails.ui b/desktop-widgets/plannerDetails.ui index 1f2790d85..17e22bcb5 100644 --- a/desktop-widgets/plannerDetails.ui +++ b/desktop-widgets/plannerDetails.ui @@ -83,17 +83,13 @@ - font: 13pt "Courier"; + true - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html> +