X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=100eb409d634ad0b1a9275c8ee8fff3d8459d6fb;hb=d597ece5e7efac2a25251034d89fa761759d28f7;hp=453296ac13b60bb2f050d5b660ef10a84e9cc4fb;hpb=b8072fd6f77ebd592ecd514dadc04839516b8a8b;p=lyx.git

diff --git a/src/LyXView.C b/src/LyXView.C
index 453296ac13..100eb409d6 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -32,20 +32,14 @@
 #include "buffer.h"
 #include "frontends/Dialogs.h"
 #include "frontends/Toolbar.h"
-#ifdef NEW_MENUBAR
-# include "frontends/Menubar.h"
-# include "MenuBackend.h"
-#else
-# include "menus.h"
-#endif
+#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;
@@ -70,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.
@@ -82,11 +77,7 @@ LyXView::LyXView(int width, int height)
 
 LyXView::~LyXView()
 {
-#ifdef NEW_MENUBAR
 	delete menubar;
-#else
-	delete menus;
-#endif
 	delete toolbar;
 	delete bufferview;
 	delete minibuffer;
@@ -129,7 +120,7 @@ Toolbar * LyXView::getToolbar() const
 }
 
 
-void LyXView::setLayout(int layout)
+void LyXView::setLayout(LyXTextClass::size_type layout)
 {
 	toolbar->setLayout(layout);
 }
@@ -138,6 +129,7 @@ void LyXView::setLayout(int layout)
 void LyXView::updateToolbar()
 {
 	toolbar->update();
+	menubar->update();
 }
 
 
@@ -153,7 +145,6 @@ MiniBuffer * LyXView::getMiniBuffer() const
 }
 
 
-#ifdef NEW_MENUBAR
 Menubar * LyXView::getMenubar() const
 {
 	return menubar;
@@ -169,13 +160,6 @@ void LyXView::updateMenubar()
 		menubar->set("main");
 }
 
-#else
-Menus * LyXView::getMenus() const
-{
-	return menus;
-}
-#endif
-
 
 Intl * LyXView::getIntl() const
 {
@@ -209,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);
 }
@@ -221,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);
 }
 
 
@@ -251,11 +236,7 @@ void LyXView::create_form_form_main(int width, int height)
 	//
 	// THE MENUBAR
 	//
-#ifdef NEW_MENUBAR
 	menubar = new Menubar(this, menubackend);
-#else	
-	menus = new Menus(this, air);
-#endif
 
 	//
 	// TOOLBAR
@@ -317,29 +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();
-#ifdef NEW_MENUBAR
 	updateMenubar();
-#endif
 	
 	// 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);
 }
 
@@ -379,20 +362,7 @@ void LyXView::updateLayoutChoice()
 }
 
 
-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)
@@ -437,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
@@ -454,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
@@ -465,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())
@@ -484,4 +455,5 @@ void LyXView::showState()
 {
 	getMiniBuffer()->Set(CurrentState(view()));
 	getToolbar()->update();
+	menubar->update();
 }