X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiGraphics.h;h=67a4cbeac299d05cf32cbf354e92b2e1085b91ae;hb=ee7dd4a11ea21851e7e32164c66b37d3bc8ac31d;hp=3e9908b06d242dc0139c1ec31f51b494d8cf4afb;hpb=470aba2a0e552f27d55992372c09f15af9725fa8;p=lyx.git

diff --git a/src/frontends/qt4/GuiGraphics.h b/src/frontends/qt4/GuiGraphics.h
index 3e9908b06d..67a4cbeac2 100644
--- a/src/frontends/qt4/GuiGraphics.h
+++ b/src/frontends/qt4/GuiGraphics.h
@@ -5,7 +5,9 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Herbert Voß
+ * \author Herbert Voß
+ * \author Baruch Even
+ * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,47 +16,73 @@
 #define GUIGRAPHICS_H
 
 #include "GuiDialog.h"
-#include "ControlGraphics.h"
 #include "ui_GraphicsUi.h"
 
+#include "insets/InsetGraphicsParams.h"
+
+#include "support/docstring.h"
+
 #include <vector>
 
 class QString;
 
 namespace lyx {
+
 namespace frontend {
 
-class GuiGraphicsDialog : public GuiDialog, public Ui::GraphicsUi
+class GuiGraphics : public GuiDialog, public Ui::GraphicsUi
 {
 	Q_OBJECT
+
 public:
-	GuiGraphicsDialog(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);
-	/// parent controller
-	ControlGraphics & controller();
+	///
 	bool isValid();
-	/// Apply changes
+	/// Dialog inherited methods
+	//@{
 	void applyView();
-	/// update
-	void updateContents();
+	void updateContents() {}
+	bool initialiseParams(std::string const & data);
+	void clearParams();
+	void dispatchParams();
+	bool isBufferDependent() const { return true; }
+	//@}
+
+	///
+	void paramsToDialog(InsetGraphicsParams const & params);
+
 	/// get bounding box from file
 	void getBB();
+	/// Browse for a file
+	QString browse(QString const &) const;
+	/// Read the Bounding Box from a eps or ps-file
+	std::string readBoundingBox(std::string const & file);
+	/// test if file exist
+	bool isFileNameValid(std::string const & fname) const;
 
+	/// 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_;
 };
 
 } // namespace frontend