anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 10:47:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show branches from master document in branch inset dialog

Browse Source
This commit is contained in:
Yuriy Skalko 2022-10-07 18:56:33 +03:00
parent 8508c3fe04
commit 8f43f83ddf
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/frontends/qt/GuiBranch.cpp
View File

@ -22,9 +22,13 @@
#include "insets/InsetBranch.h" #include "insets/InsetBranch.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include <QPushButton> #include <QPushButton>
using namespace std; using namespace std;
using namespace lyx::support;
namespace lyx { namespace lyx {
namespace frontend { namespace frontend {
@ -40,20 +44,36 @@ GuiBranch::GuiBranch(QWidget * parent) : InsetParamsWidget(parent)
void GuiBranch::paramsToDialog(Inset const * inset) void GuiBranch::paramsToDialog(Inset const * inset)
{ {
InsetBranch const * ib = static_cast<InsetBranch const *>(inset); InsetBranch const * ib = static_cast<InsetBranch const *>(inset);
typedef BranchList::const_iterator const_iterator; Buffer const & buf = ib->buffer();
BranchList const & branchlist = ib->buffer().params().branchlist(); BranchList const & branchlist = buf.params().branchlist();
docstring const cur_branch = ib->branch(); docstring const cur_branch = ib->branch();
branchCO->clear(); branchCO->clear();
const_iterator const begin = branchlist.begin();
const_iterator const end = branchlist.end();
int id = 0; int id = 0;
int count = 0; int count = 0;
for (const_iterator it = begin; it != end; ++it, ++count) { for (Branch const & it : branchlist) {
docstring const & branch = it->branch(); docstring const & branch = it.branch();
branchCO->addItem(toqstr(branch)); branchCO->addItem(toqstr(branch), toqstr(branch));
if (cur_branch == branch) if (cur_branch == branch)
id = count; id = count;
++count;
}
// Add branches from master
Buffer const * masterBuf = buf.masterBuffer();
if (masterBuf != &buf) {
BranchList const & masterBranchlist = masterBuf->params().branchlist();
for (Branch const & it : masterBranchlist) {
docstring const & branch = it.branch();
if (!branchlist.find(branch)) {
branchCO->addItem(
toqstr(bformat(_("%1$s[[branch]] (%2$s)[[master]]"),
branch, _("master"))),
toqstr(branch));
if (cur_branch == branch)
id = count;
++count;
}
}
} }
branchCO->setCurrentIndex(id); branchCO->setCurrentIndex(id);
invertedCB->setChecked(ib->params().inverted); invertedCB->setChecked(ib->params().inverted);
@ -62,7 +82,8 @@ void GuiBranch::paramsToDialog(Inset const * inset)
docstring GuiBranch::dialogToParams() const docstring GuiBranch::dialogToParams() const
{ {
InsetBranchParams params(qstring_to_ucs4(branchCO->currentText()), invertedCB->isChecked()); docstring branch = qstring_to_ucs4(branchCO->itemData(branchCO->currentIndex()).toString());
InsetBranchParams params(branch, invertedCB->isChecked());
return from_utf8(InsetBranch::params2string(params)); return from_utf8(InsetBranch::params2string(params));
} }