John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index 36804ac4c6bbafe4c419202ff69ec2345d9b05c2..5362a6e48e13711ff3dbcc8aade6a59103ae6e54 100644 (file)
--- 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;
 
@@ -206,9 +208,9 @@ void LyXView::updateLayoutChoice()
                toolbar->updateLayoutList(false);
        }
        
-       layout_type layout = bufferview->text->cursor.par()->getLayout();
+       layout_type layout = bufferview->getLyXText()->cursor.par()->getLayout();
 
-       if (layout != current_layout){
+       if (layout != current_layout) {
                toolbar->setLayout(layout);
                current_layout = layout;
        }
@@ -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,13 +232,14 @@ 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;
 }