]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/xforms/FormGraphics.C
Introduce LFUN_PRINT.
[lyx.git] / src / frontends / xforms / FormGraphics.C
index 66de72a4bda307ccb54ad95dcfaec48577986b68..af3f41d5cccedf081fc626648ca5f27369ac51d5 100644 (file)
-/* This file is part of
- * ====================================================== 
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2000-2001 The LyX Team.
+/**
+ * \file FormGraphics.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Baruch Even
+ * \author Herbert Voß
+ * \author Rob Lahaye
  *
- * \file FormGraphics.C
- * \author Baruch Even, baruch.even@writeme.com
+ * Full author contact details are available in file CREDITS.
  */
 
-#include <config.h> 
-
-#ifdef __GNUG__
-#pragma implementation
-#endif 
+#include <config.h>
 
-#include "xformsBC.h"
-#include "ControlGraphics.h"
 #include "FormGraphics.h"
-#include "form_graphics.h"
+#include "ControlGraphics.h"
+#include "forms/form_graphics.h"
 
-#include "xforms_helpers.h"
+#include "controllers/helper_funcs.h"
+
+#include "checkedwidgets.h"
 #include "input_validators.h"
-#include "debug.h" // for lyxerr
-#include "support/lstrings.h"  // for strToDbl & tostr
-#include "support/FileInfo.h"  // for FileInfo
-#include "insets/insetgraphicsParams.h"
+#include "Tooltips.h"
+#include "xforms_helpers.h"
+#include "xformsBC.h"
+
 #include "lyxrc.h" // for lyxrc.display_graphics
 
-using std::endl;
+#include "insets/insetgraphicsParams.h"
 
-namespace {
+#include "frontends/Alert.h"
+
+#include "support/lyxlib.h"  // for float_equal
+#include "support/tostr.h"
 
-// Zero test for double precision numbers
-double const tol = 1.0e-08;
+#include "lyx_forms.h"
 
-// The maximum digits for the image scale
-int const SCALE_MAXDIGITS = 3;
+using lyx::support::bformat;
+using lyx::support::float_equal;
+using lyx::support::getStringFromVector;
+using lyx::support::strToDbl;
+using lyx::support::strToInt;
+using lyx::support::token;
 
-// The maximum digits for the image width
-int const WIDTH_MAXDIGITS = 3;
+using std::endl;
+
+using std::vector;
+using std::string;
 
-// The maximum digits for the image height
-int const HEIGHT_MAXDIGITS = 3;
 
-// The max characters in the rotation angle (minus sign and 3 digits)
-int const ROTATE_MAXCHARS = 4;
+namespace {
 
-// The maximum characters in a filename.
+// Bound the number of input characters
+int const SIZE_MAXDIGITS = 10;
 int const FILENAME_MAXCHARS = 1024;
+
+string defaultUnit("cm");
+
+#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL < 2)
+bool const scalableTabfolders = false;
+#else
+bool const scalableTabfolders = true;
+#endif
+
 } // namespace anon
 
 
-typedef FormCB<ControlGraphics, FormDB<FD_form_graphics> > base_class;
+typedef FormController<ControlGraphics, FormView<FD_graphics> > base_class;
 
-FormGraphics::FormGraphics(ControlGraphics & c)
-       : base_class(c, _("Graphics"))
+FormGraphics::FormGraphics(Dialog & parent)
+       : base_class(parent, _("Graphics"), scalableTabfolders)
 {}
 
 
+void FormGraphics::redraw()
+{
+       if (form() && form()->visible)
+               fl_redraw_form(form());
+       else
+               return;
+       FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder);
+       if (outer_form && outer_form->visible)
+               fl_redraw_form(outer_form);
+}
+
+
 void FormGraphics::build()
 {
-       dialog_.reset(build_graphics());
-
-       // This is the place to add settings of the dialog that did not go
-       // to the .fd file.
-
-       // Set the input widgets to issue a callback to input() whenever
-       // they change, so we can verify their content.
-       fl_set_input_return (dialog_->input_filename,     FL_RETURN_CHANGED);
-       fl_set_input_return (dialog_->input_scale,        FL_RETURN_CHANGED);
-       fl_set_input_return (dialog_->input_width,        FL_RETURN_CHANGED);
-       fl_set_input_return (dialog_->input_height,       FL_RETURN_CHANGED);
-       fl_set_input_return (dialog_->input_rotate_angle, FL_RETURN_CHANGED);
-       fl_set_input_return (dialog_->input_subcaption,   FL_RETURN_CHANGED);
-
-       // Set the maximum characters that can be written in the input texts.
-       fl_set_input_maxchars(dialog_->input_scale,        SCALE_MAXDIGITS);
-       fl_set_input_maxchars(dialog_->input_width,        WIDTH_MAXDIGITS);
-       fl_set_input_maxchars(dialog_->input_height,       HEIGHT_MAXDIGITS);
-       fl_set_input_maxchars(dialog_->input_filename,     FILENAME_MAXCHARS);
-       fl_set_input_maxchars(dialog_->input_rotate_angle, ROTATE_MAXCHARS);
-
-       // Set input filter on width and height to make them accept only
-       // unsigned numbers.
-       fl_set_input_filter(dialog_->input_scale,  fl_unsigned_float_filter);
-       fl_set_input_filter(dialog_->input_width,  fl_unsigned_float_filter);
-       fl_set_input_filter(dialog_->input_height, fl_unsigned_float_filter);
-
-       // Set input filter on rotate_angle to make it accept only
-       // floating point numbers.
-       fl_set_input_filter(dialog_->input_rotate_angle, fl_float_filter);
-
-       // Create the contents of the choices
-       string const width = " cm | inch | page %% | column %% ";
-       fl_addto_choice(dialog_->choice_width_units, width.c_str());
-
-       string const height = " cm | inch | page %% ";
-       fl_addto_choice(dialog_->choice_height_units, height.c_str());
-
-        // 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().setRestore(dialog_->button_restore);
-
-       bc().addReadOnly(dialog_->input_filename);
-       bc().addReadOnly(dialog_->button_browse);
-       bc().addReadOnly(dialog_->check_display);
-       bc().addReadOnly(dialog_->input_scale);
-       bc().addReadOnly(dialog_->input_width);
-       bc().addReadOnly(dialog_->choice_width_units);
-       bc().addReadOnly(dialog_->input_height);
-       bc().addReadOnly(dialog_->choice_height_units);
-       bc().addReadOnly(dialog_->input_rotate_angle);
-       bc().addReadOnly(dialog_->input_subcaption);
-       bc().addReadOnly(dialog_->check_subcaption);
+       dialog_.reset(build_graphics(this));
+
+       // Manage the ok, apply, restore and cancel/close buttons
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
+       bcview().setRestore(dialog_->button_restore);
+
+       // The file section.
+       file_.reset(build_graphics_file(this));
+
+       // Disable for read-only documents.
+       bcview().addReadOnly(file_->button_browse);
+       bcview().addReadOnly(file_->check_aspectratio);
+       bcview().addReadOnly(file_->check_draft);
+       bcview().addReadOnly(file_->check_nounzip);
+
+       // Check validity of "length + unit" input.
+       addCheckedGlueLength(bcview(), file_->input_width);
+       addCheckedGlueLength(bcview(), file_->input_height);
+
+       // Trigger an input event for cut&paste with middle mouse button.
+       setPrehandler(file_->input_filename);
+       setPrehandler(file_->input_lyxscale);
+       setPrehandler(file_->input_width);
+       setPrehandler(file_->input_height);
+
+       // Activate ok/apply immediately upon input.
+       fl_set_input_return(file_->input_filename, FL_RETURN_CHANGED);
+       fl_set_input_return(file_->input_lyxscale, FL_RETURN_CHANGED);
+       fl_set_input_return(file_->input_width, FL_RETURN_CHANGED);
+       fl_set_input_return(file_->input_height, FL_RETURN_CHANGED);
+
+       fl_set_input_maxchars(file_->input_filename, FILENAME_MAXCHARS);
+       fl_set_input_filter(file_->input_lyxscale, fl_unsigned_int_filter);
+
+       // Width default is scaling: use unsigned float filter.
+       fl_set_input_filter(file_->input_width, fl_unsigned_float_filter);
+       fl_set_input_maxchars(file_->input_height, SIZE_MAXDIGITS);
+
+       string const display_List =
+               _("Default|Monochrome|Grayscale|Color|Do not display");
+       fl_addto_choice(file_->choice_display, display_List.c_str());
+
+       string const width_list = bformat(_("Scale%%%%|%1$s"), choice_Length_All);
+       fl_addto_choice(file_->choice_width, width_list.c_str());
+
+       fl_addto_choice(file_->choice_height, choice_Length_All.c_str());
+
+       // set up the tooltips for the filesection
+       string str = _("The file you want to insert.");
+       tooltips().init(file_->input_filename, str);
+       str = _("Browse the directories.");
+       tooltips().init(file_->button_browse, str);
+
+       str = _("Scale the image to inserted percentage value.");
+       tooltips().init(file_->input_lyxscale, str);
+       str = _("Select display mode for this image.");
+       tooltips().init(file_->choice_display, str);
+
+       str = _("Set the image width to the inserted value.");
+       tooltips().init(file_->input_width, str);
+       // xgettext:no-c-format
+       str = _("Select unit for width; Scale% for scaling whole image.");
+       tooltips().init(file_->choice_width, str);
+       str = _("Set the image height to the inserted value.");
+       tooltips().init(file_->input_height, str);
+       str = _("Select unit for height.");
+       tooltips().init(file_->choice_height, str);
+       str = _("Do not distort the image. "
+               "Keep image within \"width\" by \"height\" and obey "
+               "aspect ratio.");
+       tooltips().init(file_->check_aspectratio, str);
+       str = _("Pass a filename like \"file.eps.gz\" to the LaTeX output. "
+               "Useful when LaTeX should unzip the file. Needs an additional "
+               "file like \"file.eps.bb\" which holds the values for "
+               "the bounding box.");
+       tooltips().init(file_->check_nounzip, str);
+       str = _("Show image only as a rectangle of the original size.");
+       tooltips().init(file_->check_draft, str);
+
+       // the bounding box selection
+       bbox_.reset(build_graphics_bbox(this));
+
+       // disable for read-only documents
+       bcview().addReadOnly(bbox_->button_getBB);
+       bcview().addReadOnly(bbox_->check_clip);
+
+       // check validity of "length + unit" input
+       addCheckedLyXLength(bcview(), bbox_->input_bb_x1, bbox_->text_X);
+
+       // trigger an input event for cut&paste with middle mouse button.
+       setPrehandler(bbox_->input_bb_x0);
+       setPrehandler(bbox_->input_bb_y0);
+       setPrehandler(bbox_->input_bb_x1);
+       setPrehandler(bbox_->input_bb_y1);
+
+       // for activate ok/apply immediately upon input
+       fl_set_input_return(bbox_->input_bb_x0, FL_RETURN_CHANGED);
+       fl_set_input_return(bbox_->input_bb_y0, FL_RETURN_CHANGED);
+       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_y1, fl_unsigned_float_filter);
+
+       string const bb_units = getStringFromVector(frnt::getBBUnits(), "|");
+       fl_addto_choice(bbox_->choice_bb_units, bb_units.c_str());
+
+       // set up the tooltips for the bounding-box-section
+       str = _("The lower left x-value of the bounding box.");
+       tooltips().init(bbox_->input_bb_x0, str);
+       str = _("The lower left y-value of the bounding box.");
+       tooltips().init(bbox_->input_bb_y0, str);
+       str = _("The upper right x-value of the bounding box; "
+               "only this input field allows length + unit, e.g. 5cm "
+               "and sets the unit for the other input fields.");
+       tooltips().init(bbox_->input_bb_x1, str);
+       str = _("The upper right y-value of the bounding box.");
+       tooltips().init(bbox_->input_bb_y1, str);
+       str = _("Select unit for the bounding box values.");
+       tooltips().init(bbox_->choice_bb_units, str);
+
+       str = _("Read the image coordinates new from file. For (e)ps-file "
+               "the bounding box is read, otherwise the imagesize in pixels. "
+               "Default unit is \"bp\", the PostScript's b(ig) p(oint).");
+       tooltips().init(bbox_->button_getBB, str);
+
+       str = _("Clip image to the bounding box values.");
+       tooltips().init(bbox_->check_clip, str);
+
+       // the extra section
+       extra_.reset(build_graphics_extra(this));
+
+       // disable for read-only documents
+       bcview().addReadOnly(extra_->input_rotate_angle);
+       bcview().addReadOnly(extra_->choice_origin);
+       bcview().addReadOnly(extra_->check_subcaption);
+       bcview().addReadOnly(extra_->input_special);
+
+       // trigger an input event for cut&paste with middle mouse button.
+       setPrehandler(extra_->input_rotate_angle);
+       setPrehandler(extra_->input_subcaption);
+       setPrehandler(extra_->input_special);
+
+       fl_set_input_return(extra_->input_rotate_angle, FL_RETURN_CHANGED);
+       fl_set_input_return(extra_->input_subcaption, FL_RETURN_CHANGED);
+       fl_set_input_return(extra_->input_special, FL_RETURN_CHANGED);
+
+       fl_set_input_filter(extra_->input_rotate_angle, fl_float_filter);
+
+       using namespace frnt;
+       vector<RotationOriginPair> origindata = getRotationOriginData();
+
+       // Store the identifiers for later
+       origins_ = getSecond(origindata);
+
+       string const choice = getStringFromVector(getFirst(origindata), "|");
+       fl_addto_choice(extra_->choice_origin, choice.c_str());
+
+       // set up the tooltips for the extra section
+       str = _("Insert the rotation angle in degrees. "
+               "Positive value rotates anti-clockwise, "
+               "negative value clockwise.");
+       tooltips().init(extra_->input_rotate_angle, str);
+       str = _("Insert the point of origin for rotation.");
+       tooltips().init(extra_->choice_origin, str);
+       str = _("Enables use of subfigure with its own caption.");
+       tooltips().init(extra_->check_subcaption, str);
+       str = _("Insert the optional subfigure caption.");
+       tooltips().init(extra_->input_subcaption, str);
+       str = _("Add any additional LaTeX option, which is defined in the "
+               "graphicx-package and not mentioned in the gui's tabfolders.");
+       tooltips().init(extra_->input_special, str);
+
+       // Enable the tabfolder to be rescaled correctly.
+       if (scalableTabfolders)
+               fl_set_tabfolder_autofit(dialog_->tabfolder, FL_FIT);
+
+       // Stack tabs
+       fl_addto_tabfolder(dialog_->tabfolder, _("File").c_str(),
+                          file_->form);
+       fl_addto_tabfolder(dialog_->tabfolder, _("Bounding Box").c_str(),
+                          bbox_->form);
+       fl_addto_tabfolder(dialog_->tabfolder, _("Extra").c_str(),
+                          extra_->form);
+
+       // set the right default unit
+       switch (lyxrc.default_papersize) {
+       case PAPER_DEFAULT: break;
+       case PAPER_USLETTER:
+       case PAPER_LEGALPAPER:
+       case PAPER_EXECUTIVEPAPER: defaultUnit = "in"; break;
+       case PAPER_A3PAPER:
+       case PAPER_A4PAPER:
+       case PAPER_A5PAPER:
+       case PAPER_B5PAPER: defaultUnit = "cm"; break;
+       }
 }
 
 
@@ -127,253 +293,355 @@ void FormGraphics::apply()
        // Create the parameters structure and fill the data from the dialog.
        InsetGraphicsParams & igp = controller().params();
 
-       igp.filename = fl_get_input(dialog_->input_filename);
+       // the file section
+       igp.filename.set(getString(file_->input_filename),
+                        kernel().bufferFilepath());
+
+       igp.lyxscale = strToInt(getString(file_->input_lyxscale));
+       if (igp.lyxscale == 0) {
+               igp.lyxscale = 100;
+       }
 
-       if (lyxrc.display_graphics == "no") {
-               igp.display = InsetGraphicsParams::NONE;
+       switch (fl_get_choice(file_->choice_display)) {
+       case 5:
+               igp.display = lyx::graphics::NoDisplay;
+               break;
+       case 4:
+               igp.display = lyx::graphics::ColorDisplay;
+               break;
+       case 3:
+               igp.display = lyx::graphics::GrayscaleDisplay;
+               break;
+       case 2:
+               igp.display = lyx::graphics::MonochromeDisplay;
+               break;
+       case 1:
+               igp.display = lyx::graphics::DefaultDisplay;
+       }
 
-       } else {
-               if (fl_get_button(dialog_->check_display)) {
-                       if (lyxrc.display_graphics == "mono") {
-                               igp.display = InsetGraphicsParams::MONOCHROME;
-                       } else if (lyxrc.display_graphics == "gray") {
-                               igp.display = InsetGraphicsParams::GRAYSCALE;
-                       } else if (lyxrc.display_graphics == "color") {
-                               igp.display = InsetGraphicsParams::COLOR;
-                       }
-                       
-               } else {
-                       igp.display = InsetGraphicsParams::NONE;
+       // first item in choice_width means scaling
+       if (fl_get_choice(file_->choice_width) == 1) {
+               igp.scale = strToDbl(getString(file_->input_width));
+               if (float_equal(igp.scale, 0.0, 0.05)) {
+                       igp.scale = 100.0;
                }
+               igp.width = LyXLength();
+       } else {
+               igp.scale = 0.0;
+               igp.width = LyXLength(getLengthFromWidgets(file_->input_width,
+                                                          file_->choice_width));
        }
+       igp.height = LyXLength(getLengthFromWidgets(file_->input_height,
+                                                   file_->choice_height));
+       igp.keepAspectRatio = fl_get_button(file_->check_aspectratio);
 
-       double const scale =
-               strToDbl(strip(fl_get_input(dialog_->input_scale)));
-       if (scale < tol) {
-               double const width =
-                       strToDbl(strip(fl_get_input(dialog_->input_width)));
+       igp.draft = fl_get_button(file_->check_draft);
+       igp.noUnzip = fl_get_button(file_->check_nounzip);
 
-               if (width < tol) {
-                       igp.widthResize = InsetGraphicsParams::DEFAULT_SIZE;
-                       igp.widthSize   = 0.0;
-               } else {
-                       switch (fl_get_choice(dialog_->choice_width_units)) {
-                       case 2:
-                               igp.widthResize = InsetGraphicsParams::INCH;
+       // the bb section
+       if (!controller().bbChanged) {
+               // don't write anything
+               igp.bb.erase();
+       } else {
+               // allow length + unit input only for x1 input field
+               string x1_str = "0";
+               if (!getString(bbox_->input_bb_x1).empty()) {
+                       x1_str = getLengthFromWidgets(bbox_->input_bb_x1,
+                                                     bbox_->choice_bb_units);
+                       LyXLength x1 = LyXLength(x1_str);
+                       x1_str = x1.asString();
+
+                       string unit;
+                       switch (x1.unit()) {
+                       case LyXLength::IN:
+                               unit = "in";
                                break;
-                       case 3:
-                               igp.widthResize =
-                                       InsetGraphicsParams::PERCENT_PAGE;
+                       case LyXLength::MM:
+                               unit = "mm";
                                break;
-                       case 4:
-                               igp.widthResize =
-                                       InsetGraphicsParams::PERCENT_COLUMN;
+                       case LyXLength::CM:
+                               unit = "cm";
                                break;
+                       case LyXLength::BP:
                        default:
-                               igp.widthResize = InsetGraphicsParams::CM;
-                               break;
+                               unit = "bp";
                        }
-                       igp.widthSize = width;
+                       fl_set_choice_text(bbox_->choice_bb_units, unit.c_str());
                }
-               
-               double const height =
-                       strToDbl(strip(fl_get_input(dialog_->input_height)));
-               
-               if (height < tol) {
-                       igp.heightResize = InsetGraphicsParams::DEFAULT_SIZE;
-                       igp.heightSize   = 0.0;
-               } else {
-                       switch (fl_get_choice(dialog_->choice_height_units)) {
-                       case 2:
-                               igp.heightResize = InsetGraphicsParams::INCH;
-                               break;
-                       case 3:
-                               igp.heightResize =
-                                       InsetGraphicsParams::PERCENT_PAGE;
-                               break;
-                       default:
-                               igp.heightResize = InsetGraphicsParams::CM;
-                               break;
-                       }
-                       igp.heightSize = height;
-               }
-               
-       } else {
-               igp.widthResize  = InsetGraphicsParams::DEFAULT_SIZE;
-               igp.widthSize    = 0.0;
-               igp.heightResize = InsetGraphicsParams::SCALE;
-               igp.heightSize   = scale;
+
+               string bb;
+               if (getString(bbox_->input_bb_x0).empty())
+                       bb = "0";
+               else
+                       bb = getLengthFromWidgets(bbox_->input_bb_x0,
+                                                 bbox_->choice_bb_units);
+
+               bb += ' ';
+
+               if (getString(bbox_->input_bb_y0).empty())
+                       bb += '0';
+               else
+                       bb += getLengthFromWidgets(bbox_->input_bb_y0,
+                                                 bbox_->choice_bb_units);
+
+               bb += ' ' + x1_str + ' ';
+
+               if (getString(bbox_->input_bb_y1).empty())
+                       bb += '0';
+               else
+                       bb += getLengthFromWidgets(bbox_->input_bb_y1,
+                                                  bbox_->choice_bb_units);
+
+               igp.bb = bb;
        }
-       
-       igp.rotateAngle =
-               strToDbl(strip(fl_get_input(dialog_->input_rotate_angle)));
-       while (igp.rotateAngle < 0.0 || igp.rotateAngle > 360.0) {
-               if (igp.rotateAngle < 0.0) {
-                       igp.rotateAngle += 360.0;
-               } else if (igp.rotateAngle > 360.0) {
-                       igp.rotateAngle -= 360.0;
-               }
+       igp.clip = fl_get_button(bbox_->check_clip);
+
+       // the extra section
+       igp.rotateAngle = strToDbl(getString(extra_->input_rotate_angle));
+
+       // map angle into -360 (clock-wise) to +360 (counter clock-wise)
+       while (igp.rotateAngle <= -360.0) {
+               igp.rotateAngle += 360.0;
        }
+       while (igp.rotateAngle >=  360.0) {
+               igp.rotateAngle -= 360.0;
+       }
+       fl_set_input(extra_->input_rotate_angle, tostr(igp.rotateAngle).c_str());
 
-       igp.subcaption = fl_get_button(dialog_->check_subcaption);
-       igp.subcaptionText = fl_get_input(dialog_->input_subcaption);
+       int const origin_pos = fl_get_choice(extra_->choice_origin);
+       if (origin_pos == 0) {
+               igp.rotateOrigin.erase();
+       } else {
+               igp.rotateOrigin = origins_[origin_pos - 1];
+       }
 
-       igp.testInvariant();
+       igp.subcaption = fl_get_button(extra_->check_subcaption);
+       igp.subcaptionText = getString(extra_->input_subcaption);
+
+       igp.special = getString(extra_->input_special);
 }
 
 
-void FormGraphics::update()
-{
+void FormGraphics::update() {
        // Update dialog with details from inset
        InsetGraphicsParams & igp = controller().params();
 
-       // Update the filename input field
-       fl_set_input(dialog_->input_filename,
-                    igp.filename.c_str());
+       // the file section
+       string const name =
+               igp.filename.outputFilename(kernel().bufferFilepath());
+       fl_set_input(file_->input_filename, name.c_str());
+       fl_set_input(file_->input_lyxscale, tostr(igp.lyxscale).c_str());
+
+       switch (igp.display) {
+       case lyx::graphics::NoDisplay:
+               fl_set_choice(file_->choice_display, 5);
+               break;
+       case lyx::graphics::ColorDisplay:
+               fl_set_choice(file_->choice_display, 4);
+               break;
+       case lyx::graphics::GrayscaleDisplay:
+               fl_set_choice(file_->choice_display, 3);
+               break;
+       case lyx::graphics::MonochromeDisplay:
+               fl_set_choice(file_->choice_display, 2);
+               break;
+       case lyx::graphics::DefaultDisplay:
+               fl_set_choice(file_->choice_display, 1);
+       }
 
-       // To display or not to display
-       if (lyxrc.display_graphics == "no") {
-               fl_set_button(dialog_->check_display, 0);
+       // set width input fields according to scaling or width/height input
+       if (!float_equal(igp.scale, 0.0, 0.05)) {
+               fl_set_input_filter(file_->input_width, fl_unsigned_float_filter);
+               fl_set_input_maxchars(file_->input_width, 0);
+               fl_set_input(file_->input_width, tostr(igp.scale).c_str());
+               fl_set_choice(file_->choice_width, 1);
        } else {
-               if (igp.display == InsetGraphicsParams::NONE) {
-                       fl_set_button(dialog_->check_display, 0);
-               } else {
-                       fl_set_button(dialog_->check_display, 1);
-               }
+               fl_set_input_filter(file_->input_width, NULL);
+               fl_set_input_maxchars(file_->input_width, SIZE_MAXDIGITS);
+               updateWidgetsFromLength(file_->input_width, file_->choice_width,
+                                       igp.width, defaultUnit);
        }
 
-       setEnabled(dialog_->check_display, (lyxrc.display_graphics != "no"));
-
-       if (igp.heightResize == InsetGraphicsParams::SCALE) {
-               string number = tostr(igp.heightSize);
-               fl_set_input(dialog_->input_scale, number.c_str());
-               fl_set_input(dialog_->input_width, "");
-               fl_set_choice(dialog_->choice_width_units, 1);
-               fl_set_input(dialog_->input_height, "");
-               fl_set_choice(dialog_->choice_height_units, 1);
-
+       updateWidgetsFromLength(file_->input_height, file_->choice_height,
+                               igp.height, defaultUnit);
+
+       // disable height input in case of scaling
+       bool const disable_height = !float_equal(igp.scale, 0.0, 0.05);
+       setEnabled(file_->input_height, !disable_height);
+       setEnabled(file_->choice_height, !disable_height);
+
+       fl_set_button(file_->check_aspectratio, igp.keepAspectRatio);
+       fl_set_button(file_->check_draft, igp.draft);
+       fl_set_button(file_->check_nounzip, igp.noUnzip);
+
+       // disable aspectratio button in case of scaling or one of width/height
+       // is empty
+       bool const disable_aspectRatio = disable_height ||
+                               getString(file_->input_width).empty() ||
+                               getString(file_->input_height).empty();
+       setEnabled(file_->check_aspectratio, !disable_aspectRatio);
+
+       // 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
+       updateBB(igp.filename.absFilename(), igp.bb);
+       fl_set_button(bbox_->check_clip, igp.clip);
+
+       // the extra section
+       fl_set_input(extra_->input_rotate_angle,
+                    tostr(igp.rotateAngle).c_str());
+
+       int origin_pos;
+       if (igp.rotateOrigin.empty()) {
+               origin_pos = 1;
        } else {
-               fl_set_input(dialog_->input_scale, "");
-
-               string number;
-               if (igp.widthResize != InsetGraphicsParams::DEFAULT_SIZE) {
-                       number = tostr(igp.widthSize);
-               }
-               fl_set_input(dialog_->input_width, number.c_str());
+               origin_pos = 1 + findPos(origins_, igp.rotateOrigin);
+       }
+       fl_set_choice(extra_->choice_origin, origin_pos);
 
-               int pos = 1;
-               switch (igp.widthResize) {
-               case InsetGraphicsParams::INCH:
-                       pos = 2; break;
+       fl_set_button(extra_->check_subcaption, igp.subcaption);
+       fl_set_input(extra_->input_subcaption, igp.subcaptionText.c_str());
+       setEnabled(extra_->input_subcaption,
+                  fl_get_button(extra_->check_subcaption));
+       fl_set_input(extra_->input_special, igp.special.c_str());
 
-               case InsetGraphicsParams::PERCENT_PAGE:
-                       pos = 3; break;
+       // open dialog in the file-tab, whenever filename is empty
+       if (igp.filename.empty()) {
+               fl_set_folder(dialog_->tabfolder, file_->form);
+       }
+}
 
-               case InsetGraphicsParams::PERCENT_COLUMN:
-                       pos = 4; break;
 
-               default:
-                       break;
-               }
-               fl_set_choice(dialog_->choice_width_units, pos);
+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]
+                       << "FormGraphics::updateBB() [no BoundingBox]" << endl;
+               string const bb = controller().readBB(filename);
+               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());
 
-               number.erase();
-               if (igp.heightResize != InsetGraphicsParams::DEFAULT_SIZE) {
-                       number = tostr(igp.heightSize);
+               } 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());
                }
-               fl_set_input(dialog_->input_height, number.c_str());
-
-               pos = 1;
-               switch (igp.heightResize) {
-               case InsetGraphicsParams::INCH:
-                       pos = 2; break;
+               // "bp"
+               fl_set_choice(bbox_->choice_bb_units, 1);
 
-               case InsetGraphicsParams::PERCENT_PAGE:
-                       pos = 3; break;
-
-               default:
-                       break;
-               }
-               fl_set_choice(dialog_->choice_height_units, pos);
+       } else {
+               // get the values from the inset
+               lyxerr[Debug::GRAPHICS]
+                       << "FormGraphics::updateBB(): igp has BoundingBox"
+                       << " ["<< bb_inset << "]" << endl;
+               controller().bbChanged = true;
+
+               LyXLength anyLength;
+               anyLength = LyXLength(token(bb_inset,' ',0));
+               updateWidgetsFromLength(bbox_->input_bb_x0,
+                                       bbox_->choice_bb_units,anyLength,"bp");
+               anyLength = LyXLength(token(bb_inset,' ',1));
+               updateWidgetsFromLength(bbox_->input_bb_y0,
+                                       bbox_->choice_bb_units,anyLength,"bp");
+               anyLength = LyXLength(token(bb_inset,' ',2));
+               updateWidgetsFromLength(bbox_->input_bb_x1,
+                                       bbox_->choice_bb_units,anyLength,"bp");
+               anyLength = LyXLength(token(bb_inset,' ',3));
+               updateWidgetsFromLength(bbox_->input_bb_y1,
+                                       bbox_->choice_bb_units,anyLength,"bp");
        }
-               
-       // Update the rotate angle
-       fl_set_input(dialog_->input_rotate_angle,
-                    tostr(igp.rotateAngle).c_str());
-
-       // Update the subcaption check button and input field
-       fl_set_button(dialog_->check_subcaption,
-                     igp.subcaption);
-       fl_set_input(dialog_->input_subcaption,
-                    igp.subcaptionText.c_str());
-
-       setEnabled(dialog_->input_subcaption,
-                  fl_get_button(dialog_->check_subcaption));
 }
 
 
 ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
 {
-       if (ob == dialog_->button_browse) {
+       // the file section
+       if (ob == file_->button_browse) {
                // Get the filename from the dialog
-               string const in_name = fl_get_input(dialog_->input_filename);
-               string const out_name = controller().Browse(in_name);
-
+               string const in_name = getString(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(dialog_->input_filename, out_name.c_str());
+                       fl_set_input(file_->input_filename, out_name.c_str());
                }
-       }
-
-       if (ob == dialog_->input_scale) {
-               double const scale =
-                       strToDbl(strip(fl_get_input(dialog_->input_scale)));
-               if (scale > tol) {
-                       fl_set_input(dialog_->input_width, "");
-                       fl_set_choice(dialog_->choice_width_units, 1);
-                       fl_set_input(dialog_->input_height, "");
-                       fl_set_choice(dialog_->choice_height_units, 1);
+               if (controller().isFilenameValid(out_name) &&
+                   !controller().bbChanged) {
+                       updateBB(out_name, string());
+               }
+       } else if (ob == file_->input_width || ob == file_->input_height) {
+               // disable aspectratio button in case of scaling or one of
+               // width/height is empty
+               bool const disable = fl_get_choice(file_->choice_width) == 1 ||
+                                   getString(file_->input_width).empty() ||
+                                   getString(file_->input_height).empty();
+               setEnabled(file_->check_aspectratio, !disable);
+       } else if (ob == file_->choice_width) {
+               // disable height input in case of scaling
+               bool const scaling = fl_get_choice(file_->choice_width) == 1;
+               setEnabled(file_->input_height, !scaling);
+               setEnabled(file_->choice_height, !scaling);
+
+               // allow only integer intput for scaling; float otherwise
+               if (scaling) {
+                       fl_set_input_filter(file_->input_width, fl_unsigned_float_filter);
+                       fl_set_input_maxchars(file_->input_width, 0);
+               } else {
+                       fl_set_input_filter(file_->input_width, NULL);
+                       fl_set_input_maxchars(file_->input_width, SIZE_MAXDIGITS);
                }
-       }
-
-       if (ob == dialog_->input_width || ob == dialog_->input_height) {
-               double const width =
-                       strToDbl(strip(fl_get_input(dialog_->input_width)));
-               double const height =
-                       strToDbl(strip(fl_get_input(dialog_->input_height)));
 
-               if (width > tol || height > tol) {
-                       fl_set_input(dialog_->input_scale, "");
+               // disable aspectratio button in case of scaling or height
+               // input is empty
+               bool const disable_aspectratio =
+                       scaling || getString(file_->input_height).empty();
+               setEnabled(file_->check_aspectratio, !disable_aspectratio);
+       // the bb section
+       } else if (!controller().bbChanged &&
+                  (ob == bbox_->check_clip  || 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 = getString(file_->input_filename);
+               if (!filename.empty()) {
+                       string bb = controller().readBB(filename);
+                       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());
+                               fl_set_choice_text(bbox_->choice_bb_units, "bp");
+                       }
+                       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, "bp");
                }
-       }
+       // the extra section
+       } else if (ob == extra_->check_subcaption) {
+               setEnabled(extra_->input_subcaption,
+                          fl_get_button(extra_->check_subcaption));
 
-       if (ob == dialog_->check_subcaption) {
-               setEnabled(dialog_->input_subcaption,
-                          fl_get_button(dialog_->check_subcaption));
        }
 
-       return checkInput();
-}
-
-
-ButtonPolicy::SMInput FormGraphics::checkInput()
-{
-       // Put verifications that the dialog shows some sane values,
-       // if not disallow clicking on ok/apply.
-       // Possibly use a label in the bottom of the dialog to give the reason.
-
-       ButtonPolicy::SMInput activate = ButtonPolicy::SMI_VALID;
-
-       // We verify now that there is a filename, it exists, it's a file
-       // and it's readable.
-       string filename = fl_get_input(dialog_->input_filename);
-       FileInfo file(filename);
-       if (filename.empty()
-               || !file.isOK()
-               || !file.exist()
-               || !file.isRegular()
-               || !file.readable()
-          )
-               activate = ButtonPolicy::SMI_INVALID;
-
-       return activate;
+       return ButtonPolicy::SMI_VALID;
 }