#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()
#include "gettext.h"
#include "lyxfunc.h"
#include "BufferView.h"
+#include "lyxtextclasslist.h"
+
+#include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#include "frontends/Timeout.h"
+#include "frontends/Menubar.h"
+
+#include "support/filetools.h" // OnlyFilename()
+
+#include <sys/time.h>
+#include <unistd.h>
using std::endl;
extern void AutoSave(BufferView *);
extern void QuitLyX();
-LyXTextClass::size_type current_layout = 0;
+string current_layout;
LyXView::LyXView()
intl = new Intl;
+ // Give the timeout some default sensible value.
+ autosave_timeout = new Timeout(5000);
+
dialogs_ = new Dialogs(this);
- // temporary until all dialogs moved into Dialogs.
- dialogs_->updateBufferDependent
- .connect(SigC::slot(&updateAllVisibleBufferRelatedDialogs));
dialogs_->hideBufferDependent
.connect(SigC::slot(&CloseAllBufferRelatedDialogs));
Dialogs::redrawGUI.connect(SigC::slot(this, &LyXView::redraw));
delete minibuffer;
delete lyxfunc;
delete intl;
+ delete autosave_timeout;
delete dialogs_;
}
}
-void LyXView::setLayout(LyXTextClass::size_type layout)
+void LyXView::setLayout(string const & layout)
{
toolbar->setLayout(layout);
}
void LyXView::updateToolbar()
{
toolbar->update();
- menubar->update();
}
menubar->set("main_nobuffer");
else
menubar->set("main");
+ menubar->update();
}
void LyXView::resetAutosaveTimer()
{
if (lyxrc.autosave)
- autosave_timeout.restart();
+ autosave_timeout->restart();
}
if (last_textclass != int(buffer()->params.textclass)) {
toolbar->updateLayoutList(true);
last_textclass = int(buffer()->params.textclass);
- current_layout = 0;
- } else
+ current_layout = textclasslist[last_textclass].defaultLayoutName();
+ } else {
toolbar->updateLayoutList(false);
+ }
-
-
- LyXTextClass::size_type layout =
- bufferview->text->cursor.par()->getLayout();
+ string const & layout =
+ bufferview->getLyXText()->cursor.par()->layout();
- if (layout != current_layout){
+ if (layout != current_layout) {
toolbar->setLayout(layout);
current_layout = layout;
}
{
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);
}
}
if (title != last_title) {
- setWindowTitle(title);
+ setWindowTitle(title, icon_title);
+ last_title = title;
}
}
void LyXView::showState()
{
- message(CurrentState(view()));
- getToolbar()->update();
- menubar->update();
+ message(currentState(view()));
}