#include FORMS_H_LOCATION
+#include "Timeout.h"
+#include "support/utility.hpp"
+
+// uncomment this line to try out the new menus
+#define NEW_MENUBAR 1
+
class LyXFunc;
class Toolbar;
class MiniBuffer;
class Intl;
class Buffer;
+#ifdef NEW_MENUBAR
+class Menubar;
+#else
class Menus;
+#endif
+
class BufferView;
+class Dialogs;
-///
-struct FD_form_main {
- ///
- FL_FORM * form_main;
- ///
- FL_OBJECT * timer_autosave;
- ///
- FL_OBJECT * timer_update;
- ///
- void * vdata;
- ///
- long ldata;
-};
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
/**
view is supposed (at least IMHO) to be another class, that shows its output
in one or more LyXView's.
*/
-class LyXView {
+class LyXView : public Object, public noncopyable {
public:
/// constructor
LyXView(int w, int h);
///
BufferView * view() const;
- /// returns a pointer to the main form.
- FD_form_main * getMainForm() const;
-
/// returns a pointer to the form.
FL_FORM * getForm() const;
/// return a pointer to the toolbar
Toolbar * getToolbar() const;
+ /// sets the layout in the toolbar layout combox
+ void setLayout(int layout);
+
+ /// update the toolbar
+ void updateToolbar();
+
/// return a pointer to the lyxfunc
LyXFunc * getLyXFunc() const;
/// return a pointer to the minibuffer
MiniBuffer * getMiniBuffer() const;
+#ifdef NEW_MENUBAR
///
- Menus * getMenus() const;
+ Menubar * getMenubar() const;
+ ///
+ void updateMenubar();
+#else
+ ///
+ Menus * getMenus() const;
+#endif
///
Intl * getIntl() const;
+ ///
+ Dialogs * getDialogs() { return dialogs_; }
+
///
void updateLayoutChoice();
/// Updates the title of the window
void updateWindowTitle();
+
+ /// Show state (toolbar and font in minibuffer)
+ void showState();
+
/// Reset autosave timer
void resetAutosaveTimer();
private:
Toolbar * toolbar;
///
MiniBuffer * minibuffer;
+#ifdef NEW_MENUBAR
+ ///
+ Menubar * menubar;
+#else
///
Menus * menus;
+#endif
///
Intl * intl;
+ ///
+ Dialogs * dialogs_;
/** This is supposed to be a pointer or a list of pointers to the
BufferViews currently being shown in the LyXView. So far
///
void UpdateDocumentClassChoice();
public:
+#if FL_REVISION < 89
///
static int KeyPressMask_raw_callback(FL_FORM *, void * xev);
+#endif
/** This callback is run when a close event is sent from the
window manager. */
static int atCloseMainFormCB(FL_FORM *, void *);
/// A callback
void AutoSave();
- /// A callback
- static void UpdateTimerCB(FL_OBJECT *, long);
private:
+ ///
+ Timeout autosave_timeout;
/// makes the main form.
void create_form_form_main(int width, int height);
/// A pointer to the form.
- FD_form_main * form_main_;
- /// A pointer to the form.
FL_FORM * form_;
-
/** The last textclass layout list in the layout choice selector
This should probably be moved to the toolbar, but for now it's
here. (Asger) */