Make listings dialog translatable (mostly strings from InsetListingsParams), fix...

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index b953d790e30ab4e0204712c5c63763971a0547df..91c9a5fab7632ec9f65b7ffc20ad1ba31e48a802 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -14,9 +14,9 @@
 #include "insets/Inset.h"
 
 #include "BufferView.h"
+#include "Color.h"
 #include "Dimension.h"
 #include "gettext.h"
-#include "LColor.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "MetricsInfo.h"
@@ -28,7 +28,7 @@
 #include "graphics/PreviewLoader.h"
 #include "graphics/Previews.h"
 
-#include "support/filename.h"
+#include "support/FileName.h"
 #include "support/lstrings.h"
 
 #include <boost/bind.hpp>
@@ -48,13 +48,13 @@ LyXRC_PreviewStatus RenderPreview::status()
 }
 
 
-RenderPreview::RenderPreview(InsetBase const * inset)
+RenderPreview::RenderPreview(Inset const * inset)
        : parent_(inset)
 {}
 
 
 RenderPreview::RenderPreview(RenderPreview const & other,
-                            InsetBase const * inset)
+                            Inset const * inset)
        : RenderBase(other),
          boost::signals::trackable(),
          snippet_(other.snippet_),
@@ -62,7 +62,7 @@ RenderPreview::RenderPreview(RenderPreview const & other,
 {}
 
 
-auto_ptr<RenderBase> RenderPreview::clone(InsetBase const * inset) const
+auto_ptr<RenderBase> RenderPreview::clone(Inset const * inset) const
 {
        return auto_ptr<RenderBase>(new RenderPreview(*this, inset));
 }
@@ -128,9 +128,9 @@ bool RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.asc = 50;
                dim.des = 0;
 
-               LyXFont font(mi.base.font);
-               font.setFamily(LyXFont::SANS_FAMILY);
-               font.setSize(LyXFont::SIZE_FOOTNOTE);
+               Font font(mi.base.font);
+               font.setFamily(Font::SANS_FAMILY);
+               font.setSize(Font::SIZE_FOOTNOTE);
                docstring const stat = statusMessage(mi.base.bv, snippet_);
                dim.wid = 15 + theFontMetrics(font).width(stat);
        }
@@ -154,17 +154,17 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
                              *image);
 
        } else {
-               int const offset = InsetOld::TEXT_TO_INSET_OFFSET;
+               int const offset = Inset::TEXT_TO_INSET_OFFSET;
 
                pi.pain.rectangle(x + offset,
                                  y - dim_.asc,
                                  dim_.wid - 2 * offset,
                                  dim_.asc + dim_.des,
-                                 LColor::foreground);
+                                 Color::foreground);
 
-               LyXFont font(pi.base.font);
-               font.setFamily(LyXFont::SANS_FAMILY);
-               font.setSize(LyXFont::SIZE_FOOTNOTE);
+               Font font(pi.base.font);
+               font.setFamily(Font::SANS_FAMILY);
+               font.setSize(Font::SIZE_FOOTNOTE);
 
                docstring const stat = statusMessage(pi.base.bv, snippet_);
                pi.pain.text(x + offset + 6,
@@ -241,7 +241,7 @@ void RenderPreview::imageReady(graphics::PreviewImage const & pimage)
 }
 
 
-RenderMonitoredPreview::RenderMonitoredPreview(InsetBase const * inset)
+RenderMonitoredPreview::RenderMonitoredPreview(Inset const * inset)
        : RenderPreview(inset),
          monitor_(FileName(), 2000)
 {}