Herbert's graphic7.diff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3490 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/help/Graphics.hlp b/lib/help/Graphics.hlp
deleted file mode 100644 (file)
index 5ea85b3..0000000
--- a/lib/help/Graphics.hlp
+++ /dev/null
@@ -1,70 +0,0 @@
-@iTabFolder Filename--------------------------------
-
-@bFile:
-    You do not need the extension like *eps, when your
-    config file of graphicx is present and has such
-    entries.
-@bBrowse:
-    Opens the browse gui
-    
-@bBounding Box----
-    The image size in Pixeln. Given through lower left
-    corner (x0,y0) and upper right corner (y1,y2)
-    LaTeX excepts all other valid units. The bounding
-    box is used by LaTeX to reserve space when 
-    formatting the doxument.
-    
-@bOptions----
-@bGet Bounding Box from file
-    When you have a lot of changes in the bounding
-    box you can reload the original values from
-    the image file, if exists ;-)
-@bClip to Bounding Box
-    enable this switch if LaTeX should clip the image
-    if it's greater than the bounding box.
-@bDraft mode
-    enable this switch, when only a rectangle should 
-    appear. Speeds up your computing process.
-    
-@bSubfigure
-    If this image is part of a collection of some other
-    figures, you can enable the switch and insert a
-    subcaption. LyX includes the package subfigure.
-    
-@iTabFolder Imagesize------------------------------------
-@bLaTeX----
-@bDefault
-    Enable this switch when LaTeX shall take the image
-    "as is".
-@bWidth/Height
-    Enable this if you like to change one or both of
-    these values. You have different possibilities for
-    the unit.
-@bkeep aspectratio
-    Enable this switch if the aspectratio shall be the
-    same.
-@bScale
-    Enter a value in degrees, like 45, when your image
-    shall be rotated.    
-
-@bLyX Screen----
-@bDon't display
-    LyX shows only a rectangle. Makes processing faster
-@bin Monochrome:    
-@bin Grayscale:
-@bin Color:
-    choose one of these modes to show your image in LyX
-@bWidth/Height:
-    You can specify a special width/height for the
-    images.
-   
-@iTabFolder Special------------------------------------
-@bRotation Angle:
-    Choose any value. The default unit is degree.
-@bOrigin:
-    You can specify the origin point for the rotation.
-
-@bSpecial Options:
-    This is expecially for old graphicx stylefiles.
-    You can enter any options you like. Divede them
-    by a comma.

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 63c4c9842f966b620c559d8a3fceb61a5a70c974..23365fc1d57f7e8bed818f9d1486dc5e143810aa 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,16 @@
+2002-02-05  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * forms/form_graphics.fd: Tiny tweek to make the Restore, Ok, Apply,
+       Cancel buttons' positions consistent with the other dialogs.
+
+2002-02-05  Herbert Voss  <voss@lyx.org>
+
+       * forms/form_graphics.fd: Noew the same view of the 
+       buttons as in preferences (LyXView). Make some things clear
+       with better names.
+       * FormGraphic.C: cosmetic changes to the layout. Delete
+       the help button
+
 2002-02-05  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormBase.[Ch]: You want tooltips too? You got 'em. Verified as

diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index fb9a0eb565edf908889c9a850b15659c57bc7fbd..8448cd0d0f4698899967249423d27afbe2fa96d7 100644 (file)
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -74,7 +74,6 @@ void FormGraphics::build()
        bc().setApply(dialog_->button_apply);
        bc().setCancel(dialog_->button_cancel);
        bc().setRestore(dialog_->button_restore);
-       bc().addReadOnly(dialog_->button_help);
 
        // the file section
        file_.reset(build_file());
@@ -95,6 +94,7 @@ void FormGraphics::build()
 
        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);
 
@@ -107,11 +107,12 @@ void FormGraphics::build()
 
        fl_addto_choice(lyxview_->choice_width_lyxwidth, choice_Length_WithUnit.c_str());
        fl_addto_choice(lyxview_->choice_width_lyxheight, choice_Length_WithUnit.c_str());
-       fl_addto_choice(lyxview_->choice_display,
-               _(" Default | Monochrome | Grayscale | Color | Do not display "));
-       fl_set_choice(lyxview_->choice_display, 1);
 
-       bc().addReadOnly(lyxview_->choice_display);
+       bc().addReadOnly(lyxview_->radio_pref);
+       bc().addReadOnly(lyxview_->radio_mono);
+       bc().addReadOnly(lyxview_->radio_gray);
+       bc().addReadOnly(lyxview_->radio_color);
+       bc().addReadOnly(lyxview_->radio_nodisplay);
 
        // the size section
        size_.reset(build_size());
@@ -129,7 +130,7 @@ void FormGraphics::build()
        fl_addto_choice(size_->choice_width_units, choice_Length_All.c_str());
        fl_addto_choice(size_->choice_height_units, choice_Length_All.c_str());
 
-       bc().addReadOnly(size_->button_default);
+       bc().addReadOnly(size_->button_asis);
        bc().addReadOnly(size_->button_wh);
        bc().addReadOnly(size_->button_scale);
        bc().addReadOnly(size_->check_aspectratio);
@@ -155,8 +156,8 @@ void FormGraphics::build()
 
        // add the different tabfolders
        fl_addto_tabfolder(dialog_->tabFolder, _("File"), file_->form);
-       fl_addto_tabfolder(dialog_->tabFolder, _("LyXView"), lyxview_->form);
-       fl_addto_tabfolder(dialog_->tabFolder, _("Size"), size_->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);
 }
@@ -166,10 +167,12 @@ void FormGraphics::apply()
 {
        // Create the parameters structure and fill the data from the dialog.
        InsetGraphicsParams & igp = controller().params();
+
        // the file section
        igp.filename = getStringFromInput(file_->input_filename);
        igp.subcaption = fl_get_button(file_->check_subcaption);
        igp.subcaptionText = getStringFromInput(file_->input_subcaption);
+       igp.rotate = fl_get_button(file_->check_rotate);
        igp.rotateAngle =
                strToDbl(getStringFromInput(file_->input_rotate_angle));
        while (igp.rotateAngle < 0.0 || igp.rotateAngle > 360.0) {
@@ -187,24 +190,18 @@ void FormGraphics::apply()
        igp.clip = fl_get_button(file_->button_clip);
 
        // the lyxview section
-       switch (fl_get_choice(lyxview_->choice_display)) {
-       case 1:
-               igp.display = InsetGraphicsParams::DEFAULT;             
-               break;
-       case 2:
-               igp.display = InsetGraphicsParams::MONOCHROME;          
-               break;
-       case 3:
-               igp.display = InsetGraphicsParams::GRAYSCALE;           
-               break;
-       case 4:
-               igp.display = InsetGraphicsParams::COLOR;               
-               break;
-       case 5:
-               igp.display = InsetGraphicsParams::NONE;                
-               break;
-       }
-       if (fl_get_button(lyxview_->button_lyxdefault))
+       if (fl_get_button(lyxview_->radio_pref))
+           igp.display = InsetGraphicsParams::DEFAULT;
+       else if (fl_get_button(lyxview_->radio_mono))
+           igp.display = InsetGraphicsParams::MONOCHROME;
+       else if (fl_get_button(lyxview_->radio_gray))
+           igp.display = InsetGraphicsParams::GRAYSCALE;
+       else if (fl_get_button(lyxview_->radio_color))
+           igp.display = InsetGraphicsParams::COLOR;
+       else if (fl_get_button(lyxview_->radio_nodisplay))
+           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;
@@ -217,7 +214,7 @@ void FormGraphics::apply()
        igp.lyxscale = strToInt(getStringFromInput(lyxview_->input_lyxscale));
 
        // the size section
-       if (fl_get_button(size_->button_default))
+       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;
@@ -277,31 +274,36 @@ void FormGraphics::update() {
        fl_set_input(file_->input_subcaption, igp.subcaptionText.c_str());
        setEnabled(file_->input_subcaption,
                   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());
        if (igp.rotateOrigin.empty())
            fl_set_choice(file_->choice_origin,0);
        else
            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);
 
        // the lyxview section
        switch (igp.display) {
        case InsetGraphicsParams::DEFAULT:
-               fl_set_choice(lyxview_->choice_display, 1);
+               fl_set_button(lyxview_->radio_pref, 1);
                break;
        case InsetGraphicsParams::MONOCHROME:
-               fl_set_choice(lyxview_->choice_display, 2);
+               fl_set_button(lyxview_->radio_mono, 1);
                break;
        case InsetGraphicsParams::GRAYSCALE:
-               fl_set_choice(lyxview_->choice_display, 3);
+               fl_set_button(lyxview_->radio_gray, 1);
                break;
        case InsetGraphicsParams::COLOR:
-               fl_set_choice(lyxview_->choice_display, 4);
+               fl_set_button(lyxview_->radio_color, 1);
                break;
        case InsetGraphicsParams::NONE:
-               fl_set_choice(lyxview_->choice_display, 5);
+               fl_set_button(lyxview_->radio_nodisplay, 1);
                break;
        }
        updateWidgetsFromLength(lyxview_->input_lyxwidth,
@@ -311,7 +313,7 @@ void FormGraphics::update() {
        fl_set_input(lyxview_->input_lyxscale, tostr(igp.lyxscale).c_str());
        switch (igp.lyxsize_type) {
            case InsetGraphicsParams::DEFAULT_SIZE: {
-               fl_set_button(lyxview_->button_lyxdefault,1);
+               fl_set_button(lyxview_->button_lyxasis,1);
                setEnabled(lyxview_->input_lyxwidth, 0);
                setEnabled(lyxview_->choice_width_lyxwidth, 0);
                setEnabled(lyxview_->input_lyxheight, 0);
@@ -348,7 +350,7 @@ void FormGraphics::update() {
        fl_set_input(size_->input_scale, tostr(igp.scale).c_str());
        switch (igp.size_type) {
            case InsetGraphicsParams::DEFAULT_SIZE: {
-               fl_set_button(size_->button_default,1);
+               fl_set_button(size_->button_asis,1);
                setEnabled(size_->input_width, 0);
                setEnabled(size_->choice_width_units, 0);
                setEnabled(size_->input_height, 0);
@@ -444,9 +446,14 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
        } else if (ob == file_->check_subcaption) {
                setEnabled(file_->input_subcaption,
                           fl_get_button(file_->check_subcaption));
+       } else if (ob == file_->check_rotate) {
+               setEnabled(file_->input_rotate_angle,
+                          fl_get_button(file_->check_rotate));
+               setEnabled(file_->choice_origin,
+                          fl_get_button(file_->check_rotate));
 
        // the lyxview section
-       } else if (ob == lyxview_->button_lyxdefault) {
+       } else if (ob == lyxview_->button_lyxasis) {
                setEnabled(lyxview_->input_lyxwidth, 0);
                setEnabled(lyxview_->choice_width_lyxwidth, 0);
                setEnabled(lyxview_->input_lyxheight, 0);
@@ -488,7 +495,7 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
            }
 
        // the size section
-       } else if (ob == size_->button_default) {
+       } else if (ob == size_->button_asis) {
                setEnabled(size_->input_width, 0);
                setEnabled(size_->choice_width_units, 0);
                setEnabled(size_->input_height, 0);
@@ -509,8 +516,6 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long)
                setEnabled(size_->choice_height_units, 0);
                setEnabled(size_->check_aspectratio, 0);
                setEnabled(size_->input_scale, 1);
-       } else if (ob == dialog_->button_help) {
-           controller().help();
        }
 
        // check if the input is valid

diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h
index c304a8cdd6ab29ebe9d9806aa9168efbb9bbf2c2..588c6036641665c49776a6c0c5ca365e9d3ec57f 100644 (file)
--- a/src/frontends/xforms/FormGraphics.h
+++ b/src/frontends/xforms/FormGraphics.h
@@ -53,8 +53,6 @@ private:
        virtual void update();
        /// Filter the inputs on callback from xforms
        virtual ButtonPolicy::SMInput input(FL_OBJECT *, long);
-       /// 
-       void help();
 
        /// Fdesign generated method
        FD_form_graphics * build_graphics();

diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C
index 1600fd1d8972b5e7d5414d171bb5031c22bbb251..9ebb3ee488869526598564865fa671189ee6638c 100644 (file)
--- a/src/frontends/xforms/form_graphics.C
+++ b/src/frontends/xforms/form_graphics.C
@@ -26,37 +26,30 @@ FD_form_graphics * FormGraphics::build_graphics()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 360, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 5, 490, 270, _("Tabbed folder"));
+  fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 5, 500, 270, _("Tabbed folder"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_ALL);
-  {
-    char const * const dummy = N_("Help|#H");
-    fdui->button_help = obj = fl_add_button(FL_NORMAL_BUTTON, 435, 320, 65, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 205, 320, 80, 30, idex(_(dummy)));
+    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 320, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest);
     fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 320, 75, 30, _("Ok"));
+  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 225, 320, 90, 30, _("Ok"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseOKCB, 0);
   {
     char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 325, 320, 75, 30, idex(_(dummy)));
+    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 320, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   {
     char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_RETURN_BUTTON, 95, 320, 75, 30, idex(_(dummy)));
+    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 320, 320, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -101,12 +94,12 @@ FD_form_file * FormGraphics::build_file()
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 50, 460, 50, _("Subfigure"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 50, 475, 55, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
     char const * const dummy = N_("Subfigure|#S");
-    fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 60, 30, 30, idex(_(dummy)));
+    fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 65, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -114,33 +107,33 @@ FD_form_file * FormGraphics::build_file()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("Title:|#T");
-    fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 180, 60, 280, 30, idex(_(dummy)));
+    fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 190, 65, 280, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 110, 460, 60, _("Rotation"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 110, 475, 60, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
     char const * const dummy = N_("Angle:|#n");
-    fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 105, 130, 72, 28, idex(_(dummy)));
+    fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 190, 125, 55, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 180, 130, 66, 30, _("degrees"));
+  obj = fl_add_text(FL_NORMAL_TEXT, 247, 125, 38, 30, _("deg"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
   {
     char const * const dummy = N_("Origin:|#O");
-    fdui->choice_origin = obj = fl_add_choice(FL_NORMAL_CHOICE, 340, 130, 118, 28, idex(_(dummy)));
+    fdui->choice_origin = obj = fl_add_choice(FL_NORMAL_CHOICE, 350, 125, 118, 28, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 180, 460, 50, _("Options"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 180, 475, 50, _("Options"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
@@ -153,7 +146,15 @@ FD_form_file * FormGraphics::build_file()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
     char const * const dummy = N_("draft mode|#m");
-    fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 30, 30, idex(_(dummy)));
+    fdui->button_draft = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 190, 30, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  {
+    char const * const dummy = N_("Rotate|#a");
+    fdui->check_rotate = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 125, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -183,14 +184,14 @@ FD_form_size * FormGraphics::build_size()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 10, 470, 210, _("Size"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 10, 470, 210, _("Output Size"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
 
   fdui->radio_size = fl_bgn_group();
   {
-    char const * const dummy = N_("Default|#D");
-    fdui->button_default = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 20, 30, 30, idex(_(dummy)));
+    char const * const dummy = N_("Original Size|#O");
+    fdui->button_asis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 20, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -198,8 +199,8 @@ FD_form_size * FormGraphics::build_size()
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Custom|#C");
-    fdui->button_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 80, 30, 30, idex(_(dummy)));
+    char const * const dummy = N_("Scale|#S");
+    fdui->button_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 75, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -207,8 +208,8 @@ FD_form_size * FormGraphics::build_size()
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Scale|#S");
-    fdui->button_scale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 175, 30, 30, idex(_(dummy)));
+    char const * const dummy = N_("Custom|#C");
+    fdui->button_wh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 50, 140, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
@@ -218,46 +219,47 @@ FD_form_size * FormGraphics::build_size()
   fl_end_group();
 
   {
-    char const * const dummy = N_("Width:|#W");
-    fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 325, 80, 85, 30, idex(_(dummy)));
+    char const * const dummy = N_("Value:|#V");
+    fdui->input_scale = obj = fl_add_input(FL_NORMAL_INPUT, 325, 75, 85, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 80, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+  // xgettext:no-c-format
+  obj = fl_add_text(FL_NORMAL_TEXT, 420, 75, 25, 30, _("%"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
   {
-    char const * const dummy = N_("Height:|#H");
-    fdui->input_height = obj = fl_add_input(FL_NORMAL_INPUT, 325, 115, 85, 30, idex(_(dummy)));
+    char const * const dummy = N_("Width:|#W");
+    fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 325, 140, 85, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_height_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 115, 60, 30, "");
+  fdui->choice_width_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 140, 60, 30, "");
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Value:|#V");
-    fdui->input_scale = obj = fl_add_input(FL_NORMAL_INPUT, 325, 175, 85, 30, idex(_(dummy)));
+    char const * const dummy = N_("Height:|#g");
+    fdui->input_height = obj = fl_add_input(FL_NORMAL_INPUT, 325, 175, 85, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  // xgettext:no-c-format
-  obj = fl_add_text(FL_NORMAL_TEXT, 420, 175, 25, 30, _("%"));
+  fdui->choice_height_units = obj = fl_add_choice(FL_NORMAL_CHOICE, 415, 175, 60, 30, "");
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("keep aspectratio|#k");
-    fdui->check_aspectratio = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 115, 30, 30, idex(_(dummy)));
+    char const * const dummy = N_("keep Aspect ratio|#k");
+    fdui->check_aspectratio = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 175, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 15, 60, 470, 65, "");
   fl_end_form();
 
   fdui->form->fdui = fdui;
@@ -282,7 +284,7 @@ FD_form_bbox * FormGraphics::build_bbox()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 25, 455, 195, _("Bounding Box"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 25, 455, 195, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   obj = fl_add_text(FL_NORMAL_TEXT, 135, 35, 35, 25, _("X"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -399,79 +401,121 @@ FD_form_lyxview * FormGraphics::build_lyxview()
   fdui->form = fl_bgn_form(FL_NO_BOX, 505, 235);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 235, "");
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 10, 470, 205, _("Screen Display"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 10, 475, 205, _("Screen Display"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
-    char const * const dummy = N_("Show:|#o");
-    fdui->choice_display = obj = fl_add_choice(FL_NORMAL_CHOICE, 30, 45, 100, 30, idex(_(dummy)));
+    char const * const dummy = N_("Value:|#V");
+    fdui->input_lyxscale = obj = fl_add_input(FL_NORMAL_INPUT, 350, 75, 70, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+ fl_bgn_group();
   {
-    char const * const dummy = N_("Width:|#w");
-    fdui->input_lyxwidth = obj = fl_add_input(FL_NORMAL_INPUT, 305, 70, 90, 30, idex(_(dummy)));
+    char const * const dummy = N_("Original Size|#n");
+    fdui->button_lyxasis = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 20, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_width_lyxwidth = obj = fl_add_choice(FL_NORMAL_CHOICE, 410, 70, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+  {
+    char const * const dummy = N_("Scale|#S");
+    fdui->button_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 75, 30, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Height:|#h");
-    fdui->input_lyxheight = obj = fl_add_input(FL_NORMAL_INPUT, 305, 110, 90, 30, idex(_(dummy)));
+    char const * const dummy = N_("Custom|#C");
+    fdui->button_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 255, 130, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_width_lyxheight = obj = fl_add_choice(FL_NORMAL_CHOICE, 410, 110, 60, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+  fl_end_group();
+
+  // xgettext:no-c-format
+  obj = fl_add_text(FL_NORMAL_TEXT, 430, 75, 25, 30, _("%"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 150, 60, 340, 55, "");
+
+  fdui->radio_display = fl_bgn_group();
+  {
+    char const * const dummy = N_("Default|#f");
+    fdui->radio_pref = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 20, 30, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Value:|#V");
-    fdui->input_lyxscale = obj = fl_add_input(FL_NORMAL_INPUT, 305, 175, 90, 30, idex(_(dummy)));
+    char const * const dummy = N_("Monochrome|#M");
+    fdui->radio_mono = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 70, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
- fl_bgn_group();
   {
-    char const * const dummy = N_("Default|#D");
-    fdui->button_lyxdefault = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 20, 30, 30, idex(_(dummy)));
+    char const * const dummy = N_("Grayscale|#G");
+    fdui->radio_gray = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 100, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Custom|#C");
-    fdui->button_lyxwh = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 70, 30, 30, idex(_(dummy)));
+    char const * const dummy = N_("Color|#o");
+    fdui->radio_color = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 130, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   {
-    char const * const dummy = N_("Scale|#S");
-    fdui->button_lyxscale = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 205, 175, 30, 30, idex(_(dummy)));
+    char const * const dummy = N_("Don't display|#y");
+    fdui->radio_nodisplay = obj = fl_add_round3dbutton(FL_RADIO_BUTTON, 20, 160, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_color(obj, FL_COL1, FL_YELLOW);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_group();
 
-  // xgettext:no-c-format
-  obj = fl_add_text(FL_NORMAL_TEXT, 410, 175, 25, 30, _("%"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 150, 10, 340, 50, _("Screen Size"));
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  {
+    char const * const dummy = N_("Width:|#w");
+    fdui->input_lyxwidth = obj = fl_add_input(FL_NORMAL_INPUT, 350, 130, 70, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->choice_width_lyxwidth = obj = fl_add_choice(FL_NORMAL_CHOICE, 430, 130, 50, 30, "");
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  {
+    char const * const dummy = N_("Height:|#h");
+    fdui->input_lyxheight = obj = fl_add_input(FL_NORMAL_INPUT, 350, 170, 70, 30, idex(_(dummy)));
+    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
+  }
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->choice_width_lyxheight = obj = fl_add_choice(FL_NORMAL_CHOICE, 430, 170, 50, 30, "");
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 150, 115, 340, 100, "");
+  obj = fl_add_text(FL_NORMAL_TEXT, 30, 45, 115, 25, _("(from Preferences)"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
   fl_end_form();

diff --git a/src/frontends/xforms/form_graphics.h b/src/frontends/xforms/form_graphics.h
index 0497a0c1135f688fd064dbd86670887176408395..c91e6aa7dac69e2b2e67515fc9bfaa4171cd3d91 100644 (file)
--- a/src/frontends/xforms/form_graphics.h
+++ b/src/frontends/xforms/form_graphics.h
@@ -5,7 +5,6 @@
 #define FD_form_graphics_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
@@ -28,7 +27,6 @@ struct FD_form_graphics {
 
        FL_FORM *form;
        FL_OBJECT *tabFolder;
-       FL_OBJECT *button_help;
        FL_OBJECT *button_restore;
        FL_OBJECT *button_ok;
        FL_OBJECT *button_cancel;
@@ -47,20 +45,21 @@ struct FD_form_file {
        FL_OBJECT *choice_origin;
        FL_OBJECT *button_clip;
        FL_OBJECT *button_draft;
+       FL_OBJECT *check_rotate;
 };
 struct FD_form_size {
        ~FD_form_size();
 
        FL_FORM *form;
        FL_OBJECT *radio_size;
-       FL_OBJECT *button_default;
-       FL_OBJECT *button_wh;
+       FL_OBJECT *button_asis;
        FL_OBJECT *button_scale;
+       FL_OBJECT *button_wh;
+       FL_OBJECT *input_scale;
        FL_OBJECT *input_width;
        FL_OBJECT *choice_width_units;
        FL_OBJECT *input_height;
        FL_OBJECT *choice_height_units;
-       FL_OBJECT *input_scale;
        FL_OBJECT *check_aspectratio;
 };
 struct FD_form_bbox {
@@ -87,15 +86,20 @@ struct FD_form_lyxview {
        ~FD_form_lyxview();
 
        FL_FORM *form;
-       FL_OBJECT *choice_display;
+       FL_OBJECT *input_lyxscale;
+       FL_OBJECT *button_lyxasis;
+       FL_OBJECT *button_lyxscale;
+       FL_OBJECT *button_lyxwh;
+       FL_OBJECT *radio_display;
+       FL_OBJECT *radio_pref;
+       FL_OBJECT *radio_mono;
+       FL_OBJECT *radio_gray;
+       FL_OBJECT *radio_color;
+       FL_OBJECT *radio_nodisplay;
        FL_OBJECT *input_lyxwidth;
        FL_OBJECT *choice_width_lyxwidth;
        FL_OBJECT *input_lyxheight;
        FL_OBJECT *choice_width_lyxheight;
-       FL_OBJECT *input_lyxscale;
-       FL_OBJECT *button_lyxdefault;
-       FL_OBJECT *button_lyxwh;
-       FL_OBJECT *button_lyxscale;
 };
 
 #endif /* FD_form_graphics_h_ */

diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd
index 13e2576f45711ab4e14a5f91b3986c10b6b02458..f78081941ac6f163291624a478bebc378f3b86b4 100644 (file)
--- a/src/frontends/xforms/forms/form_graphics.fd
+++ b/src/frontends/xforms/forms/form_graphics.fd
@@ -11,7 +11,7 @@ SnapGrid: 5
 Name: form_graphics
 Width: 510
 Height: 360
-Number of Objects: 8
+Number of Objects: 7
 
 --------------------
 class: FL_BOX
@@ -34,7 +34,7 @@ argument:
 --------------------
 class: FL_TABFOLDER
 type: TOP_TABFOLDER
-box: 10 5 490 270
+box: 5 5 500 270
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
@@ -52,25 +52,7 @@ argument:
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 435 320 65 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Help|#H
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_help
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 205 320 80 30
+box: 5 320 80 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -88,7 +70,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: RETURN_BUTTON
-box: 10 320 75 30
+box: 225 320 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -106,7 +88,7 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 325 320 75 30
+box: 415 320 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -123,8 +105,8 @@ argument: 0
 
 --------------------
 class: FL_BUTTON
-type: RETURN_BUTTON
-box: 95 320 75 30
+type: NORMAL_BUTTON
+box: 320 320 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -132,7 +114,7 @@ style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Apply|#A
-shortcut: ^M
+shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
 name: button_apply
@@ -161,7 +143,7 @@ argument:
 Name: form_file
 Width: 505
 Height: 235
-Number of Objects: 13
+Number of Objects: 14
 
 --------------------
 class: FL_BOX
@@ -220,14 +202,14 @@ argument: 0
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 15 50 460 50
+box: 10 50 475 55
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Subfigure
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -238,7 +220,7 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 20 60 30 30
+box: 15 65 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_RIGHT
@@ -256,7 +238,7 @@ argument: 0
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 180 60 280 30
+box: 190 65 280 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -274,14 +256,14 @@ argument: 0
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 15 110 460 60
+box: 10 110 475 60
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Rotation
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -292,7 +274,7 @@ argument:
 --------------------
 class: FL_INPUT
 type: INT_INPUT
-box: 105 130 72 28
+box: 190 125 55 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -310,14 +292,14 @@ argument: 0
 --------------------
 class: FL_TEXT
 type: NORMAL_TEXT
-box: 180 130 66 30
+box: 247 125 38 30
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: degrees
+label: deg
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -328,7 +310,7 @@ argument:
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 340 130 118 28
+box: 350 125 118 28
 boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
@@ -346,7 +328,7 @@ argument: 0
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 15 180 460 50
+box: 10 180 475 50
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
@@ -382,7 +364,7 @@ argument: 0
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 20 190 30 30
+box: 15 190 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_RIGHT
@@ -397,11 +379,29 @@ name: button_draft
 callback: C_FormBaseInputCB
 argument: 0
 
+--------------------
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 15 125 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_RIGHT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Rotate|#a
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: check_rotate
+callback: C_FormBaseInputCB
+argument: 0
+
 =============== FORM ===============
 Name: form_size
 Width: 505
 Height: 235
-Number of Objects: 14
+Number of Objects: 15
 
 --------------------
 class: FL_BOX
@@ -431,7 +431,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Size
+label: Output Size
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -467,47 +467,47 @@ alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Default|#D
+label: Original Size|#O
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_default
+name: button_asis
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 50 80 30 30
+box: 50 75 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Custom|#C
+label: Scale|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_wh
+name: button_scale
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 50 175 30 30
+box: 50 140 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Scale|#S
+label: Custom|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_scale
+name: button_wh
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -532,61 +532,61 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 325 80 85 30
+box: 325 75 85 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Width:|#W
+label: Value:|#V
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_width
+name: input_scale
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 415 80 60 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_LEFT
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 420 75 25 30
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: %
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: choice_width_units
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 325 115 85 30
+box: 325 140 85 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Height:|#H
+label: Width:|#W
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_height
+name: input_width
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHOICE
 type: NORMAL_CHOICE
-box: 415 115 60 30
+box: 415 140 60 30
 boxtype: FL_FRAME_BOX
 colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
@@ -597,7 +597,7 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: choice_height_units
+name: choice_width_units
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -611,43 +611,43 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Value:|#V
+label: Height:|#g
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_scale
+name: input_height
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 420 175 25 30
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 415 175 60 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: %
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: choice_height_units
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 85 115 30 30
+box: 85 175 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: keep aspectratio|#k
+label: keep Aspect ratio|#k
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -655,6 +655,24 @@ name: check_aspectratio
 callback: C_FormBaseInputCB
 argument: 0
 
+--------------------
+class: FL_FRAME
+type: ENGRAVED_FRAME
+box: 15 60 470 65
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 =============== FORM ===============
 Name: form_bbox
 Width: 505
@@ -689,7 +707,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bounding Box
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -959,7 +977,7 @@ argument: 0
 Name: form_lyxview
 Width: 505
 Height: 235
-Number of Objects: 14
+Number of Objects: 24
 
 --------------------
 class: FL_BOX
@@ -982,7 +1000,7 @@ argument:
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 15 10 470 205
+box: 15 10 475 205
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
@@ -998,84 +1016,102 @@ callback:
 argument: 
 
 --------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 30 45 100 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_TOP_LEFT
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 350 75 70 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Show:|#o
+label: Value:|#V
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: choice_display
+name: input_lyxscale
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 305 70 90 30
-boxtype: FL_DOWN_BOX
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 10 10 0
+boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_ROUND3DBUTTON
+type: RADIO_BUTTON
+box: 255 20 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Width:|#w
+label: Original Size|#n
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_lyxwidth
+name: button_lyxasis
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 410 70 60 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
+class: FL_ROUND3DBUTTON
+type: RADIO_BUTTON
+box: 255 75 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Scale|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: choice_width_lyxwidth
+name: button_lyxscale
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 305 110 90 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_ROUND3DBUTTON
+type: RADIO_BUTTON
+box: 255 130 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Height:|#h
+label: Custom|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_lyxheight
+name: button_lyxwh
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 410 110 60 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_LEFT
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
@@ -1083,27 +1119,45 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: choice_width_lyxheight
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 305 175 90 30
-boxtype: FL_DOWN_BOX
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 430 75 25 30
+boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Value:|#V
+label: %
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_lyxscale
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_FRAME
+type: ENGRAVED_FRAME
+box: 150 60 340 55
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
 
 --------------------
 class: FL_BEGIN_GROUP
@@ -1113,67 +1167,103 @@ boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
+name: radio_display
 callback: 
 argument: 
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 205 20 30 30
+box: 20 20 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Default|#D
+label: Default|#f
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_lyxdefault
+name: radio_pref
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 205 70 30 30
+box: 20 70 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Custom|#C
+label: Monochrome|#M
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_lyxwh
+name: radio_mono
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_ROUND3DBUTTON
 type: RADIO_BUTTON
-box: 205 175 30 30
+box: 20 100 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Scale|#S
+label: Grayscale|#G
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_lyxscale
+name: radio_gray
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_ROUND3DBUTTON
+type: RADIO_BUTTON
+box: 20 130 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Color|#o
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: radio_color
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_ROUND3DBUTTON
+type: RADIO_BUTTON
+box: 20 160 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Don't display|#y
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: radio_nodisplay
 callback: C_FormBaseInputCB
 argument: 0
 
@@ -1185,12 +1275,120 @@ boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 150 10 340 50
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: Screen Size
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 350 130 70 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Width:|#w
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_lyxwidth
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 430 130 50 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: choice_width_lyxwidth
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 350 170 70 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Height:|#h
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_lyxheight
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 430 170 50 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
+name: choice_width_lyxheight
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_FRAME
+type: ENGRAVED_FRAME
+box: 150 115 340 100
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
 name: 
 callback: 
 argument: 
@@ -1198,14 +1396,14 @@ argument:
 --------------------
 class: FL_TEXT
 type: NORMAL_TEXT
-box: 410 175 25 30
+box: 30 45 115 25
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: %
+label: (from Preferences)
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 0c2b6c24ca9842a2a122223a615e9b31c9d25de8..a5ce8165ccba1b45f7d0959df0e4aaa16a91b7e1 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-05  Herbert Voss  <voss@lyx.org>
+
+       * insetgraphic.C: 
+       * insetgraphicsParams.[Ch]: some cosmetic changes to latex output
+       and adding a rotate bool similiar to subcaption
+
 2002-02-04  Herbert Voss  <voss@lyx.org>
 
        * insetgraphic.C: 

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 03f7616a0f29f042f40f0bbc65a34115be46815e..819ba4b88f9700e862d15e38e5214b67acf01569 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -410,6 +410,7 @@ void InsetGraphics::readFigInset(Buffer const * buf, LyXLex & lex)
                        // kept for backwards compability. Delete in 0.13.x
                } else if (token == "angle") {
                        if (lex.next())
+                               params.rotate = true;
                                params.rotateAngle = lex.getFloat();
                } else if (token == "size") {
                        if (lex.next())
@@ -460,42 +461,41 @@ string const InsetGraphics::createLatexOptions() const
        // before writing it to the output stream.
        ostringstream options;
        if (!params.bb.empty())
-           options << "bb=" << strip(params.bb) << ',';
+           options << "  bb=" << strip(params.bb) << ",%\n";
        if (params.draft)
-           options << "%\n  draft,";
+           options << "  draft,%\n";
        if (params.clip)
-           options << "%\n  clip,";
+           options << "  clip,%\n";
        if (params.size_type == InsetGraphicsParams::WH) {
            if (!params.width.zero())
-               options << "%\n  width=" << params.width.asLatexString() << ',';
+               options << "  width=" << params.width.asLatexString() << ",%\n";
            if (!params.height.zero())
-               options << "%\n  height=" << params.height.asLatexString() << ',';
+               options << "  height=" << params.height.asLatexString() << ",%\n";
        } else if (params.size_type == InsetGraphicsParams::SCALE) {
            if (params.scale > 0)
-               options << "%\n  scale=" << double(params.scale)/100.0 << ',';
+               options << "  scale=" << double(params.scale)/100.0 << ",%\n";
        }
        if (params.keepAspectRatio)
-           options << "%\n  keepaspectratio,";
+           options << "  keepaspectratio,%\n";
        // Make sure it's not very close to zero, a float can be effectively
        // zero but not exactly zero.
-       if (!lyx::float_equal(params.rotateAngle, 0, 0.001)) {
-           options << "%\n  angle=" << params.rotateAngle << ',';
+       if (!lyx::float_equal(params.rotateAngle, 0, 0.001) && params.rotate) {
+           options << "  angle=" << params.rotateAngle << ",%\n";
            if (!params.rotateOrigin.empty()) {
-               options << "%\n  origin=";
-               options << params.rotateOrigin[0];
+               options << "  origin=" << params.rotateOrigin[0];
                if (contains(params.rotateOrigin,"Top"))
                    options << 't';
                else if (contains(params.rotateOrigin,"Bottom"))
                    options << 'b';
                else if (contains(params.rotateOrigin,"Baseline"))
                    options << 'B';
-               options << ',';
+               options << ",%\n";
            }
        }
        if (!params.special.empty())
-           options << params.special << ',';
+           options << params.special << ",%\n";
        string opts = options.str().c_str();
-       opts = strip(opts, ',');
+       opts = opts.substr(0,opts.size()-3);    // delete last ",%\n"
        return opts;
 }
 
@@ -595,7 +595,7 @@ int InsetGraphics::latex(Buffer const *buf, ostream & os,
        // Write the options if there are any.
        string const opts = createLatexOptions();
        if (!opts.empty()) {
-               os << "[%\n  " << opts << ']';
+               os << "[%\n" << opts << ']';
        }
        // Make the filename relative to the lyx file
        // and remove the extension so the LaTeX will use whatever is

diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C
index 5332132e36927b64bde91c7507312228f271abd2..4d09828351577a641822cb4330bacad8406dd870 100644 (file)
--- a/src/insets/insetgraphicsParams.C
+++ b/src/insets/insetgraphicsParams.C
@@ -108,7 +108,8 @@ void InsetGraphicsParams::init()
        size_type = DEFAULT_SIZE;       // do nothing
        lyxsize_type = DEFAULT_SIZE;    // do nothing
        keepAspectRatio = false;        //
-       rotateOrigin = "center";        // 
+       rotate = false;                 // Rotating 
+       rotateOrigin = "center";        // Origin
        rotateAngle = 0.0;              // in degrees
        special = string();             // userdefined stuff
 }
@@ -131,6 +132,7 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
        lyxwidth = igp.lyxwidth;
        lyxheight = igp.lyxheight;
        lyxscale = igp.lyxscale;
+       rotate = igp.rotate;
        rotateOrigin = igp.rotateOrigin;
        rotateAngle = igp.rotateAngle;
        special = igp.special;
@@ -155,6 +157,7 @@ bool operator==(InsetGraphicsParams const & left,
                left.lyxwidth == right.lyxwidth &&
                left.lyxheight == right.lyxheight &&
                left.lyxscale == right.lyxscale &&
+               left.rotate == right.rotate &&
                left.rotateOrigin == right.rotateOrigin &&
                lyx::float_equal(left.rotateAngle, right.rotateAngle, 0.001 &&
                left.special == right.special) 
@@ -205,6 +208,8 @@ void InsetGraphicsParams::Write(Buffer const * buf, ostream & os) const
            os << "\tscale " << scale << '\n';
        if (keepAspectRatio)
                os << "\tkeepAspectRatio\n";
+       if (rotate)
+               os << "\trotate\n";
        if (!lyx::float_equal(rotateAngle, 0.0, 0.001))
                os << "\trotateAngle " << rotateAngle << '\n';
        if (!rotateOrigin.empty())
@@ -287,6 +292,8 @@ bool InsetGraphicsParams::Read(Buffer const * buf, LyXLex & lex,
        } else if (token == "scale") {
                lex.next();
                scale = lex.getInteger();
+       } else if (token == "rotate") {
+               rotate = true;
        } else if (token == "rotateAngle") {
                lex.next();
                rotateAngle = lex.getFloat();

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index d8afae97f79d86480e4e85931ff09a54cd063f73..5f83835853c849a9ef29ef4d45ceaa2bb064b2d6 100644 (file)
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -48,6 +48,12 @@ struct InsetGraphicsParams
        /// The text of the subcaption.
        string subcaptionText;
        /// The bounding box with "xLB yLB yRT yRT ", divided by a space!
+       /// Do we rotate?
+       bool rotate;
+       /// Origin point of rotation
+       string rotateOrigin;
+       /// Rotation angle.
+       float rotateAngle;
        string bb;
        /// clip image 
        bool clip;
@@ -75,10 +81,6 @@ struct InsetGraphicsParams
        int lyxscale;
        /// Typ of the LyXView, same as for latex
        sizeType lyxsize_type;
-       /// Origin point of rotation
-       string rotateOrigin;
-       /// Rotation angle.
-       float rotateAngle;
        ///
        InsetGraphicsParams();
        ///