Restore fix for constant resetting of View>Source widget (bug #8411).

This commit is contained in:
Richard Heck 2012-11-09 21:04:10 -05:00
parent 759b7154c9
commit c920318f42
2 changed files with 11 additions and 4 deletions

View File

@ -197,6 +197,7 @@ void ViewSourceWidget::updateDefaultFormat()
outputFormatCO->addItem(qt_("Default"),
QVariant(QString("default")));
int index = 0;
vector<string> tmp = bv_->buffer().params().backends();
vector<string>::const_iterator it = tmp.begin();
vector<string>::const_iterator en = tmp.end();
@ -206,12 +207,15 @@ void ViewSourceWidget::updateDefaultFormat()
if (!fmt) {
LYXERR0("Can't find format for backend " << format << "!");
continue;
}
}
QString const pretty =
fmt ? qt_(fmt->prettyname()) : toqstr(format);
outputFormatCO->addItem(pretty, QVariant(toqstr(format)));
QString const pretty = qt_(fmt->prettyname());
QString const qformat = toqstr(format);
outputFormatCO->addItem(pretty, QVariant(qformat));
if (qformat == view_format_)
index = outputFormatCO->count() -1;
}
outputFormatCO->setCurrentIndex(index);
outputFormatCO->blockSignals(false);
}

View File

@ -58,6 +58,9 @@ What's new
* USER INTERFACE
- Fix regression in which clicking in the main work area always resets
the selected format in View>Source (bug #8411).
- When selecting text and Insert > Preview, immediately display the
preview (bug #8075).