From fadf8ba12e34a09ac4d956025311a1d7c3b3b9ea Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Thu, 7 Feb 2008 16:46:19 +0000 Subject: [PATCH] * GuiLayoutBox: fix initial readonly disabled state and small cleanups. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22845 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiToolbar.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index f95a6a9cce..aa2bdc68e1 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -307,7 +307,6 @@ void GuiLayoutBox::updateContents(bool reset) return; } - setEnabled(true); TextClass const * text_class = &buffer->params().getTextClass(); if (!reset && text_class_ == text_class) { set(owner_.view()->cursor().innerParagraph().layout()->name()); @@ -316,23 +315,20 @@ void GuiLayoutBox::updateContents(bool reset) text_class_ = text_class; - setUpdatesEnabled(false); clear(); - TextClass::const_iterator it = text_class_->begin(); TextClass::const_iterator const end = text_class_->end(); for (; it != end; ++it) addItemSort(toqstr(translateIfPossible((*it)->name())), lyxrc.sort_layouts); - setCurrentIndex(0); + set(owner_.view()->cursor().innerParagraph().layout()->name()); // needed to recalculate size hint hide(); setMinimumWidth(sizeHint().width()); - set(owner_.view()->cursor().innerParagraph().layout()->name()); - show(); - setUpdatesEnabled(true); + setEnabled(!buffer->isReadonly()); + show(); }