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

Use combo box data rather than looking up info from InsetRef.

Browse Source 
(cherry picked from commit c4fdab6993)
This commit is contained in:
Richard Kimberly Heck 2019-01-06 17:45:08 -05:00
parent 982be56270
commit 90d56cbb4a
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt4/GuiRef.cpp
View File

@ -148,10 +148,10 @@ void GuiRef::enableView(bool enable)
void GuiRef::enableBoxes() void GuiRef::enableBoxes()
{ {
bool const isFormatted = QString const reftype =
(InsetRef::getName(typeCO->currentIndex()) == "formatted"); typeCO->itemData(typeCO->currentIndex()).toString();
bool const isLabelOnly = bool const isFormatted = (reftype == "formatted");
(InsetRef::getName(typeCO->currentIndex()) == "labelonly"); bool const isLabelOnly = (reftype == "labelonly");
bool const usingRefStyle = buffer().params().use_refstyle; bool const usingRefStyle = buffer().params().use_refstyle;
pluralCB->setEnabled(isFormatted && usingRefStyle); pluralCB->setEnabled(isFormatted && usingRefStyle);
capsCB->setEnabled(isFormatted && usingRefStyle); capsCB->setEnabled(isFormatted && usingRefStyle);

6
src/insets/InsetRef.cpp
View File

@ -492,12 +492,6 @@ int InsetRef::getType(string const & name)
} }
string const & InsetRef::getName(int type)
{
return types[type].latex_name;
}
docstring InsetRef::getTOCString() const docstring InsetRef::getTOCString() const
{ {
return tooltip_.empty() ? screenLabel() : tooltip_; return tooltip_.empty() ? screenLabel() : tooltip_;

2
src/insets/InsetRef.h
View File

@ -31,8 +31,6 @@ public:
static const type_info types[]; static const type_info types[];
/// ///
static int getType(std::string const & name); static int getType(std::string const & name);
///
static std::string const & getName(int type);
/// ///
InsetRef(Buffer * buffer, InsetCommandParams const &); InsetRef(Buffer * buffer, InsetCommandParams const &);