From d9314d15dc427b9baa2f17fd744c67a279f99aac Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 13 Oct 2017 11:25:55 +0200 Subject: [PATCH] Some improvements to the graphics dialog * Describe the viewport/bb situation more accurate * Use generic term "coordinates", since bb and viewport are flavor-specific * Add some tooltips * Increase the width of the options widget. (cherry picked from commit c462fadff57373744e27ac38df04bac2c651b67c) --- src/frontends/qt4/ui/GraphicsUi.ui | 684 ++++++++++++++++------------- status.23x | 2 + 2 files changed, 373 insertions(+), 313 deletions(-) diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui index 3942651e83..83d0d0965b 100644 --- a/src/frontends/qt4/ui/GraphicsUi.ui +++ b/src/frontends/qt4/ui/GraphicsUi.ui @@ -1,109 +1,133 @@ - + + GraphicsUi - - + + 0 0 - 482 - 383 + 654 + 512 - - - 0 - 0 + + 0 0 - + - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + - + 0 - - + + &Graphics - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Select an image file - + &Browse... - - - + + + Output Size - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - + + - - + + - - - + + + true - - - 0 - 0 + + 0 0 - + Width of image in output - + - + Qt::Horizontal - + 61 20 @@ -111,69 +135,67 @@ - - + + - - - + + + true - - - 0 - 0 + + 0 0 - + Height of image in output - - - + + + true - + Sets height of graphic. Leave unchecked to set automatically. - + Set &height: - - - + + + &Scale graphics (%): - - - + + + true - + Sets width of graphic. Leave unchecked to set automatically. - + Set &width: - - - + + + true - + Scale image to maximum size not exceeding width and height - + &Maintain aspect ratio @@ -181,75 +203,82 @@ - - - + + + Rotate Graphics - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Check to change the order of rotating and scaling - + Ro&tate after scaling - - - + + + The origin of the rotation - - - + + + The origin of the rotation - + Or&igin: - + origin - - - - - 0 - 0 + + + + 0 0 - + Angle to rotate image by - - - + + + Angle to rotate image by - + A&ngle (degrees): - + angle @@ -257,45 +286,54 @@ - - - + + + File name of image - + &File: - + filename - - - + + + File name of image - - - &Clipping + + + &Coordinates and Clipping - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - + - + Qt::Vertical - + 20 40 @@ -303,114 +341,121 @@ - - - - Clip to bounding box values + + + + Clip to the coordinates specified below (bounding box for DVI/PS output, viewport for PDF output) - - Clip to &bounding box + + Clip to c&oordinates - - - + + + true - - - 0 - 0 + + 0 0 - + QFrame::StyledPanel - + QFrame::Plain - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + &Left bottom: - + lbX - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + Right &top: - + rtX - - - + + + y: - - - + + + y: - - - + + + x: - - - + + + x: @@ -418,12 +463,12 @@ - + - + Qt::Horizontal - + 181 20 @@ -431,76 +476,70 @@ - - - - Get bounding box from the (EPS) file + + + + Read coordinates from the file (bounding box value in case of PostScript files, graphic dimensions in case of other file types) - + &Get from File - - + + LaTe&X and LyX options - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - - Qt::Horizontal - - - - 161 - 20 - - - - - - - - - 0 - 0 + + + + 0 0 - + Additional LaTeX options - - - + + + Additional LaTeX options - + LaTeX &options: - + latexoptions - + - + Qt::Vertical - + 354 81 @@ -508,67 +547,74 @@ - - - + + + Qt::StrongFocus - + Enable LyX to preview this graphics, if graphics previewing is not disabled at application level (see Preferences dialog). - + Sho&w in LyX - + true - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + true - - - 0 - 0 + + 0 0 - + Percentage to scale by in LyX - - - + + + Percentage to scale by in LyX - + Sca&le on screen (%): - + displayscale - + - + Qt::Horizontal - + 40 20 @@ -579,30 +625,39 @@ - - - + + + Assign the graphic to a group of graphics that share the same settings - + Graphics Group - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - + - + Qt::Horizontal - + 121 51 @@ -610,43 +665,41 @@ - - - - - 0 - 0 + + + + 0 0 - + - - A&ssigned to group: + + Assigned &to group: - + groupCO - - - + + + Click to define a new graphics group. - + O&pen new group... - - - + + + Select an existing group for the current graphics. - + false @@ -654,12 +707,12 @@ - - - + + + Draft mode - + &Draft mode @@ -668,36 +721,45 @@ - - - - 0 - - + + + 6 + + 0 + + + 0 + + + 0 + + + 0 + - - + + &Restore - + false - + false - + Qt::Horizontal - + QSizePolicy::MinimumExpanding - + 20 20 @@ -706,53 +768,49 @@ - - + + &OK - + true - + true - - - - 0 - 0 + + + 0 0 - + &Apply - + false - + false - - - - 0 - 0 + + + 0 0 - + Close - + false @@ -803,7 +861,7 @@ displayGB - qt_i18n.h + qt_i18n.h diff --git a/status.23x b/status.23x index ca88a24970..849f36cb8d 100644 --- a/status.23x +++ b/status.23x @@ -69,6 +69,8 @@ What's new - Cosmetic polishment of the "Math Options" pane of Document Settings (bug 10777). +- UI improvements in the graphics dialog (bug 10771). + * DOCUMENTATION AND LOCALIZATION