diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2013-11-30 15:41:18 +0200 |
|---|---|---|
| committer | Lubomir I. Ivanov <neolit123@gmail.com> | 2013-11-30 15:41:18 +0200 |
| commit | a60475d336abae3f1f672443dc5bb8a13395a830 (patch) | |
| tree | 96a95ac7959e3728d752f8840a7c78f7d1830b73 /qt-ui | |
| parent | f85b434ef1fd58e559a68ab2f4e3fbc20e98dd46 (diff) | |
| download | subsurface-a60475d336abae3f1f672443dc5bb8a13395a830.tar.gz | |
Print: adjustments to font sizes and alignment
The new profile table requires different alignment and
different font sizes for specific cells.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/models.cpp | 16 | ||||
| -rw-r--r-- | qt-ui/printlayout.cpp | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 726a56914..ead8abc57 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1717,17 +1717,17 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const } // dive location if (row == 1 && col == 0) { - font.setPixelSize(baseSize); font.setBold(true); + font.setPixelSize(baseSize); return QVariant::fromValue(font); } // depth/duration - if ((row == 0 || row == 1) && col == 5) { + if ((row == 0 || row == 1) && col == 4) { font.setPixelSize(baseSize); return QVariant::fromValue(font); } // notes - if (row == 9 && col == 0) { + if (row > 5 && col == 0) { font.setPixelSize(baseSize + 1); return QVariant::fromValue(font); } @@ -1735,12 +1735,10 @@ QVariant ProfilePrintModel::data(const QModelIndex &index, int role) const return QVariant::fromValue(font); } case Qt::TextAlignmentRole: { - unsigned int align = Qt::AlignCenter; - // dive #, location, notes - if ((row < 2 || row == 10) && col == 0) - align = Qt::AlignLeft | Qt::AlignVCenter; - // depth, duration - if (row < 2 && col == 5) + // everything is aligned to the left + unsigned int align = Qt::AlignLeft; + // align depth and duration right + if (row < 2 && col == 4) align = Qt::AlignRight | Qt::AlignVCenter; return QVariant::fromValue(align); } diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index 24d3492a5..a0533b71d 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); profilePrintColumnWidths.append(dw); profilePrintColumnWidths.append(dw); // fit to 100% - const int sr = 9; // smallest row height in pixels + const int sr = 10; // smallest row height in pixels profilePrintRowHeights.append(sr + 2); - profilePrintRowHeights.append(sr + 7); + profilePrintRowHeights.append(sr + 5); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); profilePrintRowHeights.append(sr); |