CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,877 Commits 10 Branches 30 Tags 34 MiB
e4449a0ba3
Commit Graph

176 Commits

Author SHA1 Message Date
Redson
6fe626ab9a
feat: Make the changes persistent. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 06:09:13 -03:00
Redson
a12f892841
fix: Check the box when the theme is changed via settings 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:46:24 -03:00
Redson
aa3ea79f94
fix: Check the current theme box on startup. 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:38:31 -03:00
Redson
ef53455b66
fix: Build on QT6 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-15 05:19:46 -03:00
ADudeCalledLeo
ba46ff6692
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts 2022-11-15 10:05:04 +02:00
leo78913
0e916244f0
feat: Add themes and their logic. 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-14 21:10:48 -03:00
RedsonBr140
1e4ee02cbc
Merge branch 'PrismLauncher:develop' into menu-themes 2022-11-14 21:09:37 -03:00
Redson
be765f8d88
feat: Add empty menu 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-14 16:33:25 -03:00
ADudeCalledLeo
ce892c9e77
Add icon 
NOTE: Currently missing on Legacy, Flat and Flat (White)
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-14 21:02:31 +02:00
Sefa Eyeoglu
e14b998da3
refactor: improve readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-14 18:38:12 +01:00
Ryan Cao
2c9452efaf
Merge branch 'develop' into macos-add-to-path 2022-11-14 19:26:31 +08:00
Ryan Cao
97a7af855f
slight reword: "install to PATH" 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-14 19:21:47 +08:00
ADudeCalledLeo
5be8545edc
Windows, Linux: prevent segfault on missing icon 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 20:18:51 +02:00
ADudeCalledLeo
b0269e6dfc
Linux: fixes 
- Fix shortcut icons
- Possibly fix shortcut creation on AppImages
- Fix shortcut not working if path to launcher contains spaces

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 17:51:29 +02:00
ADudeCalledLeo
43b9d9484d
tabs -> spaces 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:49:28 +02:00
ADudeCalledLeo
69bbb29328
Mac: attempt 2 
- create .command files instead of .sh
- fix shortcuts not working if path to Prism Launcher contains spaces
- fix path to executable in shortcutss
- add check for running from extracted folder (prevents creating shortcuts)

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-13 15:47:37 +02:00
ADudeCalledLeo
5322155b19
Mac: fix build 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:48:21 +02:00
ADudeCalledLeo
45ce72593a
Windows: remove icon if shortcut creation fails 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:43:58 +02:00
ADudeCalledLeo
b813c867b5
refactor #if checks 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:41:52 +02:00
ADudeCalledLeo
f7d7d76ee8
Mac: now supported! [UNTESTED] 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:36:49 +02:00
ADudeCalledLeo
dbe0553b4a
Move addAction call above left-align loop 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
9be48f1dc4
this ain't static, falco 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:31 +02:00
ADudeCalledLeo
6043444e4e
Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:30 +02:00
ADudeCalledLeo
487e352642
Fix nested #if directive 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:29 +02:00
ADudeCalledLeo
cc5f82bfac
Windows: fix window icon being replaced 
Dunno why it happens but the fix was literally 2 lines, so whatever I guess

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00
ADudeCalledLeo
4d4dfab388
Windows: add instance icon to shortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:28 +02:00
ADudeCalledLeo
6ae3b183fd
Remove unnessecary "is defined" check 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:27 +02:00
ADudeCalledLeo
f12117c532
[UNTESTED] Linux: add icons to shortcuts 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:26 +02:00
ADudeCalledLeo
70768189ba
Windows: implement FS::createShortcut 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:19:25 +02:00
ADudeCalledLeo
30b266622c
Add 'Create shortcut' button to instance toolbar 
Implemented on Windows only rn!

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
 2022-11-12 20:18:49 +02:00
flow
6c53e68a52
Merge pull request #406 from Scrumplex/fix-clear-metadata 2022-11-10 07:50:14 -08:00
DioEgizio
126bbd67f7
Merge pull request #405 from AshtakaOOf/spooky 2022-11-06 07:27:39 +01:00
Sefa Eyeoglu
9fb80a2687
Merge pull request #242 from marcelohdez/more-copy-options 2022-11-06 01:10:24 +01:00
Sefa Eyeoglu
d5d224d89a
fix: save metacache after clearing 
If the user closes the launcher right after clearing, it probably
didn't actually clear the cache yet.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 01:05:13 +01:00
Sefa Eyeoglu
4708ce4226
refactor: rename halloween cats to -spooky 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:47:33 +01:00
Sefa Eyeoglu
a0580946dc
fix: allow -ween variants for all cats 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-06 00:04:43 +01:00
Sefa Eyeoglu
e68fd7c1e3
Merge pull request #383 from leo78913/toolbar-lock 2022-11-06 00:00:47 +01:00
leo78913
0938f80b41
Update launcher/ui/MainWindow.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-05 18:10:36 -03:00
Ryan Cao
3df31579a1
fix: @timoreo22 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:31:38 +08:00
Ryan Cao
cf3aad9c41
fix: use osascript to get admin privileges 
inspired from VSCode's approach

Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:18:05 +08:00
Ryan Cao
7b1e68bfa8
initial support for add to PATH action 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-05 22:17:59 +08:00
leozamboni
9f5537d936
feat: spooky cat for halloween 
Signed-off-by: leozamboni <leonardonunes169@gmail.com>
 2022-11-04 15:09:57 -03:00
leo78913
3d11d044d2 add an option to lock the toolbars 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-02 20:33:02 -03:00
Santiago Cézar
9ca4f19aea remove logcat 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-02 07:45:43 -03:00
Santiago Cézar
0a0ce74105 add rory 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
 2022-11-01 19:06:27 -03: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
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
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
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
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
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
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
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
81e326571b
fix: enable demo launch only on supported instances 
e.g. >= 1.3.1 instances

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 19:27:42 -03:00
flow
11216d200c change: move demo action to "Play offline" menu 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 18:44:18 -03:00
jopejoe1
777be6a48d Add 'Ctrl+Alt+O' Shortcut to launch demo instance. 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-09-15 18:44:18 -03:00
jopejoe1
29dcb9d274 Added Launch Demo button. 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-09-15 18:44:18 -03:00
flow
93507a263b
fix: hide 'More news...' button if the news aren't loaded yet 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-12 17:41:11 -03: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
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
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
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
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
timoreo
2e17e78052
Merge pull request #845 from flowln/news_in_launcher 2022-07-01 20:04:06 +02:00
Sefa Eyeoglu
286f82cc99
Merge pull request #826 from kthchew/fix/kill-menubar 2022-06-30 11:50:43 +02: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
flow
455e4de6f3
feat: add news reader dialog 
Makes it easier to read about new blog posts! Yay :D
 2022-06-25 20:15:16 -03:00
Kenneth Chew
c31fce3621
Workaround Qt bug to fix menu bar separators on macOS 2022-06-22 00:34:04 -04:00
Kenneth Chew
5c05cf2206
Disable launch actions in menu bar when last instance is deleted 
This caused a crash when the action was selected!
 2022-06-21 19:19:55 -04:00
Kenneth Chew
d4e544c62c
Separate the kill and launch instance actions 2022-06-21 19:19:55 -04:00
jn64
5335540c33 Rename main window 2022-06-20 13:45:36 +08:00
Sefa Eyeoglu
a4ef0940ed
chore: add license headers 2022-06-12 13:50:58 +02:00
Sefa Eyeoglu
2ff0aa09e3
fix: remove updater if it is not used 2022-06-12 13:39:47 +02:00
Vance
fa5b1d9978
change slot name 2022-06-10 15:48:18 +08:00
Vance
4a261cac1a
fix: update toolbar when instance state changes 2022-06-10 10:25:13 +08:00
Sefa Eyeoglu
b191291737
Merge pull request #577 from PolyMC/fix/toolbar_🦀_fix 2022-05-22 18:11:00 +02:00
Kenneth Chew
05cd30ac06
Refactor code, create abstract class ExternalUpdater 
(Hopefully) this makes implementing updaters using external libraries easier on other platforms. To implement an updater on a new platform, create a new class that implements the pure virtual methods from `ExternalUpdater` and add code in the `UpdateChecker` initializer to initialize the new class.
 2022-05-19 15:16:37 -04:00
Kenneth Chew
b5bdfa6c2e
Implement automatic and manual updates on macOS 2022-05-19 15:16:37 -04:00
txtsd
9b387d73e5
Merge pull request #529 from flowln/vertical_toolbar 
Set right orientation for instance toolbar when moving it around
 2022-05-17 12:14:34 +05:30
Lenny McLennington
6dfec4db40
Fix toolbar disappearing in a certain circumstance. 2022-05-17 00:21:57 +01:00
flow
6d78ea5a45
Merge pull request #539 from kthchew/fix/translation-switch 
Fix untranslated strings after changing language
 2022-05-15 17:11:21 -03:00
Kenneth Chew
288e7bc9c5
Make profile menu scrollable 2022-05-09 15:37:56 -04:00
Kenneth Chew
5171d99fe5
Retranslate playtime text immediately when language is changed 2022-05-08 23:42:37 -04:00
Kenneth Chew
ea9d61c21c
Retranslate account actions after switching language 2022-05-08 23:19:23 -04:00
flow
29a53d7e95
fix: always have the instance toolbar be vertical 
This overrides the orientation set automatically by Qt when we start
moving the toolbar around.
 2022-05-07 20:44:44 -03:00
Daniel Schemp
71777e7a6f added and fixed some Mnemonics in MainWindow 2022-04-22 00:31:03 +02:00
DioEgizio
7b9d462fbc remove "on x" 2022-04-18 18:31:50 +02:00
Kenneth Chew
3acc761419
Fix bugs with instance menu bar options when opening without instances 
- The launch option is no longer empty.
- The program now checks on startup whether an instance is selected to decide whether to disable instance options.

Also, get rid of a dynamic cast.
 2022-04-17 12:44:24 -04:00
Kenneth Chew
9bad83a551
Use TranslatedAction instead of QAction for menu bar actions 2022-04-16 13:35:13 -04:00
Kenneth Chew
a549828655
Remove the Edit menu bar menu 
It wouldn't bring much utility.

- The keyboard shortcuts for copy/paste/etc. already work and are well-known. The menu bar likely doesn't need to advertise them.
- There's not very many places you would be able to use these options in the main window (because there's not many places to type stuff in the main window). It would only be applicable on systems with a native menu bar that shows in all other windows as well (but again, the keyboard shortcuts still work).

Also, rename `actionWiki` -> `actionOpenWiki` to match the corresponding `on_actionOpenWiki_triggered`
 2022-04-16 13:17:34 -04:00
Kenneth Chew
6a97ac603a
Use preexisting actions in the menu bar 
The code is now much cleaner.

Because the actions already present are enabled elsewhere even when the menu bar is hidden, keyboard shortcuts added to them automatically work regardless of whether the menu bar is visible. This means that the hacky workaround related to this can be removed.
 2022-04-16 03:32:08 -04:00