Mercurial > octave-nkf

diff libgui/src/main-window.cc @ 16379:4bb1b82076e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: provide defaults for all values read from the settings file * files-dockwidget.cc(notice_settings): provide default values for settings * file-editor-tab.cc(update_lexer,notice_settings): default font is Courier New instead of Courier * main-window.cc(notice_settings): provide defaults for terminal font and cursor * main-window.cc(construct): new default window geometry and widget placement * resource-manager.cc(do_update_network_settings): default for port setting * settings-dialog.cc(constructor): provide default values for settings
author Torsten <ttl@justmail.de>
date Wed, 27 Mar 2013 19:52:26 +0100
parents 8430ea8c1594
children ac9db42ef23e
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Wed Mar 27 16:12:35 2013 -0400
+++ b/libgui/src/main-window.cc	Wed Mar 27 19:52:26 2013 +0100
@@ -215,12 +215,12 @@
 
   // Set terminal font:
   QFont term_font = QFont();
-  term_font.setFamily(settings->value("terminal/fontName").toString());
-  term_font.setPointSize(settings->value("terminal/fontSize").toInt ());
+  term_font.setFamily(settings->value("terminal/fontName","Courier New").toString());
+  term_font.setPointSize(settings->value("terminal/fontSize",10).toInt ());
   _terminal->setTerminalFont (term_font);
 
-  QString cursorType = settings->value ("terminal/cursorType").toString ();
-  bool cursorBlinking = settings->value ("terminal/cursorBlinking").toBool ();
+  QString cursorType = settings->value ("terminal/cursorType","ibeam").toString ();
+  bool cursorBlinking = settings->value ("terminal/cursorBlinking",true).toBool ();
   if (cursorType == "ibeam")
     _terminal->setCursorType(QTerminalInterface::IBeamCursor, cursorBlinking);
   else if (cursorType == "block")
@@ -1126,14 +1126,25 @@
 
   setWindowTitle ("Octave");
   setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
+  addDockWidget (Qt::RightDockWidgetArea, _terminal_dock_widget);
+  addDockWidget (Qt::RightDockWidgetArea, _documentation_dock_widget);
+  tabifyDockWidget(_terminal_dock_widget,_documentation_dock_widget);
+#ifdef HAVE_QSCINTILLA
+  addDockWidget (Qt::RightDockWidgetArea, _file_editor);
+  tabifyDockWidget(_terminal_dock_widget,_file_editor);
+#endif
+  addDockWidget (Qt::LeftDockWidgetArea, _files_dock_widget);
   addDockWidget (Qt::LeftDockWidgetArea, _workspace_view);
   addDockWidget (Qt::LeftDockWidgetArea, _history_dock_widget);
-  addDockWidget (Qt::RightDockWidgetArea, _files_dock_widget);
-#ifdef HAVE_QSCINTILLA
-  addDockWidget (Qt::RightDockWidgetArea, _file_editor);
-#endif
-  addDockWidget (Qt::BottomDockWidgetArea, _terminal_dock_widget);
-  addDockWidget (Qt::RightDockWidgetArea, _documentation_dock_widget);
+
+  int win_x = QApplication::desktop()->width();
+  int win_y = QApplication::desktop()->height();
+  if (win_x > 960)
+    win_x = 960;
+  if (win_y > 720)
+    win_y = 720;
+  setGeometry (0,0,win_x,win_y);
+
   setStatusBar (_status_bar);
 
   _octave_qt_event_listener = new octave_qt_event_listener ();