Mercurial > hg > octave-lyh

comparison gui/src/TerminalView.h @ 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
comparison
equal deleted inserted replaced
13769:43ffcaee3fea 13869:d80086a9880e
16 */ 16 */
17 17
18 #ifndef OCTAVETERMINAL_H 18 #ifndef OCTAVETERMINAL_H
19 #define OCTAVETERMINAL_H 19 #define OCTAVETERMINAL_H
20 #include <QPlainTextEdit> 20 #include <QPlainTextEdit>
21 #include "AbstractTerminalView.h"
21 #include "TerminalEmulation.h" 22 #include "TerminalEmulation.h"
22 23
23 class TerminalView:public QPlainTextEdit, Terminal 24 class TerminalView:
25 public QPlainTextEdit,
26 public AbstractTerminalView,
27 Terminal
24 { 28 {
25 Q_OBJECT 29 Q_OBJECT
26 public: 30 public:
27 TerminalView (QWidget * parent = 0); 31 TerminalView (QWidget * parent = 0);
28 ~TerminalView (); 32 ~TerminalView ();
30 TerminalEmulation *terminalEmulation () 34 TerminalEmulation *terminalEmulation ()
31 { 35 {
32 return m_terminalEmulation; 36 return m_terminalEmulation;
33 } 37 }
34 38
35 void sendText (QString text) { m_terminalEmulation->transmitText(text); } 39 // AbstractTerminalView interface
40 void sendText (const QString& text)
41 { m_terminalEmulation->transmitText(text); }
42 QWidget* widget (void) { return this; }
36 43
37 // Terminal Interface 44 // Terminal Interface
38 QTextCursor textCursor(); 45 QTextCursor textCursor();
39 void setTextCursor (const QTextCursor &cursor); 46 void setTextCursor (const QTextCursor &cursor);
40 void bell (); 47 void bell ();