Merge branch 'master' into features/python3

libavg · Nov 13, 2020 · daffd28 · daffd28
2 parents 732a14e + 3805e6d
commit daffd28
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/python/libavg/app/app.py b/python/libavg/app/app.py
@@ -98,7 +98,7 @@ def run(self, mainDiv, **kargs):
         self._applySettingsExtenders(kargs)
         self._setupLogging()
 
-        mainDiv.onStartup()
+        self._startupMainDiv()
 
         self._setupResolution()
         self._setupRootNode()
@@ -125,7 +125,7 @@ def run(self, mainDiv, **kargs):
             self._teardownKeyboardManager()
             raise
 
-        mainDiv.onExit()
+        self._exitMainDiv()
 
         self._stopClickTest()
         self._teardownKeyboardManager()
@@ -224,6 +224,9 @@ def _setupLogging(self):
                 level = getattr(avg.logger.Severity, strLevel)
                 avg.logger.configureCategory(cat, level)
 
+    def _startupMainDiv(self):
+        self._mainDiv.onStartup()
+
     def _setupRootNode(self):
         # FIXME: "../../libavg/doc/avg.dtd" doesn't exist (anymore)
         player.loadString('''<?xml version="1.0"?>
@@ -341,13 +344,13 @@ def _setupKeyboardManager(self):
         keyboardmanager.bindKeyDown(
                 keyname='D',
                 handler=self._debugPanel.toggleVisibility,
-                help='Show/hide the debug panel',
+                help='Show/hide debug panel',
                 modifiers=avg.KEYMOD_CTRL)
 
         keyboardmanager.bindKeyDown(
                 keyname='H',
                 handler=lambda: player.showCursor(not player.isCursorShown()),
-                help='Show/hide cursor',
+                help='Show/hide mouse cursor',
                 modifiers=avg.KEYMOD_CTRL)
 
         keyboardmanager.bindKeyDown(
@@ -359,7 +362,7 @@ def _setupKeyboardManager(self):
         keyboardmanager.bindKeyDown(
                 keyname='B',
                 handler=self.dumpTextObjectCount,
-                help='Dump objects count to the console',
+                help='Dump objects count to console',
                 modifiers=avg.KEYMOD_CTRL)
 
         keyboardmanager.bindKeyDown(
@@ -433,3 +436,6 @@ def _runLoop(self):
     def _onInitInternal(self):
         self._mainDiv.onInit()
         player.subscribe(player.ON_FRAME, self._mainDiv.onFrame)
+
+    def _exitMainDiv(self):
+        self._mainDiv.onExit()
diff --git a/python/libavg/app/debugpanel.py b/python/libavg/app/debugpanel.py
@@ -244,7 +244,7 @@ def onShow(self):
         kbmgr.bindKeyDown(
                 keyname='I',
                 handler=self.persistColumn,
-                help="Object count snapshot",
+                help="Take objects count snapshot",
                 modifiers=avg.KEYMOD_CTRL)
 
     def onHide(self):
@@ -441,32 +441,32 @@ def __init__(self, parent=None, fontsize=10, **kwargs):
     def setupKeys(self):
         kbmgr.bindKeyDown(keyname='G',
                 handler=lambda: self.toggleWidget(GPUMemoryGraphWidget),
-                help="GPU memory graph",
+                help='Show/hide GPU memory graph',
                 modifiers=avg.KEYMOD_CTRL)
 
         kbmgr.bindKeyDown(keyname='M',
                 handler=lambda: self.toggleWidget(MemoryGraphWidget),
-                help="Memory graph",
+                help='Show/hide memory graph',
                 modifiers=avg.KEYMOD_CTRL)
 
         kbmgr.bindKeyDown(keyname='F',
                 handler=lambda: self.toggleWidget(FrametimeGraphWidget),
-                help="Frametime graph",
+                help='Show/hide frametime graph',
                 modifiers=avg.KEYMOD_CTRL)
 
         kbmgr.bindKeyDown(text='?',
                 handler=lambda: self.toggleWidget(KeyboardManagerBindingsShower),
-                help="Show keyboard bindings",
+                help='Show/hide keyboard bindings',
                 modifiers=kbmgr.KEYMOD_ANY)
 
         kbmgr.bindKeyDown(keyname='O',
                 handler=lambda: self.toggleWidget(ObjectDumpWidget),
-                help="Object count table",
+                help='Show/hide objects count table',
                 modifiers=avg.KEYMOD_CTRL)
 
         kbmgr.bindKeyDown(keyname='V',
                 handler=self.toggleTouchVisualization,
-                help="Cursor visualization",
+                help='Toggle contact visualization',
                 modifiers=avg.KEYMOD_CTRL)
 
     def addWidget(self, widgetClass, **kwargs):