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

"macOS Duplicating keyframes duplicates objects too" fix #358

Closed
wants to merge 9 commits into from
Closed

"macOS Duplicating keyframes duplicates objects too" fix #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9574657
Merge "friction-icon-theme" updates
pgilfernandez Nov 25, 2024
584c9d9
Merge submodules
pgilfernandez Nov 27, 2024
925d4b9
Merge branch 'main' of https://github.com/friction2d/friction
pgilfernandez Nov 27, 2024
33ef62d
Merge branch 'main' of https://github.com/friction2d/friction
pgilfernandez Nov 29, 2024
b942746
Merge branch 'main' of https://github.com/friction2d/friction
pgilfernandez Nov 29, 2024
07f6c14
Merge branch 'main' of https://github.com/friction2d/friction
pgilfernandez Dec 2, 2024
db5b51e
merge submodules updates
pgilfernandez Dec 2, 2024
29e3891
Merge branch 'main' of https://github.com/friction2d/friction
pgilfernandez Dec 2, 2024
8c0a308
fix duplicate shortcut
pgilfernandez Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs
Open in desktop
Submodule docs updated 6 files
+0 −1 _config.yml
+2 −2 _layouts/home.html
+1 −1 about.html
+1 −1 about.md
+0 −1 assets/style.css
+0 −14 docs_mac.qrc
2 changes: 2 additions & 0 deletions src/app/GUI/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,9 @@ void MainWindow::setupMenuBar()
const auto qAct = new NoShortcutAction(tr("Duplicate", "MenuBar_Edit"));
mEditMenu->addAction(qAct);
qAct->setIcon(QIcon::fromTheme("duplicate"));
#ifndef Q_OS_MAC
qAct->setShortcut(Qt::CTRL + Qt::Key_D);
#endif
mActions.duplicateAction->connect(qAct);
cmdAddAction(qAct);
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/icons
Open in desktop
Submodule icons updated 19 files
+0 −17 hicolor.qrc
+ − hicolor/128x128/friction/frame.png
+ − hicolor/16x16/friction/frame.png
+ − hicolor/17x17/friction/frame.png
+ − hicolor/18x18/friction/frame.png
+ − hicolor/192x192/friction/frame.png
+ − hicolor/20x20/friction/frame.png
+ − hicolor/21x21/friction/frame.png
+ − hicolor/22x22/friction/frame.png
+ − hicolor/24x24/friction/frame.png
+ − hicolor/256x256/friction/frame.png
+ − hicolor/25x25/friction/frame.png
+ − hicolor/26x26/friction/frame.png
+ − hicolor/28x28/friction/frame.png
+ − hicolor/32x32/friction/frame.png
+ − hicolor/48x48/friction/frame.png
+ − hicolor/64x64/friction/frame.png
+ − hicolor/96x96/friction/frame.png
+0 −91 hicolor/scalable/friction/frame.svg
Loading