de.po: fix doubled accelerator keys

[lyx.git] / src / graphics / GraphicsImage.h

diff --git a/src/graphics/GraphicsImage.h b/src/graphics/GraphicsImage.h
index eb2223912ffb10bed829d6ac26ef5acfc59fbf82..f316572d967b9bb19c6df5aac61e755fab16c6c4 100644 (file)
--- a/src/graphics/GraphicsImage.h
+++ b/src/graphics/GraphicsImage.h
@@ -1,43 +1,41 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsImage.h
+ * \file GraphicsImage.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- *  \author Baruch Even 
- *  \author Angus Leeming 
+ * \author Baruch Even
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- *  An abstract base class for the images themselves.
- *  Allows the user to retrieve the pixmap, once loaded and to issue commands
- *  to modify it.
+ * An abstract base class for the images themselves.
+ * Allows the user to retrieve the pixmap, once loaded and to issue commands
+ * to modify it.
  *
- *  The boost::functions newImage and loadableFormats are connected to the
- *  appropriate derived classes elsewhere, allowing the graphics cache to
- *  access them without knowing anything about their instantiation.
+ * The boost::functions newImage and loadableFormats are connected to the
+ * appropriate derived classes elsewhere, allowing the graphics cache to
+ * access them without knowing anything about their instantiation.
  *
- *  The loading process can be asynchronous, but cropping, rotating and
- *  scaling block execution.
+ * The loading process can be asynchronous, but cropping, rotating and
+ * scaling block execution.
  */
 
 #ifndef GRAPHICSIMAGE_H
 #define GRAPHICSIMAGE_H
 
-#include "LString.h"
+#include "Dimension.h"
 
-#include <boost/shared_ptr.hpp>
-#include <boost/function/function0.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/function.hpp>
+#include <boost/signal.hpp>
 
 #include <vector>
-#include <utility>
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+namespace lyx {
 
-namespace grfx {
+namespace support { class FileName; }
+
+namespace graphics {
 
 class Params;
 
@@ -46,19 +44,8 @@ public:
        /** This is to be connected to a function that will return a new
         *  instance of a viable derived class.
         */
-       typedef boost::shared_ptr<Image> ImagePtr;
-       ///
-       static boost::function0<ImagePtr> newImage;
+       static boost::function<Image *()> newImage;
 
-       /// Return the list of loadable formats.
-       typedef std::vector<string> FormatList;
-       ///
-       static boost::function0<FormatList> loadableFormats;
-
-       /// Must define default c-tor explicitly as we define a copy c-tor.
-       Image() {}
-       /// Don't copy the signal finishedLoading
-       Image(Image const &) {}
        ///
        virtual ~Image() {}
 
@@ -66,18 +53,18 @@ public:
        virtual Image * clone() const = 0;
 
        /// Get the image width
-       virtual unsigned int getWidth() const = 0;
+       virtual unsigned int width() const = 0;
 
        /// Get the image height
-       virtual unsigned int getHeight() const = 0;
+       virtual unsigned int height() const = 0;
 
-       /// is the image drawable ?
+       /// Is the image drawable ?
        virtual bool isDrawable() const = 0;
 
        /** At the end of the loading process inform the outside world
-        *  by emitting a signal.
+        *  by emitting a signal
         */
-       typedef boost::signal1<void, bool> SignalType;
+       typedef boost::signal<void(bool)> SignalType;
        ///
        SignalType finishedLoading;
 
@@ -85,7 +72,7 @@ public:
         *  The caller should expect this process to be asynchronous and
         *  so should connect to the "finished" signal above.
         */
-       virtual void load(string const & filename) = 0;
+       virtual bool load(support::FileName const & filename) = 0;
 
        /** Generate the pixmap.
         *  Uses the params to decide on color, grayscale etc.
@@ -93,24 +80,21 @@ public:
         */
        virtual bool setPixmap(Params const & params) = 0;
 
-       /// Clip the image using params.
-       virtual void clip(Params const & params) = 0;
-
-       /// Rotate the image using params.
-       virtual void rotate(Params const & params) = 0;
-
-       /// Scale the image using params.
-       virtual void scale(Params const & params) = 0;
-
 protected:
+       /// Must define default c-tor explicitly as we define a copy c-tor.
+       Image() {}
+       /// Don't copy the signal finishedLoading
+       Image(Image const &) {}
+
        /** Uses the params to ascertain the dimensions of the scaled image.
-        *  Returned as make_pair(width, height).
-        *  If something goes wrong, returns make_pair(getWidth(), getHeight())
+        *  Returned as Dimension(width, height, 0 descend).
+        *  If something goes wrong, returns make_pair(getWidth(), getHeight(), 0)
         */
-       std::pair<unsigned int, unsigned int>
-       getScaledDimensions(Params const & params) const;
+       Dimension scaledDimension(Params const & params) const;
 };
 
-} // namespace grfx
+
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSIMAGE_H