fix tooltips in toolbar

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

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index 9724419d4d01712a139c3e2b1514f0b4f693bc98..65e42cf318fb466fda96476aeb5c722cfa543eb1 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -14,7 +14,6 @@
 #endif
 
 #include "LyXView.h"
-#include "MiniBuffer.h"
 #include "debug.h"
 #include "intl.h"
 #include "lyxrc.h"
@@ -26,12 +25,12 @@
 #include "lyx_cb.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "lyxtextclasslist.h"
 
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Timeout.h"
-#include "frontends/Menubar.h"
+#include "Dialogs.h"
+#include "Toolbar.h"
+#include "Timeout.h"
+#include "Menubar.h"
+#include "controllers/ControlCommandBuffer.h"
 
 #include "support/filetools.h" // OnlyFilename()
 
@@ -56,6 +55,7 @@ LyXView::LyXView()
        autosave_timeout_.reset(new Timeout(5000));
 
        dialogs_.reset(new Dialogs(this));
+       controlcommand_.reset(new ControlCommandBuffer(*getLyXFunc()));
 }
 
 
@@ -71,6 +71,7 @@ void LyXView::init()
 
        // Start autosave timer
        if (lyxrc.autosave) {
+               autosave_timeout_->timeout.connect(boost::bind(&LyXView::autoSave, this));
                autosave_timeout_->setTimeout(lyxrc.autosave * 1000);
                autosave_timeout_->start();
        }
@@ -115,30 +116,6 @@ LyXFunc * LyXView::getLyXFunc() const
 }
 
 
-MiniBuffer * LyXView::getMiniBuffer() const
-{
-       return minibuffer_.get();
-}
-
-
-void LyXView::message(string const & str)
-{
-       minibuffer_->message(str);
-}
-
-
-void LyXView::messagePush(string const & str)
-{
-       minibuffer_->messagePush(str);
-}
-
-
-void LyXView::messagePop()
-{
-       minibuffer_->messagePop();
-}
-
-
 Menubar * LyXView::getMenubar() const
 {
        return menubar_.get();
@@ -147,12 +124,6 @@ Menubar * LyXView::getMenubar() const
 
 void LyXView::updateMenubar()
 {
-       if (!view()->buffer() && menubackend.hasMenu("main_nobuffer")) {
-               menubar_->set("main_nobuffer");
-       } else {
-               menubar_->set("main");
-       }
-
        menubar_->update();
 }
 
@@ -190,7 +161,7 @@ void LyXView::updateLayoutChoice()
 
        // update the layout display
        if (toolbar_->updateLayoutList(buffer()->params.textclass)) {
-               current_layout = textclasslist[buffer()->params.textclass].defaultLayoutName();
+               current_layout = buffer()->params.getLyXTextClass().defaultLayoutName();
        }
 
        string const & layout =
@@ -227,9 +198,3 @@ void LyXView::updateWindowTitle()
                last_title = title;
        }
 }
-
-
-void LyXView::showState()
-{
-       message(currentState(view()));
-}