diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-10-05 13:52:57 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-15 14:33:56 +0000 |
| commit | 3c5650e514d6d8bad86a54a037e550db7cc19a71 (patch) | |
| tree | 6499046b274c1b6db57cba2505a208be29d35056 /src/plugins/debugger/debugger.qrc | |
| parent | 62c8aecb5fd950a56b17483bccd176f4f77245e4 (diff) | |
Add macOS touch bar support
Introduce a generic Utils::TouchBar that implements a touch bar for
macOS based on QAction. Touch bars can be nested, and one is set to be
the application's top level touch bar.
Also add an ActionContainer for the touch bar. That allows us to manage
the layout of the touch bar the same way we do with menus.
Since the touch bar is an input device with very limited space, a
command in the touch bar needs to be specifically styled for the touch
bar by setting either touchBarText or touchBarIcon (or both).
Touch bars can be nested by nesting the ActionContainers. A nested touch
bar ActionContainer needs to specify an icon and/or text to show in the
touch bar button that opens that sub-bar.
Commands are only shown in the touch bar if they are valid within the
current context.
Implementation-wise we cannot use the standard NSPopoverTouchBarItem for
nesting touch bar levels. We cannot hide items in the touch bar, because
hidden items still take up space in the touch bar. So we need to rebuild
the touch bar regularly. Since the items we show are very dynamic, every
time the items in the toplevel bar change because of a context change,
any opened sub-level touch bar closes. That is why we maintain a stack of
touch bar levels ourselves, replacing the main touch bar with the current
level, and managing opening and closing the levels manually.
This patch adds buttons for Help, Bookmarks, Header/Source, Follow
(Symbol), Decl/Def, and a sub-bar for the debugger actions.
Fixes: QTCREATORBUG-21263
Change-Id: Ib63e610f21a993f1d324fe23c83a7f2224f434ac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/plugins/debugger/debugger.qrc')
| -rw-r--r-- | src/plugins/debugger/debugger.qrc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 2e457b74e1..bf8095b338 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -49,5 +49,19 @@ <file>images/recordoutline@2x.png</file> <file>images/tracepointoverlay.png</file> <file>images/tracepointoverlay@2x.png</file> + <file>images/macos_touchbar_debug.png</file> + <file>images/macos_touchbar_debug@2x.png</file> + <file>images/macos_touchbar_debug_continue.png</file> + <file>images/macos_touchbar_debug_continue@2x.png</file> + <file>images/macos_touchbar_debug_interrupt.png</file> + <file>images/macos_touchbar_debug_interrupt@2x.png</file> + <file>images/macos_touchbar_debug_exit.png</file> + <file>images/macos_touchbar_debug_exit@2x.png</file> + <file>images/macos_touchbar_debug_step_into.png</file> + <file>images/macos_touchbar_debug_step_into@2x.png</file> + <file>images/macos_touchbar_debug_step_out.png</file> + <file>images/macos_touchbar_debug_step_out@2x.png</file> + <file>images/macos_touchbar_debug_step_over.png</file> + <file>images/macos_touchbar_debug_step_over@2x.png</file> </qresource> </RCC> |