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

288 Commits

Author SHA1 Message Date
TheKodeToad
4cdf669154 Modify "Change Version" to use "Install Loader" dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 19:39:04 +01:00
TheKodeToad
7138425c85
Merge branch 'develop' into better-component-installation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 13:05:55 +01:00
Trial97
0f64ee6a5f
Added warnings for running instances 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 18:28:25 +03:00
Trial97
c23bf2fd22
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-06-28 17:46:01 +03:00
Sefa Eyeoglu
faec21d572
Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-06-28 08:47:53 +02:00
Trial97
54cb077b40
Added more information to the screenshot upload warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:31:36 +03:00
Rachel Powers
df4fd7df7f
Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class 2023-06-25 12:43:48 -07:00
Trial97
6d0e255ca1
fix: Page container extra info set on logs page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 22:00:33 +03:00
Rachel Powers
9c10965997
refactor: split out setting api headers for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
TheKodeToad
c75ba0f855
Fix big mistake :iea: 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 12:46:07 +01:00
TheKodeToad
603ed22015 Replace accidental usages of QAbstractButton::pressed 
This signal is not usually what you want, and creates an inconsistent experience.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 10:36:54 +01:00
Trial97
ce4a86fbcd
Made custom url function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 10:41:29 +03:00
Trial97
54d7477679
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-25 10:12:29 +03:00
TheKodeToad
8a3aba1634 Fix Open Global Settings, why not 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:30:51 +01:00
TheKodeToad
529e2054ea A few tweaks, with inspiration from Zeke :3 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:26:27 +01:00
Trial97
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +03:00
Rachel Powers
f1ebec641a
Merge pull request #1058 from Ryex/feature/images-for-resource-page 
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
 2023-06-22 13:26:47 -07:00
TheKodeToad
e7ad373d89
Merge branch 'PrismLauncher:develop' into better-component-installation 2023-06-22 13:22:44 +01:00
Trial97
0063d52952
Merge branch 'settings2' of github.com:Trial97/PrismLauncher into settings 2023-06-21 23:25:37 +03:00
Trial97
820892d7cc
Made settings editable when instance is running 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 22:42:08 +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
Trial97
480faca559
Removed unused variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 21:17:17 +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
Trial97
ba609f3600
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 09:14:58 +03:00
seth
ca659136e2
Merge pull request #1119 from Trial97/mods_txt 
Added dynamic page extra info
 2023-06-20 19:56:38 -04:00
Alfio
f769b0b4c6 Remove inconsistent/unneeded question marks in UI 
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
 2023-06-20 10:40:27 +02:00
James Beddek
75bd626f33
Screenshots: do not retry image thumbnailing on null result 
This causes the thumbnailing thread pool to spend a lot of time attempting to
retry an image that failed. A null result is common where the image is too large
to be allocated (>128MiB alloc).

The repeated retries continue after page delete, causing hangs if a user
tries to exit the application.

Fixes: #1201
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 16:59:59 +12:00
James Beddek
f2471f0f68
Screenshots: clear the thumbnailing pool on page delete 
Removes pending QThreadPool jobs which linger after page delete.
May help with #1201 by allowing the pool to finish earlier.

Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 16:54:15 +12:00
James Beddek
d9b24f7705
Screenshots: remove path from watcher if it no longer exists 
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 16:52:57 +12:00
TheKodeToad
82d3755e25 License all the things 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-19 23:36:20 +01:00
TheKodeToad
6ccc7e77f9 Basic, unfinished & broken impl 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-19 22:42:30 +01:00
Trial97
3ee0fec729
Removed mods from lambda 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 12:22:22 +03:00
Trial97
147366bc0a
Made ByteSynkArray to use shared_ptr 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 22:59:41 +03:00
Trial97
6667ff9330
Updated text and fixed mod page text update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 12:32:48 +03:00
Trial97
5bf091149d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-15 11:46:44 +03:00
Trial97
be0df38453
Added tooltip for name label 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 11:40:39 +03:00
Trial97
fcfb3d2df7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-15 10:37:10 +03:00
TheKodeToad
3526d00a23
Merge branch 'develop' into feat/dont-hide-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-14 20:05:02 +01:00
PandaNinjas
318d11481d
Resolve other switch fallthrough issues 2023-06-07 19:37:54 -04:00
Trial97
e936bc4c60
Added custom text for multiple selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-07 01:38:10 +03:00
Trial97
f724059b88
Added visit mod's page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-07 01:23:53 +03:00
Trial97
1e702ee40f
Added dynamic page extra info 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-07 00:16:23 +03:00
Tayou
3b9d822d72
Merge pull request #1073 from leo78913/accounts-menus-fixes 2023-06-06 20:34:41 +02: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
b28f682ad9 Merge branch 'develop' into feature/images-for-resource-page 2023-05-28 12:01:49 -07:00
Rachel Powers
7af116fb00 refactor: function scope statics 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 05:06:28 -07:00
Rachel Powers
0357921284 cleanup: move qstyle getInstance decl inline 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-28 04:37:09 -07:00
Rachel Powers
37420405c7 fix(memory leak): refactor NoBigComboStyle -> singleton 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-27 23:22:40 -07:00
Rachel Powers
e61d8e4dc8 fix: katabasis and QStyle leaks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-25 16:16:58 -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