From f5fa4cf6ff0b798945ed4e0db64d1103507e4373 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 10 Mar 2009 11:58:59 +0100
Subject: [PATCH] Fixes: cmd+h (hide) is overridden by designer's layout
horizontally
Task: 243962
---
src/plugins/designer/formeditorw.cpp | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index b451ed72ded..bb0929e7c6f 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -358,12 +358,21 @@ void FormEditorW::setupActions()
//tool actions
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutHorizontally"));
+#ifndef Q_OS_MAC
addToolAction(m_fwm->actionHorizontalLayout(), am, m_context,
m_toolActionIds.back(), mformtools, tr("Ctrl+H"));
-
+#else
+ addToolAction(m_fwm->actionHorizontalLayout(), am, m_context,
+ m_toolActionIds.back(), mformtools, tr("Meta+H"));
+#endif
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutVertically"));
+#ifndef Q_OS_MAC
addToolAction(m_fwm->actionVerticalLayout(), am, m_context,
m_toolActionIds.back(), mformtools, tr("Ctrl+L"));
+#else
+ addToolAction(m_fwm->actionVerticalLayout(), am, m_context,
+ m_toolActionIds.back(), mformtools, tr("Meta+L"));
+#endif
m_toolActionIds.push_back(QLatin1String("FormEditor.SplitHorizontal"));
addToolAction(m_fwm->actionSplitHorizontal(), am, m_context,
@@ -378,16 +387,26 @@ void FormEditorW::setupActions()
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutGrid"));
+#ifndef Q_OS_MAC
addToolAction(m_fwm->actionGridLayout(), am, m_context,
m_toolActionIds.back(), mformtools, tr("Ctrl+G"));
+#else
+ addToolAction(m_fwm->actionGridLayout(), am, m_context,
+ m_toolActionIds.back(), mformtools, tr("Meta+G"));
+#endif
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutBreak"));
addToolAction(m_fwm->actionBreakLayout(), am, m_context,
m_toolActionIds.back(), mformtools);
m_toolActionIds.push_back(QLatin1String("FormEditor.LayoutAdjustSize"));
+#ifndef Q_OS_MAC
addToolAction(m_fwm->actionAdjustSize(), am, m_context,
m_toolActionIds.back(), mformtools, tr("Ctrl+J"));
+#else
+ addToolAction(m_fwm->actionAdjustSize(), am, m_context,
+ m_toolActionIds.back(), mformtools, tr("Meta+J"));
+#endif
m_toolActionIds.push_back(QLatin1String("FormEditor.SimplifyLayout"));
addToolAction(m_fwm->actionSimplifyLayout(), am, m_context,
--
GitLab