anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 06:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #11748.

Browse Source 
Track the last chosen citation style when we clear the entries.

(cherry picked from commit 64f7da961a)
This commit is contained in:
Richard Kimberly Heck 2020-02-26 23:00:09 -05:00
parent 3fc90f6b6f
commit 7c0cbe68bc
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt4/GuiCitation.cpp
View File

@ -386,6 +386,8 @@ void GuiCitation::updateStyles(BiblioInfo const & bi)
int curr = selectedLV->model()->rowCount() - 1;
if (curr < 0 || selected_keys.empty()) {
last_chosen_style_ =
citationStyleCO->itemData(citationStyleCO->currentIndex()).toString();
citationStyleCO->clear();
citationStyleCO->setEnabled(false);
citationStyleLA->setEnabled(false);
@ -408,7 +410,10 @@ void GuiCitation::updateStyles(BiblioInfo const & bi)
// save old style selection
QString const curdata =
citationStyleCO->itemData(citationStyleCO->currentIndex()).toString();
QString const olddata = (curdata.isEmpty()) ? style_ : curdata;
QString const olddata = (curdata.isEmpty()) ?
(last_chosen_style_.isEmpty() ? style_ : last_chosen_style_): curdata;
// reset this
last_chosen_style_.clear();
citationStyleCO->clear();
BiblioInfo::CiteStringMap::const_iterator cit = sty.begin();
BiblioInfo::CiteStringMap::const_iterator end = sty.end();

2
src/frontends/qt4/GuiCitation.h
View File

@ -183,6 +183,8 @@ private:
/// last used citation style
QString style_;
/// this is the last style chosen in the current dialog
QString last_chosen_style_;
///
GuiSelectionManager * selectionManager;
/// available keys.

2
status.23x
View File

@ -27,6 +27,8 @@ What's new
* USER INTERFACE
- Keep citation style when all selected citations are deleted (bug 11748).
* DOCUMENTATION AND LOCALIZATION