On Thu, May 23, 2002 at 12:34:15PM +0200, Lars Gullik Bj�nnes wrote:
> I am not sure I am in complete agreement with this one...
I think there needs to be some refactoring done here anyway. Many
of the accessors never made much sense to me. But I feel really queasy
about a setWindowTitle() method in core code, and the fact that it will
be the only case in a simple GUII inheritance hierarchy where the
toolkit-specific versions inherit from something in core code. Source
discoverability is good, and code to update the environment combo truly
belongs in frontends/
The important thing to note is that this is of course a first iteration.
It's not meant to be perfectly factored, and it certainly isn't.
> send the patch for a lookee..
Attached. Boring huh ? Shout if you want a look at the proper GUII
LyXView files too (iirc they're not that different)
> And we get one humongous merge into head later on... eh...
Actually I was thinking of the exact opposite. We create a branch, apply
the huge patch to it, fix stuff up, then merge bit by bit back to the
trunk.
regards
john
--
"This is playing, not work, therefore it's not a waste of time."
- Zath
Index: src/BufferView2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView2.C,v
retrieving revision 1.127
diff -u -r1.127 BufferView2.C
--- src/BufferView2.C 15 May 2002 23:49:06 -0000 1.127
+++ src/BufferView2.C 23 May 2002 10:35:22 -0000
@@ -14,7 +14,7 @@
#include "buffer.h"
#include "lyxcursor.h"
#include "lyxtext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "bufferlist.h"
#include "lyxscreen.h"
#include "LaTeX.h"
Index: src/BufferView_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.239
diff -u -r1.239 BufferView_pimpl.C
--- src/BufferView_pimpl.C 15 May 2002 23:49:06 -0000 1.239
+++ src/BufferView_pimpl.C 23 May 2002 10:35:27 -0000
@@ -10,7 +10,7 @@
#include "lyxtext.h"
#include "lyxrow.h"
#include "paragraph.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "commandtags.h"
#include "lyxfunc.h"
#include "debug.h"
@@ -378,9 +378,9 @@
bv_->theLockingInset(the_locking_inset);
}
+ // this will scroll the screen such that the cursor becomes visible
bv_->text->first_y = screen_->topCursorVisible(bv_->text);
- // this will scroll the screen such that the cursor becomes visible
updateScrollbar();
redraw();
Index: src/FontLoader.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/FontLoader.C,v
retrieving revision 1.39
diff -u -r1.39 FontLoader.C
--- src/FontLoader.C 21 Mar 2002 17:25:07 -0000 1.39
+++ src/FontLoader.C 23 May 2002 10:35:27 -0000
@@ -21,7 +21,7 @@
#include "debug.h"
#include "lyxrc.h" // lyxrc.font_*
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/GUIRunTime.h"
using std::endl;
Index: src/LyXView.C
===================================================================
RCS file: src/LyXView.C
diff -N src/LyXView.C
--- src/LyXView.C 21 Mar 2002 17:25:08 -0000 1.70
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,247 +0,0 @@
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
-
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "LyXView.h"
-#include "minibuffer.h"
-#include "debug.h"
-#include "intl.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "buffer.h"
-#include "MenuBackend.h"
-#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();
-
-string current_layout;
-
-
-LyXView::LyXView()
-{
- lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
- lyxfunc = new LyXFunc(this);
-
- intl = new Intl;
-
- // Give the timeout some default sensible value.
- autosave_timeout = new Timeout(5000);
-
- dialogs_ = new Dialogs(this);
- Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
-}
-
-
-LyXView::~LyXView()
-{
- delete menubar;
- delete toolbar;
- delete bufferview;
- delete minibuffer;
- delete lyxfunc;
- delete intl;
- delete autosave_timeout;
- delete dialogs_;
-}
-
-
-void LyXView::resize()
-{
- view()->resize();
-}
-
-
-/// returns the buffer currently shown in the main form.
-Buffer * LyXView::buffer() const
-{
- return bufferview->buffer();
-}
-
-
-BufferView * LyXView::view() const
-{
- return bufferview;
-}
-
-
-Toolbar * LyXView::getToolbar() const
-{
- return toolbar;
-}
-
-
-void LyXView::setLayout(string const & layout)
-{
- toolbar->setLayout(layout);
-}
-
-
-void LyXView::updateToolbar()
-{
- toolbar->update();
-}
-
-
-LyXFunc * LyXView::getLyXFunc() const
-{
- return lyxfunc;
-}
-
-
-MiniBuffer * LyXView::getMiniBuffer() const
-{
- return minibuffer;
-}
-
-
-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::updateMenubar()
-{
- if ((!view() || !view()->buffer())
- && menubackend.hasMenu("main_nobuffer"))
- menubar->set("main_nobuffer");
- else
- menubar->set("main");
- menubar->update();
-}
-
-
-Intl * LyXView::getIntl() const
-{
- return intl;
-}
-
-
-// Callback for autosave timer
-void LyXView::AutoSave()
-{
- lyxerr[Debug::INFO] << "Running AutoSave()" << endl;
- if (view()->available())
- ::AutoSave(view());
-}
-
-
-/// Reset autosave timer
-void LyXView::resetAutosaveTimer()
-{
- if (lyxrc.autosave)
- autosave_timeout->restart();
-}
-
-
-void LyXView::invalidateLayoutChoice()
-{
- last_textclass = -1;
-}
-
-
-void LyXView::updateLayoutChoice()
-{
- // This has a side-effect that the layouts are not showed when no
- // document is loaded.
- if (!view() || !view()->buffer()) {
- toolbar->clearLayoutList();
- return;
- }
-
- // Update the layout display
- if (last_textclass != int(buffer()->params.textclass)) {
- toolbar->updateLayoutList(true);
- last_textclass = int(buffer()->params.textclass);
- current_layout = textclasslist[last_textclass].defaultLayoutName();
- } else {
- toolbar->updateLayoutList(false);
- }
-
- string const & layout =
- bufferview->getLyXText()->cursor.par()->layout();
-
- if (layout != current_layout) {
- toolbar->setLayout(layout);
- current_layout = layout;
- }
-}
-
-
-// Updates the title of the window with the filename of the current document
-void LyXView::updateWindowTitle()
-{
- static string last_title = "LyX";
- string title = "LyX";
- string icon_title = "LyX";
-
- if (view()->available()) {
- 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);
- }
- }
- if (title != last_title) {
- setWindowTitle(title, icon_title);
- last_title = title;
- }
-}
-
-
-void LyXView::showState()
-{
- message(currentState(view()));
-}
Index: src/LyXView.h
===================================================================
RCS file: src/LyXView.h
diff -N src/LyXView.h
--- src/LyXView.h 21 Mar 2002 17:25:08 -0000 1.40
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,131 +0,0 @@
-// -*- C++ -*-
-
-#ifndef LYXVIEW_BASE_H
-#define LYXVIEW_BASE_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include <boost/utility.hpp>
-#include <sigc++/signal_system.h>
-
-#include "LString.h"
-#include "support/types.h"
-
-class Buffer;
-class Toolbar;
-class MiniBuffer;
-class Intl;
-class Menubar;
-
-class BufferView;
-class Dialogs;
-class LyXFunc;
-class Timeout;
-
-///
-class LyXView : public SigC::Object, boost::noncopyable {
-public:
- ///
- LyXView();
- ///
- virtual ~LyXView();
- ///
- virtual void init() = 0;
- ///
- virtual void setPosition(int, int) = 0;
- ///
- virtual void show(int, int, string const &) = 0;
- /// Redraw the main form.
- virtual void redraw() = 0;
-
- /// Resize all BufferViews in this LyXView (because the width changed)
- void resize();
-
- /// returns the buffer currently shown in the main form.
- Buffer * buffer() const;
-
- ///
- BufferView * view() const;
-
- /// return a pointer to the toolbar
- Toolbar * getToolbar() const;
-
- /// sets the layout in the toolbar layout combox
- void setLayout(string const & layout);
- /// update the toolbar
- void updateToolbar();
-
- /// return a pointer to the lyxfunc
- LyXFunc * getLyXFunc() const;
-
- /// return a pointer to the minibuffer
- MiniBuffer * getMiniBuffer() const;
-
- ///
- void message(string const &);
- ///
- void messagePush(string const & str);
- ///
- void messagePop();
-
- ///
- Menubar * getMenubar() const;
-
- ///
- void updateMenubar();
-
- ///
- 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();
- ///
- virtual void prohibitInput() const = 0;
- ///
- virtual void allowInput() const = 0;
-protected:
- ///
- Menubar * menubar;
- ///
- Toolbar * toolbar;
- /** This is supposed to be a pointer or a list of pointers to the
- BufferViews currently being shown in the LyXView. So far
- this is not used, but that should change pretty soon. (Lgb) */
- BufferView * bufferview;
- ///
- MiniBuffer * minibuffer;
- ///
- Intl * intl;
- ///
- Timeout * autosave_timeout;
- /// A callback
- void AutoSave();
- ///
- void invalidateLayoutChoice();
-private:
- ///
- LyXFunc * lyxfunc;
- ///
- Dialogs * dialogs_;
- ///
- virtual void setWindowTitle(string const &, string const &) = 0;
- /** 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) */
- int last_textclass;
-};
-#endif
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.121
diff -u -r1.121 Makefile.am
--- src/Makefile.am 23 May 2002 09:24:55 -0000 1.121
+++ src/Makefile.am 23 May 2002 10:35:30 -0000
@@ -76,8 +76,6 @@
Lsstream.h \
LyXAction.C \
LyXAction.h \
- LyXView.C \
- LyXView.h \
MenuBackend.C \
MenuBackend.h \
ParagraphParameters.C \
@@ -95,8 +93,6 @@
ToolbarDefaults.h \
WorkArea.C \
WorkArea.h \
- XFormsView.C \
- XFormsView.h \
box.h \
box.C \
broken_headers.h \
Index: src/WorkArea.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/WorkArea.C,v
retrieving revision 1.68
diff -u -r1.68 WorkArea.C
--- src/WorkArea.C 1 May 2002 22:17:05 -0000 1.68
+++ src/WorkArea.C 23 May 2002 10:35:33 -0000
@@ -16,7 +16,7 @@
#include "WorkArea.h"
#include "debug.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxrc.h" // lyxrc.show_banner
#include "version.h" // lyx_version
@@ -574,12 +574,10 @@
case SelectionRequest:
lyxerr[Debug::GUI] << "X requested selection." << endl;
selectionRequested.emit();
-// ret = 1;
break;
case SelectionClear:
lyxerr[Debug::GUI] << "Lost selection." << endl;
selectionLost.emit();
-// ret = 1;
break;
}
return ret;
Index: src/XFormsView.C
===================================================================
RCS file: src/XFormsView.C
diff -N src/XFormsView.C
--- src/XFormsView.C 21 Mar 2002 17:25:09 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,258 +0,0 @@
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
-
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "XFormsView.h"
-#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-#include "lyxlookup.h"
-#endif
-#include "minibuffer.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 "MenuBackend.h"
-#include "ToolbarDefaults.h"
-#include "lyxfunc.h"
-#include "BufferView.h"
-
-using std::endl;
-
-//extern void AutoSave(BufferView *);
-extern void QuitLyX();
-
-// This is very temporary
-BufferView * current_view;
-
-extern "C" {
-
-static
-int C_XFormsView_atCloseMainFormCB(FL_FORM * form, void * p)
-{
- return XFormsView::atCloseMainFormCB(form, p);
-}
-
-}
-
-
-XFormsView::XFormsView(int width, int height)
- : LyXView()
-{
- create_form_form_main(width, height);
- fl_set_form_atclose(form_, C_XFormsView_atCloseMainFormCB, 0);
-
- // Connect the minibuffer signals
- minibuffer->stringReady.connect(SigC::slot(getLyXFunc(),
- &LyXFunc::miniDispatch));
- minibuffer->timeout.connect(SigC::slot(getLyXFunc(),
- &LyXFunc::initMiniBuffer));
-
- // Make sure the buttons are disabled if needed.
- updateToolbar();
-}
-
-
-XFormsView::~XFormsView() {}
-
-
-/// Redraw the main form.
-void XFormsView::redraw() {
- lyxerr[Debug::INFO] << "XFormsView::redraw()" << endl;
- fl_redraw_form(form_);
- getMiniBuffer()->redraw();
-}
-
-
-FL_FORM * XFormsView::getForm() const
-{
- return form_;
-}
-
-
-// Callback for close main form from window manager
-int XFormsView::atCloseMainFormCB(FL_FORM *, void *)
-{
- QuitLyX();
- return FL_IGNORE;
-}
-
-
-void XFormsView::setPosition(int x, int y)
-{
- fl_set_form_position(form_, x, y);
-}
-
-
-void XFormsView::show(int place, int border, string const & title)
-{
- fl_set_form_minsize(form_, form_->w, form_->h);
- fl_show_form(form_, place, border, title.c_str());
- getLyXFunc()->initMiniBuffer();
-#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- InitLyXLookup(fl_get_display(), form_->window);
-#endif
-}
-
-
-void XFormsView::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(SigC::slot(this, &XFormsView::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();
-
- minibuffer->dd_init();
-}
-
-
-void XFormsView::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);
-}
-
-
-void XFormsView::setWindowTitle(string const & title, string const & icon_title)
-{
- fl_set_form_title(form_, title.c_str());
- fl_winicontitle(form_->window, icon_title.c_str());
-}
-
-
-// How should this actually work? Should it prohibit input in all BufferViews,
-// or just in the current one? If "just the current one", then it should be
-// placed in BufferView. If "all BufferViews" then LyXGUI (I think) should
-// run "prohibitInput" on all LyXViews which will run prohibitInput on all
-// BufferViews. Or is it perhaps just the (input in) BufferViews in the
-// current LyxView that should be prohibited (Lgb) (This applies to
-// "allowInput" as well.)
-void XFormsView::prohibitInput() const
-{
- view()->hideCursor();
-
- static Cursor cursor;
- static bool cursor_undefined = true;
-
- if (cursor_undefined) {
- cursor = XCreateFontCursor(fl_get_display(), XC_watch);
- XFlush(fl_get_display());
- cursor_undefined = false;
- }
-
- /* set the cursor to the watch for all forms and the canvas */
- XDefineCursor(fl_get_display(), getForm()->window, cursor);
-
- XFlush(fl_get_display());
- fl_deactivate_all_forms();
-}
-
-
-void XFormsView::allowInput() const
-{
- /* reset the cursor from the watch for all forms and the canvas */
-
- XUndefineCursor(fl_get_display(), getForm()->window);
-
- XFlush(fl_get_display());
- fl_activate_all_forms();
-}
Index: src/XFormsView.h
===================================================================
RCS file: src/XFormsView.h
diff -N src/XFormsView.h
--- src/XFormsView.h 21 Mar 2002 17:25:09 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
-
-#ifndef LyXView_H
-#define LyXView_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include FORMS_H_LOCATION
-
-#include "LyXView.h"
-
-/**
- This class is the form containing the view of the buffer. The actual buffer
- view is supposed (at least IMHO) to be another class, that shows its output
- in one or more LyXView's.
- */
-class XFormsView : public LyXView {
-public:
- /// constructor
- XFormsView(int w, int h);
- /// destructor
- ~XFormsView();
- /// Where to place the form.
- virtual void setPosition(int, int);
- /// Show the main form.
- virtual void show(int, int, string const & t = string("LyX"));
- /// init (should probably be removed later) (Lgb)
- virtual void init();
- /// Redraw the main form.
- virtual void redraw();
- /// returns a pointer to the form.
- FL_FORM * getForm() const;
- ///
- virtual void prohibitInput() const;
- ///
- virtual void allowInput() const;
- /** This callback is run when a close event is sent from the
- window manager. */
- static int atCloseMainFormCB(FL_FORM *, void *);
-private:
- /// pass the title, and the iconified title
- virtual void setWindowTitle(string const &, string const &);
- /// makes the main form.
- void create_form_form_main(int width, int height);
- /// A pointer to the form.
- FL_FORM * form_;
-};
-#endif
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.339
diff -u -r1.339 buffer.C
--- src/buffer.C 22 May 2002 12:33:01 -0000 1.339
+++ src/buffer.C 23 May 2002 10:35:42 -0000
@@ -31,7 +31,7 @@
#include "version.h"
#include "LaTeX.h"
#include "Chktex.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "debug.h"
#include "LaTeXFeatures.h"
#include "lyxtext.h"
@@ -735,7 +735,6 @@
LyXLex nylex(0, 0);
nylex.setStream(istr);
inset->read(this, nylex);
-
par->insertInset(pos, inset, font);
++pos;
insertErtContents(par, pos);
Index: src/bufferlist.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferlist.C,v
retrieving revision 1.76
diff -u -r1.76 bufferlist.C
--- src/bufferlist.C 21 Mar 2002 17:25:09 -0000 1.76
+++ src/bufferlist.C 23 May 2002 10:35:45 -0000
@@ -28,7 +28,7 @@
#include "bufferview_funcs.h"
#include "BufferView.h"
#include "gettext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "vc-backend.h"
#include "TextCache.h"
#include "lyxtextclasslist.h"
Index: src/bufferview_funcs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferview_funcs.C,v
retrieving revision 1.48
diff -u -r1.48 bufferview_funcs.C
--- src/bufferview_funcs.C 27 Mar 2002 10:27:59 -0000 1.48
+++ src/bufferview_funcs.C 23 May 2002 10:35:45 -0000
@@ -15,7 +15,7 @@
#endif
#include "bufferview_funcs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "paragraph.h"
#include "lyxfont.h"
@@ -206,7 +206,7 @@
}
-/* -------> Does the actual toggle job of the XxxCB() calls above.
+/* Does the actual toggle job of the calls above.
* Also shows the current font state.
*/
void toggleAndShow(BufferView * bv, LyXFont const & font, bool toggleall)
Index: src/converter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/converter.C,v
retrieving revision 1.47
diff -u -r1.47 converter.C
--- src/converter.C 27 Mar 2002 00:05:28 -0000 1.47
+++ src/converter.C 23 May 2002 10:35:48 -0000
@@ -21,7 +21,7 @@
#include "buffer.h"
#include "bufferview_funcs.h"
#include "LaTeX.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyx_cb.h" // ShowMessage()
#include "gettext.h"
#include "BufferView.h"
Index: src/importer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/importer.C,v
retrieving revision 1.13
diff -u -r1.13 importer.C
--- src/importer.C 21 Mar 2002 17:25:09 -0000 1.13
+++ src/importer.C 23 May 2002 10:35:48 -0000
@@ -18,7 +18,7 @@
#include "importer.h"
#include "converter.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "bufferlist.h"
Index: src/lyx_cb.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_cb.C,v
retrieving revision 1.175
diff -u -r1.175 lyx_cb.C
--- src/lyx_cb.C 21 Mar 2002 17:25:10 -0000 1.175
+++ src/lyx_cb.C 23 May 2002 10:35:49 -0000
@@ -17,7 +17,7 @@
#include "bufferview_funcs.h"
#include "debug.h"
#include "lastfiles.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxrc.h"
#include "lyxtext.h"
#include "gettext.h"
Index: src/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_gui.C,v
retrieving revision 1.105
diff -u -r1.105 lyx_gui.C
--- src/lyx_gui.C 21 Mar 2002 17:25:11 -0000 1.105
+++ src/lyx_gui.C 23 May 2002 10:35:50 -0000
@@ -20,7 +20,7 @@
#include "lyx_main.h"
#include "debug.h"
#include "version.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "BufferView.h"
#include "lyxserver.h"
@@ -90,7 +90,7 @@
lyxerr << etxt << " id: " << xeev->resourceid << endl;
// By doing an abort we get a nice backtrace. (hopefully)
lyx::abort();
- return 0; // Solaris CC wants us to return something
+ return 0;
}
}
Index: src/lyx_main.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_main.C,v
retrieving revision 1.105
diff -u -r1.105 lyx_main.C
--- src/lyx_main.C 2 Apr 2002 11:55:36 -0000 1.105
+++ src/lyx_main.C 23 May 2002 10:35:53 -0000
@@ -17,7 +17,7 @@
#include "lyx_main.h"
#include "lyx_gui.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "lyxrc.h"
#include "buffer.h"
Index: src/lyxfind.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfind.C,v
retrieving revision 1.24
diff -u -r1.24 lyxfind.C
--- src/lyxfind.C 12 Apr 2002 09:02:21 -0000 1.24
+++ src/lyxfind.C 23 May 2002 10:35:54 -0000
@@ -6,7 +6,7 @@
#include "lyxtext.h"
#include "lyxfind.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Alert.h"
#include "support/textutils.h"
#include "support/lstrings.h"
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.314
diff -u -r1.314 lyxfunc.C
--- src/lyxfunc.C 22 Apr 2002 22:31:48 -0000 1.314
+++ src/lyxfunc.C 23 May 2002 10:36:01 -0000
@@ -36,7 +36,7 @@
#include "bufferview_funcs.h"
#include "minibuffer.h"
#include "vspace.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "FloatList.h"
#include "converter.h"
#include "exporter.h"
Index: src/lyxvc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxvc.C,v
retrieving revision 1.32
diff -u -r1.32 lyxvc.C
--- src/lyxvc.C 26 Mar 2002 12:11:43 -0000 1.32
+++ src/lyxvc.C 23 May 2002 10:36:04 -0000
@@ -10,7 +10,7 @@
#include "buffer.h"
#include "BufferView.h"
#include "gettext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "frontends/Alert.h"
Index: src/minibuffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/minibuffer.C,v
retrieving revision 1.51
diff -u -r1.51 minibuffer.C
--- src/minibuffer.C 21 Mar 2002 17:25:15 -0000 1.51
+++ src/minibuffer.C 23 May 2002 10:36:04 -0000
@@ -20,14 +20,14 @@
// FIXME: temporary
#include "frontends/xforms/DropDown.h"
+#include "frontends/xforms/XFormsView.h"
#include "minibuffer.h"
#include "support/lyxalgo.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-#include "LyXView.h"
-#include "XFormsView.h"
+#include "frontends/LyXView.h"
#include "gettext.h"
#include "LyXAction.h"
#include "BufferView.h"
Index: src/text.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text.C,v
retrieving revision 1.249
diff -u -r1.249 text.C
--- src/text.C 23 May 2002 09:21:23 -0000 1.249
+++ src/text.C 23 May 2002 10:36:20 -0000
@@ -19,7 +19,7 @@
#include "buffer.h"
#include "debug.h"
#include "lyxrc.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Painter.h"
#include "tracer.h"
#include "font.h"
Index: src/text2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text2.C,v
retrieving revision 1.229
diff -u -r1.229 text2.C
--- src/text2.C 23 May 2002 09:21:26 -0000 1.229
+++ src/text2.C 23 May 2002 10:36:25 -0000
@@ -18,13 +18,13 @@
#include "LString.h"
#include "paragraph.h"
#include "lyxtextclasslist.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "undo_funcs.h"
#include "buffer.h"
#include "bufferparams.h"
#include "gettext.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "CutAndPaste.h"
#include "frontends/Painter.h"
#include "font.h"
Index: src/trans.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/trans.C,v
retrieving revision 1.38
diff -u -r1.38 trans.C
--- src/trans.C 21 Mar 2002 17:25:31 -0000 1.38
+++ src/trans.C 23 May 2002 10:36:25 -0000
@@ -4,7 +4,7 @@
#pragma implementation
#endif
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "trans.h"
#include "support/filetools.h"
#include "support/lstrings.h"
Index: src/vc-backend.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/vc-backend.C,v
retrieving revision 1.25
diff -u -r1.25 vc-backend.C
--- src/vc-backend.C 21 Mar 2002 17:25:32 -0000 1.25
+++ src/vc-backend.C 23 May 2002 10:36:28 -0000
@@ -8,7 +8,7 @@
#include "debug.h"
#include "buffer.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "support/FileInfo.h"
Index: src/frontends/Liason.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Liason.C,v
retrieving revision 1.23
diff -u -r1.23 Liason.C
--- src/frontends/Liason.C 21 Mar 2002 21:13:35 -0000 1.23
+++ src/frontends/Liason.C 23 May 2002 10:36:31 -0000
@@ -18,7 +18,7 @@
#include "lyxrc.h"
#include "PrinterParams.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "buffer.h"
#include "exporter.h"
Index: src/frontends/LyXView.C
===================================================================
RCS file: src/frontends/LyXView.C
diff -N src/frontends/LyXView.C
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/LyXView.C 23 May 2002 10:36:31 -0000
@@ -0,0 +1,247 @@
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 The LyX Team.
+ *
+ * ====================================================== */
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "frontends/LyXView.h"
+#include "minibuffer.h"
+#include "debug.h"
+#include "intl.h"
+#include "lyxrc.h"
+#include "lyxtext.h"
+#include "buffer.h"
+#include "MenuBackend.h"
+#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();
+
+string current_layout;
+
+
+LyXView::LyXView()
+{
+ lyxerr[Debug::INIT] << "Initializing LyXFunc" << endl;
+ lyxfunc = new LyXFunc(this);
+
+ intl = new Intl;
+
+ // Give the timeout some default sensible value.
+ autosave_timeout = new Timeout(5000);
+
+ dialogs_ = new Dialogs(this);
+ Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
+}
+
+
+LyXView::~LyXView()
+{
+ delete menubar;
+ delete toolbar;
+ delete bufferview;
+ delete minibuffer;
+ delete lyxfunc;
+ delete intl;
+ delete autosave_timeout;
+ delete dialogs_;
+}
+
+
+void LyXView::resize()
+{
+ view()->resize();
+}
+
+
+/// returns the buffer currently shown in the main form.
+Buffer * LyXView::buffer() const
+{
+ return bufferview->buffer();
+}
+
+
+BufferView * LyXView::view() const
+{
+ return bufferview;
+}
+
+
+Toolbar * LyXView::getToolbar() const
+{
+ return toolbar;
+}
+
+
+void LyXView::setLayout(string const & layout)
+{
+ toolbar->setLayout(layout);
+}
+
+
+void LyXView::updateToolbar()
+{
+ toolbar->update();
+}
+
+
+LyXFunc * LyXView::getLyXFunc() const
+{
+ return lyxfunc;
+}
+
+
+MiniBuffer * LyXView::getMiniBuffer() const
+{
+ return minibuffer;
+}
+
+
+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::updateMenubar()
+{
+ if ((!view() || !view()->buffer())
+ && menubackend.hasMenu("main_nobuffer"))
+ menubar->set("main_nobuffer");
+ else
+ menubar->set("main");
+ menubar->update();
+}
+
+
+Intl * LyXView::getIntl() const
+{
+ return intl;
+}
+
+
+// Callback for autosave timer
+void LyXView::AutoSave()
+{
+ lyxerr[Debug::INFO] << "Running AutoSave()" << endl;
+ if (view()->available())
+ ::AutoSave(view());
+}
+
+
+/// Reset autosave timer
+void LyXView::resetAutosaveTimer()
+{
+ if (lyxrc.autosave)
+ autosave_timeout->restart();
+}
+
+
+void LyXView::invalidateLayoutChoice()
+{
+ last_textclass = -1;
+}
+
+
+void LyXView::updateLayoutChoice()
+{
+ // This has a side-effect that the layouts are not showed when no
+ // document is loaded.
+ if (!view() || !view()->buffer()) {
+ toolbar->clearLayoutList();
+ return;
+ }
+
+ // Update the layout display
+ if (last_textclass != int(buffer()->params.textclass)) {
+ toolbar->updateLayoutList(true);
+ last_textclass = int(buffer()->params.textclass);
+ current_layout = textclasslist[last_textclass].defaultLayoutName();
+ } else {
+ toolbar->updateLayoutList(false);
+ }
+
+ string const & layout =
+ bufferview->getLyXText()->cursor.par()->layout();
+
+ if (layout != current_layout) {
+ toolbar->setLayout(layout);
+ current_layout = layout;
+ }
+}
+
+
+// Updates the title of the window with the filename of the current document
+void LyXView::updateWindowTitle()
+{
+ static string last_title = "LyX";
+ string title = "LyX";
+ string icon_title = "LyX";
+
+ if (view()->available()) {
+ 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);
+ }
+ }
+ if (title != last_title) {
+ setWindowTitle(title, icon_title);
+ last_title = title;
+ }
+}
+
+
+void LyXView::showState()
+{
+ message(currentState(view()));
+}
Index: src/frontends/LyXView.h
===================================================================
RCS file: src/frontends/LyXView.h
diff -N src/frontends/LyXView.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/LyXView.h 23 May 2002 10:36:31 -0000
@@ -0,0 +1,131 @@
+// -*- C++ -*-
+
+#ifndef LYXVIEW_BASE_H
+#define LYXVIEW_BASE_H
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include <boost/utility.hpp>
+#include <sigc++/signal_system.h>
+
+#include "LString.h"
+#include "support/types.h"
+
+class Buffer;
+class Toolbar;
+class MiniBuffer;
+class Intl;
+class Menubar;
+
+class BufferView;
+class Dialogs;
+class LyXFunc;
+class Timeout;
+
+///
+class LyXView : public SigC::Object, boost::noncopyable {
+public:
+ ///
+ LyXView();
+ ///
+ virtual ~LyXView();
+ ///
+ virtual void init() = 0;
+ ///
+ virtual void setPosition(int, int) = 0;
+ ///
+ virtual void show(int, int, string const &) = 0;
+ /// Redraw the main form.
+ virtual void redraw() = 0;
+
+ /// Resize all BufferViews in this LyXView (because the width changed)
+ void resize();
+
+ /// returns the buffer currently shown in the main form.
+ Buffer * buffer() const;
+
+ ///
+ BufferView * view() const;
+
+ /// return a pointer to the toolbar
+ Toolbar * getToolbar() const;
+
+ /// sets the layout in the toolbar layout combox
+ void setLayout(string const & layout);
+ /// update the toolbar
+ void updateToolbar();
+
+ /// return a pointer to the lyxfunc
+ LyXFunc * getLyXFunc() const;
+
+ /// return a pointer to the minibuffer
+ MiniBuffer * getMiniBuffer() const;
+
+ ///
+ void message(string const &);
+ ///
+ void messagePush(string const & str);
+ ///
+ void messagePop();
+
+ ///
+ Menubar * getMenubar() const;
+
+ ///
+ void updateMenubar();
+
+ ///
+ 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();
+ ///
+ virtual void prohibitInput() const = 0;
+ ///
+ virtual void allowInput() const = 0;
+protected:
+ ///
+ Menubar * menubar;
+ ///
+ Toolbar * toolbar;
+ /** This is supposed to be a pointer or a list of pointers to the
+ BufferViews currently being shown in the LyXView. So far
+ this is not used, but that should change pretty soon. (Lgb) */
+ BufferView * bufferview;
+ ///
+ MiniBuffer * minibuffer;
+ ///
+ Intl * intl;
+ ///
+ Timeout * autosave_timeout;
+ /// A callback
+ void AutoSave();
+ ///
+ void invalidateLayoutChoice();
+private:
+ ///
+ LyXFunc * lyxfunc;
+ ///
+ Dialogs * dialogs_;
+ ///
+ virtual void setWindowTitle(string const &, string const &) = 0;
+ /** 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) */
+ int last_textclass;
+};
+#endif
Index: src/frontends/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Makefile.am,v
retrieving revision 1.34
diff -u -r1.34 Makefile.am
--- src/frontends/Makefile.am 23 May 2002 09:21:27 -0000 1.34
+++ src/frontends/Makefile.am 23 May 2002 10:36:31 -0000
@@ -31,4 +31,6 @@
Timeout.C \
Timeout.h \
Toolbar.C \
- Toolbar.h
+ Toolbar.h \
+ LyXView.C \
+ LyXView.h
Index: src/frontends/controllers/ControlAboutlyx.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlAboutlyx.C,v
retrieving revision 1.5
diff -u -r1.5 ControlAboutlyx.C
--- src/frontends/controllers/ControlAboutlyx.C 9 Apr 2002 10:02:10 -0000 1.5
+++ src/frontends/controllers/ControlAboutlyx.C 23 May 2002 10:36:31 -0000
@@ -18,7 +18,7 @@
#include "ButtonControllerBase.h"
#include "ControlAboutlyx.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "Lsstream.h"
#include "BufferView.h"
#include "gettext.h"
Index: src/frontends/controllers/ControlBibitem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBibitem.C,v
retrieving revision 1.13
diff -u -r1.13 ControlBibitem.C
--- src/frontends/controllers/ControlBibitem.C 21 Mar 2002 21:21:27 -0000 1.13
+++ src/frontends/controllers/ControlBibitem.C 23 May 2002 10:36:31 -0000
@@ -23,7 +23,7 @@
#include "ButtonControllerBase.h"
#include "ControlBibitem.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "BufferView.h"
Index: src/frontends/controllers/ControlBibtex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlBibtex.C,v
retrieving revision 1.12
diff -u -r1.12 ControlBibtex.C
--- src/frontends/controllers/ControlBibtex.C 8 Apr 2002 16:47:50 -0000 1.12
+++ src/frontends/controllers/ControlBibtex.C 23 May 2002 10:36:31 -0000
@@ -24,7 +24,7 @@
#include "ButtonControllerBase.h"
#include "ControlBibtex.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "BufferView.h"
#include "lyxrc.h"
Index: src/frontends/controllers/ControlCharacter.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlCharacter.C,v
retrieving revision 1.22
diff -u -r1.22 ControlCharacter.C
--- src/frontends/controllers/ControlCharacter.C 1 May 2002 14:43:37 -0000
1.22
+++ src/frontends/controllers/ControlCharacter.C 23 May 2002 10:36:31 -0000
@@ -20,7 +20,7 @@
#include "buffer.h"
#include "Dialogs.h"
#include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "bufferview_funcs.h" // ToggleAndShow
#include "gettext.h"
#include "language.h"
Index: src/frontends/controllers/ControlCitation.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlCitation.C,v
retrieving revision 1.18
diff -u -r1.18 ControlCitation.C
--- src/frontends/controllers/ControlCitation.C 21 Mar 2002 21:21:27 -0000 1.18
+++ src/frontends/controllers/ControlCitation.C 23 May 2002 10:36:31 -0000
@@ -23,7 +23,7 @@
#include "ControlCitation.h"
#include "buffer.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
// need to #include this in _one_ of the ControlCommand-derived classses in
// order to instantiate
Index: src/frontends/controllers/ControlCommand.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlCommand.C,v
retrieving revision 1.16
diff -u -r1.16 ControlCommand.C
--- src/frontends/controllers/ControlCommand.C 21 Mar 2002 21:21:27 -0000 1.16
+++ src/frontends/controllers/ControlCommand.C 23 May 2002 10:36:31 -0000
@@ -23,7 +23,7 @@
#include "ControlInset.tmpl"
#include "buffer.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "BufferView.h"
Index: src/frontends/controllers/ControlConnections.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlConnections.C,v
retrieving revision 1.11
diff -u -r1.11 ControlConnections.C
--- src/frontends/controllers/ControlConnections.C 21 Mar 2002 21:21:27 -0000
1.11
+++ src/frontends/controllers/ControlConnections.C 23 May 2002 10:36:31 -0000
@@ -20,7 +20,7 @@
#include "ViewBase.h"
#include "ControlConnections.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
using SigC::slot;
Index: src/frontends/controllers/ControlERT.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlERT.C,v
retrieving revision 1.3
diff -u -r1.3 ControlERT.C
--- src/frontends/controllers/ControlERT.C 21 Mar 2002 21:21:27 -0000 1.3
+++ src/frontends/controllers/ControlERT.C 23 May 2002 10:36:31 -0000
@@ -22,7 +22,7 @@
#include "ControlERT.h"
#include "ControlInset.tmpl"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "BufferView.h"
Index: src/frontends/controllers/ControlError.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlError.C,v
retrieving revision 1.8
diff -u -r1.8 ControlError.C
--- src/frontends/controllers/ControlError.C 21 Mar 2002 21:21:27 -0000 1.8
+++ src/frontends/controllers/ControlError.C 23 May 2002 10:36:31 -0000
@@ -22,7 +22,7 @@
#include "ControlError.h"
#include "ControlInset.tmpl"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "insets/inseterror.h"
Index: src/frontends/controllers/ControlExternal.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlExternal.C,v
retrieving revision 1.21
diff -u -r1.21 ControlExternal.C
--- src/frontends/controllers/ControlExternal.C 22 May 2002 01:16:36 -0000 1.21
+++ src/frontends/controllers/ControlExternal.C 23 May 2002 10:36:33 -0000
@@ -25,7 +25,7 @@
#include "ControlInset.tmpl"
#include "Dialogs.h"
#include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "ViewBase.h"
#include "buffer.h"
#include "frontends/Alert.h"
Index: src/frontends/controllers/ControlFloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlFloat.C,v
retrieving revision 1.4
diff -u -r1.4 ControlFloat.C
--- src/frontends/controllers/ControlFloat.C 21 Mar 2002 21:21:27 -0000 1.4
+++ src/frontends/controllers/ControlFloat.C 23 May 2002 10:36:33 -0000
@@ -20,7 +20,7 @@
#include "ControlFloat.h"
#include "ControlInset.tmpl"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "BufferView.h"
#include "insets/insetfloat.h"
Index: src/frontends/controllers/ControlForks.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlForks.C,v
retrieving revision 1.2
diff -u -r1.2 ControlForks.C
--- src/frontends/controllers/ControlForks.C 21 Mar 2002 21:21:27 -0000 1.2
+++ src/frontends/controllers/ControlForks.C 23 May 2002 10:36:33 -0000
@@ -17,7 +17,7 @@
#include "ViewBase.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "frontends/Dialogs.h"
Index: src/frontends/controllers/ControlGraphics.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlGraphics.C,v
retrieving revision 1.37
diff -u -r1.37 ControlGraphics.C
--- src/frontends/controllers/ControlGraphics.C 1 May 2002 13:15:37 -0000 1.37
+++ src/frontends/controllers/ControlGraphics.C 23 May 2002 10:36:33 -0000
@@ -30,7 +30,7 @@
#include "buffer.h"
#include "BufferView.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "gettext.h"
#include "lyxrc.h"
Index: src/frontends/controllers/ControlInclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlInclude.C,v
retrieving revision 1.17
diff -u -r1.17 ControlInclude.C
--- src/frontends/controllers/ControlInclude.C 21 Mar 2002 21:21:27 -0000 1.17
+++ src/frontends/controllers/ControlInclude.C 23 May 2002 10:36:33 -0000
@@ -23,7 +23,7 @@
#include "Alert.h"
#include "BufferView.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "gettext.h"
#include "helper_funcs.h"
Index: src/frontends/controllers/ControlIndex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlIndex.C,v
retrieving revision 1.5
diff -u -r1.5 ControlIndex.C
--- src/frontends/controllers/ControlIndex.C 21 Mar 2002 21:21:27 -0000 1.5
+++ src/frontends/controllers/ControlIndex.C 23 May 2002 10:36:33 -0000
@@ -22,7 +22,7 @@
#include "ControlIndex.h"
#include "buffer.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
using SigC::slot;
Index: src/frontends/controllers/ControlLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlLog.C,v
retrieving revision 1.9
diff -u -r1.9 ControlLog.C
--- src/frontends/controllers/ControlLog.C 21 Mar 2002 21:21:27 -0000 1.9
+++ src/frontends/controllers/ControlLog.C 23 May 2002 10:36:33 -0000
@@ -21,7 +21,7 @@
#include "ViewBase.h"
#include "ButtonControllerBase.h"
#include "ControlLog.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "Dialogs.h"
#include "lyxrc.h"
#include "BufferView.h"
Index: src/frontends/controllers/ControlMinipage.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlMinipage.C,v
retrieving revision 1.14
diff -u -r1.14 ControlMinipage.C
--- src/frontends/controllers/ControlMinipage.C 21 Mar 2002 21:21:27 -0000 1.14
+++ src/frontends/controllers/ControlMinipage.C 23 May 2002 10:36:33 -0000
@@ -22,7 +22,7 @@
#include "ControlMinipage.h"
#include "ControlInset.tmpl"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "BufferView.h"
#include "helper_funcs.h"
Index: src/frontends/controllers/ControlPreamble.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlPreamble.C,v
retrieving revision 1.12
diff -u -r1.12 ControlPreamble.C
--- src/frontends/controllers/ControlPreamble.C 21 Mar 2002 21:21:27 -0000 1.12
+++ src/frontends/controllers/ControlPreamble.C 23 May 2002 10:36:33 -0000
@@ -15,7 +15,7 @@
#include "ViewBase.h"
#include "ButtonControllerBase.h"
#include "ControlPreamble.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "Dialogs.h"
#include "buffer.h"
#include "lyxrc.h"
Index: src/frontends/controllers/ControlPrint.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlPrint.C,v
retrieving revision 1.17
diff -u -r1.17 ControlPrint.C
--- src/frontends/controllers/ControlPrint.C 8 Apr 2002 16:47:50 -0000 1.17
+++ src/frontends/controllers/ControlPrint.C 23 May 2002 10:36:33 -0000
@@ -23,7 +23,7 @@
#include "ControlPrint.h"
#include "buffer.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "PrinterParams.h"
#include "Liason.h"
#include "helper_funcs.h"
Index: src/frontends/controllers/ControlRef.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlRef.C,v
retrieving revision 1.10
diff -u -r1.10 ControlRef.C
--- src/frontends/controllers/ControlRef.C 26 Mar 2002 12:12:29 -0000 1.10
+++ src/frontends/controllers/ControlRef.C 23 May 2002 10:36:33 -0000
@@ -22,11 +22,12 @@
#include "ButtonControllerBase.h"
#include "ControlRef.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "lyxfunc.h"
#include "bufferlist.h"
#include "support/filetools.h" // MakeAbsPath, MakeDisplayPath
+#include "debug.h"
using SigC::slot;
using std::vector;
Index: src/frontends/controllers/ControlSearch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlSearch.C,v
retrieving revision 1.11
diff -u -r1.11 ControlSearch.C
--- src/frontends/controllers/ControlSearch.C 21 Mar 2002 21:21:27 -0000 1.11
+++ src/frontends/controllers/ControlSearch.C 23 May 2002 10:36:33 -0000
@@ -22,7 +22,7 @@
#include "ControlSearch.h"
#include "Dialogs.h"
#include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "lyxfind.h"
#include "debug.h"
Index: src/frontends/controllers/ControlSendto.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlSendto.C,v
retrieving revision 1.5
diff -u -r1.5 ControlSendto.C
--- src/frontends/controllers/ControlSendto.C 29 Apr 2002 09:50:34 -0000 1.5
+++ src/frontends/controllers/ControlSendto.C 23 May 2002 10:36:33 -0000
@@ -17,7 +17,7 @@
#include "ButtonControllerBase.h"
#include "ControlSendto.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "buffer.h"
#include "converter.h"
Index: src/frontends/controllers/ControlShowFile.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlShowFile.C,v
retrieving revision 1.2
diff -u -r1.2 ControlShowFile.C
--- src/frontends/controllers/ControlShowFile.C 16 Jan 2002 14:47:57 -0000 1.2
+++ src/frontends/controllers/ControlShowFile.C 23 May 2002 10:36:33 -0000
@@ -17,7 +17,7 @@
#include "ButtonControllerBase.h"
#include "ControlShowFile.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "gettext.h"
#include "support/filetools.h" // FileSearch
Index: src/frontends/controllers/ControlSpellchecker.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlSpellchecker.C,v
retrieving revision 1.16
diff -u -r1.16 ControlSpellchecker.C
--- src/frontends/controllers/ControlSpellchecker.C 21 Mar 2002 21:21:27 -0000
1.16
+++ src/frontends/controllers/ControlSpellchecker.C 23 May 2002 10:36:36 -0000
@@ -33,7 +33,7 @@
#include "buffer.h"
#include "lyxrc.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxtext.h"
#include "gettext.h"
#include "support/lstrings.h"
Index: src/frontends/controllers/ControlTabularCreate.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlTabularCreate.C,v
retrieving revision 1.8
diff -u -r1.8 ControlTabularCreate.C
--- src/frontends/controllers/ControlTabularCreate.C 21 Mar 2002 21:21:27 -0000
1.8
+++ src/frontends/controllers/ControlTabularCreate.C 23 May 2002 10:36:36 -0000
@@ -21,7 +21,7 @@
#include "ControlTabularCreate.h"
#include "BufferView.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "support/lstrings.h"
Index: src/frontends/controllers/ControlTexinfo.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlTexinfo.C,v
retrieving revision 1.11
diff -u -r1.11 ControlTexinfo.C
--- src/frontends/controllers/ControlTexinfo.C 21 Mar 2002 21:21:27 -0000 1.11
+++ src/frontends/controllers/ControlTexinfo.C 23 May 2002 10:36:36 -0000
@@ -21,7 +21,7 @@
#include "ButtonControllerBase.h"
#include "ControlTexinfo.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "gettext.h"
#include "support/filetools.h" // FileSearch
Index: src/frontends/controllers/ControlThesaurus.C
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlThesaurus.C,v
retrieving revision 1.4
diff -u -r1.4 ControlThesaurus.C
--- src/frontends/controllers/ControlThesaurus.C 16 Jan 2002 14:47:57 -0000
1.4
+++ src/frontends/controllers/ControlThesaurus.C 23 May 2002 10:36:36 -0000
@@ -17,7 +17,7 @@
#include "ControlThesaurus.h"
#include "Dialogs.h"
#include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfind.h"
#include "buffer.h"
#include "debug.h"
Index: src/frontends/controllers/ControlToc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlToc.C,v
retrieving revision 1.12
diff -u -r1.12 ControlToc.C
--- src/frontends/controllers/ControlToc.C 21 Mar 2002 21:21:27 -0000 1.12
+++ src/frontends/controllers/ControlToc.C 23 May 2002 10:36:36 -0000
@@ -22,7 +22,7 @@
#include "ControlToc.h"
#include "buffer.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "support/lstrings.h" // tostr
#include "gettext.h"
Index: src/frontends/controllers/ControlUrl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlUrl.C,v
retrieving revision 1.7
diff -u -r1.7 ControlUrl.C
--- src/frontends/controllers/ControlUrl.C 21 Mar 2002 21:21:27 -0000 1.7
+++ src/frontends/controllers/ControlUrl.C 23 May 2002 10:36:36 -0000
@@ -21,7 +21,7 @@
#include "ButtonControllerBase.h"
#include "ControlUrl.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
using SigC::slot;
Index: src/frontends/controllers/ControlVCLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlVCLog.C,v
retrieving revision 1.14
diff -u -r1.14 ControlVCLog.C
--- src/frontends/controllers/ControlVCLog.C 21 Mar 2002 21:21:27 -0000 1.14
+++ src/frontends/controllers/ControlVCLog.C 23 May 2002 10:36:36 -0000
@@ -25,7 +25,7 @@
#include "ControlVCLog.h"
#include "buffer.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "Dialogs.h"
#include "lyxrc.h"
#include "support/lyxlib.h"
Index: src/frontends/gnome/Dialogs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/Dialogs.C,v
retrieving revision 1.23
diff -u -r1.23 Dialogs.C
--- src/frontends/gnome/Dialogs.C 31 Mar 2002 23:17:11 -0000 1.23
+++ src/frontends/gnome/Dialogs.C 23 May 2002 10:36:36 -0000
@@ -17,7 +17,7 @@
#include "gettext.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "gnomeBC.h"
#include "Tooltips.h"
#include "GUI.h"
Index: src/frontends/gnome/FileDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/FileDialog.C,v
retrieving revision 1.4
diff -u -r1.4 FileDialog.C
--- src/frontends/gnome/FileDialog.C 21 Mar 2002 21:20:19 -0000 1.4
+++ src/frontends/gnome/FileDialog.C 23 May 2002 10:36:36 -0000
@@ -23,7 +23,7 @@
#include <sigc++/signal_system.h>
-#include "LyXView.h" // This is only needed while we have the xforms part!
+#include "frontends/LyXView.h" // This is only needed while we have the xforms part!
#include "bufferview_funcs.h"
// FileDialog::Private
Index: src/frontends/qt2/QtLyXView.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QtLyXView.h,v
retrieving revision 1.3
diff -u -r1.3 QtLyXView.h
--- src/frontends/qt2/QtLyXView.h 19 Aug 2001 13:25:14 -0000 1.3
+++ src/frontends/qt2/QtLyXView.h 23 May 2002 10:36:36 -0000
@@ -10,4 +10,4 @@
*/
#undef emit
-#include "LyXView.h"
+#include "frontends/LyXView.h"
Index: src/frontends/xforms/DropDown.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/DropDown.h,v
retrieving revision 1.6
diff -u -r1.6 DropDown.h
--- src/frontends/xforms/DropDown.h 23 Apr 2002 08:16:26 -0000 1.6
+++ src/frontends/xforms/DropDown.h 23 May 2002 10:36:36 -0000
@@ -14,7 +14,7 @@
#pragma interface
#endif
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include <sigc++/signal_system.h>
#include "LString.h"
#include FORMS_H_LOCATION
Index: src/frontends/xforms/FileDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FileDialog.C,v
retrieving revision 1.7
diff -u -r1.7 FileDialog.C
--- src/frontends/xforms/FileDialog.C 21 Mar 2002 21:18:02 -0000 1.7
+++ src/frontends/xforms/FileDialog.C 23 May 2002 10:36:39 -0000
@@ -17,7 +17,7 @@
// temp. hack until Allow/prohibitInput is not
// needed any more in src/ - for now it's simplest
// to leave it there
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "bufferview_funcs.h"
#include "gettext.h"
#include "commandtags.h"
Index: src/frontends/xforms/FormBaseDeprecated.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormBaseDeprecated.C,v
retrieving revision 1.22
diff -u -r1.22 FormBaseDeprecated.C
--- src/frontends/xforms/FormBaseDeprecated.C 8 May 2002 17:52:02 -0000 1.22
+++ src/frontends/xforms/FormBaseDeprecated.C 23 May 2002 10:36:39 -0000
@@ -18,7 +18,7 @@
#include "xforms_resize.h"
#include "GUIRunTime.h"
#include "Tooltips.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxrc.h"
#include "support/LAssert.h"
@@ -98,7 +98,7 @@
}
fl_freeze_form(form());
- update(); // make sure its up-to-date
+ update();
fl_unfreeze_form(form());
if (form()->visible) {
Index: src/frontends/xforms/FormDocument.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDocument.C,v
retrieving revision 1.101
diff -u -r1.101 FormDocument.C
--- src/frontends/xforms/FormDocument.C 14 May 2002 10:53:27 -0000 1.101
+++ src/frontends/xforms/FormDocument.C 23 May 2002 10:36:41 -0000
@@ -27,7 +27,7 @@
#include "bmtable.h"
#include "language.h"
#include "frnt_lang.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxfunc.h"
#include "lyxrc.h"
#include "BufferView.h"
Index: src/frontends/xforms/FormIndex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormIndex.C,v
retrieving revision 1.28
diff -u -r1.28 FormIndex.C
--- src/frontends/xforms/FormIndex.C 21 Mar 2002 21:18:03 -0000 1.28
+++ src/frontends/xforms/FormIndex.C 23 May 2002 10:36:41 -0000
@@ -15,7 +15,7 @@
#include "xformsBC.h"
#include "ControlIndex.h"
#include "FormIndex.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "form_index.h"
typedef FormCB<ControlIndex, FormDB<FD_form_index> > base_class;
Index: src/frontends/xforms/FormInset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormInset.C,v
retrieving revision 1.16
diff -u -r1.16 FormInset.C
--- src/frontends/xforms/FormInset.C 21 Mar 2002 21:18:03 -0000 1.16
+++ src/frontends/xforms/FormInset.C 23 May 2002 10:36:41 -0000
@@ -15,7 +15,7 @@
#endif
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "FormInset.h"
#include "xformsBC.h"
Index: src/frontends/xforms/FormMathsBitmap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsBitmap.C,v
retrieving revision 1.20
diff -u -r1.20 FormMathsBitmap.C
--- src/frontends/xforms/FormMathsBitmap.C 2 Apr 2002 17:04:23 -0000 1.20
+++ src/frontends/xforms/FormMathsBitmap.C 23 May 2002 10:36:44 -0000
@@ -21,7 +21,7 @@
#include "FormMathsBitmap.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "bmtable.h"
#include "debug.h"
#include "xforms_helpers.h"
Index: src/frontends/xforms/FormMathsDelim.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsDelim.C,v
retrieving revision 1.15
diff -u -r1.15 FormMathsDelim.C
--- src/frontends/xforms/FormMathsDelim.C 23 Apr 2002 08:16:26 -0000 1.15
+++ src/frontends/xforms/FormMathsDelim.C 23 May 2002 10:36:44 -0000
@@ -18,7 +18,7 @@
#include "FormMathsDelim.h"
#include "form_maths_delim.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "bmtable.h"
#include "debug.h"
#include "support/lstrings.h"
Index: src/frontends/xforms/FormMathsMatrix.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsMatrix.C,v
retrieving revision 1.23
diff -u -r1.23 FormMathsMatrix.C
--- src/frontends/xforms/FormMathsMatrix.C 23 Apr 2002 08:16:26 -0000 1.23
+++ src/frontends/xforms/FormMathsMatrix.C 23 May 2002 10:36:44 -0000
@@ -20,7 +20,7 @@
#include "FormMathsMatrix.h"
#include "form_maths_matrix.h"
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "Lsstream.h"
#include "lyxfunc.h"
#include "support/LAssert.h"
Index: src/frontends/xforms/FormMathsPanel.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsPanel.C,v
retrieving revision 1.28
diff -u -r1.28 FormMathsPanel.C
--- src/frontends/xforms/FormMathsPanel.C 26 Apr 2002 14:19:20 -0000 1.28
+++ src/frontends/xforms/FormMathsPanel.C 23 May 2002 10:36:44 -0000
@@ -16,7 +16,7 @@
#endif
#include "Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "FormMathsPanel.h"
#include "form_maths_panel.h"
#include "MathsSymbols.h"
Index: src/frontends/xforms/FormParagraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormParagraph.C,v
retrieving revision 1.68
diff -u -r1.68 FormParagraph.C
--- src/frontends/xforms/FormParagraph.C 1 May 2002 09:46:36 -0000 1.68
+++ src/frontends/xforms/FormParagraph.C 23 May 2002 10:36:46 -0000
@@ -18,7 +18,7 @@
#include "form_paragraph.h"
#include "Dialogs.h"
#include "Liason.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "buffer.h"
#include "lyxtext.h"
#include "xforms_helpers.h"
Index: src/frontends/xforms/FormPreferences.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreferences.C,v
retrieving revision 1.111
diff -u -r1.111 FormPreferences.C
--- src/frontends/xforms/FormPreferences.C 1 May 2002 09:46:36 -0000 1.111
+++ src/frontends/xforms/FormPreferences.C 23 May 2002 10:36:51 -0000
@@ -20,7 +20,7 @@
#include "buffer.h"
#include "converter.h"
#include "debug.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "language.h"
#include "frnt_lang.h"
#include "lyxfunc.h"
Index: src/frontends/xforms/FormPrint.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPrint.C,v
retrieving revision 1.37
diff -u -r1.37 FormPrint.C
--- src/frontends/xforms/FormPrint.C 25 Mar 2002 11:16:15 -0000 1.37
+++ src/frontends/xforms/FormPrint.C 23 May 2002 10:36:51 -0000
@@ -18,7 +18,7 @@
#include "FormPrint.h"
#include "form_print.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "PrinterParams.h"
Index: src/frontends/xforms/FormTabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormTabular.C,v
retrieving revision 1.46
diff -u -r1.46 FormTabular.C
--- src/frontends/xforms/FormTabular.C 21 Mar 2002 21:18:03 -0000 1.46
+++ src/frontends/xforms/FormTabular.C 23 May 2002 10:36:54 -0000
@@ -16,7 +16,7 @@
#include "FormTabular.h"
#include "form_tabular.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "Dialogs.h"
#include "buffer.h"
#include "xforms_helpers.h"
Index: src/frontends/xforms/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Makefile.am,v
retrieving revision 1.65
diff -u -r1.65 Makefile.am
--- src/frontends/xforms/Makefile.am 23 May 2002 09:21:27 -0000 1.65
+++ src/frontends/xforms/Makefile.am 23 May 2002 10:36:54 -0000
@@ -208,8 +208,10 @@
Toolbar_pimpl.h \
Tooltips.C \
Tooltips.h \
- XPainter.h \
+ XFormsView.C \
+ XFormsView.h \
XPainter.C \
+ XPainter.h \
xforms_helpers.C \
xforms_helpers.h \
xforms_resize.C \
Index: src/frontends/xforms/XFormsView.C
===================================================================
RCS file: src/frontends/xforms/XFormsView.C
diff -N src/frontends/xforms/XFormsView.C
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/xforms/XFormsView.C 23 May 2002 10:36:56 -0000
@@ -0,0 +1,258 @@
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 The LyX Team.
+ *
+ * ====================================================== */
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "XFormsView.h"
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+#include "lyxlookup.h"
+#endif
+#include "minibuffer.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 "MenuBackend.h"
+#include "ToolbarDefaults.h"
+#include "lyxfunc.h"
+#include "BufferView.h"
+
+using std::endl;
+
+//extern void AutoSave(BufferView *);
+extern void QuitLyX();
+
+// This is very temporary
+BufferView * current_view;
+
+extern "C" {
+
+static
+int C_XFormsView_atCloseMainFormCB(FL_FORM * form, void * p)
+{
+ return XFormsView::atCloseMainFormCB(form, p);
+}
+
+}
+
+
+XFormsView::XFormsView(int width, int height)
+ : LyXView()
+{
+ create_form_form_main(width, height);
+ fl_set_form_atclose(form_, C_XFormsView_atCloseMainFormCB, 0);
+
+ // Connect the minibuffer signals
+ minibuffer->stringReady.connect(SigC::slot(getLyXFunc(),
+ &LyXFunc::miniDispatch));
+ minibuffer->timeout.connect(SigC::slot(getLyXFunc(),
+ &LyXFunc::initMiniBuffer));
+
+ // Make sure the buttons are disabled if needed.
+ updateToolbar();
+}
+
+
+XFormsView::~XFormsView() {}
+
+
+/// Redraw the main form.
+void XFormsView::redraw() {
+ lyxerr[Debug::INFO] << "XFormsView::redraw()" << endl;
+ fl_redraw_form(form_);
+ getMiniBuffer()->redraw();
+}
+
+
+FL_FORM * XFormsView::getForm() const
+{
+ return form_;
+}
+
+
+// Callback for close main form from window manager
+int XFormsView::atCloseMainFormCB(FL_FORM *, void *)
+{
+ QuitLyX();
+ return FL_IGNORE;
+}
+
+
+void XFormsView::setPosition(int x, int y)
+{
+ fl_set_form_position(form_, x, y);
+}
+
+
+void XFormsView::show(int place, int border, string const & title)
+{
+ fl_set_form_minsize(form_, form_->w, form_->h);
+ fl_show_form(form_, place, border, title.c_str());
+ getLyXFunc()->initMiniBuffer();
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
+ InitLyXLookup(fl_get_display(), form_->window);
+#endif
+}
+
+
+void XFormsView::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(SigC::slot(this, &XFormsView::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();
+
+ minibuffer->dd_init();
+}
+
+
+void XFormsView::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);
+}
+
+
+void XFormsView::setWindowTitle(string const & title, string const & icon_title)
+{
+ fl_set_form_title(form_, title.c_str());
+ fl_winicontitle(form_->window, icon_title.c_str());
+}
+
+
+// How should this actually work? Should it prohibit input in all BufferViews,
+// or just in the current one? If "just the current one", then it should be
+// placed in BufferView. If "all BufferViews" then LyXGUI (I think) should
+// run "prohibitInput" on all LyXViews which will run prohibitInput on all
+// BufferViews. Or is it perhaps just the (input in) BufferViews in the
+// current LyxView that should be prohibited (Lgb) (This applies to
+// "allowInput" as well.)
+void XFormsView::prohibitInput() const
+{
+ view()->hideCursor();
+
+ static Cursor cursor;
+ static bool cursor_undefined = true;
+
+ if (cursor_undefined) {
+ cursor = XCreateFontCursor(fl_get_display(), XC_watch);
+ XFlush(fl_get_display());
+ cursor_undefined = false;
+ }
+
+ /* set the cursor to the watch for all forms and the canvas */
+ XDefineCursor(fl_get_display(), getForm()->window, cursor);
+
+ XFlush(fl_get_display());
+ fl_deactivate_all_forms();
+}
+
+
+void XFormsView::allowInput() const
+{
+ /* reset the cursor from the watch for all forms and the canvas */
+
+ XUndefineCursor(fl_get_display(), getForm()->window);
+
+ XFlush(fl_get_display());
+ fl_activate_all_forms();
+}
Index: src/frontends/xforms/XFormsView.h
===================================================================
RCS file: src/frontends/xforms/XFormsView.h
diff -N src/frontends/xforms/XFormsView.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/xforms/XFormsView.h 23 May 2002 10:36:56 -0000
@@ -0,0 +1,59 @@
+// -*- C++ -*-
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 The LyX Team.
+ *
+ * ====================================================== */
+
+#ifndef LyXView_H
+#define LyXView_H
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include FORMS_H_LOCATION
+
+#include "frontends/LyXView.h"
+
+/**
+ This class is the form containing the view of the buffer. The actual buffer
+ view is supposed (at least IMHO) to be another class, that shows its output
+ in one or more LyXView's.
+ */
+class XFormsView : public LyXView {
+public:
+ /// constructor
+ XFormsView(int w, int h);
+ /// destructor
+ ~XFormsView();
+ /// Where to place the form.
+ virtual void setPosition(int, int);
+ /// Show the main form.
+ virtual void show(int, int, string const & t = string("LyX"));
+ /// init (should probably be removed later) (Lgb)
+ virtual void init();
+ /// Redraw the main form.
+ virtual void redraw();
+ /// returns a pointer to the form.
+ FL_FORM * getForm() const;
+ ///
+ virtual void prohibitInput() const;
+ ///
+ virtual void allowInput() const;
+ /** This callback is run when a close event is sent from the
+ window manager. */
+ static int atCloseMainFormCB(FL_FORM *, void *);
+private:
+ /// pass the title, and the iconified title
+ virtual void setWindowTitle(string const &, string const &);
+ /// makes the main form.
+ void create_form_form_main(int width, int height);
+ /// A pointer to the form.
+ FL_FORM * form_;
+};
+#endif
Index: src/insets/insetbib.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbib.C,v
retrieving revision 1.85
diff -u -r1.85 insetbib.C
--- src/insets/insetbib.C 16 Apr 2002 09:09:41 -0000 1.85
+++ src/insets/insetbib.C 23 May 2002 10:36:56 -0000
@@ -12,7 +12,7 @@
#include "lyxtext.h"
#include "lyxrc.h"
#include "font.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxtextclasslist.h"
#include "frontends/Dialogs.h"
Index: src/insets/insetcite.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcite.C,v
retrieving revision 1.32
diff -u -r1.32 insetcite.C
--- src/insets/insetcite.C 14 May 2002 09:47:12 -0000 1.32
+++ src/insets/insetcite.C 23 May 2002 10:36:59 -0000
@@ -17,7 +17,7 @@
#include "buffer.h"
#include "BufferView.h"
#include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "debug.h"
#include "gettext.h"
Index: src/insets/inseterror.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/inseterror.C,v
retrieving revision 1.40
diff -u -r1.40 inseterror.C
--- src/insets/inseterror.C 23 May 2002 09:21:28 -0000 1.40
+++ src/insets/inseterror.C 23 May 2002 10:36:59 -0000
@@ -19,7 +19,7 @@
#include "lyxfont.h"
#include "gettext.h"
#include "inseterror.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Painter.h"
#include "frontends/Dialogs.h"
Index: src/insets/insetert.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetert.C,v
retrieving revision 1.81
diff -u -r1.81 insetert.C
--- src/insets/insetert.C 9 May 2002 12:53:09 -0000 1.81
+++ src/insets/insetert.C 23 May 2002 10:36:59 -0000
@@ -19,7 +19,7 @@
#include "language.h"
#include "buffer.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxtext.h"
#include "debug.h"
#include "lyxtextclasslist.h"
Index: src/insets/insetexternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetexternal.C,v
retrieving revision 1.40
diff -u -r1.40 insetexternal.C
--- src/insets/insetexternal.C 21 Mar 2002 17:09:48 -0000 1.40
+++ src/insets/insetexternal.C 23 May 2002 10:36:59 -0000
@@ -18,7 +18,7 @@
#include "ExternalTemplate.h"
#include "BufferView.h"
#include "buffer.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyx_main.h"
#include "LaTeXFeatures.h"
#include "gettext.h"
Index: src/insets/insetfloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.C,v
retrieving revision 1.45
diff -u -r1.45 insetfloat.C
--- src/insets/insetfloat.C 9 May 2002 13:36:45 -0000 1.45
+++ src/insets/insetfloat.C 23 May 2002 10:37:02 -0000
@@ -26,7 +26,7 @@
#include "debug.h"
#include "Floating.h"
#include "buffer.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Dialogs.h"
using std::ostream;
Index: src/insets/insetfloatlist.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloatlist.C,v
retrieving revision 1.16
diff -u -r1.16 insetfloatlist.C
--- src/insets/insetfloatlist.C 28 Apr 2002 14:00:48 -0000 1.16
+++ src/insets/insetfloatlist.C 23 May 2002 10:37:02 -0000
@@ -8,7 +8,7 @@
#include "FloatList.h"
#include "LaTeXFeatures.h"
#include "frontends/Dialogs.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "buffer.h"
#include "gettext.h"
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.111
diff -u -r1.111 insetgraphics.C
--- src/insets/insetgraphics.C 23 May 2002 09:21:28 -0000 1.111
+++ src/insets/insetgraphics.C 23 May 2002 10:37:05 -0000
@@ -81,7 +81,7 @@
#include "graphics/GraphicsCache.h"
#include "graphics/GraphicsImage.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "lyxtext.h"
#include "buffer.h"
#include "BufferView.h"
Index: src/insets/insetinclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetinclude.C,v
retrieving revision 1.75
diff -u -r1.75 insetinclude.C
--- src/insets/insetinclude.C 21 Mar 2002 17:09:49 -0000 1.75
+++ src/insets/insetinclude.C 23 May 2002 10:37:05 -0000
@@ -10,7 +10,7 @@
#include "BufferView.h"
#include "debug.h"
#include "lyxrc.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "LaTeXFeatures.h"
#include "gettext.h"
#include "lyxtextclasslist.h"
Index: src/insets/insetindex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetindex.C,v
retrieving revision 1.30
diff -u -r1.30 insetindex.C
--- src/insets/insetindex.C 1 May 2002 22:17:08 -0000 1.30
+++ src/insets/insetindex.C 23 May 2002 10:37:05 -0000
@@ -6,7 +6,7 @@
#include "insetindex.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Dialogs.h"
#include "LaTeXFeatures.h"
#include "gettext.h"
Index: src/insets/insetminipage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetminipage.C,v
retrieving revision 1.46
diff -u -r1.46 insetminipage.C
--- src/insets/insetminipage.C 21 Mar 2002 17:09:49 -0000 1.46
+++ src/insets/insetminipage.C 23 May 2002 10:37:05 -0000
@@ -17,7 +17,7 @@
#include "gettext.h"
#include "lyxfont.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Dialogs.h"
#include "lyxtext.h"
#include "insets/insettext.h"
Index: src/insets/insetparent.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetparent.C,v
retrieving revision 1.34
diff -u -r1.34 insetparent.C
--- src/insets/insetparent.C 21 Mar 2002 17:09:50 -0000 1.34
+++ src/insets/insetparent.C 23 May 2002 10:37:05 -0000
@@ -20,7 +20,7 @@
#include "insetparent.h"
#include "support/filetools.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "support/LOstream.h"
#include "commandtags.h"
#include "buffer.h"
Index: src/insets/insetref.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetref.C,v
retrieving revision 1.46
diff -u -r1.46 insetref.C
--- src/insets/insetref.C 21 Mar 2002 17:09:50 -0000 1.46
+++ src/insets/insetref.C 23 May 2002 10:37:05 -0000
@@ -10,7 +10,7 @@
#include "debug.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Dialogs.h"
#include "lyxfunc.h"
#include "BufferView.h"
Index: src/insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.202
diff -u -r1.202 insettabular.C
--- src/insets/insettabular.C 23 May 2002 09:21:28 -0000 1.202
+++ src/insets/insettabular.C 23 May 2002 10:37:13 -0000
@@ -25,7 +25,7 @@
#include "frontends/Painter.h"
#include "font.h"
#include "lyxtext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "insets/insettext.h"
#include "debug.h"
#include "gettext.h"
Index: src/insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.295
diff -u -r1.295 insettext.C
--- src/insets/insettext.C 23 May 2002 09:21:29 -0000 1.295
+++ src/insets/insettext.C 23 May 2002 10:37:19 -0000
@@ -21,7 +21,7 @@
#include "lyxfont.h"
#include "commandtags.h"
#include "buffer.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "BufferView.h"
#include "lyxtextclasslist.h"
#include "LaTeXFeatures.h"
Index: src/insets/insettoc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettoc.C,v
retrieving revision 1.32
diff -u -r1.32 insettoc.C
--- src/insets/insettoc.C 21 Mar 2002 17:09:54 -0000 1.32
+++ src/insets/insettoc.C 23 May 2002 10:37:19 -0000
@@ -7,7 +7,7 @@
#include "gettext.h"
#include "insettoc.h"
#include "BufferView.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Dialogs.h"
#include "debug.h"
#include "buffer.h"
Index: src/insets/inseturl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/inseturl.C,v
retrieving revision 1.43
diff -u -r1.43 inseturl.C
--- src/insets/inseturl.C 21 Mar 2002 17:09:54 -0000 1.43
+++ src/insets/inseturl.C 23 May 2002 10:37:19 -0000
@@ -7,7 +7,7 @@
#include "inseturl.h"
#include "BufferView.h"
#include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "debug.h"
#include "frontends/Dialogs.h"
#include "support/lstrings.h"
Index: src/mathed/formula.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formula.C,v
retrieving revision 1.191
diff -u -r1.191 formula.C
--- src/mathed/formula.C 23 May 2002 09:21:29 -0000 1.191
+++ src/mathed/formula.C 23 May 2002 10:37:19 -0000
@@ -35,7 +35,7 @@
#include "support/LAssert.h"
#include "support/systemcall.h"
#include "support/filetools.h" // LibFileSearch
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Painter.h"
#include "lyxrc.h"
#include "math_hullinset.h"
Index: src/mathed/formulabase.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formulabase.C,v
retrieving revision 1.155
diff -u -r1.155 formulabase.C
--- src/mathed/formulabase.C 23 May 2002 09:21:30 -0000 1.155
+++ src/mathed/formulabase.C 23 May 2002 10:37:21 -0000
@@ -33,7 +33,7 @@
#include "debug.h"
#include "math_support.h"
#include "support/lstrings.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
#include "frontends/Painter.h"
#include "font.h"
#include "Lsstream.h"
