word per word completions
This commit is contained in:
parent
166db1e16f
commit
9ae12c43e4
|
@ -1263,8 +1263,10 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
def create_wall_tab(self):
|
def create_wall_tab(self):
|
||||||
from qt_console import Console
|
from qt_console import Console
|
||||||
|
import util, bitcoin
|
||||||
self.console = console = Console()
|
self.console = console = Console()
|
||||||
console.updateNamespace({'wallet' : self.wallet, 'interface' : self.wallet.interface, 'gui':self})
|
console.updateNamespace({'wallet' : self.wallet, 'interface' : self.wallet.interface, 'gui':self})
|
||||||
|
console.updateNamespace({'util' : util, 'bitcoin':bitcoin})
|
||||||
return console
|
return console
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# source: http://stackoverflow.com/questions/2758159/how-to-embed-a-python-interpreter-in-a-pyqt-widget
|
# source: http://stackoverflow.com/questions/2758159/how-to-embed-a-python-interpreter-in-a-pyqt-widget
|
||||||
|
|
||||||
import sys, os
|
import sys, os, re
|
||||||
import traceback
|
import traceback
|
||||||
from PyQt4 import QtCore
|
from PyQt4 import QtCore
|
||||||
from PyQt4 import QtGui
|
from PyQt4 import QtGui
|
||||||
|
@ -221,7 +221,10 @@ class Console(QtGui.QPlainTextEdit):
|
||||||
|
|
||||||
def completions(self):
|
def completions(self):
|
||||||
cmd = self.getCommand()
|
cmd = self.getCommand()
|
||||||
path = cmd.split('.')
|
lastword = re.split(' |\(|\)',cmd)[-1]
|
||||||
|
beginning = cmd[0:-len(lastword)]
|
||||||
|
|
||||||
|
path = lastword.split('.')
|
||||||
ns = self.namespace.keys()
|
ns = self.namespace.keys()
|
||||||
|
|
||||||
if len(path) == 1:
|
if len(path) == 1:
|
||||||
|
@ -237,20 +240,20 @@ class Console(QtGui.QPlainTextEdit):
|
||||||
for x in ns:
|
for x in ns:
|
||||||
if x[0] == '_':continue
|
if x[0] == '_':continue
|
||||||
xx = prefix + x
|
xx = prefix + x
|
||||||
if xx.startswith(cmd):
|
if xx.startswith(lastword):
|
||||||
completions.append(xx)
|
completions.append(xx)
|
||||||
|
|
||||||
if not completions:
|
if not completions:
|
||||||
self.hide_completions()
|
self.hide_completions()
|
||||||
elif len(completions) == 1:
|
elif len(completions) == 1:
|
||||||
self.hide_completions()
|
self.hide_completions()
|
||||||
self.setCommand(completions[0])
|
self.setCommand(beginning + completions[0])
|
||||||
else:
|
else:
|
||||||
# find common prefix
|
# find common prefix
|
||||||
p = os.path.commonprefix(completions)
|
p = os.path.commonprefix(completions)
|
||||||
if len(p)>len(self.getCommand()):
|
if len(p)>len(lastword):
|
||||||
self.hide_completions()
|
self.hide_completions()
|
||||||
self.setCommand(p)
|
self.setCommand(beginning + p)
|
||||||
else:
|
else:
|
||||||
self.show_completions(completions)
|
self.show_completions(completions)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue