*
* \author unknown
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-
#include "XFormsView.h"
-#include "lyx_forms.h"
+#include "XFormsMenubar.h"
+#include "XFormsToolbar.h"
#include "XMiniBuffer.h"
+
+#include "BufferView.h"
#include "debug.h"
-#include "intl.h"
-#include "lyxrc.h"
-#include "support/filetools.h" // OnlyFilename()
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
-#include "frontends/Timeout.h"
-#include "frontends/Dialogs.h"
-#include "MenuBackend.h"
-#include "ToolbarBackend.h"
#include "lyxfunc.h"
-#include "bufferview_funcs.h"
-#include "BufferView.h"
+#include "MenuBackend.h"
+
+#include "frontends/Dialogs.h"
+
+#include "support/filetools.h" // OnlyFilename()
#include <boost/bind.hpp>
-#include <boost/signals/connection.hpp>
+
+using lyx::support::LibFileSearch;
+
using std::abs;
using std::endl;
+using std::string;
+
//extern void AutoSave(BufferView *);
extern void QuitLyX();
-// This is very temporary
-BufferView * current_view;
-
extern "C" {
static
create_form_form_main(width, height);
fl_set_form_atclose(getForm(), C_XFormsView_atCloseMainFormCB, 0);
- view_state_con = view_state_changed.connect(boost::bind(&XFormsView::show_view_state, this));
- focus_con = focus_command_buffer.connect(boost::bind(&XMiniBuffer::focus, minibuffer_.get()));
+ view_state_con =
+ view_state_changed.connect(boost::bind(&XFormsView::show_view_state, this));
+ focus_con =
+ focus_command_buffer.connect(boost::bind(&XMiniBuffer::focus, minibuffer_.get()));
// Make sure the buttons are disabled if needed.
updateToolbar();
- redraw_con = getDialogs().redrawGUI().connect(boost::bind(&XFormsView::redraw, this));
+ redraw_con =
+ getDialogs().redrawGUI().connect(boost::bind(&XFormsView::redraw, this));
}
int const air = 2;
int const bw = abs(fl_get_border_width());
- menubar_.reset(new Menubar(this, menubackend));
+ menubar_.reset(new XFormsMenubar(this, menubackend));
- toolbar_.reset(new Toolbar(this, air, 30 + air + bw));
+ toolbar_.reset(new XFormsToolbar(this, air, 30 + air + bw));
+ toolbar_->init();
int const ywork = 60 + 2 * air + bw;
int const workheight = height - ywork - (25 + 2 * air);
bufferview_.reset(new BufferView(this, air, ywork,
width - 3 * air, workheight));
- ::current_view = bufferview_.get();
minibuffer_.reset(new XMiniBuffer(*controlcommand_,
air, height - (25 + air), width - (2 * air), 25));
void XFormsView::clearMessage()
{
- message(getLyXFunc().view_status_message());
+ message(getLyXFunc().viewStatusMessage());
}
void XFormsView::show_view_state()
{
- message(getLyXFunc().view_status_message());
+ message(getLyXFunc().viewStatusMessage());
}