0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,115 Commits 1 Branch 0 Tags 29 MiB
69bbb29328
Commit Graph

679 Commits

Author SHA1 Message Date
Tayou
fef60a9da0
add support for multiple custom themes 
also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions.
Themes can now be just qss or css files, they won't have color pallette information with them in that case

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:10:12 +01:00
TheKodeToad
576867605d Add another fallback 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:40:12 +00:00
TheKodeToad
d1626d20bd Slight cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:30:11 +00:00
TheKodeToad
c890aa18f7 Only select correct mod 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:25:54 +00:00
TheKodeToad
6c7d040439 Hacky tweaks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:12:27 +00:00
TheKodeToad
d03ae34b61 Auto-select first result 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:19:54 +00:00
TheKodeToad
b9547adce7 Add more license headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:02:24 +00:00
TheKodeToad
7f32c6464d Initial better mod browser link implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 16:58:22 +00:00
Rachel Powers
209a1650e4 clang_format and code cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 07:06:36 -07:00
Rachel Powers
d2f3dbaa29 fix mispellings and wrap strings for translation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
e9d4793b1e minor clean up and add some docs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
13c7efa058 copy found mods to instance (FTB and Flame) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
1598d65824 watch filesystem, compute and match hashes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
028e086960 send blocked mod info to dialog & prototype UI 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Chrono
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop 2022-10-31 20:06:59 -04:00
Chrono
dfdf739282
remove one space 
Signed-off-by: Chrono <me@disilla.org>
 2022-10-31 19:44:55 -04:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:56:07 +01:00
Sefa Eyeoglu
f2d445d27b
fix: fix undo key sequence 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:48 +01:00
Sefa Eyeoglu
29d362a6e0
fix: do not trash instances in Flatpak 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:46 +01:00
Fayne Aldan
b7d5fee995 Change Profiles to Accounts for consistency 
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
 2022-10-30 15:56:45 -06:00
Sefa Eyeoglu
b4be28b9bb
fix: fix disabled trash undo action 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-30 18:37:06 +01:00
Marcelo Hernandez
5d1aac3c53
added option to not copy screenshots 
+ moved select all checkbox to top row, centered.

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-29 22:27:31 -04:00
Sefa Eyeoglu
5ed7eb9d53
chore: update credits 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-29 13:12:51 +02:00
Marcelo Hernandez
c00f96c7ca
create getters and setters for InstanceCopyPrefs 
+ use pragma once like other .h files in this directory

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-29 00:55:33 -04:00
leo78913
4500e345b3
Merge branch 'PrismLauncher:develop' into toolbar-icons 2022-10-28 15:46:02 -03:00
Sefa Eyeoglu
e885f3c26a
Merge pull request #65 from he3als/develop 2022-10-28 18:43:30 +02:00
Marcelo Hernandez
63b6c6685c
Abstract away InstanceCopyPrefs' internals through new getSelectedFiltersAsRegex() function 
+ fix typo in comment
+ remove unused import
+ add [[nodiscard]] to methods

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-26 00:20:36 -04:00
DioEgizio
b516dd970f
Merge pull request #206 from flowln/changelog_height_fix 2022-10-25 11:29:14 +02:00
Marcelo Hernandez
385c452ddf
remove checkBool function, add updateSelectAllCheckbox function 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-24 20:49:40 -04:00
Marcelo Hernandez
a89df42561
Simplify bool check in CopyInstanceDialog.cpp 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-24 19:31:40 -04:00
flow
b638a6ae95
fix: retry mod search job after aborting it 
This way, we don't get stuck with an aborted job in our way! :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-24 09:09:24 -03:00
Marcelo Hernandez
4caf06bc99
Check "Select all" checkbox if all options are already selected 
+ code cleanup

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:41 -04:00
Marcelo Hernandez
15593b5c09
Add "Select all" checkbox + ui revamp + code cleanup 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:41 -04:00
Marcelo Hernandez
e7e56eb1e3
add more options to copy instance dialog 
- Copy game options, copy resource packs, copy shaders,
copy servers, and copy mods
- Also made a new InstanceCopyPrefs struct to store those
options rather than passing 7 different booleans into
InstanceCopyTask's constructor

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:28 -04:00
leo78913
43bf601f12 add icons to the instance toolbar 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-23 20:04:19 -03:00
Trisave
d5109f024b
Better dark theme selection contrast 
Tweak background of the selection background in order to make text more readable

Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
 2022-10-23 20:32:04 +02:00
jn64
01db80d19a Fix version labels width 
Make labels fit to the contents, so Ibeam cursor doesn't appear
over empty space. Should have been done with 90025ed.

Signed-off-by: jn64 <23169302+jn64@users.noreply.github.com>
 2022-10-23 03:35:23 +08:00
he3als
99e1c13e80 fix: add flat_white to code 2022-10-22 15:50:06 +01:00
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting 
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
 2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop 2022-10-22 10:48:00 -03:00
Jamie Mansfield
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed 
This matches the behaviour of ATLauncher.
 2022-10-22 12:35:34 +01:00
Sefa Eyeoglu
54c26b05fa
Merge pull request #185 from flowln/fix_blocked_mods_crash 2022-10-22 12:44:20 +02:00
forkiesassds
9b17cde019 CurseForge modpack page improvements 
Signed-off-by: forkiesassds <icanttellyou@memeware.net>
 2022-10-22 01:20:08 +03:00
Sefa Eyeoglu
aefb8b353e
Merge pull request #187 from leo78913/menu-icons 2022-10-21 22:39:35 +02:00
flow
7eecf454e8
fix: remove max height logic for mod update changelogs 
It's not worth it to keep this, it's just a heuristic that fails from
time to time.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-21 14:07:43 -03:00
circuit10
ff2f40f5e1
Fix typo 
Signed-off-by: circuit10 <heath.mitchell27@gmail.com>
 2022-10-21 16:28:04 +01:00
Sefa Eyeoglu
12d8409e65
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize 2022-10-21 15:25:28 +02:00
leo78913
8db89b4cfb
Merge branch 'PrismLauncher:develop' into menu-icons 2022-10-20 17:54:43 -03:00
leo78913
31dc92dafe add icons to the instance menu and 4 new icons: 
delete
rename
tag
export

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-20 17:48:57 -03:00
flow
0a7383a4e1
fix: hide ProgressDialog when failing/succeeding tasks 
WHY IS QT LIKE THAT AAAAAAAA

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 16:54:39 -03:00
Chrono-byte
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance 
Signed-off-by: Chrono-byte <me@disilla.org>
 2022-10-20 15:14:26 -04:00
flow
5d27633821
fix: show a single line in ProjectItem's desc. when there's no more space 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 15:03:46 -03:00
Sebastian Rueth
b46c4a81e0
check space requirements of project description 
if there isn't enough space for 2 lines of project description, only
draw one

Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>
 2022-10-20 08:02:05 +02:00
flow
d6479e133d fix: properly center project descriptions 
In particular, this takes into account the space used by the title, so
(hopefully) there won't be problems with custom themes with that.

Signed-off-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
 2022-10-19 20:12:50 +02:00
Sebastian Rüth
50bbf2aacc fix text clipping 
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
 2022-10-19 20:12:50 +02:00
Sefa Eyeoglu
4e08f28246
Merge pull request #31 from flowln/who_needs_webview 2022-10-19 14:28:29 +02:00
Sefa Eyeoglu
46c57e120f
Merge pull request #27 from flowln/ftb_install_improve 2022-10-19 13:51:35 +02:00
Sefa Eyeoglu
61fbc5a791
refactor: replace with new logo 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-19 13:08:23 +02:00
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
Cleo John
83ceb26151 Streamline Button changes to improve source readability. 2022-10-18 17:28:23 +02:00
Sefa Eyeoglu
3405fd91c6
Merge pull request #33 from DioEgizio/remove-useless-actions 2022-10-18 15:31:32 +02:00
Sefa Eyeoglu
98963d4cdf
Merge pull request #29 from Scrumplex/feat-clear-metadata 2022-10-18 15:25:56 +02:00
DioEgizio
e05fe77bfe feat: remove redundant actions from instance toolbar and redundant "instance"s 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-18 14:43:29 +02:00
Sefa Eyeoglu
3ac398ac49
fix: use display name in code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:50:27 +02:00
Sefa Eyeoglu
722194405a
refactor: initial rebrand 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:37:59 +02:00
flow
dfa220ef02
fix: issues with aborts (again) 
i hate it

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 15:10:35 -03:00
flow
f26be00571
fix: abort search if we're already trying to download a pack 
Meaning we don't have to wait for the searches to finish in the
background to finally start the modpack download, when we have already
selected it -_-

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 13:49:06 -03:00
flow
b2a5d8daf4
fix: don't include opted out versions with the 'Any' filter on the MD 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-12 10:26:14 -03:00
flow
fda3f1352e
feat: add image support for the news reader :^) 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-11 16:11:08 -03:00
flow
d194b02e28
fix: prevent images overriding content when changing pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-11 15:51:54 -03:00
Tayou
aaba99dc10
Update launcher/ui/MainWindow.cpp 
make " Offline" string for profilers translatable

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
 2022-10-11 14:58:34 +02:00
Tayou
93a2e0f777
Merge Launch Buttons 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-10-10 23:23:06 +02:00
Sefa Eyeoglu
71f3c6b461
feat: add clear metadata action 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-10 12:48:25 +02:00
Sefa Eyeoglu
fafc9cf9ca
Merge pull request #1033 from Scrumplex/multi-arch-support 2022-10-08 20:12:40 +02:00
flow
28f84902f6
Merge pull request #1185 from DioEgizio/fix-tooltip 
Fix outdated 'Disable mod metadata' button's warning message.
 2022-10-08 14:34:59 -03:00
Trisave
ebee50eedc
Improve default light and dark themes (#1174) 2022-10-08 14:33:24 -03:00
flow
d7992ab29d
feat: add image support for FTB packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:12:05 -03:00
flow
60f19f305e
feat: add image support for modrinth modpack pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:12:03 -03:00
flow
d99976f5d7
fix: make mod and modpack caches separate for Modrinth 
This makes it similar to CF mods / modpacks. The mods cache is
maintained with the same name because it most likely has more data it
in, so this commit will affect existing caches as minimally as possible.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
flow
db158a5735
feat: add image support for mod pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
flow
ea3be17220
feat: add widget for a text browser with image support 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-08 14:11:20 -03:00
DioEgizio
f26049009e fix: mod updating isn't upcoming anymore :p 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-08 16:20:46 +02:00
Sefa Eyeoglu
787234a53a
Merge pull request #1163 from flowln/fix_list_icons 2022-10-08 12:12:38 +02:00
Sefa Eyeoglu
fc3a64056c
Merge pull request #1154 from Scrumplex/epic-formatting-codes 2022-10-08 12:12:26 +02:00
Sefa Eyeoglu
7ccafdc993
fix: add missing includes to fix Qt 6.4 build 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-30 19:56:01 +02:00
flow
370c3aa598
Merge pull request #894 from flowln/update_from_external_source 
epic PR
 2022-09-26 08:25:12 -03:00
timoreo
9ff364b0d3
huge nit: added const refs, everywhere 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-09-26 11:50:31 +02:00
ErogigGit
8a4f1c66f8 Allow double clicking to mark for dowload 
Signed-off-by: Erogig <erogigabyte@gmail.com>
 2022-09-24 22:37:51 +02:00
flow
e7380e70a3
fix: use placeholder icon when the project has no icon in MR 
Projects with no icon return a null icon URL in Modrinth's API.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 18:05:58 -03:00
flow
3df8594f19
feat: change project item delegate for modrinth modpacks 
more info! \ ^-^/

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
flow
ee4a829293
fix: remove manual icon resize in ModModel 
THis fixes a FIXME, now that we fixed the issue :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
flow
1862f3c124
fix: set icon sizes correctly in ProjectItemDelegate 
no more dumb hacks with icons!!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
Sefa Eyeoglu
777ab3416f
feat: also format resource/texture pack names 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-21 15:00:28 +02:00
Sefa Eyeoglu
ecf5ab75e7
feat: support more formatting codes 
also fix some crashes

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-21 14:59:01 +02:00
flow
68facd6b93
fix(ui): hook up abort status signal in ProgressDialog 
Now we have a visual indication on when tasks are abortable!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
6541570969
fix: simplify abort handling and add missing emits 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
6131346e2f
refactor: change the way instance names are handled 
While working on pack updating, instance naming always gets in the way,
since we need both way of respecting the user's name choice, and a
standarized way of getting the original pack name / version.

This tries to circunvent such problems by abstracting away the naming
schema into it's own struct, holding both the original name / version,
and the user-defined name, so that everyone can be happy and world peace
can be achieved! (at least that's what i'd hope :c).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
941d75824a
refactor: add instance creation abstraction and move vanilla 
This is so that 1. Code is more cleanly separated, and 2. Allows to more
easily add instance updating :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
Sefa Eyeoglu
09e85e948c
refactor: introduce RuntimeContext 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 15:59:43 +02:00
Sefa Eyeoglu
ebbcc9f6da
fix: actually render color codes for texture packs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00