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

1789 Commits

Author SHA1 Message Date
flow
0516055b31
Merge pull request #630 from leo78913/yeet-scrollbars 2022-12-17 08:02:41 -08:00
flow
e3f8d99087
refactor(Inst. Import): use m_* for member variables in MR components 
Makes it clearer what is being changed when.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-17 12:41:10 -03:00
flow
22aebc2215
fix(Inst. Import): correctly set component versions when updating 
This makes it so that the later call to parse the old manifest doesn't
change the class data, so that the new data con continue there and be
reflected on the component list later.

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-17 12:38:58 -03:00
leo78913
3653e9d5e3 let the theme decide the notes page right margin 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-17 12:05:20 -03:00
flow
ee67b5f1ad
Merge pull request #607 from flowln/dont_crash_on_zip_import 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/609
 2022-12-16 07:22:22 -08:00
leo78913
aa3633d2d7
fix: translate unknown mod provider 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-16 11:13:54 -03:00
leo78913
c8d8dda79a fix: only show scrollbars when needed 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-15 16:34:52 -03:00
flow
c440f33122
fix(ResourceModel): use a single ConcurrentTask for parsing tasks 
This avoids creating a bunch of threads that fills up the maximum amount
allowed by QThreadPool, and causes a deadlock between the helper threads
and the main thread (main thread tries to create threads in painting
code, but isn't able to, so it keeps waiting for a thread to free up,
but all the threads are waiting on the main thread to process some
events).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-15 13:51:07 -03:00
flow
b0c866bfaa
feat(Tasks): allow adding subtasks while running in ConcurrentTask 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-15 13:48:53 -03:00
flow
dd578354c4
feat(Tasks): add ConcurrentTask::clear to allow re-using tasks 
This way old runs won't pile up in the internal DSs

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-15 13:45:50 -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
Edgars Cīrulis
52dc9068e5
ApplicationMessage: Use QHash instead of QMap 
QHash provides faster lookup times than QMap because it uses a hash table to store the elements, while QMap uses a self-balancing binary tree.

Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2022-12-15 16:17:19 +02:00
flow
4f1ea712da
Merge pull request #605 from flowln/fix_crash_in_downloader_image 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/590
 2022-12-15 04:47:56 -08:00
Sefa Eyeoglu
d193ed9eeb
Merge pull request #561 from leo78913/iconpicker-stuff 
closes https://github.com/PrismLauncher/PrismLauncher/issues/494
 2022-12-14 23:15:21 +01:00
TheKodeToad
ee003cd9ee Add confirmation on customised components 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-14 15:40:20 +00:00
TheKodeToad
127b094c41 Improve handling of destructive actions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-14 15:20:42 +00:00
DioEgizio
821c424b66 move cat to bottom right 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-14 08:36:35 +01:00
flow
5450e0edf3
fix(Inst.Import): don't set managed pack info from imported ZIPs 
This prevents the Managed Pack page from showing up even though there's
no way for it to work correctly.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-13 13:43:27 -03:00
flow
e05ccc0e55
Merge pull request #601 from Scrumplex/fix-translations-3 2022-12-13 07:01:23 -08:00
Sefa Eyeoglu
107977f3d1
fix: update source strings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-13 10:40:35 +01:00
flow
64585d8f78
fix(Inst.Import): don't assert extra data when importing from ZIP 
ZIPs don't have the necessary data in those cases.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-13 00:31:41 -03:00
flow
756d933d1a
fix: bind image fetch callback lambda to the parent object 
Fixes a possible crash with the callback being called after the image
object was already deleted.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-12 23:51:22 -03:00
flow
83deccf266
fix(ManagedPackPage): crash with GTK2 theme due to QProxyStyle 
Seemingly related issue: https://bugreports.qt.io/browse/QTBUG-49940

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-12 23:31:10 -03:00
TheLastRar
7e96077ed7 Fix: Reset stylesheet before setting style 
Resolves #510

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-12-12 20:22:08 +00:00
Una
822c5a530e
Not all libraries are from Mojang 
Signed-off-by: Una <me@unascribed.com>
 2022-12-11 16:11:32 -08:00
DioEgizio
9eb14e6b9b fix: remove leftover TODO 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-11 20:35:39 +01:00
Sefa Eyeoglu
7cc42269a9
Merge pull request #569 from Jan200101/PR/fix-mangohud 2022-12-11 18:31:05 +01:00
Tayou
83f0611200
fix breeze icon colors and matrix icon 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-12-11 17:36:05 +01:00
flow
d95625ed88
Merge pull request #486 from flowln/wide_bar_customization 2022-12-11 04:16:45 -08:00
flow
5622bcc563
Merge pull request #461 from flowln/fix_big_resource_pack_imgs 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/360
 2022-12-11 04:16:21 -08:00
Jan200101
deb9c98630
chore: replace naive mangohud preload with vklayer detection 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-11 11:01:34 +01:00
Jan200101
2c1e887c8d
chore: replace naive mangohud detection with vulkan layer detection 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-11 11:01:33 +01:00
flow
4a13d72997
Merge pull request #32 from flowln/modpack_update_page 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/180
Closes https://github.com/PrismLauncher/PrismLauncher/issues/170
 2022-12-10 06:34:18 -08:00
leo78913
2d5820e910
Update launcher/icons/IconList.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-10 10:31:44 -03:00
leo78913
6cb857b895
Update launcher/icons/IconList.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-10 10:31:30 -03:00
Rachel Powers
8f30237765 fix: prevent potental crash if droping non local files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-09 17:21:40 -07:00
flow
cb0339b492
Merge pull request #572 from DioEgizio/breeze-icons-improvements 2022-12-09 04:14:36 -08:00
Sefa Eyeoglu
e427174ff0
Merge pull request #571 from Ryex/blocked-targetFolder 
fix(blockedmods): Track and use targetFolder for blocked files
 2022-12-09 08:33:10 +01:00
DioEgizio
fc4c57f0d9 feat: improve new.svg in breeze icon packs 
makes it better and more similar to the one in legacy

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-09 07:49:16 +01:00
flow
9ad4ae5340
Merge pull request #568 from leo78913/flatpak-shortcuts 2022-12-08 17:53:33 -08:00
Rachel Powers
0f48e0fc06 fix(blockedmods): Track and use targetFolder for blocked files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-08 18:42:51 -07:00
leo78913
37ad1b40d8 fix: fix creating instance shortcuts in flatpak 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-08 20:18:07 -03:00
Jan200101
514e7ae6a0
fix: re-add LD_LIBARY_PATH to mangohud 
Upstream officially supports the use of $LIB/mangohud/

Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-08 23:09:14 +01:00
leo78913
ab2f3bb5bc make removeButton a member of IconPickerDialog 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-08 11:13:53 -03:00
flow
34230bfcf4
fix: don't try updating Flame instance names when updating versions 
Since the exact version string is only available in the manifest,
there's no easy way of getting it before commiting to the update, so
there's not much of a good way of showing the updated name in the UI,
and using the displayName is weird and gives some buggy behavior.

We may want to re-enable it in the future if we find a reliable way of
showing the correct info on the UI before starting the update.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-07 18:05:46 -03:00
DioEgizio
b0d69db878 fix: add instance shortcut creation action to menubar 
also moves deleteinstance to the same place as the instance toolbar

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-07 16:52:06 +01:00
leo78913
8c99edd3c5 feat+refactor: trash instance icons 
also refactor IconList::deleteIcon

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-06 20:25:42 -03:00
leo78913
8036272e87 fix: disable remove icon button for default icons 
pressing this button in the icon picker dialog when a default icon is selected does nothing so why not disable it

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-06 20:10:30 -03:00
flow
6f50809457
fix(FlamePage): don't assert / suggest blocked modpacks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:35 -03:00
flow
bb386a1162
fix(ManagedPackPage): only update the current instance exactly 
Also carry on the original ID to avoid updating the wrong instance.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
80054e4db2
fix(ManagedPackPage): preserve pack ID from Modrinth update 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
1630a23fb0
refactor(InstanceImport): require rvalue from 'extra_info' mappings 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
4e75419e08
fix(ManagedPagePage): don't reload pack info when not needed 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
089018015a
refactor(ManagedPackPage): use smart pointers instead of raw ones 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
feb6f285ce
feat(ManagedPackPage): add reload button when in a fail state 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
cb12c51afc
fix(ManagedPackPage): check app capabilities for creating the CF page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
c5c426ecbc
chore(ManagedPackPage): format and add headers 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
74f7039abf
fix(ManagedPackPage): clear combo boxes when adding new versions 
Prevents versions to undergo mitosis.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
57b905be24
feat(ManagedPackPage): implement Flame modpack updating button 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
34794cc4af
fix(ManagedPackPage): give extra_info to InstanceImportTask in MR packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
38f59fdf39
fix(ManagedPackPage): add warning about old bug with pack IDs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
527c1113f1
feat(ManagedPackPage): add Flame UI 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
04dbe28793
fix(ManagedPackPage): better changelog text when fetching / no changelog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:33 -03:00
flow
968366c2ae
feat+fix: allow forwarding extra info to InstanceImportTask 
This allows us to pass to the creation instances their actual pack ID
and version ID, that in Flame's case, are only available before starting
to create an instance.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
7f5dea28bb
feat(ManagedPackPage): add link to the Modrinth's pack page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
d4979974b4
fix(ManagedPackPage): better UX for when network requests fail / are pending 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
9539230915
fix: do not display managed pack page for providers without an impl. yet 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
25cfa26e7b
fix: use rich text in changelog for modrinth modpacks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
0ff8891c66
feat: add ManagedPackPage to the instance pages 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
58d2c15ffa
feat: add functionality to MR modpack update in the page :D 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
82699cc297
feat: allow skipping the update confirmation dialog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
08d008a5aa
refactor: abstract away update confirmation dialog 
... so that we can avoid code duplication.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:29 -03:00
flow
9e17ff884f
feat: add PageContainer::getPage 
This allows us to directly access a page from outside. This will be
useful for telling the ManagedPackPage who is the window it's on, so
that we can close it when updating :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
1c567232e3
feat: add (current) indicator to the currently installed version in MR 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
cba2608c1c
feat: add logic for the modrinth instance modpack page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
e5c42f68c2
feat: add basic ManagedPackPage classes 
The idea is to have a base class that defines common behavior, and
subclasses for each modpack provider, adding specific behavior.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
flow
02b4468bcd
feat(ui): add ManagedPackPage ui 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:50 -03:00
Sefa Eyeoglu
746f6945da
fix: remove rogue notr 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:32 +01:00
Sefa Eyeoglu
5cab4d8864
chore: reformat code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:31 +01:00
Sefa Eyeoglu
5cedfcbfaf
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:14 +01:00
Sefa Eyeoglu
c06abd9b6b
refactor: replace Open All with Open Missing 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:52:13 +01:00
Sefa Eyeoglu
e08d97825d
feat: implement lax filename match in BlockedModsDialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:51:18 +01:00
Sefa Eyeoglu
d61323aa6d
fix: improve resize behavior of BlockedModsDialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 20:51:18 +01:00
flow
5ae044db93
Merge pull request #556 from DioEgizio/modrinth-icon-larger 2022-12-06 11:50:35 -08:00
flow
c6e4fdac7e
Merge pull request #557 from Scrumplex/fix-fswatcher-segfault 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/555
 2022-12-06 11:50:03 -08:00
Sefa Eyeoglu
c8c3fe1023
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 13:18:50 +01:00
Sefa Eyeoglu
85bddbed86
chore: reformat code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 13:16:27 +01:00
Edgar Onghena
318a2a429c
Fix minutes unit 
Replaced "m" with "min" in `Time::prettifyDuration`

Signed-off-by: Edgar Onghena <dev@edgar.bzh>
 2022-12-06 13:01:43 +01:00
Sefa Eyeoglu
07359865c6
fix: don't allocate BlockedsModsDialog 
Fixes temporary memory leak!

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-05 21:39:26 +01:00
Sefa Eyeoglu
2fd7338cd3
dix: disable FS watcher after closing BlockedModsDialog 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-05 21:39:24 +01:00
DioEgizio
ce3cfa212c fix: make modrinth icon larger 
before it was considerably smaller than the other modpack platform icons which looked weird

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-05 20:27:29 +01:00
DioEgizio
b29c99656e
Merge pull request #546 from DioEgizio/add-server-icon 
feat: add a proper server icon
 2022-12-05 07:49:55 +01:00
DioEgizio
aceafb28f6 feat: add server icon to simple colored icons too 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Co-Authored-By: leo78913 <leo3758@riseup.net>
 2022-12-04 21:29:00 +01:00
flow
928939cbe3
fix(Inst.Copy): create FS::copy object inside the secundary thread 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-04 12:29:38 -03:00
DioEgizio
2462b8e524 feat+fix: better flat icon 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-04 13:30:24 +01:00
DioEgizio
263a72879d fix: oyxgen is lgpl3! 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-04 12:50:40 +01:00
DioEgizio
70620d5137 feat: add a proper server icon 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-04 12:45:39 +01:00
Ryan Cao
fa3caf091a
fix: warn before trashing instances 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-12-03 21:54:41 +08:00
Sefa Eyeoglu
5c6f325071
Remove blue-ish tint from remaining flat white icons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-02 20:47:11 +01:00
Sefa Eyeoglu
b9a17f5999
Merge branch 'upstream/develop' into develop 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-02 20:46:04 +01:00
flow
ab23f542c6
Merge pull request #423 from TheKodeToad/addagent 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/414
 2022-12-02 06:40:18 -08:00
flow
fa98bf1ee7
Merge pull request #481 from ryanccn/import-resource-pack-dialog-uwu 2022-12-02 06:39:54 -08:00
flow
3cc987a5b4
fix: explicitly set scheme for local file in -I argument 
Otherwise isLocalFile() will return false for local files without the
file:// thingy.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 22:54:03 -03:00
flow
386fb28a35
fix(FileResolvingTask): Fail instead of crash when there's API errors 
Also remove non-used variable (rip).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:33:35 -03:00
flow
79b79b752c
fix(Inst.Import): Show error reason in fail dialog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:32:26 -03:00
flow
a116778402
fix(Inst.Import): don't search inside 'overrides/' for the manifest 
It will never be there anyways, and saves a **bunch** of time when the
overrides folder is big and we traverse all the tree when searching for
the MMC 'instance.cfg' file.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:15:15 -03:00
Sefa Eyeoglu
9e1653ebb4
Merge pull request #436 from Scrumplex/feat-change-maxmem 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/426
 2022-11-30 18:22:55 +01:00
flow
42c00213ce
Merge pull request #238 from santiagocezar/new-icons 2022-11-29 14:30:29 -08:00
Sefa Eyeoglu
52d06ed814
chore: move instance_icons.svg 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-29 20:07:00 +01:00
TheKodeToad
31dc82b1a6 Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-29 09:43:08 +00:00
flow
4e27e132a0
fix: don't disable interaction on non-mod models when inst. is running 
It is still useful for mods though, since we don't wnt to allow
disabling mods when the instance is running, as that wouldn't affect the
running instance, possibly causing confusion

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-28 12:02:38 -03:00
Sefa Eyeoglu
a5b0b4800a
fix: make resource buttons work when instance is running 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 23:10:32 +01:00
Santiago Cézar
e6244c937a
Merge branch 'develop' into new-icons 
Signed-off-by: Santiago Cézar <48573316+santiagocezar@users.noreply.github.com>
 2022-11-27 16:28:42 -03:00
Santiago Cézar
3cbf8d4993 resolving reviews 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-27 16:24:45 -03:00
Sefa Eyeoglu
f3279a0697
Merge remote-tracking branch 'upstream/develop' into import-resource-pack-dialog-uwu 2022-11-27 20:05:21 +01:00
Sefa Eyeoglu
8cac61f0be
fix: check resource pack validity solely using pack format 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 18:41:52 +01:00
Sefa Eyeoglu
236c196e68
fix: improve code readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 18:38:56 +01:00
DioEgizio
c90f2c3ac6 fix: use monochrome icon for breeze 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-11-26 15:05:08 +01:00
Santiago Cézar
a8943ce1ee remove unused ftb icon 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:08 -03:00
Santiago Cézar
71d35dc70b meat is now round 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:08 -03:00
Santiago Cézar
9daf2a2996 resize to 24x24 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:07 -03:00
Santiago Cézar
f5d6aea942 forgot ftb 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:15:07 -03:00
Santiago Cézar
5850447fd0 merge with upstream 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 15:14:52 -03:00
Santiago Cézar
e12a7a4415 gradients! 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 14:22:49 -03:00
Santiago Cézar
81d84b8d02 initial icons 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-25 14:22:49 -03:00
flow
bae0a0530b
fix(RPImportDialog): allow changing item size to accomodate wrapped text 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-25 11:51:08 -03:00
Sefa Eyeoglu
cbf4159c7e
fix: add missing shortcut icons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-25 14:03:10 +01:00
flow
4a1d082614
reafctor(WideBar): connect to signal instead of overriding menu method 
This makes stuff more standard and closer to what we do in other places
in the codebase.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-25 09:33:05 -03:00
Sefa Eyeoglu
fd8b4c5368
Merge pull request #227 from Leo40Git/feature/instance-shortcuts 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/210
 2022-11-25 13:11:00 +01:00
Sefa Eyeoglu
5872c34315
Merge pull request #412 from leo78913/legacy-icons 
add the missing icons to the legacy icon theme
 2022-11-25 08:36:42 +01:00
TheKodeToad
96e8217b00 Button to add agent 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-23 09:46:55 +00:00
flow
20c281d6f8
fix: reset wide bar settings when the list of actions changes 
This prevents changes to the actions to cause non-intuitive issues in
the Wide bar, hiding items that previously weren't hidden.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-22 14:30:54 -03:00
Trisave
66f9fed2f2
Remove blue-ish tint from flat white icons 
Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
 2022-11-22 18:30:21 +01:00
Ryan Cao
f916ce8752
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu 2022-11-21 23:19:50 +08:00
Sefa Eyeoglu
4208c2c72a
fix: actually emit fileCopied 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 15:47:15 +01:00
DioEgizio
5cc91965d0
Merge pull request #487 from TayouVR/breeze-icon-themes 2022-11-21 14:43:58 +01:00
Sefa Eyeoglu
c74f852364
Merge pull request #243 from Scrumplex/migration-dialog 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/46
Closes https://github.com/PrismLauncher/PrismLauncher/issues/204
 2022-11-21 12:14:49 +01:00
Ryan Cao
7096f02b88
fix: text wrapping 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-21 18:15:03 +08:00
Sefa Eyeoglu
884fe0d574
feat: validate maximum memory allocation in wizard 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-20 18:16:19 +01:00
flow
f55fc51e9b
fix: remove commented-out assertions 
They may not hold true at all times, and that's fine.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-20 11:11:08 -03:00
flow
df0f9259c0
refactor: move RP/TP validation to their respective utils 
This makes it easier to validate individual resources, and allows the
logic to be used in other places in the future, if we need to.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-20 11:10:26 -03:00
Tayou
bb7a321c6e
add breeze themes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-20 05:24:10 +01:00
flow
2d69d63efe
feat(InstancePages): save/load wide bar visibility settings 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:31 -03:00
flow
479843f56b
feat(WideBar): allow loading/unloading visibility via a byte array 
I really wanted to use a QBitArray :c

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:31 -03:00
flow
6e1639551b
feat(WideBar): allow hiding buttons with right-click 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:30 -03:00
flow
2367903ac6
refactor: clean up WideBar a bit 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-19 18:41:30 -03:00
Sefa Eyeoglu
30607c34a1
Merge pull request #291 from TheKodeToad/betterjavalauncher 2022-11-19 18:45:15 +01:00
Ryan Cao
d92ae530d7
fix: stray include 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-20 00:34:44 +08:00
Ryan Cao
e0e428ce38
fix: add support for CLI and drag and drop 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-20 00:28:35 +08:00
jopejoe1
d1db7a0e23
Fix New Zealand English display 
Signed-off-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
 2022-11-19 16:28:27 +00:00