]> git.lyx.org Git - lyx.git/blobdiff - src/LyXView.C
fix ru.po typo
[lyx.git] / src / LyXView.C
index 70cca46830843b97a8bb18b3566dc503723fffd8..3b049a538c0a549dafbb1f439de028f76e67f647 100644 (file)
@@ -1,10 +1,11 @@
+
 /* 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 "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Menubar.h"
+
+#include "support/filetools.h"        // OnlyFilename()
+
+#include <sys/time.h>
+#include <unistd.h>
 
 using std::endl;
+using lyx::layout_type;
 
 extern void AutoSave(BufferView *);
 extern void QuitLyX();
-LyXTextClass::size_type current_layout = 0;
 
-// This is very temporary
-BufferView * current_view;
+layout_type current_layout = 0;
 
-extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM *, void *);
 
-
-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);
 
-       // Connect the minibuffer signals
-       minibuffer->stringReady.connect(SigC::slot(lyxfunc,
-                                                  &LyXFunc::miniDispatch));
-       minibuffer->timeout.connect(SigC::slot(lyxfunc,
-                                              &LyXFunc::initMiniBuffer));
-       
        intl = new Intl;
 
-       // Make sure the buttons are disabled if needed.
-       toolbar->update();
-       menubar->update();
-
        dialogs_ = new Dialogs(this);
        // temporary until all dialogs moved into Dialogs.
        dialogs_->updateBufferDependent
@@ -94,11 +77,9 @@ LyXView::~LyXView()
 }
 
 
-/// Redraw the main form.
-void LyXView::redraw() {
-       lyxerr[Debug::INFO] << "LyXView::redraw()" << endl;
-       fl_redraw_form(form_);
-       minibuffer->redraw();
+void LyXView::resize() 
+{
+       view()->resize();
 }
 
 
@@ -115,19 +96,13 @@ BufferView * LyXView::view() const
 }
 
 
-FL_FORM * LyXView::getForm() const
-{
-       return form_;
-}
-
-
 Toolbar * LyXView::getToolbar() const
 {
        return toolbar;
 }
 
 
-void LyXView::setLayout(LyXTextClass::size_type layout)
+void LyXView::setLayout(layout_type layout)
 {
        toolbar->setLayout(layout);
 }
@@ -136,7 +111,6 @@ void LyXView::setLayout(LyXTextClass::size_type layout)
 void LyXView::updateToolbar()
 {
        toolbar->update();
-       menubar->update();
 }
 
 
@@ -183,6 +157,7 @@ void LyXView::updateMenubar()
                menubar->set("main_nobuffer");
        else
                menubar->set("main");
+       menubar->update();
 }
 
 
@@ -209,139 +184,6 @@ void LyXView::resetAutosaveTimer()
 }
 
 
-// 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());
-       lyxfunc->initMiniBuffer();
-#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(SigC::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);
-}
-
-
 void LyXView::invalidateLayoutChoice()
 {
        last_textclass = -1;
@@ -362,15 +204,13 @@ void LyXView::updateLayoutChoice()
                toolbar->updateLayoutList(true);
                last_textclass = int(buffer()->params.textclass);
                current_layout = 0;
-       } else
+       } else {
                toolbar->updateLayoutList(false);
-
+       }
        
+       layout_type layout = bufferview->getLyXText()->cursor.par()->getLayout();
 
-       LyXTextClass::size_type layout =
-               bufferview->text->cursor.par()->GetLayout();
-
-       if (layout != current_layout){
+       if (layout != current_layout) {
                toolbar->setLayout(layout);
                current_layout = layout;
        }
@@ -382,20 +222,22 @@ 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()){
+               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;
        }
 }
@@ -403,7 +245,5 @@ void LyXView::updateWindowTitle()
 
 void LyXView::showState()
 {
-       message(CurrentState(view()));
-       getToolbar()->update();
-       menubar->update();
+       message(currentState(view()));
 }