X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.C;h=5b913c99ac8d2df2e997aff4c4494810fbc65b19;hb=fb424bae1b693200ba4a506b2775929d25d77be3;hp=df55886c3e03d4981b026224b28c45edbd75afe1;hpb=6b6d49b7dfc48c14c8faf48ed087e5daf8d90013;p=lyx.git

diff --git a/src/LyXView.C b/src/LyXView.C
index df55886c3e..5b913c99ac 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -15,20 +15,13 @@
 #pragma implementation
 #endif
 
-#include <sys/time.h>
-#include <unistd.h>
-
 #include "LyXView.h"
 #include "minibuffer.h"
 #include "debug.h"
 #include "intl.h"
 #include "lyxrc.h"
-#include "support/filetools.h"        // OnlyFilename()
 #include "lyxtext.h"
 #include "buffer.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Toolbar.h"
-#include "frontends/Menubar.h"
 #include "MenuBackend.h"
 #include "lyx_gui_misc.h"	// [update,Close,Redraw]AllBufferRelatedDialogs
 #include "bufferview_funcs.h" // CurrentState()
@@ -36,6 +29,15 @@
 #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;
 
@@ -109,7 +111,6 @@ void LyXView::setLayout(layout_type layout)
 void LyXView::updateToolbar()
 {
 	toolbar->update();
-	menubar->update();
 }
 
 
@@ -156,6 +157,7 @@ void LyXView::updateMenubar()
 		menubar->set("main_nobuffer");
 	else
 		menubar->set("main");
+	menubar->update();
 }
 
 
@@ -220,6 +222,7 @@ void LyXView::updateWindowTitle()
 {
 	static string last_title = "LyX";
 	string title = "LyX";
+	string icon_title = "LyX";
 
 	if (view()->available()) {
 		string const cur_title = buffer()->fileName();
@@ -229,19 +232,18 @@ void LyXView::updateWindowTitle()
 				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);
+		setWindowTitle(title, icon_title);
 		last_title = title;
 	}
-	last_title = title;
 }
 
 
 void LyXView::showState()
 {
 	message(currentState(view()));
-	getToolbar()->update();
-	menubar->update();
 }