Martin's changes to the Note inset.

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

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index 332c397e7dca8902124d12b64e07f2712d7c42b3..4b00b244fe97370c77a7659088b86a12f712abe4 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -1,19 +1,16 @@
 /**
  * \file LyXView.C
- * 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 Bjønnes
- * \author John Levon 
+ * \author John Levon
  *
  * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "LyXView.h"
 #include "debug.h"
 #include "intl.h"
@@ -33,6 +30,7 @@
 #include "Timeout.h"
 #include "Menubar.h"
 #include "controllers/ControlCommandBuffer.h"
+#include "mathed/math_cursor.h"
 
 #include "support/filetools.h" // OnlyFilename()
 
@@ -41,6 +39,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+using namespace lyx::support;
 using std::endl;
 
 string current_layout;
@@ -51,7 +50,7 @@ LyXView::LyXView()
          autosave_timeout_(new Timeout(5000)),
          lyxfunc_(new LyXFunc(this)),
          dialogs_(new Dialogs(*this)),
-         controlcommand_(new ControlCommandBuffer(getLyXFunc()))
+         controlcommand_(new ControlCommandBuffer(*this))
 {
        lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
 }
@@ -98,7 +97,10 @@ void LyXView::setLayout(string const & layout)
 
 void LyXView::updateToolbar()
 {
-       toolbar_->update();
+       bool const math = mathcursor;
+       bool const table =
+               !getLyXFunc().getStatus(LFUN_LAYOUT_TABULAR).disabled();
+       toolbar_->update(math, table);
 }
 
 
@@ -151,25 +153,26 @@ 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;
        }
 }
 
@@ -179,5 +182,5 @@ void LyXView::dispatch(FuncRequest const & req)
        // substitute the correct BufferView here
        FuncRequest r = req;
        r.setView(view().get());
-       getLyXFunc().dispatch(r); 
+       getLyXFunc().dispatch(r);
 }