Mercurial > octave-nkf

changeset 14286:728c8929385f gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Commented out some functionality that has not been implemented correctly until now. * Mainwindow.cpp: Commented out chat window. * MainWindow.cpp: Commented out connects to slots.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Mon, 30 Jan 2012 23:14:46 +0100
parents 04050d082a5d
children 2f902bf44669
files gui/src/MainWindow.cpp
diffstat 1 files changed, 20 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/gui/src/MainWindow.cpp	Mon Jan 30 12:45:14 2012 +0100
+++ b/gui/src/MainWindow.cpp	Mon Jan 30 23:14:46 2012 +0100
@@ -285,12 +285,22 @@
   m_filesDockWidget->setStatusTip (tr ("Browse your files."));
   m_statusBar = new QStatusBar (this);
 
-  // Setup essential MDI Windows.
-  m_terminalView = new QTerminal(this);
+  // Documentation subwindow.
   m_documentationWidget = new BrowserWidget (this);
-  m_ircWidget = new QIRCWidget (this);
+  m_documentationWidgetSubWindow = new NonClosableMdiSubWindow (this);
+  m_documentationWidgetSubWindow->setWidget (m_documentationWidget);
+  m_centralMdiArea->addSubWindow (m_documentationWidgetSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
+
+  m_documentationWidgetSubWindow->setObjectName ("DocumentationWidgetSubWindow");
+  m_documentationWidgetSubWindow->setWindowTitle (tr ("Documentation"));
+  m_documentationWidgetSubWindow
+      ->setWindowIcon (ResourceManager::instance ()->icon (ResourceManager::Documentation));
+  m_documentationWidgetSubWindow->setFocusProxy (m_documentationWidget);
+  m_documentationWidgetSubWindow->setStatusTip (tr ("Browse the Octave documentation for help."));
+  m_documentationWidgetSubWindow->setMinimumSize (300, 300);
 
   // Octave Terminal subwindow.
+  m_terminalView = new QTerminal(this);
   m_terminalViewSubWindow = new NonClosableMdiSubWindow (this);
   m_terminalViewSubWindow->setWidget (m_terminalView);
   m_centralMdiArea->addSubWindow (m_terminalViewSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
@@ -303,20 +313,10 @@
   m_terminalViewSubWindow->setStatusTip (tr ("Enter your commands into the Octave terminal."));
   m_terminalViewSubWindow->setMinimumSize (300, 300);
 
-  // Documentation subwindow.
-  m_documentationWidgetSubWindow = new NonClosableMdiSubWindow (this);
-  m_documentationWidgetSubWindow->setWidget (m_documentationWidget);
-  m_centralMdiArea->addSubWindow (m_documentationWidgetSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
-
-  m_documentationWidgetSubWindow->setObjectName ("DocumentationWidgetSubWindow");
-  m_documentationWidgetSubWindow->setWindowTitle (tr ("Documentation"));
-  m_documentationWidgetSubWindow
-      ->setWindowIcon (ResourceManager::instance ()->icon (ResourceManager::Documentation));
-  m_documentationWidgetSubWindow->setFocusProxy (m_documentationWidget);
-  m_documentationWidgetSubWindow->setStatusTip (tr ("Browse the Octave documentation for help."));
-  m_documentationWidgetSubWindow->setMinimumSize (300, 300);
-
   // Chat subwindow.
+  // Deactivated in the development process.
+  /*
+  m_ircWidget = new QIRCWidget (this);
   m_ircWidgetSubWindow = new NonClosableMdiSubWindow (this);
   m_ircWidgetSubWindow->setWidget(m_ircWidget);
   m_centralMdiArea->addSubWindow (m_ircWidgetSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
@@ -328,9 +328,10 @@
   m_ircWidgetSubWindow->setStatusTip(tr ("Instantly chat with other Octave users for help."));
   m_ircWidgetSubWindow->setFocusProxy (m_ircWidget);
   m_ircWidgetSubWindow->setMinimumSize (300, 300);
-  connect (m_ircWidget, SIGNAL (unreadMessages (bool)), this, SLOT (handleUnreadMessages (bool)));
+  //connect (m_ircWidget, SIGNAL (unreadMessages (bool)), this, SLOT (handleUnreadMessages (bool)));
 
   m_ircWidget->connectToServer("irc.freenode.net", "Octave-GUI-User", "#octave");
+  */
 
   m_lexer = NULL;  // initialise the empty lexer for the edtiors
 
@@ -386,8 +387,8 @@
   connect (showFileBrowserAction, SIGNAL (toggled (bool)), m_filesDockWidget, SLOT (setShown (bool)));
   connect (m_filesDockWidget, SIGNAL (activeChanged (bool)), showFileBrowserAction, SLOT (setChecked (bool)));
 
-  connect (this, SIGNAL (settingsChanged ()), m_workspaceView, SLOT (noticeSettings ()));
-  connect (this, SIGNAL (settingsChanged ()), m_historyDockWidget, SLOT (noticeSettings ()));
+  //connect (this, SIGNAL (settingsChanged ()), m_workspaceView, SLOT (noticeSettings ()));
+  //connect (this, SIGNAL (settingsChanged ()), m_historyDockWidget, SLOT (noticeSettings ()));
   connect (this, SIGNAL (settingsChanged ()), m_filesDockWidget, SLOT (noticeSettings ()));
 
   connect (m_filesDockWidget, SIGNAL (openFile (QString)), this, SLOT (handleOpenFileRequest (QString)));