s = _("Undef: ") + s;
}
}
- if (decoration() == Classic)
+ if (decoration() == Deco_Classic)
setLabel(isOpen() ? s : getNewLabel(s) );
else
setLabel(params_.branch + ": " + getNewLabel(s));
InsetCollapsable::Geometry InsetCollapsable::geometry() const
{
switch (decoration()) {
- case Classic:
+ case Deco_Classic:
if (status() == Open) {
if (openinlined_)
return LeftButton;
} else
return ButtonOnly;
- case Minimalistic:
+ case Deco_Minimalistic:
return status() == Open ? NoButton : ButtonOnly ;
- case Conglomerate:
+ case Deco_Conglomerate:
return status() == Open ? SubLabel : Corners ;
+
+ case Deco_Default:
+ break; // this shouldn't happen
}
// dummy return value to shut down a warning,
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3) {
// There is no button to right click:
- if (decoration() == Minimalistic ||
+ if (decoration() == Deco_Minimalistic ||
geometry() == Corners ||
geometry() == SubLabel ||
geometry() == NoButton
}
-InsetCollapsable::Decoration InsetCollapsable::decoration() const
+InsetDecoration InsetCollapsable::decoration() const
{
- if (!layout_ || layout_->decoration() == "classic")
- return Classic;
- if (layout_->decoration() == "minimalistic")
- return Minimalistic;
- if (layout_->decoration() == "conglomerate")
- return Conglomerate;
+ if (!layout_)
+ return Deco_Classic;
+ InsetDecoration const dec = layout_->decoration();
+ switch (dec) {
+ case Deco_Classic:
+ case Deco_Minimalistic:
+ case Deco_Conglomerate:
+ return dec;
+ case Deco_Default:
+ break;
+ }
if (lyxCode() == FLEX_CODE)
// FIXME: Is this really necessary?
- return Conglomerate;
- return Classic;
+ return Deco_Conglomerate;
+ return Deco_Classic;
}
* x) toggled by autoOpen_
*/
- ///
- enum Decoration {
- Classic,
- Minimalistic,
- Conglomerate
- };
/// Default looks
- virtual Decoration decoration() const;
+ virtual InsetDecoration decoration() const;
///
enum Geometry {
TopButton,
void InsetERT::setButtonLabel()
{
- if (decoration() == Classic)
+ if (decoration() == Deco_Classic)
setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
else
setLabel(getNewLabel(_("ERT")));
};
+namespace {
+ InsetDecoration translateDecoration(std::string const & str)
+ {
+ if (str == "classic")
+ return Deco_Classic;
+ if (str == "minimalistic")
+ return Deco_Minimalistic;
+ if (str == "conglomerate")
+ return Deco_Conglomerate;
+ return Deco_Default;
+ }
+}
+
+
bool InsetLayout::read(Lexer & lexrc)
{
name_ = support::subst(lexrc.getDocString(), '_', ' ');
break;
case IL_DECORATION:
lexrc.next();
- decoration_ = lexrc.getString();
+ decoration_ = translateDecoration(lexrc.getString());
break;
case IL_LATEXNAME:
lexrc.next();
namespace lyx {
class Lexer;
-
+
+///
+enum InsetDecoration {
+ Deco_Classic,
+ Deco_Minimalistic,
+ Deco_Conglomerate,
+ Deco_Default
+};
+
///
class InsetLayout {
public:
///
docstring labelstring() const { return labelstring_; };
///
- //FIXME This could be an enum
- std::string decoration() const { return decoration_; };
+ InsetDecoration decoration() const { return decoration_; };
///
std::string latextype() const { return latextype_; };
///
///
docstring labelstring_;
///
- std::string decoration_;
+ InsetDecoration decoration_;
///
std::string latextype_;
///
void InsetListings::setButtonLabel()
{
// FIXME UNICODE
- if (decoration() == Classic)
+ if (decoration() == Deco_Classic)
setLabel(isOpen() ? _("Listing") : getNewLabel(_("Listing")));
else
setLabel(getNewLabel(_("Listing")));