[rkward-cvs] SF.net SVN: rkward:[4151] trunk/rkward/rkward/windows/rktoolwindowlist.cpp

[tfry at users.sourceforge.net]

Revision: 4151
          http://rkward.svn.sourceforge.net/rkward/?rev=4151&view=rev
Author:   tfry
Date:     2012-01-10 08:51:29 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Workaround (untested) for shortcut conflict issue on Mac

Modified Paths:
--------------
    trunk/rkward/rkward/windows/rktoolwindowlist.cpp

Modified: trunk/rkward/rkward/windows/rktoolwindowlist.cpp
===================================================================
--- trunk/rkward/rkward/windows/rktoolwindowlist.cpp	2012-01-09 23:13:40 UTC (rev 4150)
+++ trunk/rkward/rkward/windows/rktoolwindowlist.cpp	2012-01-10 08:51:29 UTC (rev 4151)
@@ -35,6 +35,10 @@
 	tr.window = window;
 	tr.id = id;
 	tr.default_placement = default_placement;
+#ifdef Q_WS_MAC
+	// HACK: Workaround for shortcut conflict issue: http://www.mail-archive.com/rkward-devel@lists.sourceforge.net/msg01659.html
+	if (default_shortcut & Qt::AltModifier) default_shortcut |= Qt::CtrlModifier;
+#endif
 	tr.default_shortcut = default_shortcut;
 
 	RKToolWindowListPrivate::registered_tool_windows.append (tr);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.