CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,617 Commits 10 Branches 30 Tags
3aba7f8fec45c7c87be486d8f6b5c96f69facf93
Commit Graph

55 Commits

Author SHA1 Message Date
Sefa Eyeoglu
1d638e018a chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-04 19:41:47 +02:00
Sefa Eyeoglu
1d468ac35a chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:35 +02:00
seth
640aaa8c23 Merge pull request #1331 from TheKodeToad/hungry-trash 
Fix updating trashing resources
 2023-07-10 16:31:43 -04:00
TheKodeToad
0c6362f28d Make trash hungry 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 18:51:28 +01:00
Trial97
c23bf2fd22 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-06-28 17:46:01 +03:00
Trial97
0d2105dec4 Made buttons on ModsFolderPage enabled all the time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 21:34:40 +03:00
Rachel Powers
470518eb3a fix: resize columns on hide ^& uniform heights 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-21 02:31:40 -07:00
Rachel Powers
5fe9e30f39 fix: use instance settings, make image column user resizeable, fix memory leak 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 14:53:15 -07:00
Rachel Powers
4eb9083ddc refactor: column names as class property, use string names in setting 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 13:00:08 -07:00
Rachel Powers
b28f682ad9 Merge branch 'develop' into feature/images-for-resource-page 2023-05-28 12:01:49 -07:00
Rachel Powers
a04a6f1e0d fix(memory leak): don't give shared pointers out to foldermodels (causes cyclic refrence) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 02:15:39 -07:00
Rachel Powers
086a7e19f0 feat: Column on left, hideable 
- columns are hideable (saves to settings)
- image column moved to left
- datamodals can provide resize modes

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-24 20:15:34 -07:00
Rachel Powers
74e7c13a17 feat: display license and issue tracker 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 13:46:38 -07:00
Rachel Powers
ee94be624e use 32x32 images for image column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 11:28:19 -07:00
Rachel Powers
9913080a82 feat(modpage): mod icon in description and column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:44:28 -07:00
Rachel Powers
d80dee2a54 refactor: pass instance ptr to resource models. use it to find instance root. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:37 -07:00
Rachel Powers
458c2f38bc cleanup: code review sugestions 
clean up translation strings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:33 -07:00
Rachel Powers
a0e03c41c0 fix: typos 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
a1053a4c5a feat: warnings when instance resources are linked 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
kumquat-ir
dc8109658c review fixes 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-22 13:20:13 -05:00
kumquat-ir
9c2a3231c5 do not create nilmods folder 
"it cant be that easy" - me, clueless

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-13 01:45:23 -05:00
flow
257970c27d refactor(Mods): make provider() return a std::optional 
This makes it easier to check if a mod has a provider or not, without
having to do a string comparison.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-29 13:21:49 -03:00
leo78913
4ee29b388d feat: add a provider column to the mods page 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-15 12:02:08 -03:00
TheLastRar
fce323b945 Check parent in rowCount/columnCount/canFetchMore 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-14 19:05:57 +00:00
Sefa Eyeoglu
a24d589845 fix: ensure all resource folders exist 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:39:05 +02:00
flow
0873b8d304 fix: prevent container detaching in ResourceFolderModel 
and use const accessors whenever we can!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-16 20:12:31 -03:00
flow
42c81395b3 fix: race condition on ResourceFolderModel tests 
This (hopefully) fixes the race contiditions that sometimes got
triggered in tests.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
f21ae66265 feat: add basic resource pack parsing of pack.mcmeta 
This parses the pack format ID and the description from the local file,
from both a ZIP and a folder, and hooks it into the model.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
e2ab2aea32 change: add enable/disable to resources 
TIL that zip resource packs, when disabled, actually have the effect of
not showing up in the game at all. Since this can be useful to someone,
I moved the logic for it to the resources.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:49:54 -03:00
flow
c3ceefbafb refactor+fix: add new tests for Resource models and fix issues 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:49:23 -03:00
flow
e7cf9932a9 refactor: simplify Mod structure 
No need to keep track of pointers left and right. A single one already
gives enough headaches!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:48:51 -03:00
flow
92aa24ae34 fix: don't give shared pointer to obj. external to the model 
It causes some weird problems and adds refcounting overhead.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:48:00 -03:00
flow
97a74d5c1f refactor: adapt rest of the codebase to the new resource model 
In order to access the ModFolderModel from the ModFolderPage, i created
a new m_model for the correct type, shadowing the m_model of type
ResourceFolderModel. This creates two shared_ptr references to the same object,
but since they will have the same lifetime, it doesn't generate a memory
leak.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:47:58 -03:00
flow
1e2f0ab308 refactor: move more tied logic to model and move logic to the resources 
This moves the QSortFilterProxyModel to the resource model files,
acessible via a factory method, and moves the sorting and filtering to
the objects themselves, decoupling the code a bit.

This also adds a basic implementation of methods in the
ResourceFolderModel, simplifying the process of constructing a new model
from it.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:47:08 -03:00
flow
af2cf2734d refactor: move things around in the mod model 
Makes the method order in the cpp file the same as in the header file.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:46:33 -03:00
flow
ec62d8e973 refactor: move general code from mod model to its own model 
This aims to continue decoupling other types of resources (e.g. resource
packs, shader packs, etc) from mods, so that we don't have to
continuously watch our backs for changes to one of them affecting the
others.

To do so, this creates a more general list model for resources, based on
the mods one, that allows you to extend it with functionality for other
resources.

I had to do some template and preprocessor stuff to get around the
QObject limitation of not allowing templated classes, so that's sadge :c

On the other hand, I tried cleaning up most general-purpose code in the
mod model, and added some documentation, because it looks nice :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-20 10:45:01 -03:00
flow
2f5e55bea0 fix: only remove orphaned metadata on first opening 
This avoids deleting the metadata while one is updating their mods.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-11 13:11:56 -03:00
flow
54b335711a fix: raw-pointers and leaks in ModFolderLoadTask 
Co-authored-by: timoreo <contact@timoreo.fr>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:56:23 -03:00
flow
de9e304236 fix: std::list -> QList 
Qt6 removed Qlist::toStdList() 😭

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:45 -03:00
flow
c4316e81e6 change: make Mod a QObject used as a pointer 
Prevents problems when copying it around!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -03:00
flow
fd6755c93f change: mod metadata improvements 
- Use slug instead of name
- Keep temporary status before having local details

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:43 -03:00
flow
dfab55112b feat: remove existing mod when updating/redownloading it 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:42 -03:00
flow
2d10c246a8 feat: add update mods to the ui / mod model 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:42 -03:00
Sefa Eyeoglu
c363423718 refactor: fix deprecation up to Qt 6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
984692dc62 refactor: fix deprecation up to Qt 5.15 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +02:00
flow
e5f6dc1b14 fix: aborts when using a Qt build with assertions enabled 
Preventing undefined behaviour hooray! :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:44:19 -03:00
Sefa Eyeoglu
a4ef0940ed chore: add license headers 2022-06-12 13:50:58 +02:00
Sefa Eyeoglu
8856c8cd62 refactor(test): fix loading mod metadata setting 2022-06-12 13:33:17 +02:00
flow
67e0214fa5 fix: don't try to delete mods multiple times 
Shows a more helpful message if there's a parsing error when reading the
index file.

Also fixes a clazy warning with using the `.data()` method in a
temporary QByteArray object.
 2022-05-23 14:43:10 -03:00
flow
fab4a7a602 refactor: abstract metadata handling and clarify names 2022-05-23 14:42:28 -03:00