better selection and scrolling behaviour

[lyx.git] / src / frontends / LyXView.C

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index db4d1f2c75ba32d379622f431fa33fa4c445ed54..d805fee37175cec6c713a1110dd7bc6ae9d9a885 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -1,10 +1,12 @@
 /**
  * \file LyXView.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjornes
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -22,6 +24,7 @@
 #include "MenuBackend.h"
 #include "gettext.h"
 #include "lyxfunc.h"
+#include "funcrequest.h"
 #include "lyx_cb.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
@@ -45,17 +48,13 @@ string current_layout;
 
 
 LyXView::LyXView()
+       : intl_(new Intl),
+         autosave_timeout_(new Timeout(5000)),
+         lyxfunc_(new LyXFunc(this)),
+         dialogs_(new Dialogs(*this)),
+         controlcommand_(new ControlCommandBuffer(getLyXFunc()))
 {
        lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
-
-       lyxfunc_.reset(new LyXFunc(this));
-       intl_.reset(new Intl);
-
-       // Give the timeout some default sensible value.
-       autosave_timeout_.reset(new Timeout(5000));
-
-       dialogs_.reset(new Dialogs(this));
-       controlcommand_.reset(new ControlCommandBuffer(*getLyXFunc()));
 }
 
 
@@ -92,12 +91,6 @@ boost::shared_ptr<BufferView> const & LyXView::view() const
 }
 
 
-Toolbar * LyXView::getToolbar() const
-{
-       return toolbar_.get();
-}
-
-
 void LyXView::setLayout(string const & layout)
 {
        toolbar_->setLayout(layout);
@@ -110,30 +103,12 @@ void LyXView::updateToolbar()
 }
 
 
-LyXFunc * LyXView::getLyXFunc() const
-{
-       return lyxfunc_.get();
-}
-
-
-Menubar * LyXView::getMenubar() const
-{
-       return menubar_.get();
-}
-
-
 void LyXView::updateMenubar()
 {
        menubar_->update();
 }
 
 
-Intl * LyXView::getIntl() const
-{
-       return intl_.get();
-}
-
-
 void LyXView::autoSave()
 {
        lyxerr[Debug::INFO] << "Running autoSave()" << endl;
@@ -177,24 +152,34 @@ void LyXView::updateLayoutChoice()
 void LyXView::updateWindowTitle()
 {
        static string last_title = "LyX";
-       string title = "LyX";
-       string icon_title = "LyX";
+       string maximize_title = "LyX";
+       string minimize_title = "LyX";
 
        if (view()->available()) {
                string const cur_title = buffer()->fileName();
                if (!cur_title.empty()) {
-                       title += ": " + MakeDisplayPath(cur_title, 30);
-                       if (!buffer()->isLyxClean())
-                               title += _(" (changed)");
+                       maximize_title += ": " + MakeDisplayPath(cur_title, 30);
+                       minimize_title = OnlyFilename(cur_title);
+                       if (!buffer()->isClean()) {
+                               maximize_title += _(" (changed)");
+                               minimize_title += '*';
+                       }
                        if (buffer()->isReadonly())
-                               title += _(" (read only)");
-                       // Show only the filename if it's available
-                       icon_title = OnlyFilename(cur_title);
+                               maximize_title += _(" (read only)");
                }
        }
 
-       if (title != last_title) {
-               setWindowTitle(title, icon_title);
-               last_title = title;
+       if (maximize_title != last_title) {
+               setWindowTitle(maximize_title, minimize_title);
+               last_title = maximize_title;
        }
 }
+
+
+void LyXView::dispatch(FuncRequest const & req)
+{
+       // substitute the correct BufferView here
+       FuncRequest r = req;
+       r.setView(view().get());
+       getLyXFunc().dispatch(r);
+}