Mercurial > octave-nkf

comparison libgui/src/main-window.cc @ 19984:857a8f018f53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set up octave_link when running with --no-gui option (bug #44116) * main-window.h, main-window.cc (main_window::_start_gui): New member variable. (main_window::main_window): New argument, start_gui. Skip most initialization if start_gui is false. (main_window::confirm_shutdown_octave): Skip interactive confirmation if _start_gui is false. (main_window::connect_uiwidget_links, main_window::construct, main_window::construct_octave_qt_link): Skip most initialization if _start_gui is false. (main_window::handle_octave_ready): Handle non-gui case. * octave-gui.cc (octave_start_gui): Unify gui/non-gui options.
author John W. Eaton <jwe@octave.org>
date Tue, 17 Mar 2015 10:13:58 -0400
parents f7a805f02723
children f7846f0ea6db
comparison
equal deleted inserted replaced
19983:fc6c87e254bf 19984:857a8f018f53
71 #else 71 #else
72 return 0; 72 return 0;
73 #endif 73 #endif
74 } 74 }
75 75
76 main_window::main_window (QWidget *p) 76 main_window::main_window (QWidget *p, bool start_gui)
77 : QMainWindow (p), 77 : QMainWindow (p),
78 _workspace_model (new workspace_model ()), 78 _workspace_model (start_gui ? new workspace_model () : 0),
79 status_bar (new QStatusBar ()), 79 status_bar (start_gui ? new QStatusBar () : 0),
80 command_window (new terminal_dock_widget (this)), 80 command_window (start_gui ? new terminal_dock_widget (this) : 0),
81 history_window (new history_dock_widget (this)), 81 history_window (start_gui ? new history_dock_widget (this) : 0),
82 file_browser_window (new files_dock_widget (this)), 82 file_browser_window (start_gui ? new files_dock_widget (this) : 0),
83 doc_browser_window (new documentation_dock_widget (this)), 83 doc_browser_window (start_gui ? new documentation_dock_widget (this) : 0),
84 editor_window (create_default_editor (this)), 84 editor_window (start_gui ? create_default_editor (this) : 0),
85 workspace_window (new workspace_view (this)), 85 workspace_window (start_gui ? new workspace_view (this) : 0),
86 _settings_dlg (0), 86 _settings_dlg (0),
87 find_files_dlg (0), 87 find_files_dlg (0),
88 release_notes_window (0), 88 release_notes_window (0),
89 community_news_window (0), 89 community_news_window (0),
90 _octave_qt_link (0), 90 _octave_qt_link (0),
93 _cmd_processing (1), 93 _cmd_processing (1),
94 _cmd_queue_mutex (), 94 _cmd_queue_mutex (),
95 _dbg_queue (new QStringList ()), // no debug pending 95 _dbg_queue (new QStringList ()), // no debug pending
96 _dbg_processing (1), 96 _dbg_processing (1),
97 _dbg_queue_mutex (), 97 _dbg_queue_mutex (),
98 _prevent_readline_conflicts (true) 98 _prevent_readline_conflicts (true),
99 _suppress_dbg_location (true),
100 _start_gui (start_gui)
99 { 101 {
100 QSettings *settings = resource_manager::get_settings (); 102 QSettings *settings = resource_manager::get_settings ();
101 103
102 bool connect_to_web = true; 104 bool connect_to_web = true;
103 QDateTime last_checked; 105 QDateTime last_checked;
116 } 118 }
117 119
118 QDateTime current = QDateTime::currentDateTime (); 120 QDateTime current = QDateTime::currentDateTime ();
119 QDateTime one_day_ago = current.addDays (-1); 121 QDateTime one_day_ago = current.addDays (-1);
120 122
121 if (connect_to_web 123 if (start_gui && connect_to_web
122 && (! last_checked.isValid () || one_day_ago > last_checked)) 124 && (! last_checked.isValid () || one_day_ago > last_checked))
123 load_and_display_community_news (serial); 125 load_and_display_community_news (serial);
124 126
125 // We have to set up all our windows, before we finally launch octave. 127 // We have to set up all our windows, before we finally launch octave.
126 construct (); 128 construct ();
766 void 768 void
767 main_window::confirm_shutdown_octave (void) 769 main_window::confirm_shutdown_octave (void)
768 { 770 {
769 bool closenow = true; 771 bool closenow = true;
770 772
771 QSettings *settings = resource_manager::get_settings (); 773 if (_start_gui)
772 774 {
773 if (settings->value ("prompt_to_exit", false).toBool ()) 775 QSettings *settings = resource_manager::get_settings ();
774 { 776
775 int ans = QMessageBox::question (this, tr ("Octave"), 777 if (settings->value ("prompt_to_exit", false).toBool ())
776 tr ("Are you sure you want to exit Octave?"), 778 {
777 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); 779 int ans = QMessageBox::question (this, tr ("Octave"),
778 780 tr ("Are you sure you want to exit Octave?"),
779 if (ans != QMessageBox::Ok) 781 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
780 closenow = false; 782
781 } 783 if (ans != QMessageBox::Ok)
784 closenow = false;
785 }
782 786
783 #ifdef HAVE_QSCINTILLA 787 #ifdef HAVE_QSCINTILLA
784 if (closenow) 788 if (closenow)
785 closenow = editor_window->check_closing (); 789 closenow = editor_window->check_closing ();
786 #endif 790 #endif
791 }
787 792
788 _octave_qt_link->shutdown_confirmation (closenow); 793 _octave_qt_link->shutdown_confirmation (closenow);
789 794
790 // Awake the worker thread so that it continues shutting down (or not). 795 // Awake the worker thread so that it continues shutting down (or not).
791 _octave_qt_link->waitcondition.wakeAll (); 796 _octave_qt_link->waitcondition.wakeAll ();
1172 // a dialog box of some sort. Perhaps a better place for this would be 1177 // a dialog box of some sort. Perhaps a better place for this would be
1173 // as part of the QUIWidgetCreator class. However, mainWindow currently 1178 // as part of the QUIWidgetCreator class. However, mainWindow currently
1174 // is not a global variable and not accessible for connecting. 1179 // is not a global variable and not accessible for connecting.
1175 1180
1176 void 1181 void
1177 main_window::connect_uiwidget_links () 1182 main_window::connect_uiwidget_links (void)
1178 { 1183 {
1179 connect (&uiwidget_creator, 1184 connect (&uiwidget_creator,
1180 SIGNAL (create_dialog (const QString&, const QString&, 1185 SIGNAL (create_dialog (const QString&, const QString&,
1181 const QString&, const QStringList&, 1186 const QString&, const QStringList&,
1182 const QString&, const QStringList&)), 1187 const QString&, const QStringList&)),
1291 // Main subroutine of the constructor 1296 // Main subroutine of the constructor
1292 void 1297 void
1293 main_window::construct (void) 1298 main_window::construct (void)
1294 { 1299 {
1295 _closing = false; // flag for editor files when closed 1300 _closing = false; // flag for editor files when closed
1296 setWindowIcon (QIcon (":/actions/icons/logo.png"));
1297
1298 workspace_window->setModel (_workspace_model);
1299 connect (_workspace_model, SIGNAL (model_changed (void)),
1300 workspace_window, SLOT (handle_model_changed (void)));
1301 1301
1302 // Create and set the central widget. QMainWindow takes ownership of 1302 // Create and set the central widget. QMainWindow takes ownership of
1303 // the widget (pointer) so there is no need to delete the object upon 1303 // the widget (pointer) so there is no need to delete the object upon
1304 // destroying this main_window. 1304 // destroying this main_window.
1305 1305
1308 dummyWidget->resize (10, 10); 1308 dummyWidget->resize (10, 10);
1309 dummyWidget->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum); 1309 dummyWidget->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum);
1310 dummyWidget->hide (); 1310 dummyWidget->hide ();
1311 setCentralWidget (dummyWidget); 1311 setCentralWidget (dummyWidget);
1312 1312
1313 construct_menu_bar ();
1314
1315 construct_tool_bar ();
1316
1317 connect (qApp, SIGNAL (aboutToQuit ()),
1318 this, SLOT (prepare_to_exit ()));
1319
1320 connect (qApp, SIGNAL (focusChanged (QWidget*, QWidget*)),
1321 this, SLOT(focus_changed (QWidget*, QWidget*)));
1322
1323 connect (this, SIGNAL (settings_changed (const QSettings *)),
1324 this, SLOT (notice_settings (const QSettings *)));
1325
1326 connect (this, SIGNAL (editor_focus_changed (bool)),
1327 this, SLOT (set_global_edit_shortcuts (bool)));
1328
1329 connect (this, SIGNAL (editor_focus_changed (bool)),
1330 editor_window, SLOT (enable_menu_shortcuts (bool)));
1331
1332 connect (file_browser_window, SIGNAL (load_file_signal (const QString&)),
1333 this, SLOT (handle_load_workspace_request (const QString&)));
1334
1335 connect (file_browser_window, SIGNAL (find_files_signal (const QString&)),
1336 this, SLOT (find_files (const QString&)));
1337
1338 connect_uiwidget_links (); 1313 connect_uiwidget_links ();
1339 1314
1340 setWindowTitle ("Octave"); 1315 construct_octave_qt_link ();
1341 1316
1342 setDockOptions (QMainWindow::AnimatedDocks 1317 if (_start_gui)
1343 | QMainWindow::AllowNestedDocks 1318 {
1344 | QMainWindow::AllowTabbedDocks); 1319 setWindowIcon (QIcon (":/actions/icons/logo.png"));
1345 1320
1346 addDockWidget (Qt::RightDockWidgetArea, command_window); 1321 workspace_window->setModel (_workspace_model);
1347 addDockWidget (Qt::RightDockWidgetArea, doc_browser_window); 1322 connect (_workspace_model, SIGNAL (model_changed (void)),
1348 tabifyDockWidget (command_window, doc_browser_window); 1323 workspace_window, SLOT (handle_model_changed (void)));
1324
1325 construct_menu_bar ();
1326
1327 construct_tool_bar ();
1328
1329 connect (qApp, SIGNAL (aboutToQuit ()),
1330 this, SLOT (prepare_to_exit ()));
1331
1332 connect (qApp, SIGNAL (focusChanged (QWidget*, QWidget*)),
1333 this, SLOT(focus_changed (QWidget*, QWidget*)));
1334
1335 connect (this, SIGNAL (settings_changed (const QSettings *)),
1336 this, SLOT (notice_settings (const QSettings *)));
1337
1338 connect (this, SIGNAL (editor_focus_changed (bool)),
1339 this, SLOT (set_global_edit_shortcuts (bool)));
1340
1341 connect (this, SIGNAL (editor_focus_changed (bool)),
1342 editor_window, SLOT (enable_menu_shortcuts (bool)));
1343
1344 connect (file_browser_window, SIGNAL (load_file_signal (const QString&)),
1345 this, SLOT (handle_load_workspace_request (const QString&)));
1346
1347 connect (file_browser_window, SIGNAL (find_files_signal (const QString&)),
1348 this, SLOT (find_files (const QString&)));
1349
1350 setWindowTitle ("Octave");
1351
1352 setDockOptions (QMainWindow::AnimatedDocks
1353 | QMainWindow::AllowNestedDocks
1354 | QMainWindow::AllowTabbedDocks);
1355
1356 addDockWidget (Qt::RightDockWidgetArea, command_window);
1357 addDockWidget (Qt::RightDockWidgetArea, doc_browser_window);
1358 tabifyDockWidget (command_window, doc_browser_window);
1349 1359
1350 #ifdef HAVE_QSCINTILLA 1360 #ifdef HAVE_QSCINTILLA
1351 addDockWidget (Qt::RightDockWidgetArea, editor_window); 1361 addDockWidget (Qt::RightDockWidgetArea, editor_window);
1352 tabifyDockWidget (command_window, editor_window); 1362 tabifyDockWidget (command_window, editor_window);
1353 #endif 1363 #endif
1354 1364
1355 addDockWidget (Qt::LeftDockWidgetArea, file_browser_window); 1365 addDockWidget (Qt::LeftDockWidgetArea, file_browser_window);
1356 addDockWidget (Qt::LeftDockWidgetArea, workspace_window); 1366 addDockWidget (Qt::LeftDockWidgetArea, workspace_window);
1357 addDockWidget (Qt::LeftDockWidgetArea, history_window); 1367 addDockWidget (Qt::LeftDockWidgetArea, history_window);
1358 1368
1359 int win_x = QApplication::desktop ()->width (); 1369 int win_x = QApplication::desktop ()->width ();
1360 int win_y = QApplication::desktop ()->height (); 1370 int win_y = QApplication::desktop ()->height ();
1361 1371
1362 if (win_x > 960) 1372 if (win_x > 960)
1363 win_x = 960; 1373 win_x = 960;
1364 1374
1365 if (win_y > 720) 1375 if (win_y > 720)
1366 win_y = 720; 1376 win_y = 720;
1367 1377
1368 setGeometry (0, 0, win_x, win_y); 1378 setGeometry (0, 0, win_x, win_y);
1369 1379
1370 setStatusBar (status_bar); 1380 setStatusBar (status_bar);
1371
1372 construct_octave_qt_link ();
1373 1381
1374 #ifdef HAVE_QSCINTILLA 1382 #ifdef HAVE_QSCINTILLA
1375 connect (this, 1383 connect (this,
1376 SIGNAL (insert_debugger_pointer_signal (const QString&, int)), 1384 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
1377 editor_window, 1385 editor_window,
1378 SLOT (handle_insert_debugger_pointer_request (const QString&, int))); 1386 SLOT (handle_insert_debugger_pointer_request (const QString&, int)));
1379 1387
1380 connect (this, 1388 connect (this,
1381 SIGNAL (delete_debugger_pointer_signal (const QString&, int)), 1389 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
1382 editor_window, 1390 editor_window,
1383 SLOT (handle_delete_debugger_pointer_request (const QString&, int))); 1391 SLOT (handle_delete_debugger_pointer_request (const QString&, int)));
1384 1392
1385 connect (this, 1393 connect (this,
1386 SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)), 1394 SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
1387 editor_window, 1395 editor_window,
1388 SLOT (handle_update_breakpoint_marker_request (bool, 1396 SLOT (handle_update_breakpoint_marker_request (bool,
1389 const QString&, 1397 const QString&,
1390 int))); 1398 int)));
1391 #endif 1399 #endif
1392 1400
1393 octave_link::post_event (this, &main_window::resize_command_window_callback); 1401 octave_link::post_event (this, &main_window::resize_command_window_callback);
1394 1402
1395 configure_shortcuts (); 1403 configure_shortcuts ();
1404 }
1396 } 1405 }
1397 1406
1398 1407
1399 void 1408 void
1400 main_window::handle_octave_ready () 1409 main_window::handle_octave_ready ()
1402 // actions after the startup files are executed 1411 // actions after the startup files are executed
1403 QSettings *settings = resource_manager::get_settings (); 1412 QSettings *settings = resource_manager::get_settings ();
1404 1413
1405 QDir startup_dir = QDir (); // current octave dir after startup 1414 QDir startup_dir = QDir (); // current octave dir after startup
1406 1415
1407 if (settings->value ("restore_octave_dir").toBool ()) 1416 if (settings)
1408 { 1417 {
1409 // restore last dir from previous session 1418 if (settings->value ("restore_octave_dir").toBool ())
1410 QStringList curr_dirs 1419 {
1411 = settings->value ("MainWindow/current_directory_list").toStringList (); 1420 // restore last dir from previous session
1412 startup_dir = QDir (curr_dirs.at (0)); // last dir in previous session 1421 QStringList curr_dirs
1413 } 1422 = settings->value ("MainWindow/current_directory_list").toStringList ();
1414 else if (! settings->value ("octave_startup_dir").toString ().isEmpty ()) 1423 startup_dir = QDir (curr_dirs.at (0)); // last dir in previous session
1415 { 1424 }
1416 // do not restore but there is a startup dir configured 1425 else if (! settings->value ("octave_startup_dir").toString ().isEmpty ())
1417 startup_dir = QDir (settings->value ("octave_startup_dir").toString ()); 1426 {
1427 // do not restore but there is a startup dir configured
1428 startup_dir = QDir (settings->value ("octave_startup_dir").toString ());
1429 }
1418 } 1430 }
1419 1431
1420 if (! startup_dir.exists ()) 1432 if (! startup_dir.exists ())
1421 { 1433 {
1422 // the configured startup dir does not exist, take actual one 1434 // the configured startup dir does not exist, take actual one
1423 startup_dir = QDir (); 1435 startup_dir = QDir ();
1424 } 1436 }
1425 1437
1426 set_current_working_directory (startup_dir.absolutePath ()); 1438 set_current_working_directory (startup_dir.absolutePath ());
1427 1439
1440 if (editor_window)
1441 {
1428 #ifdef HAVE_QSCINTILLA 1442 #ifdef HAVE_QSCINTILLA
1429 // Octave ready, determine whether to create an empty script. 1443 // Octave ready, determine whether to create an empty script.
1430 // This can not be done when the editor is created because all functions 1444 // This can not be done when the editor is created because all functions
1431 // must be known for the lexer's auto completion informations 1445 // must be known for the lexer's auto completion informations
1432 editor_window->empty_script (true, false); 1446 editor_window->empty_script (true, false);
1433 #endif 1447 #endif
1434 1448 }
1435 focus_command_window (); // make sure that the command window has focus 1449
1450 if (_start_gui)
1451 focus_command_window (); // make sure that the command window has focus
1436 1452
1437 } 1453 }
1438 1454
1439 1455
1440 void 1456 void
1441 main_window::construct_octave_qt_link (void) 1457 main_window::construct_octave_qt_link (void)
1442 { 1458 {
1443 _octave_qt_link = new octave_qt_link (this); 1459 _octave_qt_link = new octave_qt_link (this);
1460
1461 connect (_octave_qt_link, SIGNAL (exit_app_signal (int)),
1462 this, SLOT (exit_app (int)));
1444 1463
1445 connect (_octave_qt_link, SIGNAL (confirm_shutdown_signal ()), 1464 connect (_octave_qt_link, SIGNAL (confirm_shutdown_signal ()),
1446 this, SLOT (confirm_shutdown_octave ())); 1465 this, SLOT (confirm_shutdown_octave ()));
1447 1466
1448 connect (_octave_qt_link, SIGNAL (exit_app_signal (int)), 1467 if (_start_gui)
1449 this, SLOT (exit_app (int))); 1468 {
1450 1469 connect (_octave_qt_link,
1451 connect (_octave_qt_link, 1470 SIGNAL (set_workspace_signal
1452 SIGNAL (set_workspace_signal 1471 (bool, const QString&, const QStringList&,
1453 (bool, const QString&, const QStringList&, 1472 const QStringList&, const QStringList&,
1454 const QStringList&, const QStringList&, 1473 const QStringList&, const QIntList&)),
1455 const QStringList&, const QIntList&)), 1474 _workspace_model,
1456 _workspace_model, 1475 SLOT (set_workspace
1457 SLOT (set_workspace 1476 (bool, const QString&, const QStringList&,
1458 (bool, const QString&, const QStringList&, 1477 const QStringList&, const QStringList&,
1459 const QStringList&, const QStringList&, 1478 const QStringList&, const QIntList&)));
1460 const QStringList&, const QIntList&))); 1479
1461 1480 connect (_octave_qt_link, SIGNAL (clear_workspace_signal ()),
1462 connect (_octave_qt_link, SIGNAL (clear_workspace_signal ()), 1481 _workspace_model, SLOT (clear_workspace ()));
1463 _workspace_model, SLOT (clear_workspace ())); 1482
1464 1483 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)),
1465 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)), 1484 this, SLOT (change_directory (QString)));
1466 this, SLOT (change_directory (QString))); 1485 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)),
1467 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)), 1486 file_browser_window, SLOT (update_octave_directory (QString)));
1468 file_browser_window, SLOT (update_octave_directory (QString))); 1487 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)),
1469 connect (_octave_qt_link, SIGNAL (change_directory_signal (QString)), 1488 editor_window, SLOT (update_octave_directory (QString)));
1470 editor_window, SLOT (update_octave_directory (QString))); 1489
1471 1490 connect (_octave_qt_link,
1472 connect (_octave_qt_link, 1491 SIGNAL (execute_command_in_terminal_signal (QString)),
1473 SIGNAL (execute_command_in_terminal_signal (QString)), 1492 this, SLOT (execute_command_in_terminal (QString)));
1474 this, SLOT (execute_command_in_terminal (QString))); 1493
1475 1494 connect (_octave_qt_link,
1476 connect (_octave_qt_link, 1495 SIGNAL (set_history_signal (const QStringList&)),
1477 SIGNAL (set_history_signal (const QStringList&)), 1496 history_window, SLOT (set_history (const QStringList&)));
1478 history_window, SLOT (set_history (const QStringList&))); 1497
1479 1498 connect (_octave_qt_link,
1480 connect (_octave_qt_link, 1499 SIGNAL (append_history_signal (const QString&)),
1481 SIGNAL (append_history_signal (const QString&)), 1500 history_window, SLOT (append_history (const QString&)));
1482 history_window, SLOT (append_history (const QString&))); 1501
1483 1502 connect (_octave_qt_link,
1484 connect (_octave_qt_link, 1503 SIGNAL (clear_history_signal (void)),
1485 SIGNAL (clear_history_signal (void)), 1504 history_window, SLOT (clear_history (void)));
1486 history_window, SLOT (clear_history (void))); 1505
1487 1506 connect (_octave_qt_link, SIGNAL (enter_debugger_signal ()),
1488 connect (_octave_qt_link, SIGNAL (enter_debugger_signal ()), 1507 this, SLOT (handle_enter_debugger ()));
1489 this, SLOT (handle_enter_debugger ())); 1508
1490 1509 connect (_octave_qt_link, SIGNAL (exit_debugger_signal ()),
1491 connect (_octave_qt_link, SIGNAL (exit_debugger_signal ()), 1510 this, SLOT (handle_exit_debugger ()));
1492 this, SLOT (handle_exit_debugger ())); 1511
1493 1512 connect (_octave_qt_link,
1494 connect (_octave_qt_link, 1513 SIGNAL (show_preferences_signal (void)),
1495 SIGNAL (show_preferences_signal (void)), 1514 this, SLOT (process_settings_dialog_request ()));
1496 this, SLOT (process_settings_dialog_request ()));
1497 1515
1498 #ifdef HAVE_QSCINTILLA 1516 #ifdef HAVE_QSCINTILLA
1499 connect (_octave_qt_link, 1517 connect (_octave_qt_link,
1500 SIGNAL (edit_file_signal (const QString&)), 1518 SIGNAL (edit_file_signal (const QString&)),
1501 editor_window, 1519 editor_window,
1502 SLOT (handle_edit_file_request (const QString&))); 1520 SLOT (handle_edit_file_request (const QString&)));
1503 #endif 1521 #endif
1504 1522
1505 connect (_octave_qt_link, 1523 connect (_octave_qt_link,
1506 SIGNAL (insert_debugger_pointer_signal (const QString&, int)), 1524 SIGNAL (insert_debugger_pointer_signal (const QString&, int)),
1507 this, 1525 this,
1508 SLOT (handle_insert_debugger_pointer_request (const QString&, int))); 1526 SLOT (handle_insert_debugger_pointer_request (const QString&, int)));
1509 1527
1510 connect (_octave_qt_link, 1528 connect (_octave_qt_link,
1511 SIGNAL (delete_debugger_pointer_signal (const QString&, int)), 1529 SIGNAL (delete_debugger_pointer_signal (const QString&, int)),
1512 this, 1530 this,
1513 SLOT (handle_delete_debugger_pointer_request (const QString&, int))); 1531 SLOT (handle_delete_debugger_pointer_request (const QString&, int)));
1514 1532
1515 connect (_octave_qt_link, 1533 connect (_octave_qt_link,
1516 SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)), 1534 SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
1517 this, 1535 this,
1518 SLOT (handle_update_breakpoint_marker_request (bool, const QString&, 1536 SLOT (handle_update_breakpoint_marker_request (bool, const QString&,
1519 int))); 1537 int)));
1520 1538
1521 connect (_octave_qt_link, 1539 connect (_octave_qt_link,
1522 SIGNAL (show_doc_signal (const QString &)), 1540 SIGNAL (show_doc_signal (const QString &)),
1523 this, SLOT (handle_show_doc (const QString &))); 1541 this, SLOT (handle_show_doc (const QString &)));
1524 1542
1525 connect (_workspace_model, 1543 connect (_workspace_model,
1526 SIGNAL (rename_variable (const QString&, const QString&)), 1544 SIGNAL (rename_variable (const QString&, const QString&)),
1527 this, 1545 this,
1528 SLOT (handle_rename_variable_request (const QString&, 1546 SLOT (handle_rename_variable_request (const QString&,
1529 const QString&))); 1547 const QString&)));
1530 1548
1531 connect (command_window, SIGNAL (interrupt_signal (void)), 1549 connect (command_window, SIGNAL (interrupt_signal (void)),
1532 _octave_qt_link, SLOT (terminal_interrupt (void))); 1550 _octave_qt_link, SLOT (terminal_interrupt (void)));
1551 }
1533 1552
1534 _octave_qt_link->execute_interpreter (); 1553 _octave_qt_link->execute_interpreter ();
1535 1554
1536 octave_link::connect_link (_octave_qt_link); 1555 octave_link::connect_link (_octave_qt_link);
1537 } 1556 }