#include "LyXView.h"
#include "lyx_main.h"
-#if FL_REVISION < 89
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
#include "lyxlookup.h"
#endif
#include "minibuffer.h"
-#include "lyxfunc.h"
#include "debug.h"
-#include "layout_forms.h"
#include "intl.h"
#include "lyxrc.h"
#include "support/filetools.h" // OnlyFilename()
#include "ToolbarDefaults.h"
#include "lyx_gui_misc.h" // [update,Close,Redraw]AllBufferRelatedDialogs
#include "bufferview_funcs.h" // CurrentState()
+#include "gettext.h"
+#include "lyxfunc.h"
using std::endl;
extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *);
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-using SigC::slot;
-#endif
LyXView::LyXView(int width, int height)
{
fl_set_form_atclose(form_, C_LyXView_atCloseMainFormCB, 0);
lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
lyxfunc = new LyXFunc(this);
+
+ // Connect the minibuffer signals
+ minibuffer->stringReady.connect(SigC::slot(lyxfunc,
+ &LyXFunc::miniDispatch));
+ minibuffer->timeout.connect(SigC::slot(lyxfunc,
+ &LyXFunc::initMiniBuffer));
+
intl = new Intl;
// Make sure the buttons are disabled if needed.
dialogs_ = new Dialogs(this);
// temporary until all dialogs moved into Dialogs.
dialogs_->updateBufferDependent
- .connect(slot(&updateAllVisibleBufferRelatedDialogs));
+ .connect(SigC::slot(&updateAllVisibleBufferRelatedDialogs));
dialogs_->hideBufferDependent
- .connect(slot(&CloseAllBufferRelatedDialogs));
- Dialogs::redrawGUI.connect(slot(this, &LyXView::redraw));
- Dialogs::redrawGUI.connect(slot(&RedrawAllBufferRelatedDialogs));
+ .connect(SigC::slot(&CloseAllBufferRelatedDialogs));
+ Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
+ Dialogs::redrawGUI.connect(SigC::slot(&RedrawAllBufferRelatedDialogs));
}
void LyXView::redraw() {
lyxerr[Debug::INFO] << "LyXView::redraw()" << endl;
fl_redraw_form(form_);
- minibuffer->Activate();
+ minibuffer->redraw();
}
}
+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;
void LyXView::show(int place, int border, string const & title)
{
fl_show_form(form_, place, border, title.c_str());
- minibuffer->Init();
-#if FL_REVISION < 89
+ lyxfunc->initMiniBuffer();
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
InitLyXLookup(fl_get_display(), form_->window);
#endif
}
// TIMERS
//
- autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave));
+ autosave_timeout.timeout.connect(SigC::slot(this, &LyXView::AutoSave));
//
// Misc
string title = "LyX";
if (view()->available()) {
- string cur_title = buffer()->fileName();
+ string const cur_title = buffer()->fileName();
if (!cur_title.empty()){
title += ": " + MakeDisplayPath(cur_title, 30);
if (!buffer()->isLyxClean())
void LyXView::showState()
{
- getMiniBuffer()->Set(CurrentState(view()));
+ message(CurrentState(view()));
getToolbar()->update();
menubar->update();
}