From d4766a8cce9a7a873f23c29fa2ef7615961686e8 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 30 Nov 2013 17:37:27 +0200 Subject: Print: yet another font adjustment for the profile table We now only use a slightly large font for the "Dive #" entry. All other font sizes remain at 9px. Another change is that we now attempt to use 11px for individual row height. This makes the table at least 12px bigger (n_rows * increment), but does not cut letters like 'g', which go slightly bellow the font baseline. Perhaps this can be improved later by adjusting the font and row sizes again. Signed-off-by: Lubomir I. Ivanov --- qt-ui/models.cpp | 16 ---------------- qt-ui/printlayout.cpp | 6 +++--- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 81bdc22a3..36ee916e3 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1689,22 +1689,6 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const font.setPixelSize(baseSize + 1); return QVariant::fromValue(font); } - // dive location - if (row == 1 && col == 0) { - font.setBold(true); - font.setPixelSize(baseSize); - return QVariant::fromValue(font); - } - // depth/duration - if ((row == 0 || row == 1) && col == 4) { - font.setPixelSize(baseSize); - return QVariant::fromValue(font); - } - // notes - if (row > 5 && col == 0) { - font.setPixelSize(baseSize + 1); - return QVariant::fromValue(font); - } font.setPixelSize(baseSize); return QVariant::fromValue(font); } diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index b24248d64..afc6dd036 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -42,9 +42,9 @@ PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct op profilePrintColumnWidths.append(dw - 3); profilePrintColumnWidths.append(dw - 3); profilePrintColumnWidths.append(dw + 6); // fit to 100% - const int sr = 10; // smallest row height in pixels - profilePrintRowHeights.append(sr + 2); - profilePrintRowHeights.append(sr + 5); + const int sr = 12; // smallest row height in pixels + profilePrintRowHeights.append(sr); + profilePrintRowHeights.append(sr + 4); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); -- cgit v1.2.3-70-g09d2