From f0b51444440b5352c48463842a4c6e646f92cb18 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Fri, 5 Mar 2004 13:08:08 +0000 Subject: [PATCH] two small qbranch ui fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8477 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 6 ++++++ src/frontends/qt2/QBranch.C | 4 ++-- src/frontends/qt2/QDocumentDialog.C | 10 ++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 1f7458e033..0e182c3ec6 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,9 @@ +2004-03-05 Jürgen Spitzmüller + + * QDocumentDialog.C (branches): Don't deselect branch + after button press. + * QBranch.C: fix off-by-one-error. + 2004-02-21 Georg Baum * QPrefs.C, QPrefsDialog.C, ui/QPrefPathsModule.ui: remove diff --git a/src/frontends/qt2/QBranch.C b/src/frontends/qt2/QBranch.C index 6a5557514c..28fd7446b3 100644 --- a/src/frontends/qt2/QBranch.C +++ b/src/frontends/qt2/QBranch.C @@ -56,8 +56,8 @@ void QBranch::update_contents() const_iterator const begin = branchlist.begin(); const_iterator const end = branchlist.end(); - int id = 1; - int count = 1; + int id = 0; + int count = 0; for (const_iterator it = begin; it != end; ++it, ++count) { string const & branch = it->getBranch(); dialog_->branchCO->insertItem(toqstr(branch)); diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 0c1d173eb2..873371fa0c 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -420,6 +420,13 @@ void QDocumentDialog::updateNumbering() void QDocumentDialog::updateBranchView() { + // store the selected branch + QListViewItem * selItem = + branchesModule->branchesLV->selectedItem(); + QString sel_branch; + if (selItem != 0) + sel_branch = selItem->text(0); + branchesModule->branchesLV->clear(); BranchList::const_iterator it = form_->branchlist_.begin(); @@ -438,6 +445,9 @@ void QDocumentDialog::updateBranchView() coloritem.fill(itemcolor); newItem->setPixmap(2, coloritem); } + // restore selected branch + if (bname == sel_branch) + branchesModule->branchesLV->setSelected(newItem, true); } form_->changed(); } -- 2.39.2