Skip to content

Allow specifying multiple custom shortcuts for actions #763

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

Merged
dail8859 merged 2 commits into from
May 7, 2025
Merged

Allow specifying multiple custom shortcuts for actions #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98ae597
Rename indent actions
dail8859 Apr 18, 2025
67105b8
Allow specifying multiple custom shortcuts for actions
dail8859 May 5, 2025
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
34 changes: 26 additions & 8 deletions src/NotepadNext/dialogs/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,8 @@ MainWindow::MainWindow(NotepadNextApplication *app) :
copyAsFormat(&rtf, "Rich Text Format");
});

connect(ui->actionIncrease_Indent, &QAction::triggered, this, [=]() { currentEditor()->tab(); });
connect(ui->actionDecrease_Indent, &QAction::triggered, this, [=]() { currentEditor()->backTab(); });
connect(ui->actionIncreaseIndent, &QAction::triggered, this, [=]() { currentEditor()->tab(); });
connect(ui->actionDecreaseIndent, &QAction::triggered, this, [=]() { currentEditor()->backTab(); });

addAction(ui->actionToggleOverType);
connect(ui->actionToggleOverType, &QAction::triggered, this, [=]() {
Expand Down Expand Up @@ -843,18 +843,36 @@ MainWindow::~MainWindow()
void MainWindow::applyCustomShortcuts()
{
ApplicationSettings *settings = app->getSettings();

settings->beginGroup("Shortcuts");

for (const QString &actionName : settings->childKeys()) {
QAction *action = findChild<QAction *>(QStringLiteral("action") + actionName, Qt::FindDirectChildrenOnly);
const QString shortcutString = settings->value(actionName).toString();

if (action != Q_NULLPTR) {
action->setShortcut(QKeySequence(shortcutString));
if (!action) {
qWarning() << "CustomShortcut: Cannot find action" << actionName;
continue;
}
else {
qWarning() << "Cannot find action" << actionName;

const QVariant value = settings->value(actionName);
if (!value.canConvert<QStringList>()) {
qWarning() << "CustomShortcut: Invalid shortcut format for" << actionName;
continue;
}

QList<QKeySequence> shortcuts;
for (const QString &shortcutString : value.toStringList()) {
auto sequence = QKeySequence(shortcutString);

if (sequence.count() > 0 && sequence[0].key() != Qt::Key_unknown) {
shortcuts.append(sequence);
}
else {
qWarning() << "CustomShortcut: Cannot create QKeySequence(" << shortcutString << ") for " << actionName;
}
}

if (!shortcuts.empty()) {
action->setShortcuts(shortcuts);
}
}

Expand Down
6 changes: 2 additions & 4 deletions src/NotepadNext/dialogs/MainWindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
<property name="title">
<string>Indent</string>
</property>
<addaction name="actionIncrease_Indent"/>
<addaction name="actionDecrease_Indent"/>
</widget>
<widget class="QMenu" name="menuEOLConversion">
<property name="title">
Expand Down Expand Up @@ -575,7 +573,7 @@
<string>Ctrl+A</string>
</property>
</action>
<action name="actionIncrease_Indent">
<action name="actionIncreaseIndent">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/text_indent.png</normaloff>:/icons/text_indent.png</iconset>
Expand All @@ -584,7 +582,7 @@
<string>Increase Indent</string>
</property>
</action>
<action name="actionDecrease_Indent">
<action name="actionDecreaseIndent">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/text_indent_remove.png</normaloff>:/icons/text_indent_remove.png</iconset>
Expand Down