s = _("Undef: ") + s;
}
}
s = _("Undef: ") + s;
}
}
- if (decoration() == Deco_Classic)
+ if (decoration() == InsetLayout::Classic)
setLabel(isOpen() ? s : getNewLabel(s) );
else
setLabel(params_.branch + ": " + getNewLabel(s));
setLabel(isOpen() ? s : getNewLabel(s) );
else
setLabel(params_.branch + ": " + getNewLabel(s));
InsetCollapsable::Geometry InsetCollapsable::geometry() const
{
switch (decoration()) {
InsetCollapsable::Geometry InsetCollapsable::geometry() const
{
switch (decoration()) {
+ case InsetLayout::Classic:
if (status() == Open) {
if (openinlined_)
return LeftButton;
if (status() == Open) {
if (openinlined_)
return LeftButton;
} else
return ButtonOnly;
} else
return ButtonOnly;
- case Deco_Minimalistic:
+ case InsetLayout::Minimalistic:
return status() == Open ? NoButton : ButtonOnly ;
return status() == Open ? NoButton : ButtonOnly ;
- case Deco_Conglomerate:
+ case InsetLayout::Conglomerate:
return status() == Open ? SubLabel : Corners ;
return status() == Open ? SubLabel : Corners ;
+ case InsetLayout::Default:
break; // this shouldn't happen
}
break; // this shouldn't happen
}
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3) {
// There is no button to right click:
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3) {
// There is no button to right click:
- if (decoration() == Deco_Minimalistic ||
+ if (decoration() == InsetLayout::Minimalistic ||
geometry() == Corners ||
geometry() == SubLabel ||
geometry() == NoButton
geometry() == Corners ||
geometry() == SubLabel ||
geometry() == NoButton
-InsetDecoration InsetCollapsable::decoration() const
+InsetLayout::InsetDecoration InsetCollapsable::decoration() const
- return Deco_Classic;
- InsetDecoration const dec = layout_->decoration();
+ return InsetLayout::Classic;
+ InsetLayout::InsetDecoration const dec = layout_->decoration();
- case Deco_Classic:
- case Deco_Minimalistic:
- case Deco_Conglomerate:
+ case InsetLayout::Classic:
+ case InsetLayout::Minimalistic:
+ case InsetLayout::Conglomerate:
+ case InsetLayout::Default:
break;
}
if (lyxCode() == FLEX_CODE)
// FIXME: Is this really necessary?
break;
}
if (lyxCode() == FLEX_CODE)
// FIXME: Is this really necessary?
- return Deco_Conglomerate;
- return Deco_Classic;
+ return InsetLayout::Conglomerate;
+ return InsetLayout::Classic;
- virtual InsetDecoration decoration() const;
+ virtual InsetLayout::InsetDecoration decoration() const;
///
enum Geometry {
TopButton,
///
enum Geometry {
TopButton,
void InsetERT::setButtonLabel()
{
void InsetERT::setButtonLabel()
{
- if (decoration() == Deco_Classic)
+ if (decoration() == InsetLayout::Classic)
setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
else
setLabel(getNewLabel(_("ERT")));
setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
else
setLabel(getNewLabel(_("ERT")));
- InsetDecoration translateDecoration(std::string const & str)
+ InsetLayout::InsetDecoration translateDecoration(std::string const & str)
+ return InsetLayout::Classic;
if (str == "minimalistic")
if (str == "minimalistic")
- return Deco_Minimalistic;
+ return InsetLayout::Minimalistic;
if (str == "conglomerate")
if (str == "conglomerate")
- return Deco_Conglomerate;
- return Deco_Default;
+ return InsetLayout::Conglomerate;
+ return InsetLayout::Default;
-///
-enum InsetDecoration {
- Deco_Classic,
- Deco_Minimalistic,
- Deco_Conglomerate,
- Deco_Default
-};
-
///
class InsetLayout {
public:
///
InsetLayout();
///
///
class InsetLayout {
public:
///
InsetLayout();
///
+ enum InsetDecoration {
+ Classic,
+ Minimalistic,
+ Conglomerate,
+ Default
+ };
+ ///
bool read(Lexer & lexrc);
///
docstring name() const { return name_; };
bool read(Lexer & lexrc);
///
docstring name() const { return name_; };
void InsetListings::setButtonLabel()
{
// FIXME UNICODE
void InsetListings::setButtonLabel()
{
// FIXME UNICODE
- if (decoration() == Deco_Classic)
+ if (decoration() == InsetLayout::Classic)
setLabel(isOpen() ? _("Listing") : getNewLabel(_("Listing")));
else
setLabel(getNewLabel(_("Listing")));
setLabel(isOpen() ? _("Listing") : getNewLabel(_("Listing")));
else
setLabel(getNewLabel(_("Listing")));