X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormGraphics.C;h=52713df6b88251a852ca2213a4aef7221bb4ab1e;hb=b9a7e874051b4fbc7f3a7ae70fd70b8f4a6766b7;hp=5eb5c39a52b03cfefde348808f2baf55439e3511;hpb=21245ae533d262983713e14634ab31017fd6e55f;p=lyx.git

diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index 5eb5c39a52..52713df6b8 100644
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -1,33 +1,28 @@
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
- *
- * ======================================================
- *
+/**
  * \file FormGraphics.C
+ * Copyright 2000-2001 The LyX Team.
+ * See the file COPYING.
+ *
  * \author Baruch Even, baruch.even@writeme.com
  * \author Herbert Voss, voss@perce.de
  */
 
-#include <config.h> 
+#include <config.h>
 
 #ifdef __GNUG__
 #pragma implementation
-#endif 
+#endif
 
 #include "xformsBC.h"
 #include "ControlGraphics.h"
 #include "FormGraphics.h"
 #include "form_graphics.h"
+#include "Alert.h"
 
 #include "xforms_helpers.h"
 #include "input_validators.h"
 #include "debug.h" // for lyxerr
 #include "support/lstrings.h"  // for strToDbl & tostr
-#include "support/FileInfo.h"
 #include "support/filetools.h"  // for MakeAbsPath etc
 #include "insets/insetgraphicsParams.h"
 #include "lyxrc.h" // for lyxrc.display_graphics
@@ -42,7 +37,14 @@ int const WIDTH_MAXDIGITS = 10;
 int const HEIGHT_MAXDIGITS = 10;
 int const ROTATE_MAXCHARS = 4;
 int const FILENAME_MAXCHARS = 1024;
- 
+string defaultUnit("cm");
+
+/// Given input and choice widgets, create a LyXLength
+LyXLength getLyXLengthFromWidgets(FL_OBJECT * input, FL_OBJECT * choice)
+{
+	return LyXLength(getLengthFromWidgets(input, choice));
+}
+
 } // namespace anon
 
 
@@ -55,11 +57,11 @@ FormGraphics::FormGraphics(ControlGraphics & c)
 
 void FormGraphics::redraw()
 {
-	if(form() && form()->visible)
+	if (form() && form()->visible)
 		fl_redraw_form(form());
 	else
 		return;
-	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabFolder);
+	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
 	if (outer_form && outer_form->visible)
 		fl_redraw_form(outer_form);
 }
@@ -69,10 +71,13 @@ void FormGraphics::build()
 {
 	dialog_.reset(build_graphics());
 
-        // Manage the ok, apply, restore and cancel/close buttons
+	// Allow the base class to control messages
+	setMessageWidget(dialog_->text_warning);
+
+	// Manage the ok, apply, restore and cancel/close buttons
 	bc().setOK(dialog_->button_ok);
 	bc().setApply(dialog_->button_apply);
-	bc().setCancel(dialog_->button_cancel);
+	bc().setCancel(dialog_->button_close);
 	bc().setRestore(dialog_->button_restore);
 
 	// the file section
@@ -85,18 +90,22 @@ void FormGraphics::build()
 	fl_set_input_maxchars(file_->input_rotate_angle, ROTATE_MAXCHARS);
 	fl_set_input_filter(file_->input_rotate_angle, fl_float_filter);
 
-	string const choice_origin = 
-	    "center|"					// c
-	    "leftTop|leftBottom|leftBaseline|"		// lt lb lB
-	    "centerTop|centerBottom|centerBaseline|"	// ct cb cB
-	    "rightTop|rightBottom|rightBaseline";	// rt rb rB
+	setPrehandler(file_->input_filename);
+	setPrehandler(file_->input_subcaption);
+	setPrehandler(file_->input_rotate_angle);
+
+	string const choice_origin =
+		"center|"					// c
+		"leftTop|leftBottom|leftBaseline|"		// lt lb lB
+		"centerTop|centerBottom|centerBaseline|"	// ct cb cB
+		"rightTop|rightBottom|rightBaseline";	// rt rb rB
 	fl_addto_choice(file_->choice_origin, choice_origin.c_str());
 
 	bc().addReadOnly(file_->button_browse);
 	bc().addReadOnly(file_->check_subcaption);
 	bc().addReadOnly(file_->check_rotate);
-	bc().addReadOnly(file_->button_clip);
-	bc().addReadOnly(file_->button_draft);
+	bc().addReadOnly(file_->check_draft);
+	bc().addReadOnly(file_->check_nounzip);
 
 	// the lyxview section
 	lyxview_.reset(build_lyxview());
@@ -105,8 +114,12 @@ void FormGraphics::build()
 	fl_set_input_return (lyxview_->input_lyxheight, FL_RETURN_CHANGED);
 	fl_set_input_return (lyxview_->input_lyxscale, FL_RETURN_CHANGED);
 
-	fl_addto_choice(lyxview_->choice_width_lyxwidth, choice_Length_WithUnit.c_str());
-	fl_addto_choice(lyxview_->choice_width_lyxheight, choice_Length_WithUnit.c_str());
+	setPrehandler(lyxview_->input_lyxwidth);
+	setPrehandler(lyxview_->input_lyxheight);
+	setPrehandler(lyxview_->input_lyxscale);
+
+	fl_addto_choice(lyxview_->choice_lyxwidth, choice_Length_WithUnit.c_str());
+	fl_addto_choice(lyxview_->choice_lyxheight, choice_Length_WithUnit.c_str());
 
 	bc().addReadOnly(lyxview_->radio_pref);
 	bc().addReadOnly(lyxview_->radio_mono);
@@ -121,18 +134,22 @@ void FormGraphics::build()
 	fl_set_input_return (size_->input_width, FL_RETURN_CHANGED);
 	fl_set_input_return (size_->input_height, FL_RETURN_CHANGED);
 
+	setPrehandler(size_->input_scale);
+	setPrehandler(size_->input_width);
+	setPrehandler(size_->input_height);
+
 	fl_set_input_maxchars(size_->input_scale, SCALE_MAXDIGITS);
 	fl_set_input_maxchars(size_->input_width, WIDTH_MAXDIGITS);
 	fl_set_input_maxchars(size_->input_height, HEIGHT_MAXDIGITS);
 
 	fl_set_input_filter(size_->input_scale,  fl_unsigned_float_filter);
 
-	fl_addto_choice(size_->choice_width_units, choice_Length_All.c_str());
-	fl_addto_choice(size_->choice_height_units, choice_Length_All.c_str());
+	fl_addto_choice(size_->choice_width, choice_Length_All.c_str());
+	fl_addto_choice(size_->choice_height, choice_Length_All.c_str());
 
-	bc().addReadOnly(size_->button_asis);
-	bc().addReadOnly(size_->button_wh);
-	bc().addReadOnly(size_->button_scale);
+	bc().addReadOnly(size_->radio_asis);
+	bc().addReadOnly(size_->radio_wh);
+	bc().addReadOnly(size_->radio_scale);
 	bc().addReadOnly(size_->check_aspectratio);
 
 	// the bounding box selection
@@ -142,24 +159,36 @@ void FormGraphics::build()
 	fl_set_input_return (bbox_->input_bb_x1, FL_RETURN_CHANGED);
 	fl_set_input_return (bbox_->input_bb_y1, FL_RETURN_CHANGED);
 
+	fl_set_input_filter(bbox_->input_bb_x0,  fl_unsigned_float_filter);
+	fl_set_input_filter(bbox_->input_bb_y0,  fl_unsigned_float_filter);
+	fl_set_input_filter(bbox_->input_bb_x1,  fl_unsigned_float_filter);
+	fl_set_input_filter(bbox_->input_bb_y1,  fl_unsigned_float_filter);
+
+	setPrehandler(bbox_->input_bb_x0);
+	setPrehandler(bbox_->input_bb_y0);
+	setPrehandler(bbox_->input_bb_x1);
+	setPrehandler(bbox_->input_bb_y1);
+
 	string const bb_units = "pt|cm|in";
-	fl_addto_choice(bbox_->choice_bb_x0, bb_units.c_str());
-	fl_addto_choice(bbox_->choice_bb_y0, bb_units.c_str());
-	fl_addto_choice(bbox_->choice_bb_x1, bb_units.c_str());
-	fl_addto_choice(bbox_->choice_bb_y1, bb_units.c_str());
+	fl_addto_choice(bbox_->choice_bb_units, bb_units.c_str());
 	bc().addReadOnly(bbox_->button_getBB);
+	bc().addReadOnly(bbox_->check_clip);
 
 	// the rotate section
 	special_.reset(build_special());
 
 	fl_set_input_return (special_->input_special, FL_RETURN_CHANGED);
+	setPrehandler(special_->input_special);
 
 	// add the different tabfolders
-	fl_addto_tabfolder(dialog_->tabFolder, _("File"), file_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("LyX View"), lyxview_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("LaTeX Size"), size_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("Bounding Box"), bbox_->form);
-	fl_addto_tabfolder(dialog_->tabFolder, _("Extras"), special_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("File"), file_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("LyX View"), lyxview_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("LaTeX Size"), size_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("Bounding Box"), bbox_->form);
+	fl_addto_tabfolder(dialog_->tabfolder, _("Extras"), special_->form);
+	// set the right default unit
+	if (lyxrc.default_papersize < 3)
+		defaultUnit = "in";
 }
 
 
@@ -183,88 +212,91 @@ void FormGraphics::apply()
 		}
 	}
 	if (fl_get_choice(file_->choice_origin) > 0)
-	    igp.rotateOrigin = fl_get_choice_text(file_->choice_origin);
+		igp.rotateOrigin = fl_get_choice_text(file_->choice_origin);
 	else
-	    igp.rotateOrigin = string();
-	igp.draft = fl_get_button(file_->button_draft);
-	igp.clip = fl_get_button(file_->button_clip);
+		igp.rotateOrigin = string();
+	igp.draft = fl_get_button(file_->check_draft);
+	igp.noUnzip = fl_get_button(file_->check_nounzip);
 
 	// the lyxview section
 	if (fl_get_button(lyxview_->radio_pref))
-	    igp.display = InsetGraphicsParams::DEFAULT;
+		igp.display = InsetGraphicsParams::DEFAULT;
 	else if (fl_get_button(lyxview_->radio_mono))
-	    igp.display = InsetGraphicsParams::MONOCHROME;
+		igp.display = InsetGraphicsParams::MONOCHROME;
 	else if (fl_get_button(lyxview_->radio_gray))
-	    igp.display = InsetGraphicsParams::GRAYSCALE;
+		igp.display = InsetGraphicsParams::GRAYSCALE;
 	else if (fl_get_button(lyxview_->radio_color))
-	    igp.display = InsetGraphicsParams::COLOR;
+		igp.display = InsetGraphicsParams::COLOR;
 	else if (fl_get_button(lyxview_->radio_nodisplay))
-	    igp.display = InsetGraphicsParams::NONE;
+		igp.display = InsetGraphicsParams::NONE;
 
-	if (fl_get_button(lyxview_->button_lyxasis))
-	    igp.lyxsize_type = InsetGraphicsParams::DEFAULT_SIZE;
-	else if (fl_get_button(lyxview_->button_lyxwh))
-	    igp.lyxsize_type = InsetGraphicsParams::WH;
+	if (fl_get_button(lyxview_->radio_lyxasis))
+		igp.lyxsize_type = InsetGraphicsParams::DEFAULT_SIZE;
+	else if (fl_get_button(lyxview_->radio_lyxwh))
+		igp.lyxsize_type = InsetGraphicsParams::WH;
 	else
-	    igp.lyxsize_type = InsetGraphicsParams::SCALE;
-	igp.lyxwidth = LyXLength(getLengthFromWidgets(lyxview_->input_lyxwidth,
-		lyxview_->choice_width_lyxwidth));
-	igp.lyxheight = LyXLength(getLengthFromWidgets(lyxview_->input_lyxheight,
-		lyxview_->choice_width_lyxheight));
+		igp.lyxsize_type = InsetGraphicsParams::SCALE;
+
+	igp.lyxwidth = getLyXLengthFromWidgets(lyxview_->input_lyxwidth,
+					       lyxview_->choice_lyxwidth);
+
+	igp.lyxheight = getLyXLengthFromWidgets(lyxview_->input_lyxheight,
+						lyxview_->choice_lyxheight);
+
 	igp.lyxscale = strToInt(getStringFromInput(lyxview_->input_lyxscale));
 
 	// the size section
-	if (fl_get_button(size_->button_asis))
-	    igp.size_type = InsetGraphicsParams::DEFAULT_SIZE;
-	else if (fl_get_button(size_->button_wh))
-	    igp.size_type = InsetGraphicsParams::WH;
+	if (fl_get_button(size_->radio_asis))
+		igp.size_type = InsetGraphicsParams::DEFAULT_SIZE;
+	else if (fl_get_button(size_->radio_wh))
+		igp.size_type = InsetGraphicsParams::WH;
 	else
-	    igp.size_type = InsetGraphicsParams::SCALE;
-	igp.width = LyXLength(getLengthFromWidgets(size_->input_width,
-		size_->choice_width_units));
-	igp.height = LyXLength(getLengthFromWidgets(size_->input_height,
-		size_->choice_height_units));
+		igp.size_type = InsetGraphicsParams::SCALE;
+
+	igp.width = getLyXLengthFromWidgets(size_->input_width,
+					    size_->choice_width);
+
+	igp.height = getLyXLengthFromWidgets(size_->input_height,
+				   size_->choice_height);
+
 	igp.scale = strToInt(getStringFromInput(size_->input_scale));
 	igp.keepAspectRatio = fl_get_button(size_->check_aspectratio);
 
 	// the bb section
 	if (!controller().bbChanged)		// different to the original one?
-	    igp.bb = string();			// don't write anything	    
+		igp.bb = string();			// don't write anything
 	else {
-	    string bb;
-	    if (getStringFromInput(bbox_->input_bb_x0).empty())
-		bb = "0 ";
-	    else
-		bb = getLengthFromWidgets(bbox_->input_bb_x0,
-			bbox_->choice_bb_x0)+" ";
-	    if (getStringFromInput(bbox_->input_bb_y0).empty())
-		bb += "0 ";
-	    else
-		bb += (getLengthFromWidgets(bbox_->input_bb_y0,
-			bbox_->choice_bb_y0)+" ");
-	    if (getStringFromInput(bbox_->input_bb_x1).empty())
-		bb += "0 ";
-	    else
-		bb += (getLengthFromWidgets(bbox_->input_bb_x1,
-			bbox_->choice_bb_x1)+" ");
-	    if (getStringFromInput(bbox_->input_bb_y1).empty())
-		bb += "0 ";
-	    else
-		bb += (getLengthFromWidgets(bbox_->input_bb_y1,
-			bbox_->choice_bb_y1)+" ");
-	    igp.bb = bb;
+		string bb;
+		if (getStringFromInput(bbox_->input_bb_x0).empty())
+			bb = "0 ";
+		else
+			bb = getLengthFromWidgets(bbox_->input_bb_x0,
+						  bbox_->choice_bb_units)+" ";
+		if (getStringFromInput(bbox_->input_bb_y0).empty())
+			bb += "0 ";
+		else
+			bb += (getLengthFromWidgets(bbox_->input_bb_y0,
+						    bbox_->choice_bb_units)+" ");
+		if (getStringFromInput(bbox_->input_bb_x1).empty())
+			bb += "0 ";
+		else
+			bb += (getLengthFromWidgets(bbox_->input_bb_x1,
+						    bbox_->choice_bb_units)+" ");
+		if (getStringFromInput(bbox_->input_bb_y1).empty())
+			bb += "0 ";
+		else
+			bb += (getLengthFromWidgets(bbox_->input_bb_y1,
+						    bbox_->choice_bb_units)+" ");
+		igp.bb = bb;
 	}
+	igp.clip = fl_get_button(bbox_->check_clip);
 
 	// the special section
 	igp.special = getStringFromInput(special_->input_special);
 }
 
 
-void FormGraphics::update() {	
-	string unit = "cm";
-	if (lyxrc.default_papersize < 3)
-	    unit = "in";
-	string const defaultUnit = string(unit); 
+void FormGraphics::update() {
 	// Update dialog with details from inset
 	InsetGraphicsParams & igp = controller().params();
 
@@ -276,17 +308,17 @@ void FormGraphics::update() {
 		   fl_get_button(file_->check_subcaption));
 	fl_set_button(file_->check_rotate, igp.rotate);
 	fl_set_input(file_->input_rotate_angle,
-	             tostr(igp.rotateAngle).c_str());
+		     tostr(igp.rotateAngle).c_str());
 	if (igp.rotateOrigin.empty())
-	    fl_set_choice(file_->choice_origin,0);
+		fl_set_choice(file_->choice_origin,1);
 	else
-	    fl_set_choice_text(file_->choice_origin,igp.rotateOrigin.c_str());
+		fl_set_choice_text(file_->choice_origin,igp.rotateOrigin.c_str());
 	setEnabled(file_->input_rotate_angle,
 		   fl_get_button(file_->check_rotate));
 	setEnabled(file_->choice_origin,
 		   fl_get_button(file_->check_rotate));
-	fl_set_button(file_->button_draft, igp.draft);
-	fl_set_button(file_->button_clip, igp.clip);
+	fl_set_button(file_->check_draft, igp.draft);
+	fl_set_button(file_->check_nounzip, igp.noUnzip);
 
 	// the lyxview section
 	switch (igp.display) {
@@ -305,122 +337,148 @@ void FormGraphics::update() {
 	case InsetGraphicsParams::NONE:
 		fl_set_button(lyxview_->radio_nodisplay, 1);
 		break;
- 	}
+	}
 	updateWidgetsFromLength(lyxview_->input_lyxwidth,
-		lyxview_->choice_width_lyxwidth, igp.lyxwidth,defaultUnit);
+				lyxview_->choice_lyxwidth, igp.lyxwidth, defaultUnit);
 	updateWidgetsFromLength(lyxview_->input_lyxheight,
-		lyxview_->choice_width_lyxheight, igp.lyxheight,defaultUnit);
+				lyxview_->choice_lyxheight, igp.lyxheight, defaultUnit);
 	fl_set_input(lyxview_->input_lyxscale, tostr(igp.lyxscale).c_str());
 	switch (igp.lyxsize_type) {
-	    case InsetGraphicsParams::DEFAULT_SIZE: {
-		fl_set_button(lyxview_->button_lyxasis,1);
+	case InsetGraphicsParams::DEFAULT_SIZE: {
+		fl_set_button(lyxview_->radio_lyxasis,1);
 		setEnabled(lyxview_->input_lyxwidth, 0);
-		setEnabled(lyxview_->choice_width_lyxwidth, 0);
+		setEnabled(lyxview_->choice_lyxwidth, 0);
 		setEnabled(lyxview_->input_lyxheight, 0);
-		setEnabled(lyxview_->choice_width_lyxheight, 0);
+		setEnabled(lyxview_->choice_lyxheight, 0);
 		setEnabled(lyxview_->input_lyxscale, 0);
 		break;
-	    }
-	    case InsetGraphicsParams::WH: {
-		fl_set_button(lyxview_->button_lyxwh, 1);
+	}
+	case InsetGraphicsParams::WH: {
+		fl_set_button(lyxview_->radio_lyxwh, 1);
 		setEnabled(lyxview_->input_lyxwidth, 1);
-		setEnabled(lyxview_->choice_width_lyxwidth, 1);
+		setEnabled(lyxview_->choice_lyxwidth, 1);
 		setEnabled(lyxview_->input_lyxheight, 1);
-		setEnabled(lyxview_->choice_width_lyxheight, 1);
+		setEnabled(lyxview_->choice_lyxheight, 1);
 		setEnabled(lyxview_->input_lyxscale, 0);
 		break;
-	    }
-	    case InsetGraphicsParams::SCALE: {
-		fl_set_button(lyxview_->button_lyxscale, 1);
+	}
+	case InsetGraphicsParams::SCALE: {
+		fl_set_button(lyxview_->radio_lyxscale, 1);
 		setEnabled(lyxview_->input_lyxwidth, 0);
-		setEnabled(lyxview_->choice_width_lyxwidth, 0);
+		setEnabled(lyxview_->choice_lyxwidth, 0);
 		setEnabled(lyxview_->input_lyxheight, 0);
-		setEnabled(lyxview_->choice_width_lyxheight, 0);
+		setEnabled(lyxview_->choice_lyxheight, 0);
 		setEnabled(lyxview_->input_lyxscale, 1);
 		break;
-	    }
+	}
 	}
 
 	// the size section
 	// Update the draft and clip mode
 	updateWidgetsFromLength(size_->input_width,
-		size_->choice_width_units,igp.width,defaultUnit);
+				size_->choice_width, igp.width, defaultUnit);
 	updateWidgetsFromLength(size_->input_height,
-		size_->choice_height_units,igp.height,defaultUnit);
+				size_->choice_height, igp.height, defaultUnit);
 	fl_set_input(size_->input_scale, tostr(igp.scale).c_str());
 	switch (igp.size_type) {
-	    case InsetGraphicsParams::DEFAULT_SIZE: {
-		fl_set_button(size_->button_asis,1);
+	case InsetGraphicsParams::DEFAULT_SIZE: {
+		fl_set_button(size_->radio_asis,1);
 		setEnabled(size_->input_width, 0);
-		setEnabled(size_->choice_width_units, 0);
+		setEnabled(size_->choice_width, 0);
 		setEnabled(size_->input_height, 0);
-		setEnabled(size_->choice_height_units, 0);
+		setEnabled(size_->choice_height, 0);
 		setEnabled(size_->check_aspectratio, 0);
 		setEnabled(size_->input_scale, 0);
 		break;
-	    }
-	    case InsetGraphicsParams::WH: {
-		fl_set_button(size_->button_wh, 1);
+	}
+	case InsetGraphicsParams::WH: {
+		fl_set_button(size_->radio_wh, 1);
 		setEnabled(size_->input_width, 1);
-		setEnabled(size_->choice_width_units, 1);
+		setEnabled(size_->choice_width, 1);
 		setEnabled(size_->input_height, 1);
-		setEnabled(size_->choice_height_units, 1);
+		setEnabled(size_->choice_height, 1);
 		setEnabled(size_->check_aspectratio, 1);
 		setEnabled(size_->input_scale, 0);
 		break;
-	    }
-	    case InsetGraphicsParams::SCALE: {
-		fl_set_button(size_->button_scale, 1);
+	}
+	case InsetGraphicsParams::SCALE: {
+		fl_set_button(size_->radio_scale, 1);
 		setEnabled(size_->input_width, 0);
-		setEnabled(size_->choice_width_units, 0);
+		setEnabled(size_->choice_width, 0);
 		setEnabled(size_->input_height, 0);
-		setEnabled(size_->choice_height_units, 0);
+		setEnabled(size_->choice_height, 0);
 		setEnabled(size_->check_aspectratio, 0);
 		setEnabled(size_->input_scale, 1);
 		break;
-	    }
+	}
 	}
 	fl_set_button(size_->check_aspectratio, igp.keepAspectRatio);
-	
-	// the bb section		
+
+	// the bb section
 	// set the bounding box values, if exists. First we need the whole
 	// path, because the controller knows nothing about the doc-dir
-	lyxerr << "GraphicsUpdate::BoundingBox = " << igp.bb << "\n";
-	controller().bbChanged = false;
-	if (igp.bb.empty()) {
-	    string const fileWithAbsPath = MakeAbsPath(igp.filename, OnlyPath(igp.filename)); 	
-	    string bb = controller().readBB(fileWithAbsPath);
-	    lyxerr << "file::BoundingBox = " << bb << "\n";
-	    if (!bb.empty()) {		
-		// get the values from the file
-		// in this case we always have the point-unit
-		fl_set_input(bbox_->input_bb_x0, token(bb,' ',0).c_str());
-		fl_set_input(bbox_->input_bb_y0, token(bb,' ',1).c_str());
-		fl_set_input(bbox_->input_bb_x1, token(bb,' ',2).c_str());
-		fl_set_input(bbox_->input_bb_y1, token(bb,' ',3).c_str());
-	    }
-	} else { 				// get the values from the inset
-	    controller().bbChanged = true;
-	    LyXLength anyLength;
-	    anyLength = LyXLength(token(igp.bb,' ',0));
-	    updateWidgetsFromLength(bbox_->input_bb_x0,
-	    		bbox_->choice_bb_x0,anyLength,"pt");
-	    anyLength = LyXLength(token(igp.bb,' ',1));
-	    updateWidgetsFromLength(bbox_->input_bb_y0,
-	    		bbox_->choice_bb_y0,anyLength,"pt");
-	    anyLength = LyXLength(token(igp.bb,' ',2));
-	    updateWidgetsFromLength(bbox_->input_bb_x1,
-	    		bbox_->choice_bb_x1,anyLength,"pt");
-	    anyLength = LyXLength(token(igp.bb,' ',3));
-	    updateWidgetsFromLength(bbox_->input_bb_y1,
-	    		bbox_->choice_bb_y1,anyLength,"pt");
-	}
+	updateBB(igp.filename, igp.bb);
+	fl_set_button(bbox_->check_clip, igp.clip);
 
 	// the special section
 	fl_set_input(special_->input_special, igp.special.c_str());
 }
 
 
+void FormGraphics::updateBB(string const & filename, string const & bb_inset)
+{
+	// Update dialog with details from inset
+	// set the bounding box values, if exists. First we need the whole
+	// path, because the controller knows nothing about the doc-dir
+	controller().bbChanged = false;
+	if (bb_inset.empty()) {
+		lyxerr[Debug::GRAPHICS] << "update:: no BoundingBox" << endl;
+		string const fileWithAbsPath =
+			MakeAbsPath(filename, OnlyPath(filename));
+		string const bb = controller().readBB(fileWithAbsPath);
+		if (!bb.empty()) {
+			// get the values from the file
+			// in this case we always have the point-unit
+			fl_set_input(bbox_->input_bb_x0,
+				     token(bb,' ',0).c_str());
+			fl_set_input(bbox_->input_bb_y0,
+				     token(bb,' ',1).c_str());
+			fl_set_input(bbox_->input_bb_x1,
+				     token(bb,' ',2).c_str());
+			fl_set_input(bbox_->input_bb_y1,
+				     token(bb,' ',3).c_str());
+
+		} else {
+			// no bb from file
+			fl_set_input(bbox_->input_bb_x0, bb.c_str());
+			fl_set_input(bbox_->input_bb_y0, bb.c_str());
+			fl_set_input(bbox_->input_bb_x1, bb.c_str());
+			fl_set_input(bbox_->input_bb_y1, bb.c_str());
+		}
+		// "pt"
+		fl_set_choice(bbox_->choice_bb_units, 1);
+
+	} else {
+		// get the values from the inset
+		lyxerr[Debug::GRAPHICS] << "update:: igp has BoundingBox"
+					<< endl;
+		controller().bbChanged = true;
+		LyXLength anyLength;
+		anyLength = LyXLength(token(bb_inset,' ',0));
+		updateWidgetsFromLength(bbox_->input_bb_x0,
+					bbox_->choice_bb_units,anyLength,"pt");
+		anyLength = LyXLength(token(bb_inset,' ',1));
+		updateWidgetsFromLength(bbox_->input_bb_y0,
+					bbox_->choice_bb_units,anyLength,"pt");
+		anyLength = LyXLength(token(bb_inset,' ',2));
+		updateWidgetsFromLength(bbox_->input_bb_x1,
+					bbox_->choice_bb_units,anyLength,"pt");
+		anyLength = LyXLength(token(bb_inset,' ',3));
+		updateWidgetsFromLength(bbox_->input_bb_y1,
+					bbox_->choice_bb_units,anyLength,"pt");
+	}
+}
+
 namespace {
 
 bool isValid(FL_OBJECT * ob)
@@ -431,8 +489,8 @@ bool isValid(FL_OBJECT * ob)
 
 } // namespace anon
 
- 
-	
+
+
 ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 {
 	// the file section
@@ -440,90 +498,173 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 		// Get the filename from the dialog
 		string const in_name = getStringFromInput(file_->input_filename);
 		string const out_name = controller().Browse(in_name);
+		lyxerr[Debug::GRAPHICS] << "[FormGraphics]out_name: " << out_name << endl;
 		if (out_name != in_name && !out_name.empty()) {
 			fl_set_input(file_->input_filename, out_name.c_str());
 		}
+		if (controller().isFilenameValid(out_name))
+  			updateBB(out_name, string());
+
 	} else if (ob == file_->check_subcaption) {
-	    	setEnabled(file_->input_subcaption,
+		setEnabled(file_->input_subcaption,
 			   fl_get_button(file_->check_subcaption));
 	} else if (ob == file_->check_rotate) {
-	    	setEnabled(file_->input_rotate_angle,
+		setEnabled(file_->input_rotate_angle,
 			   fl_get_button(file_->check_rotate));
-	    	setEnabled(file_->choice_origin,
+		setEnabled(file_->choice_origin,
 			   fl_get_button(file_->check_rotate));
 
-	// the lyxview section
-	} else if (ob == lyxview_->button_lyxasis) {
-	    	setEnabled(lyxview_->input_lyxwidth, 0);
-	    	setEnabled(lyxview_->choice_width_lyxwidth, 0);
-	    	setEnabled(lyxview_->input_lyxheight, 0);
-	    	setEnabled(lyxview_->choice_width_lyxheight, 0);
-	    	setEnabled(lyxview_->input_lyxscale, 0);
-	} else if (ob == lyxview_->button_lyxwh) {
-	    	setEnabled(lyxview_->input_lyxwidth, 1);
-	    	setEnabled(lyxview_->choice_width_lyxwidth, 1);
-	    	setEnabled(lyxview_->input_lyxheight, 1);
-	    	setEnabled(lyxview_->choice_width_lyxheight, 1);
-	    	setEnabled(lyxview_->input_lyxscale, 0);
-	} else if (ob == lyxview_->button_lyxscale) {
-	    	setEnabled(lyxview_->input_lyxwidth, 0);
-	    	setEnabled(lyxview_->choice_width_lyxwidth, 0);
-	    	setEnabled(lyxview_->input_lyxheight, 0);
-	    	setEnabled(lyxview_->choice_width_lyxheight, 0);
-	    	setEnabled(lyxview_->input_lyxscale, 1);
+		// the lyxview section
+	} else if (ob == lyxview_->radio_lyxasis) {
+		setEnabled(lyxview_->input_lyxwidth, 0);
+		setEnabled(lyxview_->choice_lyxwidth, 0);
+		setEnabled(lyxview_->input_lyxheight, 0);
+		setEnabled(lyxview_->choice_lyxheight, 0);
+		setEnabled(lyxview_->input_lyxscale, 0);
+	} else if (ob == lyxview_->radio_lyxwh) {
+		setEnabled(lyxview_->input_lyxwidth, 1);
+		setEnabled(lyxview_->choice_lyxwidth, 1);
+		setEnabled(lyxview_->input_lyxheight, 1);
+		setEnabled(lyxview_->choice_lyxheight, 1);
+		setEnabled(lyxview_->input_lyxscale, 0);
+	} else if (ob == lyxview_->radio_lyxscale) {
+		setEnabled(lyxview_->input_lyxwidth, 0);
+		setEnabled(lyxview_->choice_lyxwidth, 0);
+		setEnabled(lyxview_->input_lyxheight, 0);
+		setEnabled(lyxview_->choice_lyxheight, 0);
+		setEnabled(lyxview_->input_lyxscale, 1);
+	} else if (ob == lyxview_->button_latex_values) {
+		if (contains(fl_get_choice_text(size_->choice_width),'%'))
+			Alert::alert(_("Warning!"),
+				     _("The units text%, page%, col% and line% are not allowed here."),
+				     _("Cannot use the values from LaTeX size!"));
+		else {
+			LyXLength dummy =
+				getLyXLengthFromWidgets(size_->input_width,
+							size_->choice_width);
+			updateWidgetsFromLength(lyxview_->input_lyxwidth,
+						lyxview_->choice_lyxwidth,
+						dummy, defaultUnit);
+
+			dummy = getLyXLengthFromWidgets(size_->input_height,
+							size_->choice_height);
+			updateWidgetsFromLength(lyxview_->input_lyxheight,
+						lyxview_->choice_lyxheight,
+						dummy, defaultUnit);
+			string const scale = getStringFromInput(size_->input_scale);
+			fl_set_input(lyxview_->input_lyxscale, scale.c_str());
+			if (fl_get_button (size_->radio_asis) == 1) {
+				fl_set_button (lyxview_->radio_lyxasis, 1);
+				setEnabled(lyxview_->input_lyxwidth, 0);
+				setEnabled(lyxview_->choice_lyxwidth, 0);
+				setEnabled(lyxview_->input_lyxheight, 0);
+				setEnabled(lyxview_->choice_lyxheight, 0);
+				setEnabled(lyxview_->input_lyxscale, 0);
+			} else if (fl_get_button (size_->radio_wh) == 1) {
+				fl_set_button (lyxview_->radio_lyxwh, 1);
+				setEnabled(lyxview_->input_lyxwidth, 1);
+				setEnabled(lyxview_->choice_lyxwidth, 1);
+				setEnabled(lyxview_->input_lyxheight, 1);
+				setEnabled(lyxview_->choice_lyxheight, 1);
+				setEnabled(lyxview_->input_lyxscale, 0);
+			} else if (fl_get_button (size_->radio_scale) ==1) {
+				fl_set_button (lyxview_->radio_lyxscale, 1);
+				setEnabled(lyxview_->input_lyxwidth, 0);
+				setEnabled(lyxview_->choice_lyxwidth, 0);
+				setEnabled(lyxview_->input_lyxheight, 0);
+				setEnabled(lyxview_->choice_lyxheight, 0);
+				setEnabled(lyxview_->input_lyxscale, 1);
+			}
+		}
 
-	// the bb section
-	} else if (!controller().bbChanged && 
-		   (ob == bbox_->input_bb_x0  || ob == bbox_->input_bb_y0 ||
-		    ob == bbox_->input_bb_x1  || ob == bbox_->input_bb_y1 ||
-		    ob == bbox_->choice_bb_x0 || ob == bbox_->choice_bb_y0 ||
-		    ob == bbox_->choice_bb_x1 || ob == bbox_->choice_bb_y1)) {
-	    controller().bbChanged = true; 
+		// the bb section
+	} else if (!controller().bbChanged &&
+		   (ob == bbox_->choice_bb_units ||
+		    ob == bbox_->input_bb_x0 || ob == bbox_->input_bb_y0 ||
+		    ob == bbox_->input_bb_x1 || ob == bbox_->input_bb_y1)) {
+		controller().bbChanged = true;
 	} else if (ob == bbox_->button_getBB) {
-	    string const filename = getStringFromInput(file_->input_filename);
-	    if (!filename.empty()) {
-		string const fileWithAbsPath = MakeAbsPath(filename, OnlyPath(filename)); 	
-		string bb = controller().readBB(fileWithAbsPath);
-		lyxerr << "getBB::BoundingBox = " << bb << "\n";
-		if (!bb.empty()) {		
-			updateWidgetsFromLengthString(bbox_->input_bb_x0,
-						      bbox_->choice_bb_x0,
-						      token(bb,' ',0), "pt");
-			updateWidgetsFromLengthString(bbox_->input_bb_y0,
-						      bbox_->choice_bb_y0,
-						      token(bb,' ',1), "pt");
-			updateWidgetsFromLengthString(bbox_->input_bb_x1,
-						      bbox_->choice_bb_x1,
-						      token(bb,' ',2), "pt");
-			updateWidgetsFromLengthString(bbox_->input_bb_y1,
-						      bbox_->choice_bb_y1,
-						      token(bb,' ',3), "pt");
+		string const filename = getStringFromInput(file_->input_filename);
+		if (!filename.empty()) {
+			string const fileWithAbsPath = MakeAbsPath(filename, OnlyPath(filename));
+			string bb = controller().readBB(fileWithAbsPath);
+			if (!bb.empty()) {
+				fl_set_input(bbox_->input_bb_x0, token(bb,' ',0).c_str());
+				fl_set_input(bbox_->input_bb_y0, token(bb,' ',1).c_str());
+				fl_set_input(bbox_->input_bb_x1, token(bb,' ',2).c_str());
+				fl_set_input(bbox_->input_bb_y1, token(bb,' ',3).c_str());
+				string const unit("pt");
+				fl_set_choice_text(bbox_->choice_bb_units, unit.c_str());
+			}
+			controller().bbChanged = false;
+		} else {
+			fl_set_input(bbox_->input_bb_x0, "");
+			fl_set_input(bbox_->input_bb_y0, "");
+			fl_set_input(bbox_->input_bb_x1, "");
+			fl_set_input(bbox_->input_bb_y1, "");
+			fl_set_choice_text(bbox_->choice_bb_units, "pt");
 		}
-		controller().bbChanged = false;
-	    }
 
-	// the size section
-	} else if (ob == size_->button_asis) {
-	    	setEnabled(size_->input_width, 0);
-	    	setEnabled(size_->choice_width_units, 0);
-	    	setEnabled(size_->input_height, 0);
-	    	setEnabled(size_->choice_height_units, 0);
+		// the size section
+	} else if (ob == size_->radio_asis) {
+		setEnabled(size_->input_width, 0);
+		setEnabled(size_->choice_width, 0);
+		setEnabled(size_->input_height, 0);
+		setEnabled(size_->choice_height, 0);
 		setEnabled(size_->check_aspectratio, 0);
-	    	setEnabled(size_->input_scale, 0);
-	} else if (ob == size_->button_wh) {
-	    	setEnabled(size_->input_width, 1);
-	    	setEnabled(size_->choice_width_units, 1);
-	    	setEnabled(size_->input_height, 1);
-	    	setEnabled(size_->choice_height_units, 1);
+		setEnabled(size_->input_scale, 0);
+	} else if (ob == size_->radio_wh) {
+		setEnabled(size_->input_width, 1);
+		setEnabled(size_->choice_width, 1);
+		setEnabled(size_->input_height, 1);
+		setEnabled(size_->choice_height, 1);
 		setEnabled(size_->check_aspectratio, 1);
-	    	setEnabled(size_->input_scale, 0);
-	} else if (ob == size_->button_scale) {
-	    	setEnabled(size_->input_width, 0);
-	    	setEnabled(size_->choice_width_units, 0);
-	    	setEnabled(size_->input_height, 0);
-	    	setEnabled(size_->choice_height_units, 0);
+		setEnabled(size_->input_scale, 0);
+	} else if (ob == size_->radio_scale) {
+		setEnabled(size_->input_width, 0);
+		setEnabled(size_->choice_width, 0);
+		setEnabled(size_->input_height, 0);
+		setEnabled(size_->choice_height, 0);
 		setEnabled(size_->check_aspectratio, 0);
-	    	setEnabled(size_->input_scale, 1);
+		setEnabled(size_->input_scale, 1);
+	} else if (ob == size_->button_lyx_values) {
+		LyXLength dummy = getLyXLengthFromWidgets(lyxview_->input_lyxwidth,
+							  lyxview_->choice_lyxwidth);
+		updateWidgetsFromLength(size_->input_width,
+					size_->choice_width,
+					dummy, defaultUnit);
+		dummy = getLyXLengthFromWidgets(lyxview_->input_lyxheight,
+						lyxview_->choice_lyxheight);
+		updateWidgetsFromLength(size_->input_height,
+					size_->choice_height,
+					dummy, defaultUnit);
+		string const scale = getStringFromInput(lyxview_->input_lyxscale);
+		fl_set_input(size_->input_scale, scale.c_str());
+		if (fl_get_button (lyxview_->radio_lyxasis) == 1) {
+			fl_set_button (size_->radio_asis, 1);
+			setEnabled(size_->input_width, 0);
+			setEnabled(size_->choice_width, 0);
+			setEnabled(size_->input_height, 0);
+			setEnabled(size_->choice_height, 0);
+			setEnabled(size_->check_aspectratio, 0);
+			setEnabled(size_->input_scale, 0);
+		} else if (fl_get_button (lyxview_->radio_lyxwh) == 1) {
+			fl_set_button (size_->radio_wh, 1);
+			setEnabled(size_->input_width, 1);
+			setEnabled(size_->choice_width, 1);
+			setEnabled(size_->input_height, 1);
+			setEnabled(size_->choice_height, 1);
+			setEnabled(size_->check_aspectratio, 1);
+			setEnabled(size_->input_scale, 0);
+		} else if (fl_get_button (lyxview_->radio_lyxscale) ==1) {
+			fl_set_button (size_->radio_scale, 1);
+			setEnabled(size_->input_width, 0);
+			setEnabled(size_->choice_width, 0);
+			setEnabled(size_->input_height, 0);
+			setEnabled(size_->choice_height, 0);
+			setEnabled(size_->check_aspectratio, 0);
+			setEnabled(size_->input_scale, 1);
+		}
 	}
 
 	// check if the input is valid
@@ -538,20 +679,17 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 
 	// deactivate OK/ Apply buttons and
 	// spit out warnings if invalid
-	if (ob == bbox_->input_bb_x0 || ob == bbox_->input_bb_x1 || 
-	    ob == bbox_->input_bb_y0 || ob == bbox_->input_bb_y1 || 
-	    ob == size_->input_width || ob == size_->input_height || 
+	if (ob == bbox_->input_bb_x0 || ob == bbox_->input_bb_x1 ||
+	    ob == bbox_->input_bb_y0 || ob == bbox_->input_bb_y1 ||
+	    ob == size_->input_width || ob == size_->input_height ||
 	    ob == lyxview_->input_lyxwidth || ob == lyxview_->input_lyxheight) {
 		if (invalid) {
-			fl_set_object_label(dialog_->text_warning,
-				_("Warning: Invalid Length!"));
-			fl_show_object(dialog_->text_warning);
+			postWarning(_("Invalid Length!"));
 			return ButtonPolicy::SMI_INVALID;
 		} else {
-			fl_hide_object(dialog_->text_warning);
+			clearMessage();
 		}
 	}
 
 	return ButtonPolicy::SMI_VALID;
 }
-