GuiInfo: Show "Unknown" only if issued from an unknown info.

This commit is contained in:
Juergen Spitzmueller 2018-08-08 09:52:03 +02:00
parent 2896441dbb
commit 44718e0e8c

View File

@ -61,7 +61,6 @@ char const * info_types[] =
"icon", "icon",
"lyxrc", "lyxrc",
"lyxinfo", "lyxinfo",
"unknown",
"" ""
}; };
@ -83,7 +82,6 @@ char const * info_types_gui[] =
N_("LyX Toolbar Icon"),// icon N_("LyX Toolbar Icon"),// icon
N_("LyX Preferences Entry"),// lyxrc N_("LyX Preferences Entry"),// lyxrc
N_("LyX Application Information"),// lyxinfo N_("LyX Application Information"),// lyxinfo
N_("Unknown"),// unknown
"" ""
}; };
@ -245,7 +243,15 @@ void GuiInfo::paramsToDialog(Inset const * inset)
typeCO->blockSignals(true); typeCO->blockSignals(true);
nameLE->blockSignals(true); nameLE->blockSignals(true);
nameLE->clear(); nameLE->clear();
int const i = typeCO->findData(type); // The "unknown" item is only in the combo if we open
// the dialog from an unknown info. The user should not
// change a valid info to an unknown one.
int i = typeCO->findData("unknown");
if (i == -1 && type == "unknown")
typeCO->addItem(qt_("Unknown"), toqstr("unknown"));
if (i != -1 && type != "unknown")
typeCO->removeItem(i);
i = typeCO->findData(type);
typeCO->setCurrentIndex(i); typeCO->setCurrentIndex(i);
updateArguments(i); updateArguments(i);
int argindex = -1; int argindex = -1;