anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autosave cleanup, fix qt statusbar timeout, compile fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4731 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-07-21 01:38:24 +00:00
parent a0afb0fd38
commit 6eb285d507
7 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/ChangeLog
View File

@ -1,3 +1,7 @@
2002-07-21 John Levon <moz@compsoc.man.ac.uk>
* LyXView.C: move autosave connect here
2002-07-20 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* LyXView.C (updateMenubar): remove code to set different menubars

1
src/frontends/LyXView.C
View File

@ -72,6 +72,7 @@ void LyXView::init()
// Start autosave timer
if (lyxrc.autosave) {
autosave_timeout_->timeout.connect(boost::bind(&LyXView::autoSave, this));
autosave_timeout_->setTimeout(lyxrc.autosave * 1000);
autosave_timeout_->start();
}

8
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,11 @@
2002-07-21 John Levon <moz@compsoc.man.ac.uk>
* Menubar_pimpl.C: change for removed menubar stuff
2002-07-21 John Levon <moz@compsoc.man.ac.uk>
* QtView.C: reset idle timer on message()
2002-07-20 John Levon <moz@compsoc.man.ac.uk>
* QLImage.C: various fixes

14
src/frontends/qt2/Menubar_pimpl.C
View File

@ -47,16 +47,10 @@ extern LyXAction lyxaction;
Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe)
: owner_(static_cast<QtView*>(view)), menubackend_(mbe)
{
MenuBackend::const_iterator mb = menubackend_.begin();
MenuBackend::const_iterator mbend = menubackend_.end();
for (; mb != mbend; ++mb) {
if (mb->menubar() && mb->name() == "main") {
Menu::const_iterator m = mb->begin();
Menu::const_iterator end = mb->end();
for (; m != end; ++m) {
makeMenu(owner_->menuBar(), *m);
}
}
Menu::const_iterator m = mbe.getMenubar().begin();
Menu::const_iterator end = mbe.getMenubar().end();
for (; m != end; ++m) {
makeMenu(owner_->menuBar(), *m);
}
}

9
src/frontends/qt2/QtView.C
View File

@ -77,9 +77,6 @@ QtView::QtView(unsigned int width, unsigned int height)
addToolBar(commandbuffer_, Bottom, true);
// FIXME: move
// FIXME autosave_timeout_->timeout.connect(SigC::slot(this, &QtView::autoSave));
// assign an icon to main form
string const iconname = LibFileSearch("images", "lyx", "xpm");
@ -99,6 +96,8 @@ QtView::~QtView()
void QtView::message(string const & str)
{
statusBar()->message(str.c_str());
idle_timer_.stop();
idle_timer_.start(3000);
}
@ -110,13 +109,13 @@ void QtView::focus_command_widget()
void QtView::update_view_state_qt()
{
message(currentState(view()));
statusBar()->message(currentState(view()).c_str());
}
void QtView::update_view_state()
{
message(currentState(view()));
statusBar()->message(currentState(view()).c_str());
}

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2002-07-21 John Levon <moz@compsoc.man.ac.uk>
* XFormsView.C: move autosave timer to LyXView.C
2002-07-20 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* Menubar_pimpl.[Ch]: remove support for multiple menubars

3
src/frontends/xforms/XFormsView.C
View File

@ -160,9 +160,6 @@ void XFormsView::create_form_form_main(Dialogs & dia, int width, int height)
minibuffer_.reset(new XMiniBuffer(this, *controlcommand_,
air, height - (25 + air), width - (2 * air), 25));
// FIXME: why do this in xforms/ ?
autosave_timeout_->timeout.connect(boost::bind(&XFormsView::autoSave, this));
// assign an icon to main form
string iconname = LibFileSearch("images", "lyx", "xpm");
if (!iconname.empty()) {