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

176 Commits

Author SHA1 Message Date
Rachel Powers
d80dee2a54 refactor: pass instance ptr to resource models. use it to find instance root. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:37 -07:00
Rachel Powers
4df4b43900 fix: Apply suggestions from code review (string changes) 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-31 18:25:29 -07:00
Rachel Powers
1ca2c59f2e feat: track instance copies that use links 
confirm deleations when other instances link to it

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
flow
b724607e31 feat(RD): add shader pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
leo78913
2b0252d4ae Fix: fix some regressions in the main window 
this removes the update action from the help button
and fixes the add to path action not showing on macos

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-28 15:09:26 -03:00
flow
c78db5459e Merge pull request #724 from leo78913/dot-ui-mainwindow 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/594
Closes https://github.com/PrismLauncher/PrismLauncher/issues/69
Closes https://github.com/PrismLauncher/PrismLauncher/issues/473
 2023-01-27 10:55:49 -08:00
leo78913
4d2b5c2f42 refactor: clean up some MainWindow stuff 
this makes the accounts button and menubar item share the same QMenu
and also refactors some code

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-26 19:48:21 -03:00
Sefa Eyeoglu
6e841a3b7e Merge branch 'develop' into remove-updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-24 14:40:17 +01:00
leo78913
5a25ce8c1b Fix main window icon and stuff 
i forgor 💀

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
670cf8ee07 Fix: make the newsLabel toolbutton fullwidth again 
this reverts it to how it was before the MainWindow .ui port

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
4ed4fb2314 remove useless setEnabled calls 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
f16989bea9 feat(WideBar): custom context menu actions 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
55d4064335 Fix: translate actionNoDefaultAcount text 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
3b38a4c690 Fix: translate NoAccountsAdded text 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
ada595663d fix(widebar): fix insertSeparator 
WideBar::insertSeparator was adding the separator to the end of the toolbar

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
b2de01b076 feat(WideBar): Allow disabling alt shortcuts 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
f3acf35aea refactor: Port the main window to a .ui file 
some stuff still needs to be done in the c++ side because qt designer is dumb >:(

the instance toolbar icon and instance name buttons are still added manually inside MainWindow.cpp

looks almost identical, with some minor tweaks:
- the instance toolbar is now a WideBar, so you can customize what actions you want :D
- the instance toolbar buttons are now fullwidth
- the close window button is now at the end of the file menu
- the help menu has some layout changes

this also fixes some stuff:
- menus not having tooltips
- the top toolbar not connecting to the title bar in kde
- the instance toolbar separators looking weird after you move the toolbar

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
Tayou
cdc9f93f71 make MainWindow cat update instantly 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-20 15:16:25 +01:00
Sefa Eyeoglu
1a35fec134 Merge pull request #696 from Ryex/import-all-the-things 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700
 2023-01-16 10:04:09 +01:00
Rachel Powers
f7b0ba88da Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-13 13:15:13 -07:00
Tayou
6daa457838 Implement Suggestions from flow & Scrumplex 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:42 +01:00
Tayou
49d317b19a UX tweak + formatting + added cat to wizard 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:24 +01:00
Tayou
1b80ae0fca add theme setup wizard 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:01 +01:00
Rachel Powers
a4870d4834 fix: fix #700 
fixed by properly converting from a file path and converting to native seperators.
should have known naive handling of file path as a URL would come back to bite us cross platform.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-09 17:00:12 -07:00
Rachel Powers
30b01ef053 fix: *sigh* no implicit QString->QFileInfo conversion in Qt6, again... 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-07 15:04:23 -07:00
Rachel Powers
03b75bf2a9 feat: Import all the things! 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-07 15:04:22 -07:00
Sefa Eyeoglu
6ea1234a3b Merge pull request #618 from TheKodeToad/safer-destructive-actions 
Fixes https://github.com/PolyMC/PolyMC/issues/948
 2022-12-26 17:48:43 +01:00
TheKodeToad
bf04becc9e About to -> you are about to 
You're is used in some other places but im lazy

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-26 14:45:04 +00:00
TheKodeToad
cbe5af235c Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-24 08:59:55 +00:00
Sefa Eyeoglu
849b92665e Merge branch 'develop' into remove-updater 2022-12-14 23:22:27 +01: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
DioEgizio
9eb14e6b9b fix: remove leftover TODO 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-11 20:35:39 +01:00
flow
9ad4ae5340 Merge pull request #568 from leo78913/flatpak-shortcuts 2022-12-08 17:53:33 -08: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
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
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
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
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
236c196e68 fix: improve code readability 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-27 18:38:56 +01: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
fdbd8d9d2b refactor: remove old updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-21 16:18:05 +01: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
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
DioEgizio
dbd01d35e6 Merge pull request #455 from leo78913/menubar-stuff 2022-11-18 17:20:50 +01:00
Redson
f72ac94c11 fix: Fix usage below 
Signed-off-by: Redson <redson@riseup.net>
 2022-11-17 06:39:05 -03:00
RedsonBr140
bd3a693e70 chore: Change var name 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: RedsonBr140 <redson@riseup.net>
 2022-11-17 06:20:53 -03:00
RedsonBr140
37a117d2ef chore: Var definition inside the for loop 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: RedsonBr140 <redson@riseup.net>
 2022-11-16 12:24:28 -03:00
leo78913
7439fd6bcb fix: Fix some stuff in the menu bar 
- Remove duplicated launch actions
 - Enable the add instance action icon in menus
 - Remove ugly separator at the end of the help menu if the updater is disabled
 - Add icons to the help and news menu items

Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-11-15 10:56:41 -03:00