Merge branch 'release/0.9.10'

leftytennis · Aug 24, 2020 · e8f3296 · e8f3296
2 parents b26f39c + 61ca7e3
commit e8f3296
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/InkjetPlumber.plist b/src/InkjetPlumber.plist
@@ -19,7 +19,7 @@
     <key>CFBundleIdentifier</key>
     <string>org.threeputt.Inkjet Plumber</string>
     <key>CFBundleVersion</key>
-    <string>0.9.9</string>
+    <string>0.9.10</string>
     <key>NOTE</key>
     <string>This file was generated by Qt/QMake.</string>
     <key>SUAutomaticallyUpdate</key>

diff --git a/src/maintenancejob.cpp b/src/maintenancejob.cpp
@@ -35,7 +35,7 @@ MaintenanceJob::MaintenanceJob(QObject *parent)
     , green(true)
     , blue(true)
     , last_maint(QDateTime())
-    , output_type(IJPOutputType::OutputTypeCUPS)
+    , output_type(IJPOutputType::OutputTypeGenerated)
 {
     return;
 }
@@ -55,7 +55,7 @@ MaintenanceJob::MaintenanceJob(const QString &name, QObject *parent)
     , green(true)
     , blue(true)
     , last_maint(QDateTime())
-    , output_type(IJPOutputType::OutputTypeCUPS)
+    , output_type(IJPOutputType::OutputTypeGenerated)
 {
     return;
 }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -549,7 +549,7 @@ void MainWindow::paint_swatch(QPrinter *printer, QPainter &painter, int *x, int
 
     QFontMetrics fm(painter.fontMetrics());
 
-    int text_width = fm.width(color_name);
+    int text_width = fm.horizontalAdvance(color_name);
     int center_text = *x + (width - text_width) / 2;
     QRectF rect(center_text, y, width, height);
 
@@ -740,7 +740,7 @@ void MainWindow::read_printer_settings(const QString &printer_name)
     job->green = s.value("green", true).toBool();
     job->blue = s.value("blue", true).toBool();
     job->last_maint = s.value("last_maint", QDateTime()).toDateTime();
-    job->output_type = (IJPOutputType)s.value("output_type", IJPOutputType::OutputTypeCUPS).toInt();
+    job->output_type = (IJPOutputType)s.value("output_type", IJPOutputType::OutputTypeGenerated).toInt();
     s.endGroup();
 
     return;

diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
@@ -163,7 +163,7 @@ void PreferencesDialog::done(int result)
             current_job_->red = ui->listWidget_Colors->item(6)->checkState() == Qt::Checked ? true : false;
             current_job_->green = ui->listWidget_Colors->item(7)->checkState() == Qt::Checked ? true : false;
             current_job_->blue = ui->listWidget_Colors->item(8)->checkState() == Qt::Checked ? true : false;
-            IJPOutputType output_type = IJPOutputType::OutputTypeCUPS;
+            IJPOutputType output_type = IJPOutputType::OutputTypeGenerated;
             if (ui->radiobutton_use_cups_output->isChecked())
             {
                 output_type = IJPOutputType::OutputTypeCUPS;
@@ -308,6 +308,7 @@ void PreferencesDialog::setup_printer_settings(int current_row)
                     break;
                 case IJPOutputType::OutputTypeGenerated:
                     ui->radiobutton_use_ijp_output->setChecked(true);
+                    break;
             }
             if (ui->listWidget_Colors->count() == 9)
             {

diff --git a/src/version.h b/src/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define INKJETPLUMBER_VERSION   "0.9.9"
+#define INKJETPLUMBER_VERSION   "0.9.10"
 
 #endif // VERSION_H