From ff4d947e8c61bc3b6e337120d552bed65ec52843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= Date: Sat, 6 May 2017 13:43:50 -0500 Subject: [PATCH 1/2] Update font size and geometry after terminal has finished loading --- spyder_terminal/server/static/js/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spyder_terminal/server/static/js/main.js b/spyder_terminal/server/static/js/main.js index 6104af47..53ce8181 100644 --- a/spyder_terminal/server/static/js/main.js +++ b/spyder_terminal/server/static/js/main.js @@ -5,7 +5,8 @@ var term, pid, charWidth, charHeight, - path; + path, + curFont; var myHeaders = new Headers(); myHeaders.append("Content-Type", "application/x-www-form-urlencoded"); @@ -97,6 +98,7 @@ function setFont(font) { } function fitFont(font) { + curFont = font; setFont(font); setFont('ubuntu-powerline'); setFont(font); @@ -133,4 +135,5 @@ function runRealTerminal() { term.writeln("Loading..."); chdir(path); clearTerm(); + fitFont(curFont); } From da38f122247c9618644858e56107724fbca95a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Andr=C3=A9s=20Margffoy=20Tuay?= Date: Sat, 6 May 2017 14:35:51 -0500 Subject: [PATCH 2/2] Test update --- spyder_terminal/tests/test_terminal.py | 17 ++++++++++------- spyder_terminal/widgets/terminalgui.py | 4 ++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/spyder_terminal/tests/test_terminal.py b/spyder_terminal/tests/test_terminal.py index 0d24d2b0..1d746a8c 100644 --- a/spyder_terminal/tests/test_terminal.py +++ b/spyder_terminal/tests/test_terminal.py @@ -21,7 +21,7 @@ LOCATION = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))) -TERM_UP = 15000 +TERM_UP = 20000 def check_pwd(termwidget): @@ -86,16 +86,19 @@ def test_new_terminal(qtbot): assert status_code == 200 # Move to LOCATION - qtbot.keyClicks(term.view, 'cd {}'.format(LOCATION)) - qtbot.keyPress(term.view, Qt.Key_Return) + # qtbot.keyClicks(term.view, 'cd {}'.format(LOCATION)) + # qtbot.keyPress(term.view, Qt.Key_Return) + term.exec_cmd('cd {}'.format(LOCATION)) # Clear - qtbot.keyClicks(term.view, 'clear') - qtbot.keyPress(term.view, Qt.Key_Return) + # qtbot.keyClicks(term.view, 'clear') + # qtbot.keyPress(term.view, Qt.Key_Return) + term.exec_cmd('clear') # Run pwd - qtbot.keyClicks(term.view, 'pwd') - qtbot.keyPress(term.view, Qt.Key_Return) + # qtbot.keyClicks(term.view, 'pwd') + # qtbot.keyPress(term.view, Qt.Key_Return) + term.exec_cmd('pwd') # Assert pwd is LOCATION qtbot.waitUntil(lambda: check_pwd(term), timeout=TERM_UP) diff --git a/spyder_terminal/widgets/terminalgui.py b/spyder_terminal/widgets/terminalgui.py index c4ad8a1c..4d4de2ef 100644 --- a/spyder_terminal/widgets/terminalgui.py +++ b/spyder_terminal/widgets/terminalgui.py @@ -77,6 +77,10 @@ def get_fonts(self): """List terminal CSS fonts.""" return self.eval_javascript("$('.terminal').css('font-family')") + def exec_cmd(self, cmd): + """Execute a command inside the terminal.""" + self.eval_javascript('exec("{0}")'.format(cmd)) + class TermView(WebView): """XTerm Wrapper."""