← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythui/mythuiguidegrid.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, John Baab
  • Date: 2009-09-29 01:33:23 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20090929013323-6pvn8encm757zbxw
Tags: 0.22.0~trunk22101-0ubuntu1
[ Mario Limonciello ]
* New upstream checkout (r22101)
* Try to guard and make sure that ~mythtv is read from /etc/passwd 
  rather than assuming it's /home/mythtv.

[ John Baab ]
* debian/mythtv-common.postinst:
  - Added symlink for /home/mythtv/.mythtv/config.xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythui/mythuiguidegrid.cpp
 
1
 
 
2
#include "mythuiguidegrid.h"
 
3
 
1
4
// ANSI C headers
2
5
#include <cmath>
3
6
 
18
21
#include "mythimage.h"
19
22
#include "mythmainwindow.h"
20
23
#include "mythdb.h"
21
 
#include "mythuiguidegrid.h"
22
24
 
23
25
#define LOC QString("MythUIGuideGrid: ")
24
26
#define LOC_ERR QString("MythUIGuideGrid, Error: ")
486
488
{
487
489
    QString msg = data->title;
488
490
 
489
 
    if (m_drawCategoryText && data->category.length() > 0)
490
 
        msg += " (" + data->category + ")";
 
491
    if (m_drawCategoryText && !data->category.isEmpty())
 
492
        msg += QString(" (%1)").arg(data->category);
491
493
 
492
494
    QRect area = data->drawArea;
493
495
    area.translate(m_Area.x(), m_Area.y());
540
542
    QFile f;
541
543
    QStringList searchpath = GetMythUI()->GetThemeSearchPath();
542
544
    for (QStringList::const_iterator ii = searchpath.begin();
543
 
        ii != searchpath.end(); ii++)
 
545
        ii != searchpath.end(); ++ii)
544
546
    {
545
547
        f.setFileName(*ii + "categories.xml");
546
548
        if (f.open(QIODevice::ReadOnly))