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

Fix bug #5600: View source panel isn't updating after restart.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37096 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2011-01-04 00:00:20 +00:00
parent 0faafa47bf
commit cc00b9aaca
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontends/qt4/GuiViewSource.cpp
View File

@ -43,12 +43,13 @@ namespace frontend {
ViewSourceWidget::ViewSourceWidget() ViewSourceWidget::ViewSourceWidget()
: bv_(0), document_(new QTextDocument(this)), : bv_(0), document_(new QTextDocument(this)),
highlighter_(new LaTeXHighlighter(document_)) highlighter_(new LaTeXHighlighter(document_)),
force_getcontent_(true)
{ {
setupUi(this); setupUi(this);
connect(viewFullSourceCB, SIGNAL(clicked()), connect(viewFullSourceCB, SIGNAL(clicked()),
this, SLOT(updateView())); this, SLOT(fullSourceChanged()));
connect(autoUpdateCB, SIGNAL(toggled(bool)), connect(autoUpdateCB, SIGNAL(toggled(bool)),
updatePB, SLOT(setDisabled(bool))); updatePB, SLOT(setDisabled(bool)));
connect(autoUpdateCB, SIGNAL(toggled(bool)), connect(autoUpdateCB, SIGNAL(toggled(bool)),
@ -89,7 +90,7 @@ static size_t crcCheck(docstring const & s)
\return true if the content has changed since last call. \return true if the content has changed since last call.
*/ */
static bool getContent(BufferView const * view, bool fullSource, static bool getContent(BufferView const * view, bool fullSource,
QString & qstr, string const format) QString & qstr, string const format, bool force_getcontent)
{ {
// get the *top* level paragraphs that contain the cursor, // get the *top* level paragraphs that contain the cursor,
// or the selected text // or the selected text
@ -110,7 +111,7 @@ static bool getContent(BufferView const * view, bool fullSource,
docstring s = ostr.str(); docstring s = ostr.str();
static size_t crc = 0; static size_t crc = 0;
size_t newcrc = crcCheck(s); size_t newcrc = crcCheck(s);
if (newcrc == crc) if (newcrc == crc && !force_getcontent)
return false; return false;
crc = newcrc; crc = newcrc;
qstr = toqstr(s); qstr = toqstr(s);
@ -120,11 +121,20 @@ static bool getContent(BufferView const * view, bool fullSource,
void ViewSourceWidget::setBufferView(BufferView const * bv) void ViewSourceWidget::setBufferView(BufferView const * bv)
{ {
if (bv_ != bv)
force_getcontent_ = true;
bv_ = bv; bv_ = bv;
setEnabled(bv ? true : false); setEnabled(bv ? true : false);
} }
void ViewSourceWidget::fullSourceChanged()
{
if (autoUpdateCB->isChecked())
updateView();
}
void ViewSourceWidget::updateView() void ViewSourceWidget::updateView()
{ {
if (!bv_) { if (!bv_) {
@ -139,7 +149,8 @@ void ViewSourceWidget::updateView()
outputFormatCO->currentIndex()).toString()); outputFormatCO->currentIndex()).toString());
QString content; QString content;
if (getContent(bv_, viewFullSourceCB->isChecked(), content, format)) if (getContent(bv_, viewFullSourceCB->isChecked(), content,
format, force_getcontent_))
document_->setPlainText(content); document_->setPlainText(content);
CursorSlice beg = bv_->cursor().selectionBegin().bottom(); CursorSlice beg = bv_->cursor().selectionBegin().bottom();

4
src/frontends/qt4/GuiViewSource.h
View File

@ -46,6 +46,8 @@ public Q_SLOTS:
void updateView(); void updateView();
/// ///
void updateDefaultFormat(); void updateDefaultFormat();
///
void fullSourceChanged();
private: private:
/// ///
@ -54,6 +56,8 @@ private:
QTextDocument * document_; QTextDocument * document_;
/// LaTeX syntax highlighter /// LaTeX syntax highlighter
LaTeXHighlighter * highlighter_; LaTeXHighlighter * highlighter_;
///
bool force_getcontent_;
}; };