merged with master

This commit is contained in:
Fabio Bas 2015-08-31 22:48:14 +02:00
commit 5cfb034452
416 changed files with 65983 additions and 19400 deletions

View file

@ -108,6 +108,9 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
int color = 90 + 60 * node->depth();
return QBrush(QColor(color, 255, color));
}
case Qt::ForegroundRole: {
return QBrush(QColor(0 ,0 ,0));
}
default: return QVariant();
}
} else {
@ -125,6 +128,9 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
int color = 255 - (index.row() % 2) * 30;
return QBrush(QColor(color, color, color));
}
case Qt::ForegroundRole: {
return QBrush(QColor(0 ,0 ,0));
}
default: return QVariant();
}
}