+
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#pragma implementation
#endif
-#include <sys/time.h>
-#include <unistd.h>
-
#include "LyXView.h"
-#include "lyx_main.h"
-#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-#include "lyxlookup.h"
-#endif
#include "minibuffer.h"
-#include "lyxfunc.h"
#include "debug.h"
#include "intl.h"
#include "lyxrc.h"
-#include "support/filetools.h" // OnlyFilename()
-#include "layout.h"
#include "lyxtext.h"
#include "buffer.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,Redraw]AllBufferRelatedDialogs
#include "bufferview_funcs.h" // CurrentState()
+#include "gettext.h"
+#include "lyxfunc.h"
+#include "BufferView.h"
+#include "lyxtextclasslist.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Timeout.h"
+#include "frontends/Menubar.h"
+
+#include "support/filetools.h" // OnlyFilename()
+
+#include <sys/time.h>
+#include <unistd.h>
using std::endl;
extern void AutoSave(BufferView *);
extern void QuitLyX();
-LyXTextClass::size_type current_layout = 0;
-
-// This is very temporary
-BufferView * current_view;
-extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *);
+string current_layout;
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-using SigC::slot;
-#endif
-LyXView::LyXView(int width, int height)
+LyXView::LyXView()
{
- create_form_form_main(width, height);
- fl_set_form_atclose(form_, C_LyXView_atCloseMainFormCB, 0);
lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
lyxfunc = new LyXFunc(this);
+
intl = new Intl;
- // Make sure the buttons are disabled if needed.
- toolbar->update();
- menubar->update();
+ // Give the timeout some default sensible value.
+ autosave_timeout = new Timeout(5000);
dialogs_ = new Dialogs(this);
- // temporary until all dialogs moved into Dialogs.
- dialogs_->updateBufferDependent
- .connect(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));
}
delete minibuffer;
delete lyxfunc;
delete intl;
+ delete autosave_timeout;
delete dialogs_;
}
-/// Redraw the main form.
-void LyXView::redraw() {
- lyxerr[Debug::INFO] << "LyXView::redraw()" << endl;
- fl_redraw_form(form_);
- minibuffer->Activate();
+void LyXView::resize()
+{
+ view()->resize();
}
}
-FL_FORM * LyXView::getForm() const
-{
- return form_;
-}
-
-
Toolbar * LyXView::getToolbar() const
{
return toolbar;
}
-void LyXView::setLayout(LyXTextClass::size_type layout)
+void LyXView::setLayout(string const & layout)
{
toolbar->setLayout(layout);
}
void LyXView::updateToolbar()
{
toolbar->update();
- menubar->update();
}
}
+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;
menubar->set("main_nobuffer");
else
menubar->set("main");
+ menubar->update();
}
void LyXView::resetAutosaveTimer()
{
if (lyxrc.autosave)
- autosave_timeout.restart();
-}
-
-
-// Callback for close main form from window manager
-int LyXView::atCloseMainFormCB(FL_FORM *, void *)
-{
- QuitLyX();
- return FL_IGNORE;
-}
-
-
-// Wrapper for the above
-extern "C"
-int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p)
-{
- return LyXView::atCloseMainFormCB(form, p);
-}
-
-
-void LyXView::setPosition(int x, int y)
-{
- fl_set_form_position(form_, x, y);
-}
-
-
-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 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- InitLyXLookup(fl_get_display(), form_->window);
-#endif
-}
-
-
-void LyXView::create_form_form_main(int width, int height)
- /* to make this work as it should, .lyxrc should have been
- * read first; OR maybe this one should be made dynamic.
- * Hmmmm. Lgb.
- * We will probably not have lyxrc before the main form is
- * initialized, because error messages from lyxrc parsing
- * are presented (and rightly so) in GUI popups. Asger.
- */
-{
- // the main form
- form_ = fl_bgn_form(FL_NO_BOX, width, height);
- form_->u_vdata = this;
- FL_OBJECT * obj = fl_add_box(FL_FLAT_BOX, 0, 0, width, height, "");
- fl_set_object_color(obj, FL_MCOL, FL_MCOL);
-
- // Parameters for the appearance of the main form
- int const air = 2;
- int const bw = abs(fl_get_border_width());
-
- //
- // THE MENUBAR
- //
- menubar = new Menubar(this, menubackend);
-
- //
- // TOOLBAR
- //
-
- toolbar = new Toolbar(this, air, 30 + air + bw, toolbardefaults);
-
- // Setup the toolbar
- toolbar->set(true);
-
- //
- // WORKAREA
- //
-
- int const ywork = 60 + 2 * air + bw;
- int const workheight = height - ywork - (25 + 2 * air);
-
- ::current_view = bufferview = new BufferView(this, air, ywork,
- width - 3 * air,
- workheight);
-
- //
- // MINIBUFFER
- //
-
- minibuffer = new MiniBuffer(this, air, height - (25 + air),
- width - (2 * air), 25);
-
- //
- // TIMERS
- //
-
- autosave_timeout.timeout.connect(slot(this, &LyXView::AutoSave));
-
- //
- // Misc
- //
-
- // assign an icon to main form
- 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);
-
- fl_end_form();
-}
-
-
-void LyXView::init()
-{
- // Set the textclass choice
- invalidateLayoutChoice();
- updateLayoutChoice();
- updateMenubar();
-
- // Start autosave timer
- if (lyxrc.autosave) {
- autosave_timeout.setTimeout(lyxrc.autosave * 1000);
- autosave_timeout.start();
- }
-
- intl->InitKeyMapper(lyxrc.use_kbmap);
+ autosave_timeout->restart();
}
if (last_textclass != int(buffer()->params.textclass)) {
toolbar->updateLayoutList(true);
last_textclass = int(buffer()->params.textclass);
- current_layout = 0;
- } else
+ current_layout = textclasslist[last_textclass].defaultLayoutName();
+ } else {
toolbar->updateLayoutList(false);
+ }
-
-
- LyXTextClass::size_type layout =
- bufferview->text->cursor.par()->GetLayout();
+ string const & layout =
+ bufferview->getLyXText()->cursor.par()->layout();
- if (layout != current_layout){
+ if (layout != current_layout) {
toolbar->setLayout(layout);
current_layout = layout;
}
{
static string last_title = "LyX";
string title = "LyX";
+ string icon_title = "LyX";
if (view()->available()) {
- string cur_title = buffer()->fileName();
- if (!cur_title.empty()){
+ string const cur_title = buffer()->fileName();
+ if (!cur_title.empty()) {
title += ": " + MakeDisplayPath(cur_title, 30);
if (!buffer()->isLyxClean())
title += _(" (Changed)");
if (buffer()->isReadonly())
title += _(" (read only)");
+ /* Show only the filename if it's available. */
+ icon_title = OnlyFilename(cur_title);
}
}
- // Don't update title if it's the same as last time
if (title != last_title) {
- fl_set_form_title(form_, title.c_str());
+ setWindowTitle(title, icon_title);
last_title = title;
}
}
void LyXView::showState()
{
- getMiniBuffer()->Set(CurrentState(view()));
- getToolbar()->update();
- menubar->update();
+ message(currentState(view()));
}
projects / lyx.git / blobdiff