Mercurial > hg > octave-nkf

comparison gui/src/FileEditorMdiSubWindow.cpp @ 13869:d80086a9880e gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial implementation of a Qt Win32 terminal widget. * src/AbstractTerminalView.h, src/AbstractTerminalView.cpp, src/terminal/win32/QConsole.h, src/terminal/win32/QConsole.cpp, src/terminal/win32/QConsole, src/terminal/win32/QConsoleColors.h, src/terminal/win32/QConsoleColors.cpp, src/WinTerminalView/h, src/WinTerminalView.cpp: New files. * octave-gui.pro (win32-msvc*:CONFIG): Remove console. (SOURCES): Remove src/terminal/TerminalEmulation.cpp, src/TerminalView.cpp, src/TerminalHighlighter.cpp. (unix:SOURCES): Move here. (SOURCES): Add AbstractItemView.cpp. (win32:SOURCES): New clause. (HEADERS): Remove src/terminal/TerminalEmulation.h, src/TerminalView.h, src/TerminalHighlighter.h. (unix:HEADERS): Move here. (win32:HEADERS): New clause. (win32:INCLUDEPATH): Likewise. * src/FileEditorMdiSubWindow.h (AbstractTerminalView.h): New include. (FileEditorMdiSubWindow::initEditor): Change first argument to AbstractTerminalView*. (FileEditorMdiSubWindow::m_terminalView): New member. (FileEditorMdiSubWindow::m_terminalEmulation): Remove member. * src/FileEditorMdiSubWindow.cpp (FileEditorMdiSubWindow::runFile): Call AbstractTerminalView::sendText. (FileEditorMdiSubWindow::initEditor): Change first argument to AbstractTerminalView* and store into m_terminalView. * src/MainWindow.h (AbstractTerminalView.h): New include, replacing TerminalView.h. (MainWindow::m_terminalView): Change member type to AbstractTerminalView*. (MainWindow::terminalView): Change return type to AbstractTerminalView*. * src/MainWindow.cpp (MainWindow::openEditorFile): Change first argument of FileEditorMdiSubWindow::initEditor call to AbstractTerminalView*. (MainWindow::handleSaveWorkspaceRequest, MainWindow::handleLoadWorkspaceRequest, MainWindow::handleClearWorkspaceRequest, MainWindow::handleCommandDoubleClicked): Call AbstractTerminalView::widget to get the terminal widget. (MainWindow::construct): Likewise + call AbstractTerminalView::create to create the terminal widget. * src/TerminalView.h (class TerminalView): Inherit from AbstractTerminalView. (TerminalView::sendText): Change argument to const reference.
author Michael Goffioul <michael.goffioul@gmail.com>
date Wed, 16 Nov 2011 18:51:04 +0000
parents c0e66d6e3dc8
children 5dcfb705ce12
comparison
equal deleted inserted replaced
13769:43ffcaee3fea 13869:d80086a9880e
249 void 249 void
250 FileEditorMdiSubWindow::runFile () 250 FileEditorMdiSubWindow::runFile ()
251 { 251 {
252 if (m_editor->isModified ()) 252 if (m_editor->isModified ())
253 saveFile(m_fileName); 253 saveFile(m_fileName);
254 m_terminalEmulation->transmitText (QString ("run \'%1\'\n").arg (m_fileName)); 254 m_terminalView->sendText (QString ("run \'%1\'\n").arg (m_fileName));
255 //m_terminalEmulation->setFocus (); 255 //m_terminalView->widget ()->setFocus ();
256 } 256 }
257 257
258 258
259 // (un)comment selected text 259 // (un)comment selected text
260 void 260 void
336 m_editor->setCursorPosition(prevline,0); 336 m_editor->setCursorPosition(prevline,0);
337 } 337 }
338 338
339 // function for setting the already existing lexer from MainWindow 339 // function for setting the already existing lexer from MainWindow
340 void 340 void
341 FileEditorMdiSubWindow::initEditor (TerminalEmulation* terminalEmulation, 341 FileEditorMdiSubWindow::initEditor (AbstractTerminalView* terminalView,
342 LexerOctaveGui* lexer, 342 LexerOctaveGui* lexer,
343 MainWindow* mainWindow) 343 MainWindow* mainWindow)
344 { 344 {
345 m_editor->setLexer(lexer); 345 m_editor->setLexer(lexer);
346 m_terminalEmulation = terminalEmulation; // for sending commands to octave 346 m_terminalView = terminalView; // for sending commands to octave
347 // TODO: make a global commandOctave function? 347 // TODO: make a global commandOctave function?
348 m_mainWindow = mainWindow; // get the MainWindow for chekcing state at subwindow close 348 m_mainWindow = mainWindow; // get the MainWindow for chekcing state at subwindow close
349 } 349 }
350 350
351 // TODO: Do we still need tool tips in the status bar? Tool tips are now 351 // TODO: Do we still need tool tips in the status bar? Tool tips are now