This tidies up some more LColor stuff. It doesn't address
Lior's and Angus' desire for a better LColor classification
system however.
thanks
john
--
"Faced with the prospect of rereading this book, I would rather have
my brains ripped out by a plastic fork."
- Charles Cooper on "Business at the Speed of Thought"
Index: BufferView_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.112
diff -u -r1.112 BufferView_pimpl.C
--- BufferView_pimpl.C 2001/06/01 15:10:25 1.112
+++ BufferView_pimpl.C 2001/06/01 23:32:05
@@ -2788,7 +2788,7 @@
new_inset->setOwner(bv_->theLockingInset());
new_inset->SetAutoBreakRows(true);
new_inset->SetDrawFrame(0, InsetText::LOCKED);
- new_inset->SetFrameColor(0, LColor::footnoteframe);
+ new_inset->SetFrameColor(0, LColor::captionframe);
if (bv_->insertInset(new_inset))
new_inset->Edit(bv_, 0, 0, 0);
else
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.182
diff -u -r1.182 ChangeLog
--- ChangeLog 2001/06/01 15:10:25 1.182
+++ ChangeLog 2001/06/01 23:32:10
@@ -1,3 +1,9 @@
+2001-06-02 John Levon <[EMAIL PROTECTED]>
+
+ * Bufferview_pimpl.C:
+ * LColor.h:
+ * LColor.C: further lcolor tidies
+
2001-06-01 Juergen Vigna <[EMAIL PROTECTED]>
* lyxfunc.C (Dispatch): LFUN_PREFIX don't call the update if we're
Index: LColor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LColor.C,v
retrieving revision 1.22
diff -u -r1.22 LColor.C
--- LColor.C 2001/05/30 13:53:25 1.22
+++ LColor.C 2001/06/01 23:32:12
@@ -62,7 +62,7 @@
{ background, N_("background"), "background", "linen", "background" },
{ foreground, N_("text"), "foreground", "black", "foreground" },
{ selection, N_("selection"), "selection", "LightBlue", "selection" },
- { latex, N_("latex"), "latex", "DarkRed", "latex" },
+ { latex, N_("latex text"), "latex", "DarkRed", "latex" },
{ note, N_("note"), "note", "black", "note" },
{ notebg, N_("note background"), "notebg", "yellow", "notebg" },
{ noteframe, N_("note frame"), "noteframe", "black", "noteframe" },
@@ -77,9 +77,9 @@
{ mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" },
{ mathcursor, N_("math cursor"), "mathcursor", "black", "mathcursor" },
{ mathline, N_("math line"), "mathline", "Blue", "mathline" },
- { footnote, N_("footnote"), "footnote", "DarkRed", "footnote" },
- { footnoteframe, N_("footnote frame"), "footnoteframe", "IndianRed",
"footnoteframe" },
- { ert, N_("latex inset"), "ert", "DarkRed", "ert" },
+ { captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe"
+},
+ { collapsable, N_("collapsable inset text"), "collapsable", "DarkRed",
+"collapsable" },
+ { collapsableframe, N_("collapsable inset frame"), "collapsableframe",
+"IndianRed", "collapsableframe" },
{ insetbg, N_("inset background"), "insetbg", "grey60", "insetbg" },
{ insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
{ error, N_("LaTeX error"), "error", "Red", "error" },
Index: LColor.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LColor.h,v
retrieving revision 1.16
diff -u -r1.16 LColor.h
--- LColor.h 2001/05/30 13:53:25 1.16
+++ LColor.h 2001/06/01 23:32:12
@@ -113,16 +113,14 @@
/// Math line color
mathline,
- /// Footnote marker text
- // FIXME: this is seemingly mis-used all over the place
- footnote,
- /// Footnote line color
- footnoteframe,
+ /// caption frame color
+ captionframe,
+
+ /// collapsable insets text
+ collapsable,
+ /// collapsable insets frame
+ collapsableframe,
- /// ERT marker text
- // FIXME: is there any reason this is different from latex ?
- ert,
-
/// Inset marker background color
insetbg,
/// Inset marker frame color
Index: insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.91
diff -u -r1.91 ChangeLog
--- insets/ChangeLog 2001/06/01 15:27:04 1.91
+++ insets/ChangeLog 2001/06/01 23:32:55
@@ -1,3 +1,14 @@
+2001-06-02 John Levon <[EMAIL PROTECTED]>
+
+ * insettheorem.C:
+ * insetminipage.C:
+ * insetlist.C:
+ * insetfootlike.C:
+ * insetfloat.C:
+ * insetert.C:
+ * insetcollapsable.C:
+ * insetcaption.C: LColor tidy
+
2001-06-01 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* figinset.C: fix typo
@@ -63,7 +74,7 @@
2001-05-16 Ruurd Reitsma <[EMAIL PROTECTED]>
- * figinset.C
+ * figinset.C:
* insetbib.C: fix path for OS/2 & Win32
2001-05-10 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
Index: insets/insetcaption.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcaption.C,v
retrieving revision 1.6
diff -u -r1.6 insetcaption.C
--- insets/insetcaption.C 2001/04/17 00:19:48 1.6
+++ insets/insetcaption.C 2001/06/01 23:32:55
@@ -31,7 +31,7 @@
{
SetAutoBreakRows(true);
SetDrawFrame(0, InsetText::LOCKED);
- SetFrameColor(0, LColor::footnoteframe);
+ SetFrameColor(0, LColor::captionframe);
}
Index: insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.59
diff -u -r1.59 insetcollapsable.C
--- insets/insetcollapsable.C 2001/05/28 15:11:24 1.59
+++ insets/insetcollapsable.C 2001/06/01 23:32:58
@@ -41,7 +41,7 @@
autocollapse = true;
inset.SetAutoBreakRows(true);
inset.SetDrawFrame(0, InsetText::ALWAYS);
- inset.SetFrameColor(0, LColor::footnoteframe);
+ inset.SetFrameColor(0, LColor::collapsableframe);
button_length = button_top_y = button_bottom_y = 0;
setInsetName("Collapsable");
widthCollapsed = oldWidth = 0;
@@ -481,11 +481,13 @@
return inset.getLabelList();
}
+
bool InsetCollapsable::nodraw() const
{
return inset.nodraw();
}
+
int InsetCollapsable::scroll(bool recursive) const
{
int sx = UpdatableInset::scroll(false);
Index: insets/insetert.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetert.C,v
retrieving revision 1.23
diff -u -r1.23 insetert.C
--- insets/insetert.C 2001/05/28 15:11:24 1.23
+++ insets/insetert.C 2001/06/01 23:32:58
@@ -31,7 +31,7 @@
labelfont = LyXFont(LyXFont::ALL_SANE);
labelfont.decSize();
labelfont.decSize();
- labelfont.setColor(LColor::ert);
+ labelfont.setColor(LColor::latex);
setAutoCollapse(false);
setInsetName("ERT");
}
Index: insets/insetfloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfloat.C,v
retrieving revision 1.20
diff -u -r1.20 insetfloat.C
--- insets/insetfloat.C 2001/05/31 16:48:26 1.20
+++ insets/insetfloat.C 2001/06/01 23:32:58
@@ -104,7 +104,7 @@
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
- font.setColor(LColor::footnote);
+ font.setColor(LColor::collapsable);
setLabelFont(font);
setAutoCollapse(false);
floatType_ = type;
Index: insets/insetfootlike.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetfootlike.C,v
retrieving revision 1.5
diff -u -r1.5 insetfootlike.C
--- insets/insetfootlike.C 2001/05/30 13:53:39 1.5
+++ insets/insetfootlike.C 2001/06/01 23:32:58
@@ -27,7 +27,7 @@
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
- font.setColor(LColor::footnote);
+ font.setColor(LColor::collapsable);
setLabelFont(font);
setAutoCollapse(false);
}
Index: insets/insetlist.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetlist.C,v
retrieving revision 1.7
diff -u -r1.7 insetlist.C
--- insets/insetlist.C 2001/03/30 14:28:17 1.7
+++ insets/insetlist.C 2001/06/01 23:32:58
@@ -43,7 +43,7 @@
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
- font.setColor(LColor::footnote);
+ font.setColor(LColor::collapsable);
setLabelFont(font);
setAutoCollapse(false);
setInsetName("List");
Index: insets/insetminipage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetminipage.C,v
retrieving revision 1.20
diff -u -r1.20 insetminipage.C
--- insets/insetminipage.C 2001/05/28 15:11:24 1.20
+++ insets/insetminipage.C 2001/06/01 23:32:58
@@ -66,7 +66,7 @@
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
- font.setColor(LColor::footnote);
+ font.setColor(LColor::collapsable);
setLabelFont(font);
setAutoCollapse(false);
setInsetName("Minipage");
Index: insets/insettheorem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettheorem.C,v
retrieving revision 1.5
diff -u -r1.5 insettheorem.C
--- insets/insettheorem.C 2001/03/30 14:28:17 1.5
+++ insets/insettheorem.C 2001/06/01 23:33:02
@@ -40,7 +40,7 @@
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
- font.setColor(LColor::footnote);
+ font.setColor(LColor::collapsable);
setLabelFont(font);
setAutoCollapse(false);
setInsetName("Theorem");
