Mercurial > hg > octave-nkf

comparison gui/src/FileEditorMdiSubWindow.cpp @ 13648:da69cec2459f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed OctaveTerminal to TerminalView.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Tue, 23 Aug 2011 20:31:51 +0200
parents b7d870e9b886
children 0a19410e88c0
comparison
equal deleted inserted replaced
13647:ac3d9480292d 13648:da69cec2459f
240 void 240 void
241 FileEditorMdiSubWindow::runFile () 241 FileEditorMdiSubWindow::runFile ()
242 { 242 {
243 if (m_editor->isModified ()) 243 if (m_editor->isModified ())
244 saveFile(m_fileName); 244 saveFile(m_fileName);
245 m_octave->sendText (QString ("run \'%1\'\n").arg (m_fileName)); 245 m_terminalEmulation->transmitText (QString ("run \'%1\'\n").arg (m_fileName));
246 m_octave->setFocus (); 246 //m_terminalEmulation->setFocus ();
247 } 247 }
248 248
249 // toggle bookmark 249 // toggle bookmark
250 void 250 void
251 FileEditorMdiSubWindow::toggleBookmark () 251 FileEditorMdiSubWindow::toggleBookmark ()
280 m_editor->setCursorPosition(prevline,0); 280 m_editor->setCursorPosition(prevline,0);
281 } 281 }
282 282
283 // function for setting the already existing lexer from MainWindow 283 // function for setting the already existing lexer from MainWindow
284 void 284 void
285 FileEditorMdiSubWindow::initEditor (OctaveTerminal* terminal, 285 FileEditorMdiSubWindow::initEditor (TerminalEmulation* terminalEmulation,
286 LexerOctaveGui* lexer) 286 LexerOctaveGui* lexer)
287 { 287 {
288 m_editor->setLexer(lexer); 288 m_editor->setLexer(lexer);
289 m_octave = terminal; // for sending commands to octave 289 m_terminalEmulation = terminalEmulation; // for sending commands to octave
290 // TODO: make a global commandOctave function? 290 // TODO: make a global commandOctave function?
291 } 291 }
292 292
293 // TODO: Do we still need tool tips in the status bar? Tool tips are now 293 // TODO: Do we still need tool tips in the status bar? Tool tips are now
294 // shown directly at the theme icons 294 // shown directly at the theme icons