summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/qthelper.cpp5
-rw-r--r--core/qthelper.h1
-rw-r--r--desktop-widgets/mainwindow.cpp4
-rw-r--r--desktop-widgets/printdialog.cpp7
-rw-r--r--desktop-widgets/printdialog.h3
-rw-r--r--desktop-widgets/printer.cpp9
-rw-r--r--desktop-widgets/printer.h3
-rw-r--r--desktop-widgets/templateedit.cpp2
-rw-r--r--desktop-widgets/templatelayout.cpp4
-rw-r--r--desktop-widgets/templatelayout.h2
10 files changed, 20 insertions, 20 deletions
diff --git a/core/qthelper.cpp b/core/qthelper.cpp
index 2f94be101..d0a6e36db 100644
--- a/core/qthelper.cpp
+++ b/core/qthelper.cpp
@@ -1484,11 +1484,6 @@ extern "C" void parse_display_units(char *line)
qDebug() << line;
}
-extern "C" bool in_planner()
-{
- return getAppState() == ApplicationState::PlanDive || getAppState() == ApplicationState::EditPlannedDive;
-}
-
extern "C" enum deco_mode decoMode(bool in_planner)
{
return in_planner ? prefs.planner_deco_mode : prefs.display_deco_mode;
diff --git a/core/qthelper.h b/core/qthelper.h
index b813408cd..135689c69 100644
--- a/core/qthelper.h
+++ b/core/qthelper.h
@@ -137,7 +137,6 @@ extern "C" {
#endif
char *printGPSCoordsC(const location_t *loc);
-bool in_planner();
bool getProxyString(char **buffer);
bool canReachCloudServer();
void updateWindowTitle();
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 91fd44fcb..e2fb7368a 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -653,7 +653,9 @@ void MainWindow::updateLastUsedDir(const QString &dir)
void MainWindow::on_actionPrint_triggered()
{
#ifndef NO_PRINTING
- PrintDialog dlg(this);
+ bool in_planner = getAppState() == ApplicationState::PlanDive ||
+ getAppState() == ApplicationState::EditPlannedDive;
+ PrintDialog dlg(in_planner, this);
dlg.exec();
#endif
diff --git a/desktop-widgets/printdialog.cpp b/desktop-widgets/printdialog.cpp
index 8187dda6e..a4c181c68 100644
--- a/desktop-widgets/printdialog.cpp
+++ b/desktop-widgets/printdialog.cpp
@@ -19,8 +19,9 @@
template_options::color_palette_struct ssrf_colors, almond_colors, blueshades_colors, custom_colors;
-PrintDialog::PrintDialog(QWidget *parent) :
+PrintDialog::PrintDialog(bool inPlanner, QWidget *parent) :
QDialog(parent, QFlag(0)),
+ inPlanner(inPlanner),
printer(NULL),
qprinter(NULL)
{
@@ -174,10 +175,10 @@ void PrintDialog::createPrinterObj()
{
// create a new printer object
if (!printer) {
- qprinter = new QPrinter();
+ qprinter = new QPrinter;
qprinter->setResolution(printOptions.resolution);
qprinter->setOrientation((QPrinter::Orientation)printOptions.landscape);
- printer = new Printer(qprinter, printOptions, templateOptions, Printer::PRINT);
+ printer = new Printer(qprinter, printOptions, templateOptions, Printer::PRINT, inPlanner);
}
}
diff --git a/desktop-widgets/printdialog.h b/desktop-widgets/printdialog.h
index 6e34ca7cb..7e98f22f6 100644
--- a/desktop-widgets/printdialog.h
+++ b/desktop-widgets/printdialog.h
@@ -18,10 +18,11 @@ class PrintDialog : public QDialog {
Q_OBJECT
public:
- explicit PrintDialog(QWidget *parent = 0);
+ explicit PrintDialog(bool inPlanner, QWidget *parent = 0);
~PrintDialog();
private:
+ bool inPlanner;
PrintOptions *optionsWidget;
QProgressBar *progressBar;
Printer *printer;
diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp
index b3af96a75..ff5a65b93 100644
--- a/desktop-widgets/printer.cpp
+++ b/desktop-widgets/printer.cpp
@@ -14,12 +14,13 @@
#include <QWebElement>
#include "profile-widget/profilewidget2.h"
-Printer::Printer(QPaintDevice *paintDevice, const print_options &printOptions, const template_options &templateOptions, PrintMode printMode) :
+Printer::Printer(QPaintDevice *paintDevice, const print_options &printOptions, const template_options &templateOptions, PrintMode printMode, bool inPlanner) :
paintDevice(paintDevice),
webView(new QWebView),
printOptions(printOptions),
templateOptions(templateOptions),
printMode(printMode),
+ inPlanner(inPlanner),
done(0),
dpi(0)
{
@@ -205,7 +206,7 @@ QString Printer::exportHtml()
QString html;
if (printOptions.type == print_options::DIVELIST)
- html = t.generate();
+ html = t.generate(inPlanner);
else if (printOptions.type == print_options::STATISTICS )
html = t.generateStatistics();
@@ -235,7 +236,7 @@ void Printer::print()
// export border width with at least 1 pixel
// templateOptions.borderwidth = std::max(1, pageSize.width() / 1000);
if (printOptions.type == print_options::DIVELIST)
- webView->setHtml(t.generate());
+ webView->setHtml(t.generate(inPlanner));
else if (printOptions.type == print_options::STATISTICS )
webView->setHtml(t.generateStatistics());
if (printOptions.color_selected && printerPtr->colorMode())
@@ -269,7 +270,7 @@ void Printer::previewOnePage()
// initialize the border settings
// templateOptions.border_width = std::max(1, pageSize.width() / 1000);
if (printOptions.type == print_options::DIVELIST)
- webView->setHtml(t.generate());
+ webView->setHtml(t.generate(inPlanner));
else if (printOptions.type == print_options::STATISTICS )
webView->setHtml(t.generateStatistics());
bool ok;
diff --git a/desktop-widgets/printer.h b/desktop-widgets/printer.h
index 8030e9f75..43a1fa9b7 100644
--- a/desktop-widgets/printer.h
+++ b/desktop-widgets/printer.h
@@ -27,6 +27,7 @@ private:
const template_options &templateOptions;
QSize pageSize;
PrintMode printMode;
+ bool inPlanner;
int done;
int dpi;
void render(int Pages);
@@ -38,7 +39,7 @@ private slots:
void templateProgessUpdated(int value);
public:
- Printer(QPaintDevice *paintDevice, const print_options &printOptions, const template_options &templateOptions, PrintMode printMode);
+ Printer(QPaintDevice *paintDevice, const print_options &printOptions, const template_options &templateOptions, PrintMode printMode, bool inPlanner);
~Printer();
void print();
void previewOnePage();
diff --git a/desktop-widgets/templateedit.cpp b/desktop-widgets/templateedit.cpp
index e7d81f8d9..db8a92007 100644
--- a/desktop-widgets/templateedit.cpp
+++ b/desktop-widgets/templateedit.cpp
@@ -59,7 +59,7 @@ void TemplateEdit::updatePreview()
int height = ui->label->height();
QPixmap map(width * 2, height * 2);
map.fill(QColor::fromRgb(255, 255, 255));
- Printer printer(&map, printOptions, newTemplateOptions, Printer::PREVIEW);
+ Printer printer(&map, printOptions, newTemplateOptions, Printer::PREVIEW, false);
printer.previewOnePage();
ui->label->setPixmap(map.scaled(width, height, Qt::IgnoreAspectRatio));
diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index ca7e6218a..ec895687b 100644
--- a/desktop-widgets/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
@@ -95,13 +95,13 @@ TemplateLayout::TemplateLayout(const print_options &printOptions, const template
{
}
-QString TemplateLayout::generate()
+QString TemplateLayout::generate(bool in_planner)
{
QString htmlContent;
State state;
- if (in_planner()) {
+ if (in_planner) {
state.dives.append(&displayed_dive);
} else {
int i;
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index 3b5c3b9b5..c25c9d4ea 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -27,7 +27,7 @@ class TemplateLayout : public QObject {
Q_OBJECT
public:
TemplateLayout(const print_options &printOptions, const template_options &templateOptions);
- QString generate();
+ QString generate(bool in_planner);
QString generateStatistics();
static QString readTemplate(QString template_name);
static void writeTemplate(QString template_name, QString grantlee_template);
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-25 05:46:33 +0000