From 2a4ec85d14316f7d172ebfcc86dc574a052a544e Mon Sep 17 00:00:00 2001 From: Jeff Thompson Date: Fri, 22 Jul 2016 17:50:35 -0500 Subject: [PATCH 1/2] more work on bug #3 --- InkjetPlumber.plist | 4 ++-- mainwindow.cpp | 45 ++++++++++++++++++++++++++------------------- mainwindow.h | 2 +- version.h | 2 +- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/InkjetPlumber.plist b/InkjetPlumber.plist index b5bf053..81c65f0 100644 --- a/InkjetPlumber.plist +++ b/InkjetPlumber.plist @@ -19,7 +19,7 @@ CFBundleIdentifier org.threeputt.Inkjet Plumber CFBundleVersion - 0.9.1.1 + 0.9.1.1-2-ga5ffa64 NOTE This file was generated by Qt/QMake. SUFeedURL @@ -27,7 +27,7 @@ SUEnableAutomatedChecks YES SUAllowsAutomaticUpdates - NO + YES SUScheduledCheckInterval 3600 diff --git a/mainwindow.cpp b/mainwindow.cpp index c7185af..65b21cb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -315,17 +315,18 @@ void MainWindow::paint_page(MaintenanceJob* job, QPrinter* printer) painter.drawText(0, 0, "Inkjet Plumber maintenance job sent to " + printer->printerName() + ": " + QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.")); painter.setPen(QPen(Qt::black)); + int resolution = printer->resolution(); int offset = 0; - if (job->cyan) print_swatch(painter, &offset, 50, Qt::cyan); - if (job->magenta) print_swatch(painter, &offset, 50, Qt::magenta); - if (job->yellow) print_swatch(painter, &offset, 50, Qt::yellow); - if (job->black) print_swatch(painter, &offset, 50, Qt::black); - if (job->gray) print_swatch(painter, &offset, 50, Qt::gray); - if (job->light_gray) print_swatch(painter, &offset, 50, Qt::lightGray); - if (job->red) print_swatch(painter, &offset, 50, Qt::red); - if (job->green) print_swatch(painter, &offset, 50, Qt::green); - if (job->blue) print_swatch(painter, &offset, 50, Qt::blue); + if (job->cyan) paint_swatch(printer, painter, &offset, 50, Qt::cyan); + if (job->magenta) paint_swatch(printer, painter, &offset, 50, Qt::magenta); + if (job->yellow) paint_swatch(printer, painter, &offset, 50, Qt::yellow); + if (job->black) paint_swatch(printer, painter, &offset, 50, Qt::black); + if (job->gray) paint_swatch(printer, painter, &offset, 50, Qt::gray); + if (job->light_gray) paint_swatch(printer, painter, &offset, 50, Qt::lightGray); + if (job->red) paint_swatch(printer, painter, &offset, 50, Qt::red); + if (job->green) paint_swatch(printer, painter, &offset, 50, Qt::green); + if (job->blue) paint_swatch(printer, painter, &offset, 50, Qt::blue); QPrinterInfo printer_info(*printer); QPageSize page_size(printer->pageLayout().pageSize()); @@ -353,7 +354,7 @@ void MainWindow::paint_page(MaintenanceJob* job, QPrinter* printer) text += "paper height = " + QString::number(printer->paperRect().height()) + " dpi
"; painter.save(); - painter.translate(0, 500); + painter.translate(0, resolution * 2); QTextDocument doc; doc.setDefaultFont(tahoma); @@ -370,11 +371,12 @@ void MainWindow::paint_page(MaintenanceJob* job, QPrinter* printer) return; } -void MainWindow::print_swatch(QPainter& painter, int *x, int y, QColor color) const +void MainWindow::paint_swatch(QPrinter* printer, QPainter& painter, int *x, int y, QColor color) const { - const int width = 150; - const int height = 150; - const int padding = 50; + const int resolution = printer->resolution(); + const int width = resolution / 2; + const int height = resolution / 2; + const int padding = resolution / 6; QString color_name = color.name(); @@ -386,7 +388,7 @@ void MainWindow::print_swatch(QPainter& painter, int *x, int y, QColor color) co int text_width = fm.width(color_name); int center_text = *x + (width - text_width) / 2; - QRectF rect(center_text, y, 150, 150); + QRectF rect(center_text, y, width, height); painter.drawText(rect, color_name); @@ -397,12 +399,12 @@ void MainWindow::print_swatch(QPainter& painter, int *x, int y, QColor color) co painter.setPen(QPen(color)); painter.drawRect(*x, new_y, width, height); - for (int i = 0; i < 150; i+=10) + for (int i = 0; i < height; i+=10) { painter.drawLine(*x, new_y+i, *x+width, new_y+i+10); } - *x += 200; + *x += width + padding; return; } @@ -482,13 +484,18 @@ void MainWindow::run_maint_job(MaintenanceJob* job) void MainWindow::setup_sparkle() { + QUrl url; + long interval; #if defined(INKJETPLUMBER_DEBUG) - long interval = (60*60*1); + interval = (1*3600); // one hour + url = "https://threeputt.org/InkjetPlumber/appcast.php?develop=true"; #else - long interval = (60*60*24); + interval = (24*3600); // 24 hours + url = "https://threeputt.org/InkjetPlumber/appcast.php?develop=false"; #endif if (updater_) { + updater_->setFeedURL(url); updater_->setUpdateCheckInterval(interval); QDateTime dt = updater_->lastUpdateCheckDate(); log_message("Last update check performed at " + dt.toString("yyyy-MM-dd hh:mm:ss") + "."); diff --git a/mainwindow.h b/mainwindow.h index 5dd020f..d552053 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -87,7 +87,7 @@ private slots: QString get_state_string(QPrinter::PrinterState state) const; QString get_unit_string(QPageSize::Unit unit) const; void log_message(const QString& msg) const; - void print_swatch(QPainter& painter, int* x, int y, QColor color) const; + void paint_swatch(QPrinter* printer, QPainter& painter, int* x, int y, QColor color) const; void read_printer_settings(const QString& printer_name); void run_maint_job(MaintenanceJob* job); void setup_sparkle(); diff --git a/version.h b/version.h index 5b57702..68dfee5 100644 --- a/version.h +++ b/version.h @@ -20,6 +20,6 @@ #ifndef VERSION_H #define VERSION_H -#define INKJETPLUMBER_VERSION "0.9.1.1" +#define INKJETPLUMBER_VERSION "0.9.1.1-2-ga5ffa64" #endif // VERSION_H From db67953f16a0acfefad8a3f3ce62aadbd52f08c8 Mon Sep 17 00:00:00 2001 From: Jeff Thompson Date: Fri, 22 Jul 2016 17:55:02 -0500 Subject: [PATCH 2/2] another go at fixing bug #3 --- InkjetPlumber.plist | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/InkjetPlumber.plist b/InkjetPlumber.plist index 81c65f0..4e293a8 100644 --- a/InkjetPlumber.plist +++ b/InkjetPlumber.plist @@ -19,7 +19,7 @@ CFBundleIdentifier org.threeputt.Inkjet Plumber CFBundleVersion - 0.9.1.1-2-ga5ffa64 + 0.9.1.2 NOTE This file was generated by Qt/QMake. SUFeedURL diff --git a/version.h b/version.h index 68dfee5..022494d 100644 --- a/version.h +++ b/version.h @@ -20,6 +20,6 @@ #ifndef VERSION_H #define VERSION_H -#define INKJETPLUMBER_VERSION "0.9.1.1-2-ga5ffa64" +#define INKJETPLUMBER_VERSION "0.9.1.2" #endif // VERSION_H