+2003-07-04 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * introduce namespace lyx::graphics
2003-07-02 André Pönitz <poenitz@gmx.net>
using lyx::pos_type;
using lyx::textclass_type;
+namespace grfx = lyx::graphics;
+
// all these externs should eventually be removed.
extern BufferList bufferlist;
+2003-07-04 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * introduce namespace lyx::graphics
2003-06-27 André Pönitz <poenitz@gmx.net>
2003-06-06 Alfredo Braunstein <abraunst@libero.it>
* Dialogs.[Ch] (visible): added.
-
+
2003-06-03 John Levon <levon@movementarian.org>
* lyx_gui.h: add sync_events()
class LyXFont;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Image;
}
+}
+
/**
* Painter - A painter class to encapsulate all graphics parameters and operations
/// draw an image from the image cache
virtual Painter & image(int x, int y,
int w, int h,
- grfx::Image const & image) = 0;
+ lyx::graphics::Image const & image) = 0;
/// draw a string at position x, y (y is the baseline)
virtual Painter & text(int x, int y,
+2003-07-04 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * introduce namespace lyx::graphics
+
2003-07-03 John Levon <levon@movementarian.org>
* ui/QTexinfoDialog.ui: enable View properly
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
typedef QController<ControlExternal, QView<QExternalDialog> > base_class;
using std::find_if;
using std::endl;
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// Access to this class is through this static method.
Image::ImagePtr QLImage::newImage()
xformed_pixmap_ = xformed_pixmap_.xForm(m);
}
-} // namespace grfx
+} // namespace graphics
+} // lyx
#include <qpixmap.h>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class QLImage : public Image {
public:
QPixmap xformed_pixmap_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // QLIMAGE_H
using std::endl;
+namespace grfx = lyx::graphics;
QLPainter::QLPainter(QWorkArea & qwa)
: Painter(), owner_(qwa), paint_check_(0)
/// draw an image from the image cache
virtual Painter & image(int x, int y,
int w, int h,
- grfx::Image const & image);
+ lyx::graphics::Image const & image);
/// draw a string at position x, y (y is the baseline)
virtual Painter & text(int x, int y,
using std::setw;
using std::endl;
+namespace grfx = lyx::graphics;
+
typedef Qt2CB<ControlPrefs, Qt2DB<QPrefsDialog> > base_class;
{
static LQApplication a(argc, argv);
- using namespace grfx;
+ using namespace lyx::graphics;
Image::newImage = boost::bind(&QLImage::newImage);
Image::loadableFormats = boost::bind(&QLImage::loadableFormats);
using std::max;
using std::endl;
+namespace grfx = lyx::graphics;
+
namespace {
class SplashScreen : boost::noncopyable, boost::signals::trackable {
+2003-07-04 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * introduce namespace lyx::graphics
+
2003-07-01 Lars Gullik Bjønnes <larsbj@gullik.net>
* introcude namespace lyx::support
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
typedef FormController<ControlExternal, FormView<FD_external> > base_class;
FormExternal::FormExternal(Dialog & parent)
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
namespace {
// These should probably go inside the class definition...
using std::endl;
using std::max;
+namespace grfx = lyx::graphics;
XPainter::XPainter(XWorkArea & xwa)
: Painter(), owner_(xwa)
/// draw an image from the image cache
virtual Painter & image(int x, int y,
int w, int h,
- grfx::Image const & image);
+ lyx::graphics::Image const & image);
/// draw a string at position x, y (y is the baseline)
virtual Painter & text(int x, int y,
lyxColorHandler.reset(new LyXColorHandler());
- using namespace grfx;
+ using namespace lyx::graphics;
// connect the image loader based on the xforms library
Image::newImage = boost::bind(&xformsImage::newImage);
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// Access to this class is through this static method.
Image::ImagePtr xformsImage::newImage()
finishedLoading(false);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
namespace {
+namespace grfx = lyx::graphics;
+
extern "C" {
int status_report(FL_IMAGE * ob, const char *s)
struct flimage_;
typedef flimage_ FL_IMAGE;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class xformsImage : public Image
{
PixmapStatus pixmap_status_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // XFORMSIMAGE_H
+2003-07-04 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * Change namespace grfx to lyx::graphics.
+
2003-07-01 Lars Gullik Bjønnes <larsbj@gullik.net>
* introcude namespace lyx::support
using namespace lyx::support;
-namespace grfx {
+namespace lyx {
+namespace graphics {
/** The cache contains one item per file, so use a map to find the
* cache item quickly by filename.
return it->second;
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#include <boost/shared_ptr.hpp>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class CacheItem;
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSCACHE_H
using std::endl;
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct CacheItem::Impl : public boost::signals::trackable {
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
namespace {
+namespace grfx = lyx::graphics;
+
string const findTargetFormat(string const & from)
{
typedef grfx::Image::FormatList FormatList;
} // anon namespace
-namespace grfx {
+namespace lyx {
+namespace graphics {
void CacheItem::Impl::convertToDisplayFormat()
{
converter_->startConversion();
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
class InsetGraphics;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Image;
class Converter;
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSCACHEITEM_H
using std::endl;
using std::ostream;
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct Converter::Impl : public boost::signals::trackable {
///
return pimpl_->finished_ ? pimpl_->to_file_ : empty;
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
+
//------------------------------
// Implementation details follow
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
Converter::Impl::Impl(string const & from_file, string const & to_file_base,
string const & from_format, string const & to_format)
}
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
namespace {
#include <boost/scoped_ptr.hpp>
#include <boost/utility.hpp>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Converter : boost::noncopyable {
public:
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSCONVERTER_H
using std::endl;
using std::abs;
-namespace grfx {
+namespace lyx {
+namespace graphics {
// This is to be connected to a function that will return a new
// instance of a viable derived class.
return std::make_pair(width, height);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#include <vector>
#include <utility>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Params;
getScaledDimensions(Params const & params) const;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSIMAGE_H
#include <list>
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct Loader::Impl : boost::signals::trackable {
///
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
class Inset;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Image;
class Params;
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSLOADER_H
using std::abs;
-namespace grfx {
+namespace lyx {
+namespace graphics {
Params::Params()
: display(ColorDisplay),
return !(a == b);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#include "LString.h"
-namespace grfx {
+namespace lyx {
+namespace graphics {
/** Parse a string of the form "200pt 500pt 300mm 5in" into a
* usable bounding box.
bool operator==(Params const &, Params const &);
bool operator!=(Params const &, Params const &);
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSPARAMS_H
#include "graphics/GraphicsTypes.h"
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// The translator between the Display enum and corresponding lyx string.
Translator<DisplayType, string> displayTranslator(DefaultDisplay, "default");
}
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#include "LString.h"
#include "support/translator.h"
-namespace grfx {
+namespace lyx {
+namespace graphics {
/// The status of the loading process
enum ImageStatus {
///
void setDisplayTranslator();
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // GRAPHICSTYPES_H
using std::endl;
using std::list;
-
-namespace grfx {
+namespace lyx {
+namespace graphics {
int LoaderQueue::s_numimages_ = 5;
int LoaderQueue::s_millisecs_ = 500;
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#include <set>
#include <queue>
-namespace grfx {
+namespace lyx {
+namespace graphics {
class LoaderQueue {
public:
void stopLoader();
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // LOADERQUEUE_H
using namespace lyx::support;
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct PreviewImage::Impl : public boost::signals::trackable {
///
}
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
class Inset;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewLoader;
class Image;
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWIMAGE_H
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
struct PreviewLoader::Impl : public boost::signals::trackable {
///
return pimpl_->buffer();
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
// The details of the Impl
} // namespace anon
-namespace grfx {
+namespace lyx {
+namespace graphics {
PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
: parent_(p), buffer_(b), font_scaling_factor_(0.0)
}
}
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx
namespace {
class Buffer;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewImage;
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWLOADER_H
using namespace lyx::support;
-namespace grfx {
+namespace lyx {
+namespace graphics {
bool PreviewedInset::activated()
{
!view() || !view()->buffer())
return;
- grfx::Previews & previews = grfx::Previews::get();
- grfx::PreviewLoader & loader = previews.loader(view()->buffer());
+ Previews & previews = Previews::get();
+ PreviewLoader & loader = previews.loader(view()->buffer());
addPreview(loader);
if (!snippet_.empty())
loader.startLoading();
}
-void PreviewedInset::addPreview(grfx::PreviewLoader & ploader)
+void PreviewedInset::addPreview(PreviewLoader & ploader)
{
if (!Previews::activated() || !previewWanted())
return;
if (!view() || !view()->buffer() || snippet_.empty())
return;
- grfx::Previews & previews = grfx::Previews::get();
- grfx::PreviewLoader & loader = previews.loader(view()->buffer());
+ Previews & previews = Previews::get();
+ PreviewLoader & loader = previews.loader(view()->buffer());
loader.remove(snippet_);
snippet_.erase();
pimage_ = 0;
return false;
if (!pimage_ || snippet_ != pimage_->snippet()) {
- grfx::PreviewLoader & ploader =
- grfx::Previews::get().loader(view()->buffer());
+ PreviewLoader & ploader =
+ Previews::get().loader(view()->buffer());
pimage_ = ploader.preview(snippet_);
}
}
-void PreviewedInset::imageReady(grfx::PreviewImage const & pimage) const
+void PreviewedInset::imageReady(PreviewImage const & pimage) const
{
// Check snippet against the Inset's current contents
if (snippet_ != pimage.snippet())
view()->updateInset(&inset_);
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
class Inset;
class BufferView;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewImage;
class PreviewLoader;
boost::signals::connection connection_;
};
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWEDINSET_H
#include <map>
+namespace lyx {
+
using namespace lyx::support;
-namespace grfx {
+namespace graphics {
bool Previews::activated()
{
ploader.startLoading();
}
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
class Buffer;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewLoader;
boost::scoped_ptr<Impl> const pimpl_;
};
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
#endif // PREVIEWS_H
+2003-07-04 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * introduce namespace lyx::graphics
+
2003-07-01 Lars Gullik Bjønnes <larsbj@gullik.net>
* introduce namespace lyx::support
class ParagraphList;
class UpdatableInset;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class PreviewLoader;
}
+}
/// Insets
class Inset : public InsetBase {
* Most insets have no interest in this capability, so the method
* defaults to empty.
*/
- virtual void addPreview(grfx::PreviewLoader &) const {}
+ virtual void addPreview(lyx::graphics::PreviewLoader &) const {}
/** Find the PreviewLoader, add a LaTeX snippet to it and
* start the loading process.
using std::endl;
using std::max;
+namespace grfx = lyx::graphics;
InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
: UpdatableInset(), collapsed_(collapsed), inset(bp),
bool = true, bool = false);
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
protected:
///
using std::ostream;
using std::endl;
+namespace grfx = lyx::graphics;
namespace {
/// The name of the tempfile used for manipulations.
string tempname;
/// how the inset is displayed by LyX
- grfx::DisplayType display;
+ lyx::graphics::DisplayType display;
/// The scale of the displayed graphic (If shown).
unsigned int lyxscale;
};
#include "LString.h"
#include "lyxlength.h"
+namespace grfx = lyx::graphics;
+
class LyXLex;
-namespace grfx {
+namespace lyx {
+namespace graphics {
class Params;
}
+}
+
/// This struct holds all the parameters needed by insetGraphics.
struct InsetGraphicsParams
using std::vector;
using std::pair;
+namespace grfx = lyx::graphics;
+
extern BufferList bufferlist;
bool loadIfNeeded() const;
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
private:
/// get the text displayed on the button
using std::swap;
using std::max;
+namespace grfx = lyx::graphics;
+
namespace {
int const ADD_TO_HEIGHT = 2;
bool forceDefaultParagraphs(Inset const * in) const;
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
//
// Public structures and variables
using lyx::pos_type;
using lyx::textclass_type;
+namespace grfx = lyx::graphics;
// These functions should probably go into bufferview_funcs somehow (Jug)
void appendParagraphs(Buffer * bp, ParagraphList &);
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
//
// Public structures and variables
using namespace lyx::support;
+namespace grfx = lyx::graphics;
+
RenderInset::RenderInset()
{}
class PainterInfo;
-class RenderInset
+class RenderInset
{
public:
virtual ~RenderInset();
/// This should provide the text for the button
void update(string const &, bool editable);
-
+
/// compute the size of the object returned in dim
virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
/// draw inset and update (xo, yo)-cache
virtual RenderInset * clone() const;
/// Refresh the info about which file to display and how to display it.
- void update(grfx::Params const & params);
+ void update(lyx::graphics::Params const & params);
/// compute the size of the object returned in dim
virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
/// Is the image ready to draw, or should we display a message instead?
bool readyToDisplay() const;
-
+
/// The stored data.
- grfx::Loader loader_;
- grfx::Params params_;
+ lyx::graphics::Loader loader_;
+ lyx::graphics::Params params_;
/// Cached variable (not copied).
mutable unsigned long checksum_;
* Copyright 1995-2002 the LyX Team
* Read the file COPYING
*
- * \author unknown
+ * \author Lars Gullik Bjønnes
*/
#include <config.h>
using std::system;
#endif
+namespace grfx = lyx::graphics;
+
extern void LoadLyXFile(string const &);
extern void QuitLyX();
using std::endl;
using std::vector;
+namespace grfx = lyx::graphics;
+
class kb_keymap;
extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
///
int label_init_length;
///
- grfx::DisplayType display_graphics;
+ lyx::graphics::DisplayType display_graphics;
///
bool show_banner;
///
+2003-07-04 Lars Gullik Bjønnes <larsbj@gullik.net>
+
+ * introduce namespace lyx::graphics
+
2003-07-01 Lars Gullik Bjønnes <larsbj@gullik.net>
* introduce namespace lyx::support
using std::ostream;
using std::vector;
+namespace grfx = lyx::graphics;
class InsetFormula::PreviewImpl : public grfx::PreviewedInset {
public:
///
void generatePreview() const;
///
- void addPreview(grfx::PreviewLoader &) const;
+ void addPreview(lyx::graphics::PreviewLoader &) const;
///
void mutate(string const & type);
projects / features.git / commitdiff