-// -*- C++ -*-
/* This file is part of
* ======================================================
*
#include "LyXView.h"
#include "lyx_main.h"
#include "lyxlookup.h"
-#include "toolbar.h"
#include "minibuffer.h"
#include "lyxfunc.h"
-#include "lyx.xpm"
#include "debug.h"
#include "layout_forms.h"
#include "intl.h"
#include "layout.h"
#include "lyxtext.h"
#include "buffer.h"
-#include "menus.h"
#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+#include "MenuBackend.h"
+#include "ToolbarDefaults.h"
#include "lyx_gui_misc.h" // [update,Close]AllBufferRelatedDialogs
+#include "bufferview_funcs.h" // CurrentState()
using std::endl;
-extern FD_form_document * fd_form_document;
-
extern void AutoSave(BufferView *);
extern void QuitLyX();
LyXTextClass::size_type current_layout = 0;
lyxfunc = new LyXFunc(this);
intl = new Intl;
+ // Make sure the buttons are disabled if needed.
+ toolbar->update();
+ menubar->update();
+
dialogs_ = new Dialogs(this);
// temporary until all dialogs moved into Dialogs.
dialogs_->updateBufferDependent
LyXView::~LyXView()
{
- delete menus;
+ delete menubar;
delete toolbar;
delete bufferview;
delete minibuffer;
}
+void LyXView::setLayout(LyXTextClass::size_type layout)
+{
+ toolbar->setLayout(layout);
+}
+
+
+void LyXView::updateToolbar()
+{
+ toolbar->update();
+ menubar->update();
+}
+
+
LyXFunc * LyXView::getLyXFunc() const
{
return lyxfunc;
}
-Menus * LyXView::getMenus() const
+Menubar * LyXView::getMenubar() const
{
- return menus;
+ return menubar;
+}
+
+
+void LyXView::updateMenubar()
+{
+ if ((!view() || !view()->buffer())
+ && menubackend.hasMenu("main_nobuffer"))
+ menubar->set("main_nobuffer");
+ else
+ menubar->set("main");
}
// Wrapper for the above
-extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p)
+extern "C"
+int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p)
{
return LyXView::atCloseMainFormCB(form, p);
}
}
-void LyXView::show(int place, int border, char const * title)
+void LyXView::show(int place, int border, string const & title)
{
- fl_show_form(form_, place, border, title);
+ fl_show_form(form_, place, border, title.c_str());
minibuffer->Init();
- InitLyXLookup(fl_display, form_->window);
+ InitLyXLookup(fl_get_display(), form_->window);
}
//
// THE MENUBAR
//
-
- menus = new Menus(this, air);
+ menubar = new Menubar(this, menubackend);
//
// TOOLBAR
//
- toolbar = new Toolbar(this, air, 30 + air + bw);
+ toolbar = new Toolbar(this, air, 30 + air + bw, toolbardefaults);
// Setup the toolbar
toolbar->set(true);
//
// assign an icon to main form
- unsigned int w, h;
- Pixmap lyx_p, lyx_mask;
- lyx_p = fl_create_from_pixmapdata(fl_root,
- const_cast<char**>(lyx_xpm),
- &w,
- &h,
- &lyx_mask,
- 0,
- 0,
- 0); // this leaks
- fl_set_form_icon(form_, lyx_p, lyx_mask);
+ string iconname = LibFileSearch("images", "lyx", "xpm");
+ if (!iconname.empty()) {
+ unsigned int w, h;
+ Pixmap lyx_p, lyx_mask;
+ lyx_p = fl_read_pixmapfile(fl_root,
+ iconname.c_str(),
+ &w,
+ &h,
+ &lyx_mask,
+ 0,
+ 0,
+ 0); // this leaks
+ fl_set_form_icon(form_, lyx_p, lyx_mask);
+ }
// set min size
fl_set_form_minsize(form_, 50, 50);
}
+#if 0
extern "C"
int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev);
+#endif
+
void LyXView::init()
{
// Set the textclass choice
invalidateLayoutChoice();
updateLayoutChoice();
- UpdateDocumentClassChoice();
+ updateMenubar();
// Start autosave timer
if (lyxrc.autosave) {
autosave_timeout.setTimeout(lyxrc.autosave * 1000);
autosave_timeout.start();
}
-
+
+#if 0
// Install the raw callback for keyboard events
fl_register_raw_callback(form_,
KeyPressMask,
C_LyXView_KeyPressMask_raw_callback);
+#endif
intl->InitKeyMapper(lyxrc.use_kbmap);
}
void LyXView::updateLayoutChoice()
{
- // Update the layout display
- if (!toolbar->combox) return;
-
// This has a side-effect that the layouts are not showed when no
// document is loaded.
- if (bufferview == 0 || bufferview->buffer() == 0) {
- toolbar->combox->clear();
- toolbar->combox->Redraw();
+ if (!view() || !view()->buffer()) {
+ toolbar->clearLayoutList();
return;
}
- // If textclass is different, we need to update the list
- if (toolbar->combox->empty() ||
- (last_textclass != int(buffer()->params.textclass))) {
- toolbar->combox->clear();
- LyXTextClass const & tc =
- textclasslist.TextClass(buffer()->params.textclass);
- for (LyXTextClass::const_iterator cit = tc.begin();
- cit != tc.end(); ++cit) {
- if ((*cit).obsoleted_by().empty())
- toolbar->combox->addline((*cit).name().c_str());
- else
- toolbar->combox->addline(("@N" + (*cit).name()).c_str());
- }
+ // Update the layout display
+ if (last_textclass != int(buffer()->params.textclass)) {
+ toolbar->updateLayoutList(true);
last_textclass = int(buffer()->params.textclass);
current_layout = 0;
- }
- // we need to do this.
- toolbar->combox->Redraw();
+ } else
+ toolbar->updateLayoutList(false);
+
+
LyXTextClass::size_type layout =
bufferview->text->cursor.par()->GetLayout();
if (layout != current_layout){
- toolbar->combox->select(layout + 1);
+ toolbar->setLayout(layout);
current_layout = layout;
}
}
-void LyXView::UpdateDocumentClassChoice()
-{
- // Update the document class display in the document form
- if (fd_form_document) {
- fl_clear_choice(fd_form_document->choice_class);
- for (LyXTextClassList::const_iterator cit = textclasslist.begin();
- cit != textclasslist.end(); ++cit) {
- fl_addto_choice(fd_form_document->choice_class,
- (*cit).description().c_str());
- }
- }
-}
-
-
+#if 0
// This is necessary, since FL_FREE-Objects doesn't get all keypress events
// as FL_KEYBOARD events :-( Matthias 280596
int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
// last_time_pressed is 0, that sinifies an autoreapeat
// at least on my system. It like some feedback from
// others, especially from user running LyX remote.
- //lyxerr << "Syncing - purging X events." << endl;
+ lyxerr[Debug::KEY] << "Syncing - purging X events." << endl;
XSync(fl_get_display(), 1);
// This purge make f.ex. scrolling stop imidiatly when
// releaseing the PageDown button. The question is if this
{
return LyXView::KeyPressMask_raw_callback(fl, xev);
}
+#endif
// Updates the title of the window with the filename of the current document
if (view()->available()) {
string cur_title = buffer()->fileName();
if (!cur_title.empty()){
- title += ": " + OnlyFilename(cur_title);
+ title += ": " + MakeDisplayPath(cur_title, 30);
if (!buffer()->isLyxClean())
title += _(" (Changed)");
if (buffer()->isReadonly())
last_title = title;
}
}
+
+
+void LyXView::showState()
+{
+ getMiniBuffer()->Set(CurrentState(view()));
+ getToolbar()->update();
+ menubar->update();
+}
projects / lyx.git / blobdiff