Skip to content

Commit

Permalink
A beautiful solution to selecting the dock using QWidget.raise_
Browse files Browse the repository at this point in the history
  • Loading branch information
edreamleo committed May 29, 2019
1 parent c321a6c commit 18af67e
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 51 deletions.
95 changes: 47 additions & 48 deletions leo/core/leoGlobals.py
Expand Up @@ -1419,7 +1419,6 @@ def null_object_print(id_, kind):
# Print each signature once.
tracing_signatures [signature] = True
g.pr('%40s %s' % (s, callers))
#@+node:ekr.20190317093640.1: *3* NOT USED: << class NullObject >>
#@+node:ekr.20090128083459.82: *3* class g.PosList (deprecated)
class PosList(list):
#@+<< docstring for PosList >>
Expand Down Expand Up @@ -5140,16 +5139,58 @@ def doHook(tag, *args, **keywords):
g.app.hookError = True # Supress this function.
g.app.idle_time_hooks_enabled = False
return None
#@+node:ekr.20031218072017.1315: *3* g.idle time functions
#@+node:EKR.20040602125018.1: *4* g.disableIdleTimeHook
#@+node:ekr.20100910075900.5950: *3* g.Wrappers for g.app.pluginController methods
# Important: we can not define g.pc here!
#@+node:ekr.20100910075900.5951: *4* g.Loading & registration
def loadOnePlugin(pluginName, verbose=False):
pc = g.app.pluginsController
return pc.loadOnePlugin(pluginName, verbose=verbose)

def registerExclusiveHandler(tags, fn):
pc = g.app.pluginsController
return pc.registerExclusiveHandler(tags, fn)

def registerHandler(tags, fn):
pc = g.app.pluginsController
return pc.registerHandler(tags, fn)

def plugin_signon(module_name, verbose=False):
pc = g.app.pluginsController
return pc.plugin_signon(module_name, verbose)

def unloadOnePlugin(moduleOrFileName, verbose=False):
pc = g.app.pluginsController
return pc.unloadOnePlugin(moduleOrFileName, verbose)

def unregisterHandler(tags, fn):
pc = g.app.pluginsController
return pc.unregisterHandler(tags, fn)
#@+node:ekr.20100910075900.5952: *4* g.Information
def getHandlersForTag(tags):
pc = g.app.pluginsController
return pc.getHandlersForTag(tags)

def getLoadedPlugins():
pc = g.app.pluginsController
return pc.getLoadedPlugins()

def getPluginModule(moduleName):
pc = g.app.pluginsController
return pc.getPluginModule(moduleName)

def pluginIsLoaded(fn):
pc = g.app.pluginsController
return pc.isLoaded(fn)
#@+node:ekr.20031218072017.1315: ** g.Idle time functions
#@+node:EKR.20040602125018.1: *3* g.disableIdleTimeHook
def disableIdleTimeHook():
'''Disable the global idle-time hook.'''
g.app.idle_time_hooks_enabled = False
#@+node:EKR.20040602125018: *4* g.enableIdleTimeHook
#@+node:EKR.20040602125018: *3* g.enableIdleTimeHook
def enableIdleTimeHook(*args, **keys):
'''Enable idle-time processing.'''
g.app.idle_time_hooks_enabled = True
#@+node:ekr.20140825042850.18410: *4* g.IdleTime
#@+node:ekr.20140825042850.18410: *3* g.IdleTime
def IdleTime(handler, delay=500, tag=None):
'''
A thin wrapper for the LeoQtGui.IdleTime class.
Expand Down Expand Up @@ -5195,53 +5236,11 @@ def handler2(timer):
return g.app.gui.idleTimeClass(handler, delay, tag)
except Exception:
return None
#@+node:ekr.20161027205025.1: *4* g.idleTimeHookHandler (stub)
#@+node:ekr.20161027205025.1: *3* g.idleTimeHookHandler (stub)
def idleTimeHookHandler(timer):
'''This function exists for compatibility.'''
g.es_print('Replaced by IdleTimeManager.on_idle')
g.trace(g.callers())
#@+node:ekr.20100910075900.5950: *3* g.Wrappers for g.app.pluginController methods
# Important: we can not define g.pc here!
#@+node:ekr.20100910075900.5951: *4* g.Loading & registration
def loadOnePlugin(pluginName, verbose=False):
pc = g.app.pluginsController
return pc.loadOnePlugin(pluginName, verbose=verbose)

def registerExclusiveHandler(tags, fn):
pc = g.app.pluginsController
return pc.registerExclusiveHandler(tags, fn)

def registerHandler(tags, fn):
pc = g.app.pluginsController
return pc.registerHandler(tags, fn)

def plugin_signon(module_name, verbose=False):
pc = g.app.pluginsController
return pc.plugin_signon(module_name, verbose)

def unloadOnePlugin(moduleOrFileName, verbose=False):
pc = g.app.pluginsController
return pc.unloadOnePlugin(moduleOrFileName, verbose)

def unregisterHandler(tags, fn):
pc = g.app.pluginsController
return pc.unregisterHandler(tags, fn)
#@+node:ekr.20100910075900.5952: *4* g.Information
def getHandlersForTag(tags):
pc = g.app.pluginsController
return pc.getHandlersForTag(tags)

def getLoadedPlugins():
pc = g.app.pluginsController
return pc.getLoadedPlugins()

def getPluginModule(moduleName):
pc = g.app.pluginsController
return pc.getPluginModule(moduleName)

def pluginIsLoaded(fn):
pc = g.app.pluginsController
return pc.isLoaded(fn)
#@+node:ekr.20041219095213: ** g.Importing
#@+node:ekr.20040917061619: *3* g.cantImport
def cantImport(moduleName, pluginName=None, verbose=True):
Expand Down
13 changes: 10 additions & 3 deletions leo/plugins/qt_frame.py
Expand Up @@ -307,6 +307,7 @@ def createAllDockWidgets(self):
(True, True, 20, rt, 'spell', self.createSpellDock),
)
for closeable, moveable, height, area, name, creator in table:
height = 0
dock = self.createDockWidget(closeable, moveable, height, name)
# Important: the central widget should be a dock.
w = creator(parent=None)
Expand Down Expand Up @@ -486,9 +487,10 @@ def createMenuBar(self):
dw.setMenuBar(w)
# Official ivars.
self.leo_menubar = w
#@+node:ekr.20110605121601.18148: *5* dw.createMiniBuffer
#@+node:ekr.20110605121601.18148: *5* dw.createMiniBuffer (class VisLineEdit)
def createMiniBuffer(self, parent):
'''Create the widgets for Leo's minibuffer area.'''
dw = self # For VisLineEdit
# Create widgets.
frame = self.createFrame(parent, 'minibufferFrame',
hPolicy=QtWidgets.QSizePolicy.MinimumExpanding,
Expand All @@ -500,11 +502,16 @@ class VisLineEdit(QtWidgets.QLineEdit):
"""In case user has hidden minibuffer with gui-minibuffer-hide"""

def focusInEvent(self, event):
g.trace('(VisLineEdit)') ###
self.parent().show()
if g.app.dock:
# Ensure the Tabs dock is visible, for completions.
dock = getattr(dw, 'tabs_dock', None)
if dock:
dock.raise_()
parent.raise_()
super().focusInEvent(event)
# Call the base class method.

def focusOutEvent(self, event):
self.store_selection()
super().focusOutEvent(event)
Expand Down

0 comments on commit 18af67e

Please sign in to comment.