# HG changeset patch # User Chris Cannam # Date 1317213519 -3600 # Node ID 2f087d950621c73d58aec99c8d0bcae397046445 # Parent 6948c3cc151e74dbfb074ea0655e69237b88d647 Fix status bar tip on Mac (SF bug 3024342) diff -r 6948c3cc151e -r 2f087d950621 view/Pane.cpp --- a/view/Pane.cpp Wed Sep 28 10:16:03 2011 +0100 +++ b/view/Pane.cpp Wed Sep 28 13:38:39 2011 +0100 @@ -1235,7 +1235,11 @@ kr.registerShortcut(tr("Select"), tr("Left"), tr("Click left button and drag to select region; drag region edge to resize")); kr.registerShortcut(tr("Multi Select"), tr("Ctrl+Left"), +#ifdef Q_OS_MAC + tr("Cmd-click left button and drag to select an additional region")); +#else tr("Ctrl-click left button and drag to select an additional region")); +#endif kr.registerShortcut(tr("Fine Select"), tr("Shift+Left"), tr("Shift-click left button and drag to select without snapping to items or grid")); @@ -2515,11 +2519,19 @@ bool haveSelection = (m_manager && !m_manager->getSelections().empty()); if (haveSelection) { +#ifdef Q_OS_MAC + if (editable) { + help = tr("Click and drag to select a range; hold Shift to avoid snapping to items; hold Cmd for multi-select; middle-click and drag to navigate"); + } else { + help = tr("Click and drag to select a range; hold Cmd for multi-select; middle-click and drag to navigate"); + } +#else if (editable) { help = tr("Click and drag to select a range; hold Shift to avoid snapping to items; hold Ctrl for multi-select; middle-click and drag to navigate"); } else { help = tr("Click and drag to select a range; hold Ctrl for multi-select; middle-click and drag to navigate"); } +#endif if (pos) { bool closeToLeft = false, closeToRight = false;