X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiGraphics.h;h=67a4cbeac299d05cf32cbf354e92b2e1085b91ae;hb=8e7d7e42952f0119db1c192386a63d1d9ede3b7f;hp=fc15ebad5bd273005dc450aeef421379fc3cda1c;hpb=6f3cdf8da80a6b3889f2a3b8b53f44590152d600;p=lyx.git

diff --git a/src/frontends/qt4/GuiGraphics.h b/src/frontends/qt4/GuiGraphics.h
index fc15ebad5b..67a4cbeac2 100644
--- a/src/frontends/qt4/GuiGraphics.h
+++ b/src/frontends/qt4/GuiGraphics.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Herbert Voß
+ * \author Herbert Voß
  * \author Baruch Even
  * \author Angus Leeming
  *
@@ -18,89 +18,73 @@
 #include "GuiDialog.h"
 #include "ui_GraphicsUi.h"
 
+#include "insets/InsetGraphicsParams.h"
+
 #include "support/docstring.h"
-#include "insets/InsetGraphics.h"
 
-#include <utility>
 #include <vector>
 
 class QString;
 
 namespace lyx {
 
-class InsetGraphics;
-class InsetGraphicsParams;
-
 namespace frontend {
 
-class LyXView;
-
 class GuiGraphics : public GuiDialog, public Ui::GraphicsUi
 {
 	Q_OBJECT
 
 public:
-	GuiGraphics(LyXView & lv);
+	GuiGraphics(GuiView & lv);
 	void setAutoText();
 
 private Q_SLOTS:
 	void change_adaptor();
-	void change_bb();
+	void changeGroup(int);
+	void changeBB();
+	void on_newGroupPB_clicked();
 	void on_browsePB_clicked();
 	void on_getPB_clicked();
-	void on_editPB_clicked();
-	void on_filename_textChanged(const QString &);
 	void on_scaleCB_toggled(bool);
 	void on_WidthCB_toggled(bool);
 	void on_HeightCB_toggled(bool);
 	void on_angle_textChanged(const QString &);
 
 private:
-	void closeEvent(QCloseEvent * e);
+	///
 	bool isValid();
-	/// Apply changes
+	/// Dialog inherited methods
+	//@{
 	void applyView();
-	/// update
-	void updateContents();
-	/// get bounding box from file
-	void getBB();
-
-	/// Store the LaTeX names for the rotation origins.
-	std::vector<std::string> origin_ltx;
-	///
+	void updateContents() {}
 	bool initialiseParams(std::string const & data);
-	/// clean-up on hide.
 	void clearParams();
-	/// clean-up on hide.
 	void dispatchParams();
-	///
 	bool isBufferDependent() const { return true; }
+	//@}
+
+	///
+	void paramsToDialog(InsetGraphicsParams const & params);
 
+	/// get bounding box from file
+	void getBB();
 	/// Browse for a file
-	docstring const browse(docstring const &) const;
+	QString browse(QString const &) const;
 	/// Read the Bounding Box from a eps or ps-file
-	std::string const readBB(std::string const & file);
-	/// Control the bb
-	bool bbChanged;
+	std::string readBoundingBox(std::string const & file);
 	/// test if file exist
-	bool isFilenameValid(std::string const & fname) const;
-	/// edit file
-	void editGraphics();
+	bool isFileNameValid(std::string const & fname) const;
 
-private:
+	/// Control the bb
+	bool bbChanged;
+	/// Store the LaTeX names for the rotation origins.
+	std::vector<std::string> origin_ltx;
 	///
 	InsetGraphicsParams params_;
+	/// the current graphics group
+	std::string current_group_;
 };
 
-
-/// get the units for the bounding box
-std::vector<std::string> const getBBUnits();
-
-/// The (tranlated) GUI std::string and it's LaTeX equivalent.
-typedef std::pair<docstring, std::string> RotationOriginPair;
-///
-std::vector<RotationOriginPair> getRotationOriginData();
-
 } // namespace frontend
 } // namespace lyx