Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 'Create shortcut' button to instance toolbar #227

Merged
merged 25 commits into from Nov 25, 2022
Merged

Add 'Create shortcut' button to instance toolbar #227

merged 25 commits into from Nov 25, 2022

Conversation

Leo40Git
Copy link
Contributor

@Leo40Git Leo40Git commented Oct 22, 2022 •
edited by Scrumplex

Closes #210.

This PR also makes FileSystem::createShortcut function on Windows systems.

TODO

  • Icon for "Create Shortcut" action
    • Missing in Legacy, Flat, and Flat (White)
  • Shortcut for "Create Shortcut" action
  • Platform-specific behavior
    • Windows
      • Use instance icon for shortcuts
    • Linux
      • Testing!!
    • macOSX
      • Write shell script
      • Testing!!

@flowln flowln added the enhancement New feature or request label Oct 22, 2022
@Leo40Git Leo40Git marked this pull request as ready for review October 25, 2022 14:44
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 25, 2022
View reviewed changes
launcher/FileSystem.cpp Fixed Show resolved Hide resolved
@Leo40Git
Copy link
Contributor Author

Windows now has instance icons!

@Leo40Git
Copy link
Contributor Author

Leo40Git commented Oct 28, 2022 •
edited

KNOWN BUG: Creating an instance shortcut on Windows replaces the application's icon with the instance's icon.
I have no idea how this happens (I blame COM), and am reasonably sure a simple setIcon call will fix this?

EDIT: Fixed!

Scrumplex
Scrumplex reviewed Nov 9, 2022
View reviewed changes
launcher/FileSystem.cpp Outdated Show resolved Hide resolved
launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved
launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved
launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved
launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved
flowln
flowln reviewed Nov 12, 2022
View reviewed changes
Copy link
Contributor

@flowln flowln left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please fix DCO :)

launcher/FileSystem.cpp Outdated Show resolved Hide resolved
Leo40Git and others added 21 commits November 12, 2022 20:18
@Leo40Git
Add 'Create shortcut' button to instance toolbar
30b2666 
Implemented on Windows only rn!

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Windows: implement FS::createShortcut
7076818 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
[UNTESTED] Linux: add icons to shortcuts
f12117c 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Remove unnessecary "is defined" check
6ae3b18 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Add missing fail check for CoInitialize
b83f9be 
Add a few comments

Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Windows: add instance icon to shortcut
4d4dfab 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Windows: fix window icon being replaced
cc5f82b 
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>
@Leo40Git
Fix nested #if directive
487e352 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git @Scrumplex
Apply suggestions from code review
6043444 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
this ain't static, falco
9be48f1 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Move addAction call above left-align loop
dbe0553 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git @flowln
Linux: fix path shortcut is written to
7e5076b 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Mac: now supported! [UNTESTED]
f7d7d76 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
refactor #if checks
b813c86 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Windows: remove icon if shortcut creation fails
45ce725 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Mac: fix build
5322155 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Mac: attempt 2
69bbb29 
- 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>
@Leo40Git
tabs -> spaces
43b9d94 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Linux: fixes
b0269e6 
- 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>
@Leo40Git
Undo accidental tomlplusplus downgrade
c4cfec1 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Linux: remove TryExec entry from .desktop files
acd5096 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Windows, Linux: prevent segfault on missing icon
5be8545 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
flowln
flowln approved these changes Nov 14, 2022
View reviewed changes
Copy link
Contributor

@flowln flowln left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

just do the TODOs (particularly the icon one, since now that we have icons on the sidebar for every other action, this action not having one looks weird) :D

launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved
@Leo40Git
Add icon
ce892c9 
NOTE: Currently missing on Legacy, Flat and Flat (White)
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Restore QRC headers
cca052c 
Signed-off-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>
@Leo40Git
Merge remote-tracking branch 'upstream/develop' into feature/instance…
ba46ff6 
…-shortcuts
Scrumplex
Scrumplex approved these changes Nov 25, 2022
View reviewed changes
Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Scrumplex Scrumplex added this to the 6.0 milestone Nov 25, 2022
@Scrumplex
Copy link
Member

We can handle the missing icons in a separate PR

@Scrumplex Scrumplex merged commit fd8b4c5 into PrismLauncher:develop Nov 25, 2022
@Leo40Git Leo40Git deleted the feature/instance-shortcuts branch November 25, 2022 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flowln flowln flowln approved these changes

@Scrumplex Scrumplex Scrumplex approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
6.0
Development

Successfully merging this pull request may close these issues.

Instance shortcuts
3 participants
@Leo40Git @Scrumplex @flowln