CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,673 Commits 10 Branches 30 Tags 34 MiB
370c3aa598
Commit Graph

537 Commits

Author SHA1 Message Date
Gingeh
f33b31e048 Check for running instance when re-opening the mod folder page and when selecting mods 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-02 14:14:45 +10:00
Gingeh
0d10ebb7ca Update launcher/ui/pages/instance/ModFolderPage.h 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-02 12:50:25 +10:00
flow
4a8abc948e
fix: prevent segfault due to callbacks into deleted objects 
Since network requests are, for the most part, asynchronous, there's a
chance a request only comes through after the request sender has already
been deleted.

This adds a global (read static) hash table relating models for the mod
downloader to their status (true = alive, false = destroyed). It is a
bit of a hack, but I couldn't come up with a better way of doing this.

To reproduce the issue before this commit: scroll really quickly through
CF mods, to trigger network requests for their versions and description.
Then, in the middle of it close the mod downloader. Sometimes this will
create a crash.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 18:34:15 -03:00
Gingeh
77b640b76b Disable "Check for Updates" and "Download Mods" while the game is running 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-01 20:56:05 +10:00
Gingeh
a8dfe98b1a Disable "Check for Updates" if all mods are removed 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-01 20:56:05 +10:00
flow
cee41b87f7
fix(ui): force redraw of mod list when (de)selecting a mod 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:31 -03:00
flow
7a95314e42
feat(ui): remember mod download dialog's geometry 
Makes it consistent with other modal dialogs.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:31 -03:00
flow
6aaf1f4f21
feat: lazy-load CF mod descriptions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
0808a10b7b
feat: cache mod versions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
6f052baa94
refactor: use function cb instead of class cb in getVersions 
I've discovered even more functional programming! :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
5bc67d3f6b
feat: cache extra mod info (like links and body) 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
74c6c5cfbc
refactor: use function cb instead of class cb in getModInfo 
I've discovered functional programming :^)
This makes this route more fit for general use.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
158b7fd166
feat+refactor: clean up ProgressWidget and add progress indicatior to 
mod downloader

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
c3f647dc96
feat: add (semi) instant searching in mod downloader 
It has a delay of 350ms from the last typed character to search, in
order to cache small changes while typing.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:30 -03:00
flow
5936c7b65c
change: preserve search term across different mod providers 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
a8bcd85c93
feat+refactor: add shortcuts to mod downloader and clean up 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
127b558f95
change: change button names to be more user-friendly 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
6e9a27f40f
feat: display the 'body' of a MR mod on the mod downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
4a13dbe3bb
feat: create delegate for project item views 
This allows us to define custom painting for list view items. In
particular, this is applied to the mod downloader, in order to allow
displaying both the mod name and mod description, and settings their
effects (like bold or underline) independent of each other.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
flow
0f61f5ba03
fix(ui): missing tr() in mod download dialog's title 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-01 07:33:29 -03:00
kumquat-ir
579582740e Merge remote-tracking branch 'origin/develop' into download-all-blocked 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2022-07-31 14:54:50 -04:00
Ryan Cao
b15544c163
Trash instances instead of deleting (when possible) (#549) 
Squashed because of :pofat: commit history
 2022-07-30 14:42:33 -03:00
DavidoTek
b4e8abd0ad feat: win32 enable dark titlebar for dark theme 
Signed-off-by: DavidoTek <54072917+DavidoTek@users.noreply.github.com>
 2022-07-26 23:25:17 +02:00
flow
1ce0f0e7a5
fix: progress dialog going away even if the task was not aborted 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
Sefa Eyeoglu
fb289c6b17
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:29 +02:00
Sefa Eyeoglu
75a7ea55d4
feat: implement mod resolving for FTB 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:10 +02:00
flow
00520b6a0e
feat: add hashing tasks to the sequential task in ModUpdateDialog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-24 17:46:54 -03:00
flow
3aa2003951
fix: filter in external resource pages not working 
For some reason, using setFilterFixedString() doesn't seem to update the
QRegularExpression object with a new value, instead leaving it empty. It
updates QRegExp just fine, so maybe that's an Qt bug? o.O

Anyway, using regex in the filter is kinda cool actually :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 23:50:56 -03:00
flow
813dfbd2d3
fix: hide the entire performance tab on instance settings in non-Linux 
"just woke up after a major release has just been made" coding style

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 13:29:39 -03:00
Sefa Eyeoglu
9cc1773fa7
fix: move HTML code outside of translation 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-20 10:15:21 +02:00
Sefa Eyeoglu
28ae5d710e
fix: fix translations for mod updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:03:45 +02:00
kumquat-ir
20b1723e78 merge origin/develop 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2022-07-18 14:05:23 -04:00
kumquat-ir
be78afeee5 qtcreator moment 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2022-07-18 14:03:06 -04:00
flow
0cb47cf7d7
fix: dark placeholder text in dark background on dark theme 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-18 14:25:00 -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
47bdcb6050
feat: make second metadata pass concurrent 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -03:00
flow
58dc3e93d3
fix: clean up execWithTask in Progress Dialog 
This prevents weird problems, such as dialogs being non-modal when they
should be!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -03:00
flow
79b0a16f7a
fix: try finding a good height for short changelogs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -03:00
flow
2b65ee433f
fix: changelogs with too much space between lines 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -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
fac63541a4
fix: work around HoeDown bug(?) in changelog line breaks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -03:00
flow
dfd6cb29be
feat: improve changelog and sort updatable mods 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:44 -03:00
flow
5f75e531e6
fix: handling around disabled mods 
Don't update disabled mods to prevent mod duplication. Also, chop
filename in the metadata with a '.disabled'.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:43 -03:00
flow
4e6978ff6f
feat: improve metadata gen. networking and performance 
This makes the metadata generation code a lot messier and harder to use,
but there's not really much else that can be done about it while
preserving all it's capabilities :(

At least we now have speed

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:43 -03:00
flow
9a07ede615
fix: filter out opted-out mods in mod downloader 
Maintains Pre-Updater behaviour

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:43 -03:00
flow
1709b47bb7
fix: don't double add mods in mod downloader/updater 
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
flow
6e2869834f
feat: add mod update dialog 
This subclasses the Review mods dialog to make a "Update review" one.
Also, all the necessary components built until now are put together in a
coherent unity that checks and generates metadata on-the-fly and checks for
mod updates, while giving and receiving feedback to the user.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:42 -03:00
flow
dd6aabf9ab
feat: add ChooseProviderDialog 
Allows you to prompt the user for choosing a (mod) provider. This should
be fairly independent of the mod updater logic, so it can be used for
other ends later down the road :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:41 -03:00
flow
032ceefa1d
feat: add some helping methods to WideBar 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:41 -03:00
kumquat-ir
6a1d611fd1 Restore ScrollMessageBox 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2022-07-17 02:40:27 -04:00
kumquat-ir
33e34ebb83 Add "Open All" button to blocked mods dialog 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2022-07-16 19:14:54 -04:00
Gingeh
4dfc01899a Make skin upload optional 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-07-15 12:23:11 +10:00
Sefa Eyeoglu
8f4d7ac655
Merge pull request #678 from Scrumplex/improvements-around-proprietary-services 2022-07-11 14:56:09 +02:00
Sefa Eyeoglu
b3b76d5d56
Merge branch 'develop' into feature/sparkle-mac 
# Conflicts:
#	.github/workflows/build.yml
 2022-07-10 19:38:30 +02:00
Sefa Eyeoglu
eb33a87ff5
fix: remove TODOs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 18:11:13 +02:00
Jamie Mansfield
bf560f4594
ATLauncher: Move the UI support implementation into it's own class 
This will allow it to be used in multiple locations.
 2022-07-10 11:27:42 +01:00
Sefa Eyeoglu
3b4539de79
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
15c5bbcf22
fix: fix slots for Qt 6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02: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
ff2cd50bfa
refactor: replace QRegExp with QRegularExpression 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +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
dada513
3b187b5246
Merge pull request #876 from Scrumplex/revert-updater-stuff 
Revert "fix: remove updater if it is not used"
 2022-07-10 10:50:03 +02:00
flow
35a698ef72
Merge pull request #884 from jopejoe1/ftbuifixed 
Updated FTB Classic layout
 2022-07-08 16:19:14 -03:00
Sefa Eyeoglu
08989bde5e
Merge pull request #839 from flowln/modrinth_packs_bug_hunt 2022-07-08 16:25:35 +02:00
Sefa Eyeoglu
87cbff391c
fix: disable MSA login if it is NOT supported 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
962923bbce
chore: add missing license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
311b081e60
feat: add validation for Flame key and MSA client ID 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
4103948132
feat: track capabilities of application 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
906f26698b
fix: spelling of CF 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
8a1a583afe
refactor: rename references to CurseForge to Flame 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
jopejoe1
9e19b73ce6 Updated FTB Classic layout 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-07-07 23:18:13 +02:00
Sefa Eyeoglu
e210a4b244
Revert "fix: remove updater if it is not used" 
This reverts commit 2ff0aa09e3.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-06 18:13:51 +02:00
Sefa Eyeoglu
f1902a4471
Merge pull request #794 from Scrumplex/resolve-jars-dynamically 2022-07-06 17:40:09 +02:00
Sefa Eyeoglu
04b865adae
Merge pull request #707 from Jan200101/PR/gamemode 
Add Performance related settings
 2022-07-06 17:11:43 +02:00
Jan200101
cad581388f
Add Performance related settings 
Integrates support for Feral Gamemode, discrete GPU support for Mesa and the proprietary Nvidia driver and MangoHud support

Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-07-06 09:34:14 +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
flow
145da82cd8
fix: show invalid version even when there's none 
Having a blank instead of _anything_ is bad UX. Instead, even when
there's not a valid version (most likely disabled redistribution), we
show a message in the UI, to differentiate from the loading state.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:05 -03:00
flow
64776d6bac
feat+fix: cache Flame modpack versions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:05 -03:00
flow
64d123f524
fix: use better naming for Modrinth pack versions 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:04 -03:00
flow
0ec4ade683
feat+fix: cache versions and extra info in Modrinth packs 
When you change a copy thinking you're changing the original data smh

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:04 -03:00
flow
4232b1cedb
fix: don't use uniform sizes in Modrinth modpack viewer 
Apparently, when Qt sees an icon with the height smaller than the rest,
with this option set, it will change the height of all other items to be
that one, causing #828.

While we do lose some performance changing this option, the issue is
gone, so :|

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-03 12:43:00 -03:00
Sefa Eyeoglu
474d77ac57
feat: resolve JARs dynamically 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-03 17:31:01 +02:00
Sefa Eyeoglu
278d2169da
fix: initialize accountIsOnline to fix build 
CMAKE_BUILD_TYPE=Release makes the build fail otherwise.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-03 14:32:31 +02:00
Sefa Eyeoglu
5599b5a337
Merge pull request #855 from Gingeh/account-list 2022-07-03 12:55:36 +02:00
Ezekiel Smith
7aba7b6064
Merge pull request #818 from flowln/tiny_mod_icons 
Always scale mod icons to the right size
 2022-07-03 01:49:09 +10:00
timoreo
fe2e1d931f
Merge pull request #786 from flowln/concurrent_tasks_slimmed 2022-07-01 20:09:18 +02:00
timoreo
2e17e78052
Merge pull request #845 from flowln/news_in_launcher 2022-07-01 20:04:06 +02:00
flow
02201631e7
feat: use ConcurrentTask for mod downloads 
Way faster :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-01 08:34:17 -03:00
Sefa Eyeoglu
63dfc0633f
Merge pull request #652 from flowln/mod_page 2022-07-01 10:00:36 +02:00
Gingeh
dbb63b97bd
Merge branch 'PolyMC:develop' into account-list 2022-07-01 10:43:41 +10:00
flow
5f951e8f21
change: better regex for removing 'The' when sorting mods 
Teh :|

Co-authored-by: timoreo22 <timo.oreo34@gmail.com>
 2022-06-30 07:04:47 -03:00
Sefa Eyeoglu
286f82cc99
Merge pull request #826 from kthchew/fix/kill-menubar 2022-06-30 11:50:43 +02:00
timoreo22
ed5415aeb8
Merge pull request #837 from DioEgizio/fix-sort-mr 2022-06-30 08:24:51 +02:00
Gingeh
bef79df6bb Disable the refresh button for offline accounts 2022-06-30 09:08:53 +10:00
Gingeh
d6f4ff26b5 Disable skin buttons for offline accounts 2022-06-29 18:46:39 +10:00
Gingeh
b606a2e040 Make the profile and account name columns use all available space 2022-06-29 18:45:36 +10:00
Ezekiel Smith
774ed044fc
Merge pull request #827 from kthchew/fix/menubar-separator 
Workaround Qt bug to fix menu bar separators on macOS
 2022-06-27 01:14:15 +10:00
Ezekiel Smith
9cc235cde0
Merge pull request #811 from jn64/fix/window-title 
Fix duplicate name in window title
 2022-06-27 01:13:58 +10:00
flow
9ef38171e2
fix: use clicked instead of pressed signal for button clicks 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-06-26 08:10:52 -03:00