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

Enable Screenshot & Screenshot history shortcut changing in MACOS #2098

Merged
merged 3 commits into from
Nov 21, 2021
Merged

Enable Screenshot & Screenshot history shortcut changing in MACOS #2098

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da69d01
Enable Screenshot & Screenshot history shortcut changing in MACOS
adrienpixodeo Nov 20, 2021
6533552
- Change message text for screenshot shortcut
adrienpixodeo Nov 21, 2021
8471fa0
- Format code using clang-format
adrienpixodeo Nov 21, 2021
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
Prev Previous commit
Next Next commit
- Change message text for screenshot shortcut
  • Loading branch information
@adrienpixodeo
adrienpixodeo committed Nov 21, 2021
commit 6533552221ad623f8c21592ee9ca20cbf1a42154
12 changes: 8 additions & 4 deletions src/config/setshortcutwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,16 @@ SetShortcutDialog::SetShortcutDialog(QDialog* parent, QString shortcutName)

QString msg = "";
#if defined(Q_OS_MAC)
msg = tr("Press Esc to cancel or ⌘+Backspace to disable the keyboard shortcut.");
msg = tr(
"Press Esc to cancel or ⌘+Backspace to disable the keyboard shortcut.");
#else
msg = tr("Press Esc to cancel or Backspace to disable the keyboard shortcut.");
msg =
tr("Press Esc to cancel or Backspace to disable the keyboard shortcut.");
#endif
if (shortcutName == "TAKE_SCREENSHOT" || shortcutName == "SCREENSHOT_HISTORY"){
msg += "\n" + tr("Require restart flameshot");
if (shortcutName == "TAKE_SCREENSHOT" ||
shortcutName == "SCREENSHOT_HISTORY") {
msg +=
"\n" + tr("Flameshot must be restarted for changes to take effect.");
}
QLabel* infoBottom = new QLabel(msg);
infoBottom->setMargin(10);
Expand Down