X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=100eb409d634ad0b1a9275c8ee8fff3d8459d6fb;hb=d597ece5e7efac2a25251034d89fa761759d28f7;hp=d9cdc70bbf09ec2e91b00b036975d0325628b2b9;hpb=2fe7465d032b5e57c81cb4ef2ef5705d5264d2d5;p=lyx.git diff --git a/src/LyXView.C b/src/LyXView.C index d9cdc70bbf..100eb409d6 100644 --- a/src/LyXView.C +++ b/src/LyXView.C @@ -1,4 +1,3 @@ -// -*- C++ -*- /* This file is part of * ====================================================== * @@ -21,10 +20,8 @@ #include "LyXView.h" #include "lyx_main.h" #include "lyxlookup.h" -#include "toolbar.h" #include "minibuffer.h" #include "lyxfunc.h" -#include "lyx.xpm" #include "debug.h" #include "layout_forms.h" #include "intl.h" @@ -33,15 +30,16 @@ #include "layout.h" #include "lyxtext.h" #include "buffer.h" -#include "menus.h" #include "frontends/Dialogs.h" +#include "frontends/Toolbar.h" +#include "frontends/Menubar.h" +#include "MenuBackend.h" +#include "ToolbarDefaults.h" #include "lyx_gui_misc.h" // [update,Close]AllBufferRelatedDialogs #include "bufferview_funcs.h" // CurrentState() using std::endl; -extern FD_form_document * fd_form_document; - extern void AutoSave(BufferView *); extern void QuitLyX(); LyXTextClass::size_type current_layout = 0; @@ -66,6 +64,7 @@ LyXView::LyXView(int width, int height) // Make sure the buttons are disabled if needed. toolbar->update(); + menubar->update(); dialogs_ = new Dialogs(this); // temporary until all dialogs moved into Dialogs. @@ -78,7 +77,7 @@ LyXView::LyXView(int width, int height) LyXView::~LyXView() { - delete menus; + delete menubar; delete toolbar; delete bufferview; delete minibuffer; @@ -121,6 +120,19 @@ Toolbar * LyXView::getToolbar() const } +void LyXView::setLayout(LyXTextClass::size_type layout) +{ + toolbar->setLayout(layout); +} + + +void LyXView::updateToolbar() +{ + toolbar->update(); + menubar->update(); +} + + LyXFunc * LyXView::getLyXFunc() const { return lyxfunc; @@ -133,9 +145,19 @@ MiniBuffer * LyXView::getMiniBuffer() const } -Menus * LyXView::getMenus() const +Menubar * LyXView::getMenubar() const +{ + return menubar; +} + + +void LyXView::updateMenubar() { - return menus; + if ((!view() || !view()->buffer()) + && menubackend.hasMenu("main_nobuffer")) + menubar->set("main_nobuffer"); + else + menubar->set("main"); } @@ -171,7 +193,8 @@ int LyXView::atCloseMainFormCB(FL_FORM *, void *) // Wrapper for the above -extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p) +extern "C" +int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p) { return LyXView::atCloseMainFormCB(form, p); } @@ -183,11 +206,11 @@ void LyXView::setPosition(int x, int y) } -void LyXView::show(int place, int border, char const * title) +void LyXView::show(int place, int border, string const & title) { - fl_show_form(form_, place, border, title); + fl_show_form(form_, place, border, title.c_str()); minibuffer->Init(); - InitLyXLookup(fl_display, form_->window); + InitLyXLookup(fl_get_display(), form_->window); } @@ -213,14 +236,13 @@ void LyXView::create_form_form_main(int width, int height) // // THE MENUBAR // - - menus = new Menus(this, air); + menubar = new Menubar(this, menubackend); // // TOOLBAR // - toolbar = new Toolbar(this, air, 30 + air + bw); + toolbar = new Toolbar(this, air, 30 + air + bw, toolbardefaults); // Setup the toolbar toolbar->set(true); @@ -254,17 +276,20 @@ void LyXView::create_form_form_main(int width, int height) // // assign an icon to main form - unsigned int w, h; - Pixmap lyx_p, lyx_mask; - lyx_p = fl_create_from_pixmapdata(fl_root, - const_cast(lyx_xpm), - &w, - &h, - &lyx_mask, - 0, - 0, - 0); // this leaks - fl_set_form_icon(form_, lyx_p, lyx_mask); + string iconname = LibFileSearch("images", "lyx", "xpm"); + if (!iconname.empty()) { + unsigned int w, h; + Pixmap lyx_p, lyx_mask; + lyx_p = fl_read_pixmapfile(fl_root, + iconname.c_str(), + &w, + &h, + &lyx_mask, + 0, + 0, + 0); // this leaks + fl_set_form_icon(form_, lyx_p, lyx_mask); + } // set min size fl_set_form_minsize(form_, 50, 50); @@ -273,26 +298,31 @@ void LyXView::create_form_form_main(int width, int height) } +#if 0 extern "C" int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev); +#endif + void LyXView::init() { // Set the textclass choice invalidateLayoutChoice(); updateLayoutChoice(); - UpdateDocumentClassChoice(); + updateMenubar(); // Start autosave timer if (lyxrc.autosave) { autosave_timeout.setTimeout(lyxrc.autosave * 1000); autosave_timeout.start(); } - + +#if 0 // Install the raw callback for keyboard events fl_register_raw_callback(form_, KeyPressMask, C_LyXView_KeyPressMask_raw_callback); +#endif intl->InitKeyMapper(lyxrc.use_kbmap); } @@ -305,60 +335,34 @@ void LyXView::invalidateLayoutChoice() void LyXView::updateLayoutChoice() { - // Update the layout display - if (!toolbar->combox) return; - // This has a side-effect that the layouts are not showed when no // document is loaded. - if (bufferview == 0 || bufferview->buffer() == 0) { - toolbar->combox->clear(); - toolbar->combox->Redraw(); + if (!view() || !view()->buffer()) { + toolbar->clearLayoutList(); return; } - // If textclass is different, we need to update the list - if (toolbar->combox->empty() || - (last_textclass != int(buffer()->params.textclass))) { - toolbar->combox->clear(); - LyXTextClass const & tc = - textclasslist.TextClass(buffer()->params.textclass); - for (LyXTextClass::const_iterator cit = tc.begin(); - cit != tc.end(); ++cit) { - if ((*cit).obsoleted_by().empty()) - toolbar->combox->addline((*cit).name().c_str()); - else - toolbar->combox->addline(("@N" + (*cit).name()).c_str()); - } + // Update the layout display + if (last_textclass != int(buffer()->params.textclass)) { + toolbar->updateLayoutList(true); last_textclass = int(buffer()->params.textclass); current_layout = 0; - } - // we need to do this. - toolbar->combox->Redraw(); + } else + toolbar->updateLayoutList(false); + + LyXTextClass::size_type layout = bufferview->text->cursor.par()->GetLayout(); if (layout != current_layout){ - toolbar->combox->select(layout + 1); + toolbar->setLayout(layout); current_layout = layout; } } -void LyXView::UpdateDocumentClassChoice() -{ - // Update the document class display in the document form - if (fd_form_document) { - fl_clear_choice(fd_form_document->choice_class); - for (LyXTextClassList::const_iterator cit = textclasslist.begin(); - cit != textclasslist.end(); ++cit) { - fl_addto_choice(fd_form_document->choice_class, - (*cit).description().c_str()); - } - } -} - - +#if 0 // This is necessary, since FL_FREE-Objects doesn't get all keypress events // as FL_KEYBOARD events :-( Matthias 280596 int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev) @@ -403,7 +407,7 @@ int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev) // last_time_pressed is 0, that sinifies an autoreapeat // at least on my system. It like some feedback from // others, especially from user running LyX remote. - //lyxerr << "Syncing - purging X events." << endl; + lyxerr[Debug::KEY] << "Syncing - purging X events." << endl; XSync(fl_get_display(), 1); // This purge make f.ex. scrolling stop imidiatly when // releaseing the PageDown button. The question is if this @@ -420,6 +424,7 @@ int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev) { return LyXView::KeyPressMask_raw_callback(fl, xev); } +#endif // Updates the title of the window with the filename of the current document @@ -431,7 +436,7 @@ void LyXView::updateWindowTitle() if (view()->available()) { string cur_title = buffer()->fileName(); if (!cur_title.empty()){ - title += ": " + OnlyFilename(cur_title); + title += ": " + MakeDisplayPath(cur_title, 30); if (!buffer()->isLyxClean()) title += _(" (Changed)"); if (buffer()->isReadonly()) @@ -450,4 +455,5 @@ void LyXView::showState() { getMiniBuffer()->Set(CurrentState(view())); getToolbar()->update(); + menubar->update(); }