| 1 | *** /tmp/ediff6531XJW 2010-10-10 08:42:59.463260347 +0200
|
|---|
| 2 | --- /tmp/mythuiguidegrid.cpp 2010-10-10 08:38:08.515174701 +0200
|
|---|
| 3 | ***************
|
|---|
| 4 | *** 18,23 ****
|
|---|
| 5 | --- 18,24 ----
|
|---|
| 6 | #include "x11colors.h"
|
|---|
| 7 | #include "mythverbose.h"
|
|---|
| 8 | #include "mythuitype.h"
|
|---|
| 9 | + #include "mythimage.h"
|
|---|
| 10 | #include "mythmainwindow.h"
|
|---|
| 11 | #include "mythdb.h"
|
|---|
| 12 |
|
|---|
| 13 | ***************
|
|---|
| 14 | *** 186,192 ****
|
|---|
| 15 | if (font)
|
|---|
| 16 | m_font = font;
|
|---|
| 17 | else
|
|---|
| 18 | ! VERBOSE(VB_IMPORTANT, LOC_ERR + "Unknown font: " + fontname);
|
|---|
| 19 | }
|
|---|
| 20 | else if (element.tagName() == "recordstatus")
|
|---|
| 21 | {
|
|---|
| 22 | --- 187,193 ----
|
|---|
| 23 | if (font)
|
|---|
| 24 | m_font = font;
|
|---|
| 25 | else
|
|---|
| 26 | ! VERBOSE(VB_IMPORTANT, LOC_ERR + "Unknown font: " + fontname);
|
|---|
| 27 | }
|
|---|
| 28 | else if (element.tagName() == "recordstatus")
|
|---|
| 29 | {
|
|---|
| 30 | ***************
|
|---|
| 31 | *** 334,340 ****
|
|---|
| 32 | {
|
|---|
| 33 | QColor fillColor = calcColor(m_selFillColor, alphaMod);
|
|---|
| 34 | QColor lineColor = calcColor(m_selLineColor, alphaMod);
|
|---|
| 35 | ! p->DrawRoundRect(area, 10, m_drawSelFill, fillColor,
|
|---|
| 36 | m_drawSelLine, 2, lineColor);
|
|---|
| 37 | }
|
|---|
| 38 | else if (m_selType == "highlight")
|
|---|
| 39 | --- 335,341 ----
|
|---|
| 40 | {
|
|---|
| 41 | QColor fillColor = calcColor(m_selFillColor, alphaMod);
|
|---|
| 42 | QColor lineColor = calcColor(m_selLineColor, alphaMod);
|
|---|
| 43 | ! p->DrawRoundRect(area, 10, m_drawSelFill, fillColor,
|
|---|
| 44 | m_drawSelLine, 2, lineColor);
|
|---|
| 45 | }
|
|---|
| 46 | else if (m_selType == "highlight")
|
|---|
| 47 | ***************
|
|---|
| 48 | *** 372,378 ****
|
|---|
| 49 | {
|
|---|
| 50 | if (m_verticalLayout)
|
|---|
| 51 | {
|
|---|
| 52 | ! p->DrawImage(area.left() + (area.width() / 2) - (m_arrowImages[2]->width() / 2),
|
|---|
| 53 | area.top() , m_arrowImages[2], alphaMod);
|
|---|
| 54 | }
|
|---|
| 55 | else
|
|---|
| 56 | --- 373,379 ----
|
|---|
| 57 | {
|
|---|
| 58 | if (m_verticalLayout)
|
|---|
| 59 | {
|
|---|
| 60 | ! p->DrawImage(area.left() + (area.width() / 2) - (m_arrowImages[2]->width() / 2),
|
|---|
| 61 | area.top() , m_arrowImages[2], alphaMod);
|
|---|
| 62 | }
|
|---|
| 63 | else
|
|---|
| 64 | ***************
|
|---|
| 65 | *** 398,407 ****
|
|---|
| 66 | }
|
|---|
| 67 |
|
|---|
| 68 | // draw recording status
|
|---|
| 69 | ! if (data->recType != 0 && m_recImages[data->recType])
|
|---|
| 70 | {
|
|---|
| 71 | p->DrawImage(area.right() - m_recImages[data->recType]->width(),
|
|---|
| 72 | ! area.bottom() - m_recImages[data->recType]->height(),
|
|---|
| 73 | m_recImages[data->recType], alphaMod);
|
|---|
| 74 | }
|
|---|
| 75 | }
|
|---|
| 76 | --- 399,408 ----
|
|---|
| 77 | }
|
|---|
| 78 |
|
|---|
| 79 | // draw recording status
|
|---|
| 80 | ! if (data->recType != 0)
|
|---|
| 81 | {
|
|---|
| 82 | p->DrawImage(area.right() - m_recImages[data->recType]->width(),
|
|---|
| 83 | ! area.bottom() - m_recImages[data->recType]->height(),
|
|---|
| 84 | m_recImages[data->recType], alphaMod);
|
|---|
| 85 | }
|
|---|
| 86 | }
|
|---|
