some tabular fixes for the problems reported by Helge

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

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index 1bcac4dd0f6e3a33d7786dd9f998347a8b0b2ae4..7758bb400b96a353f6b8c1f624948452e27077d9 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -1,36 +1,38 @@
 /**
  * \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>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "LyXView.h"
+#include "Dialogs.h"
+#include "Timeout.h"
+#include "Toolbars.h"
+#include "Menubar.h"
+
+#include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
+#include "bufferview_funcs.h"
+#include "cursor.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "intl.h"
+#include "lyx_cb.h"
+#include "lyxfunc.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
-#include "buffer.h"
 #include "MenuBackend.h"
-#include "gettext.h"
-#include "lyxfunc.h"
-#include "funcrequest.h"
-#include "lyx_cb.h"
-#include "BufferView.h"
-#include "bufferview_funcs.h"
+#include "paragraph.h"
 
-#include "Dialogs.h"
-#include "Toolbar.h"
-#include "Timeout.h"
-#include "Menubar.h"
 #include "controllers/ControlCommandBuffer.h"
 
 #include "support/filetools.h" // OnlyFilename()
@@ -38,19 +40,28 @@
 #include <boost/bind.hpp>
 
 #include <sys/time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
 
 using std::endl;
+using std::string;
+
+using lyx::frontend::ControlCommandBuffer;
 
 string current_layout;
 
 
 LyXView::LyXView()
-       : controlcommand_(new ControlCommandBuffer(getLyXFunc())),
+       : toolbars_(new Toolbars(*this)),
          intl_(new Intl),
          autosave_timeout_(new Timeout(5000)),
          lyxfunc_(new LyXFunc(this)),
-         dialogs_(new Dialogs(this))
+         dialogs_(new Dialogs(*this)),
+         controlcommand_(new ControlCommandBuffer(*this))
 {
        lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
 }
@@ -91,13 +102,16 @@ boost::shared_ptr<BufferView> const & LyXView::view() const
 
 void LyXView::setLayout(string const & layout)
 {
-       toolbar_->setLayout(layout);
+       toolbars_->setLayout(layout);
 }
 
 
-void LyXView::updateToolbar()
+void LyXView::updateToolbars()
 {
-       toolbar_->update();
+       bool const math = bufferview_->cursor().inMathed();
+       bool const table =
+               getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
+       toolbars_->update(math, table);
 }
 
 
@@ -126,22 +140,25 @@ void LyXView::resetAutosaveTimer()
 
 void LyXView::updateLayoutChoice()
 {
-       // don't show any layouts without a buffer
+       // Don't show any layouts without a buffer
        if (!view()->buffer()) {
-               toolbar_->clearLayoutList();
+               toolbars_->clearLayoutList();
                return;
        }
 
-       // update the layout display
-       if (toolbar_->updateLayoutList(buffer()->params.textclass)) {
-               current_layout = buffer()->params.getLyXTextClass().defaultLayoutName();
+       // Update the layout display
+       if (toolbars_->updateLayoutList(buffer()->params().textclass)) {
+               current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
        }
 
+       if (bufferview_->cursor().inMathed())
+               return;
+
        string const & layout =
-               bufferview_->getLyXText()->cursor.par()->layout()->name();
+               bufferview_->cursor().paragraph().layout()->name();
 
        if (layout != current_layout) {
-               toolbar_->setLayout(layout);
+               toolbars_->setLayout(layout);
                current_layout = layout;
        }
 }
@@ -150,33 +167,42 @@ 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()->isClean())
-                               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)
+void LyXView::dispatch(FuncRequest const & cmd)
+{
+       getLyXFunc().dispatch(cmd);
+}
+
+
+Buffer const * const LyXView::updateInset(InsetBase const * inset) const
 {
-       // substitute the correct BufferView here
-       FuncRequest r = req;
-       r.setView(view().get());
-       getLyXFunc().dispatch(r); 
+       Buffer const * buffer_ptr = 0;
+       if (inset) {
+               buffer_ptr = bufferview_->buffer();
+               bufferview_->update();
+       }
+       return buffer_ptr;
 }