From 2958b0bae25e930ece10601d902377491322dae9 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 22 Apr 2010 17:11:37 +0200
Subject: [PATCH] Cmd+0 is already taken for hiding the navigation sidebar.
---
src/plugins/help/helpplugin.cpp | 2 ++
src/plugins/texteditor/texteditoractionhandler.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index ed84f842540..721ff6785d1 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -243,7 +243,9 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
action = new QAction(tr("Reset Font Size"), this);
cmd = am->registerAction(action, TextEditor::Constants::RESET_FONT_SIZE,
modecontext);
+#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+0")));
+#endif
connect(action, SIGNAL(triggered()), m_centralWidget, SLOT(resetZoom()));
advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT);
}
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 17687f245f6..db0c1ffcb16 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -229,7 +229,9 @@ void TextEditorActionHandler::createActions()
m_resetFontSizeAction = new QAction(tr("Reset Font Size"), this);
command = am->registerAction(m_resetFontSizeAction, Constants::RESET_FONT_SIZE, m_contextId);
+#ifndef Q_WS_MAC
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+0")));
+#endif
connect(m_resetFontSizeAction, SIGNAL(triggered()), this, SLOT(resetFontSize()));
advancedMenu->addAction(command, Core::Constants::G_EDIT_FONT);
--
GitLab