Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25149 → Rev 25150

/trunk/Scribus/scribus/ui/fontcombo.cpp
36,7 → 36,6
#include "fontcombo.h"
#include "iconmanager.h"
#include "prefsmanager.h"
#include "scpage.h"
#include "scribusapp.h"
#include "scribusdoc.h"
#include "util.h"
506,10 → 505,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;
/trunk/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;
113,18 → 119,17
void ScFileWidget::gotoSelectedDirectory()
{
QStringList s(selectedFiles());
if (!s.isEmpty())
{
QFileInfo fi(s.first());
// qDebug()<<s.first()<<fi.absoluteFilePath();
if (fi.isDir())
setDirectory(fi.absoluteFilePath());
}
if (s.isEmpty())
return;
QFileInfo fi(s.first());
// qDebug()<<s.first()<<fi.absoluteFilePath();
if (fi.isDir())
setDirectory(fi.absoluteFilePath());
}
 
void ScFileWidget::gotoDesktopDirectory()
{
QString dp=QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
QString dp = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
QFileInfo fi(dp);
if (fi.exists())
setDirectory(dp);
132,7 → 137,7
 
void ScFileWidget::gotoHomeDirectory()
{
QString dp=QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
QString dp = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
QFileInfo fi(dp);
if (fi.exists())
setDirectory(dp);