games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-02 22:05:43 +02:00
Code Issues Releases Activity

Merge pull request #4113 from IvanSavenko/launcher_mod_list_tweaks

Browse Source 
Launcher mod list tweaks
This commit is contained in:
Ivan Savenko 2024-06-09 16:46:58 +03:00 committed by GitHub
commit af7357a938
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/firstLaunch/firstlaunch_moc.cpp
View File

@ -162,7 +162,10 @@ void FirstLaunchView::activateTabHeroesData()
ui->buttonTabModPreset->setChecked(false); ui->buttonTabModPreset->setChecked(false);
if(heroesDataUpdate()) if(heroesDataUpdate())
{
activateTabModPreset();
return; return;
}
QString installPath = getHeroesInstallDir(); QString installPath = getHeroesInstallDir();
if(!installPath.isEmpty()) if(!installPath.isEmpty())

15
launcher/helper.cpp
View File

@ -15,6 +15,19 @@
#include <QObject> #include <QObject>
#include <QScroller> #include <QScroller>
#ifdef VCMI_MOBILE
static QScrollerProperties generateScrollerProperties()
{
QScrollerProperties result;
result.setScrollMetric(QScrollerProperties::OvershootDragResistanceFactor, 0.25);
result.setScrollMetric(QScrollerProperties::OvershootDragDistanceFactor, 0.25);
result.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QScrollerProperties::OvershootAlwaysOff);
return result;
}
#endif
namespace Helper namespace Helper
{ {
void loadSettings() void loadSettings()
@ -26,6 +39,8 @@ void enableScrollBySwiping(QObject * scrollTarget)
{ {
#ifdef VCMI_MOBILE #ifdef VCMI_MOBILE
QScroller::grabGesture(scrollTarget, QScroller::LeftMouseButtonGesture); QScroller::grabGesture(scrollTarget, QScroller::LeftMouseButtonGesture);
QScroller * scroller = QScroller::scroller(scrollTarget);
scroller->setScrollerProperties(generateScrollerProperties());
#endif #endif
} }
} }

4
launcher/modManager/cmodlistmodel_moc.cpp
View File

@ -82,9 +82,6 @@ QVariant CModListModel::getValue(const CModEntry & mod, int field) const
case ModFields::NAME: case ModFields::NAME:
return mod.getValue("name"); return mod.getValue("name");
case ModFields::VERSION:
return mod.getValue("version");
case ModFields::TYPE: case ModFields::TYPE:
return modTypeName(mod.getValue("modType").toString()); return modTypeName(mod.getValue("modType").toString());
@ -173,7 +170,6 @@ QVariant CModListModel::headerData(int section, Qt::Orientation orientation, int
QT_TRANSLATE_NOOP("ModFields", ""), // status icon QT_TRANSLATE_NOOP("ModFields", ""), // status icon
QT_TRANSLATE_NOOP("ModFields", ""), // status icon QT_TRANSLATE_NOOP("ModFields", ""), // status icon
QT_TRANSLATE_NOOP("ModFields", "Type"), QT_TRANSLATE_NOOP("ModFields", "Type"),
QT_TRANSLATE_NOOP("ModFields", "Version"),
}; };
if(role == Qt::DisplayRole && orientation == Qt::Horizontal) if(role == Qt::DisplayRole && orientation == Qt::Horizontal)

1
launcher/modManager/cmodlistmodel_moc.h
View File

@ -22,7 +22,6 @@ enum EModFields
STATUS_ENABLED, STATUS_ENABLED,
STATUS_UPDATE, STATUS_UPDATE,
TYPE, TYPE,
VERSION,
COUNT COUNT
}; };
} }

3
launcher/modManager/cmodlistview_moc.cpp
View File

@ -102,9 +102,8 @@ void CModListView::setupModsView()
} }
else //default //TODO: default high-DPI scaling else //default //TODO: default high-DPI scaling
{ {
ui->allModsView->setColumnWidth(ModFields::NAME, 185); ui->allModsView->setColumnWidth(ModFields::NAME, 220);
ui->allModsView->setColumnWidth(ModFields::TYPE, 75); ui->allModsView->setColumnWidth(ModFields::TYPE, 75);
ui->allModsView->setColumnWidth(ModFields::VERSION, 60);
} }
ui->allModsView->resizeColumnToContents(ModFields::STATUS_ENABLED); ui->allModsView->resizeColumnToContents(ModFields::STATUS_ENABLED);

4
launcher/modManager/cmodlistview_moc.ui
View File

@ -15,7 +15,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0,0">
<item> <item>
<widget class="QLineEdit" name="lineEdit"> <widget class="QLineEdit" name="lineEdit">
<property name="sizePolicy"> <property name="sizePolicy">
@ -102,7 +102,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Download &amp;&amp; refresh repositories</string> <string>Reload repositories</string>
</property> </property>
</widget> </widget>
</item> </item>