CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: rename column enum

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2022-10-01 22:07:38 +02:00
parent 39c582297e
commit 61f938546d
No known key found for this signature in database
GPG Key ID: C10411294912A422
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
launcher/InstanceList.cpp
View File

@ -138,11 +138,11 @@ QVariant InstanceList::headerData(int section, Qt::Orientation orientation, int
}
switch(static_cast<Column>(section)) {
case Icon: return tr("Icon");
case Name: return tr("Name");
case GameVersion: return tr("Game Version");
case PlayTime: return tr("Play time");
case LastPlayed: return tr("Last played");
case IconColumn: return tr("Icon");
case NameColumn: return tr("Name");
case GameVersionColumn: return tr("Game Version");
case PlayTimeColumn: return tr("Play time");
case LastPlayedColumn: return tr("Last played");
default: return QVariant();
}
}
@ -154,12 +154,12 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const {
const InstancePtr inst = m_instances[index.row()];
switch (static_cast<Column>(index.column())) {
case Icon:
case IconColumn:
if (role == Qt::DecorationRole) {
return inst->iconKey();
}
break;
case Name:
case NameColumn:
if (role == Qt::DisplayRole || role == Qt::EditRole)
return inst->name();
if (role == Qt::AccessibleTextRole)
@ -167,12 +167,12 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const {
if (role == Qt::ToolTipRole)
return inst->instanceRoot();
break;
case GameVersion: {
case GameVersionColumn: {
if (role == Qt::DisplayRole)
return inst->getMainVersion();
break;
}
case PlayTime: {
case PlayTimeColumn: {
QString foo = Time::prettifyDuration(inst->totalTimePlayed());
if (role == Qt::DisplayRole)
return foo;
@ -180,7 +180,7 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const {
return tr("Total played for %1").arg(foo);
break;
}
case LastPlayed: {
case LastPlayedColumn: {
QString foo = Time::prettifyDuration(inst->lastTimePlayed());
QDateTime bar = QDateTime::fromMSecsSinceEpoch(inst->lastLaunch());
if (role == Qt::DisplayRole)
@ -222,7 +222,7 @@ Qt::ItemFlags InstanceList::flags(const QModelIndex& index) const
Qt::ItemFlags f;
if (index.isValid()) {
f |= (Qt::ItemIsEnabled | Qt::ItemIsSelectable);
if (index.column() == Name) {
if (index.column() == NameColumn) {
f |= Qt::ItemIsEditable; // FIXME: bad UX! User can only use rename, if they selected the name column
}
}
@ -265,7 +265,7 @@ void InstanceList::setInstanceGroup(const InstanceId& id, const GroupId& name)
if (changed) {
m_groupNameCache.insert(name);
auto idx = getInstIndex(inst.get());
emit dataChanged(index(idx, Name), index(idx, Name), { GroupRole });
emit dataChanged(index(idx, NameColumn), index(idx, NameColumn), {GroupRole });
saveGroupList();
}
}
@ -288,7 +288,7 @@ void InstanceList::deleteGroup(const QString& name)
removed = true;
auto idx = getInstIndex(instance.get());
if (idx > 0) {
emit dataChanged(index(idx, Name), index(idx, Name), { GroupRole });
emit dataChanged(index(idx, NameColumn), index(idx, NameColumn), {GroupRole });
}
}
}
@ -565,7 +565,7 @@ InstancePtr InstanceList::getInstanceByManagedName(const QString& managed_name)
QModelIndex InstanceList::getInstanceIndexById(const QString &id) const
{
return index(getInstIndex(getInstanceById(id).get()), Name);
return index(getInstIndex(getInstanceById(id).get()), NameColumn);
}
int InstanceList::getInstIndex(BaseInstance* inst) const
@ -583,7 +583,7 @@ void InstanceList::propertiesChanged(BaseInstance* inst)
{
int i = getInstIndex(inst);
if (i != -1) {
emit dataChanged(index(i, Icon), index(i, ColumnCount - 1));
emit dataChanged(index(i, IconColumn), index(i, ColumnCount - 1));
updateTotalPlayTime();
}
}

10
launcher/InstanceList.h
View File

@ -75,11 +75,11 @@ public:
enum Column
{
Icon = 0,
Name,
GameVersion,
PlayTime,
LastPlayed,
IconColumn = 0,
NameColumn,
GameVersionColumn,
PlayTimeColumn,
LastPlayedColumn,
ColumnCount
};

2
launcher/ui/instanceview/InstanceDelegate.cpp
View File

@ -24,7 +24,7 @@ InstanceDelegate::InstanceDelegate(QObject* parent) : QStyledItemDelegate(parent
void InstanceDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const
{
QStyledItemDelegate::initStyleOption(option, index);
if (index.column() == InstanceList::Icon) {
if (index.column() == InstanceList::IconColumn) {
// make decoration fill cell, subtract default margins
option->decorationSize = option->rect.size().shrunkBy(QMargins(3, 1, 3, 1));
}

2
launcher/ui/instanceview/InstanceProxyModel.cpp
View File

@ -36,7 +36,7 @@ QVariant InstanceProxyModel::data(const QModelIndex& index, int role) const
}
switch (index.column()) {
case InstanceList::LastPlayed: {
case InstanceList::LastPlayedColumn: {
if (role == Qt::DisplayRole) {
QDateTime foo = data.toDateTime();
if (foo.isNull() || !foo.isValid() || foo.toMSecsSinceEpoch() == 0)

16
launcher/ui/instanceview/InstanceView.cpp
View File

@ -80,16 +80,16 @@ void InstanceView::createTable()
header->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("InstanceViewTableHeaderState").toByteArray()));
header->setSectionsMovable(true);
header->setSectionResizeMode(InstanceList::Icon, QHeaderView::Fixed);
header->setSectionResizeMode(InstanceList::Name, QHeaderView::Stretch);
header->setSectionResizeMode(InstanceList::GameVersion, QHeaderView::Interactive);
header->setSectionResizeMode(InstanceList::PlayTime, QHeaderView::Interactive);
header->setSectionResizeMode(InstanceList::LastPlayed, QHeaderView::Interactive);
m_table->setColumnWidth(InstanceList::Icon, m_rowHeight + 3 + 3); // padding left and right
header->setSectionResizeMode(InstanceList::IconColumn, QHeaderView::Fixed);
header->setSectionResizeMode(InstanceList::NameColumn, QHeaderView::Stretch);
header->setSectionResizeMode(InstanceList::GameVersionColumn, QHeaderView::Interactive);
header->setSectionResizeMode(InstanceList::PlayTimeColumn, QHeaderView::Interactive);
header->setSectionResizeMode(InstanceList::LastPlayedColumn, QHeaderView::Interactive);
m_table->setColumnWidth(InstanceList::IconColumn, m_rowHeight + 3 + 3); // padding left and right
m_table->verticalHeader()->setDefaultSectionSize(m_rowHeight + 1 + 1); // padding top and bottom
if (!APPLICATION->settings()->contains("InstanceViewTableHeaderState"))
m_table->sortByColumn(InstanceList::LastPlayed, Qt::AscendingOrder);
m_table->sortByColumn(InstanceList::LastPlayedColumn, Qt::AscendingOrder);
connect(m_table, &QTableView::doubleClicked, this, &InstanceView::activateInstance);
connect(m_table->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &InstanceView::currentRowChanged);
@ -132,7 +132,7 @@ void InstanceView::currentRowChanged(const QModelIndex& current, const QModelInd
void InstanceView::selectNameColumn(const QModelIndex& current, const QModelIndex& previous)
{
// Make sure Name column is always selected
m_table->setCurrentIndex(current.siblingAtColumn(InstanceList::Name));
m_table->setCurrentIndex(current.siblingAtColumn(InstanceList::NameColumn));
}
void InstanceView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)