Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25147 → Rev 25151

/branches/Version15x/Scribus/scribus/ui/fontcombo.cpp
507,10 → 507,11
QString text(index.data(Qt::DisplayRole).toString());
QString wh = QString("-w%1h%2").arg(pixmapW).arg(pixmapH);
QPixmap cachedPixmap;
QString cacheKey = text + wh;
QString cacheKey(text + wh);
QString findKey(cacheKey);
if (option.state & QStyle::State_Selected)
cacheKey += "-selected";
if (QPixmapCache::find(cacheKey, &cachedPixmap))
findKey += "-selected";
if (QPixmapCache::find(findKey, &cachedPixmap))
{
painter->drawPixmap(option.rect.x(), option.rect.y(), cachedPixmap);
return;
/branches/Version15x/Scribus/scribus/ui/scfilewidget.cpp
40,6 → 40,12
QUrl volumes(QUrl::fromLocalFile("/Volumes"));
if (!urls.contains(volumes))
urls << volumes;
QUrl home(QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)));
if (!urls.contains(home))
urls << home;
QUrl documents(QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)));
if (!urls.contains(documents))
urls << documents;
QUrl dt(QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)));
if (!urls.contains(dt))
urls << dt;