Mercurial > hg > octave-lyh

comparison gui/src/MainWindow.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 2e1f54803758
children 347dfbea2c8a
comparison
equal deleted inserted replaced
13647:ac3d9480292d 13648:da69cec2459f
94 { 94 {
95 m_lexerAPI->add(keywordList.at(i)); // add single strings to the API 95 m_lexerAPI->add(keywordList.at(i)); // add single strings to the API
96 } 96 }
97 m_lexerAPI->prepare(); // prepare API info ... this make take some time 97 m_lexerAPI->prepare(); // prepare API info ... this make take some time
98 } 98 }
99 subWindow->initEditor(m_octaveTerminal,m_lexer); // init necessary informations for editor 99 subWindow->initEditor(m_terminalView->terminalEmulation(), m_lexer); // init necessary informations for editor
100 100
101 if ( fileName.isEmpty() ) 101 if ( fileName.isEmpty() )
102 subWindow->newFile (); 102 subWindow->newFile ();
103 else 103 else
104 subWindow->loadFile (fileName); 104 subWindow->loadFile (fileName);
121 MainWindow::handleSaveWorkspaceRequest () 121 MainWindow::handleSaveWorkspaceRequest ()
122 { 122 {
123 QString selectedFile = 123 QString selectedFile =
124 QFileDialog::getSaveFileName (this, tr ("Save Workspace"), 124 QFileDialog::getSaveFileName (this, tr ("Save Workspace"),
125 ResourceManager::instance ()->homePath ()); 125 ResourceManager::instance ()->homePath ());
126 m_octaveTerminal->sendText (QString ("save \'%1\'\n").arg (selectedFile)); 126 m_terminalView->sendText (QString ("save \'%1\'\n").arg (selectedFile));
127 m_octaveTerminal->setFocus (); 127 m_terminalView->setFocus ();
128 } 128 }
129 129
130 void 130 void
131 MainWindow::handleLoadWorkspaceRequest () 131 MainWindow::handleLoadWorkspaceRequest ()
132 { 132 {
133 QString selectedFile = 133 QString selectedFile =
134 QFileDialog::getOpenFileName (this, tr ("Load Workspace"), 134 QFileDialog::getOpenFileName (this, tr ("Load Workspace"),
135 ResourceManager::instance ()->homePath ()); 135 ResourceManager::instance ()->homePath ());
136 m_octaveTerminal->sendText (QString ("load \'%1\'\n").arg (selectedFile)); 136 m_terminalView->sendText (QString ("load \'%1\'\n").arg (selectedFile));
137 m_octaveTerminal->setFocus (); 137 m_terminalView->setFocus ();
138 } 138 }
139 139
140 void 140 void
141 MainWindow::handleClearWorkspaceRequest () 141 MainWindow::handleClearWorkspaceRequest ()
142 { 142 {
143 m_octaveTerminal->sendText ("clear\n"); 143 m_terminalView->sendText ("clear\n");
144 m_octaveTerminal->setFocus (); 144 m_terminalView->setFocus ();
145 } 145 }
146 146
147 void 147 void
148 MainWindow::handleCommandDoubleClicked (QString command) 148 MainWindow::handleCommandDoubleClicked (QString command)
149 { 149 {
150 m_octaveTerminal->sendText (command); 150 m_terminalView->sendText (command);
151 m_octaveTerminal->setFocus (); 151 m_terminalView->setFocus ();
152 } 152 }
153 153
154 void 154 void
155 MainWindow::handleUnreadMessages (bool yes) 155 MainWindow::handleUnreadMessages (bool yes)
156 { 156 {
279 m_filesDockWidget = new FilesDockWidget (this); 279 m_filesDockWidget = new FilesDockWidget (this);
280 m_filesDockWidget->setStatusTip (tr ("Browse your files.")); 280 m_filesDockWidget->setStatusTip (tr ("Browse your files."));
281 m_statusBar = new QStatusBar (this); 281 m_statusBar = new QStatusBar (this);
282 282
283 // Setup essential MDI Windows. 283 // Setup essential MDI Windows.
284 m_octaveTerminal = new OctaveTerminal (this); 284 m_terminalView = new TerminalView (this);
285 m_documentationWidget = new BrowserWidget (this); 285 m_documentationWidget = new BrowserWidget (this);
286 m_ircWidget = new IRCWidget (this); 286 m_ircWidget = new IRCWidget (this);
287 287
288 // Octave Terminal subwindow. 288 // Octave Terminal subwindow.
289 m_octaveTerminalSubWindow = new NonClosableMdiSubWindow (this); 289 m_terminalViewSubWindow = new NonClosableMdiSubWindow (this);
290 m_octaveTerminalSubWindow->setWidget (m_octaveTerminal); 290 m_terminalViewSubWindow->setWidget (m_terminalView);
291 m_centralMdiArea->addSubWindow (m_octaveTerminalSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint); 291 m_centralMdiArea->addSubWindow (m_terminalViewSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
292 292
293 m_octaveTerminalSubWindow->setObjectName ("OctaveTerminalSubWindow"); 293 m_terminalViewSubWindow->setObjectName ("OctaveTerminalSubWindow");
294 m_octaveTerminalSubWindow->setWindowTitle (tr ("Terminal")); 294 m_terminalViewSubWindow->setWindowTitle (tr ("Terminal"));
295 m_octaveTerminalSubWindow 295 m_terminalViewSubWindow
296 ->setWindowIcon (ResourceManager::instance ()->icon (ResourceManager::Terminal)); 296 ->setWindowIcon (ResourceManager::instance ()->icon (ResourceManager::Terminal));
297 m_octaveTerminalSubWindow->setFocusProxy (m_octaveTerminal); 297 m_terminalViewSubWindow->setFocusProxy (m_terminalView);
298 m_octaveTerminalSubWindow->setStatusTip (tr ("Enter your commands into the Octave terminal.")); 298 m_terminalViewSubWindow->setStatusTip (tr ("Enter your commands into the Octave terminal."));
299 m_octaveTerminalSubWindow->setMinimumSize (300, 300); 299 m_terminalViewSubWindow->setMinimumSize (300, 300);
300 300
301 // Documentation subwindow. 301 // Documentation subwindow.
302 m_documentationWidgetSubWindow = new NonClosableMdiSubWindow (this); 302 m_documentationWidgetSubWindow = new NonClosableMdiSubWindow (this);
303 m_documentationWidgetSubWindow->setWidget (m_documentationWidget); 303 m_documentationWidgetSubWindow->setWidget (m_documentationWidget);
304 m_centralMdiArea->addSubWindow (m_documentationWidgetSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint); 304 m_centralMdiArea->addSubWindow (m_documentationWidgetSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);