From 1229a2712d3f4fe1392616a6973e1830cf3124ef Mon Sep 17 00:00:00 2001 From: John Levon Date: Sun, 25 Aug 2002 04:06:06 +0000 Subject: [PATCH] Some Qt graphics dialog improvements. Yet more work needed :/ git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5097 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 5 + src/frontends/qt2/QGraphics.C | 62 +- src/frontends/qt2/ui/QGraphicsDialog.ui | 2310 ++++++++++------------- 3 files changed, 1011 insertions(+), 1366 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 134ea18cda..5aa9d9531d 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2002-08-25 John Levon + + * QGraphics.C: + * ui/QGraphicsDialog.ui: update, and some UI improvements + 2002-08-23 Rob Lahaye * lengthcombo.C: apply changes to "enum UNIT" in src/lyxlength.h diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 99d0263424..395bb3bd22 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -56,17 +56,43 @@ void QGraphics::build_dialog() bc().setRestore(dialog_->restorePB); bc().setCancel(dialog_->closePB); - // FIXME: and the rest ? bc().addReadOnly(dialog_->rotateGB); - bc().addReadOnly(dialog_->latexoptionsGB); - bc().addReadOnly(dialog_->bbGB); + bc().addReadOnly(dialog_->latexoptions); bc().addReadOnly(dialog_->subfigure); bc().addReadOnly(dialog_->subcaption); bc().addReadOnly(dialog_->filenameL); bc().addReadOnly(dialog_->filename); bc().addReadOnly(dialog_->browsePB); + bc().addReadOnly(dialog_->unzipCB); + bc().addReadOnly(dialog_->filename); + bc().addReadOnly(dialog_->lbX); + bc().addReadOnly(dialog_->lbY); + bc().addReadOnly(dialog_->rtX); + bc().addReadOnly(dialog_->rtY); + bc().addReadOnly(dialog_->lbXunit); + bc().addReadOnly(dialog_->lbYunit); + bc().addReadOnly(dialog_->rtXunit); + bc().addReadOnly(dialog_->rtYunit); + bc().addReadOnly(dialog_->draftCB); + bc().addReadOnly(dialog_->clip); + bc().addReadOnly(dialog_->unzipCB); + bc().addReadOnly(dialog_->subfigure); + bc().addReadOnly(dialog_->subcaption); + bc().addReadOnly(dialog_->showCB); + bc().addReadOnly(dialog_->width); + bc().addReadOnly(dialog_->height); + bc().addReadOnly(dialog_->displayCB); + bc().addReadOnly(dialog_->displayscale); + bc().addReadOnly(dialog_->widthUnit); + bc().addReadOnly(dialog_->heightUnit); + bc().addReadOnly(dialog_->aspectratio); + bc().addReadOnly(dialog_->angle); + bc().addReadOnly(dialog_->origin); + bc().addReadOnly(dialog_->latexoptions); + bc().addReadOnly(dialog_->getPB); } + void QGraphics::update_contents() { InsetGraphicsParams & igp = controller().params(); @@ -85,10 +111,7 @@ void QGraphics::update_contents() case BufferParams::PAPER_A5PAPER: case BufferParams::PAPER_B5PAPER: unit = "cm"; break; } - // ?? defaultUnit is not used !! - string const defaultUnit = string(unit); - // Update dialog with details from inset dialog_->filename->setText(igp.filename.c_str()); // set the bounding box values, if exists. First we need the whole @@ -115,8 +138,9 @@ void QGraphics::update_contents() } // Update the draft and clip mode - dialog_->draft->setChecked(igp.draft); + dialog_->draftCB->setChecked(igp.draft); dialog_->clip->setChecked(igp.clip); + dialog_->unzipCB->setChecked(igp.noUnzip); // Update the subcaption check button and input field dialog_->subfigure->setChecked(igp.subcaption); @@ -128,10 +152,12 @@ void QGraphics::update_contents() case grfx::MonochromeDisplay: item = 1; break; case grfx::GrayscaleDisplay: item = 2; break; case grfx::ColorDisplay: item = 3; break; - case grfx::NoDisplay: item = 4; break; + case grfx::NoDisplay: item = 0; break; } - dialog_->show->setCurrentItem(item); - + dialog_->showCB->setCurrentItem(item); + dialog_->showCB->setEnabled(igp.display != grfx::NoDisplay && !readOnly()); + dialog_->displayCB->setChecked(igp.display != grfx::NoDisplay); + dialog_->displayscale->setEnabled(igp.display != grfx::NoDisplay && !readOnly()); dialog_->displayscale->setText(tostr(igp.lyxscale).c_str()); dialog_->widthUnit->setCurrentItem(igp.width.unit()); @@ -187,32 +213,38 @@ void QGraphics::apply() igp.bb = bb; } - igp.draft = dialog_->draft->isChecked(); + igp.draft = dialog_->draftCB->isChecked(); igp.clip = dialog_->clip->isChecked(); igp.subcaption = dialog_->subfigure->isChecked(); igp.subcaptionText = dialog_->subcaption->text(); - switch (dialog_->show->currentItem()) { + switch (dialog_->showCB->currentItem()) { case 0: igp.display = grfx::DefaultDisplay; break; case 1: igp.display = grfx::MonochromeDisplay; break; case 2: igp.display = grfx::GrayscaleDisplay; break; case 3: igp.display = grfx::ColorDisplay; break; - case 4: igp.display = grfx::NoDisplay; break; default:; } + if (!dialog_->displayCB->isChecked()) + igp.display = grfx::NoDisplay; + string value(dialog_->width->text()); igp.width = LyXLength(strToDbl(value), dialog_->widthUnit->currentLengthItem()); value = string(dialog_->height->text()); igp.height = LyXLength(strToDbl(value), dialog_->heightUnit->currentLengthItem()); igp.keepAspectRatio = dialog_->aspectratio->isChecked(); + + igp.noUnzip = dialog_->unzipCB->isChecked(); igp.lyxscale = strToInt(string(dialog_->displayscale->text())); igp.rotateAngle = strToDbl(string(dialog_->angle->text())); - while (igp.rotateAngle < -360.0) igp.rotateAngle += 360.0; - while (igp.rotateAngle > 360.0) igp.rotateAngle -= 360.0; + while (igp.rotateAngle < -360.0) + igp.rotateAngle += 360.0; + while (igp.rotateAngle > 360.0) + igp.rotateAngle -= 360.0; if ((dialog_->origin->currentItem()) > 0) igp.rotateOrigin = dialog_->origin->currentText(); diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialog.ui index af9ded4434..b07d03d285 100644 --- a/src/frontends/qt2/ui/QGraphicsDialog.ui +++ b/src/frontends/qt2/ui/QGraphicsDialog.ui @@ -14,7 +14,7 @@ 0 0 332 - 405 + 470 @@ -52,7 +52,7 @@ title - F&ile + &Graphics @@ -92,6 +92,10 @@ buddy filename + + toolTip + File name of image + QLineEdit @@ -121,128 +125,17 @@ - - QLayoutWidget - - name - Layout24 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - displayshowL - - - text - Dis&play : - - - buddy - show - - - - QLayoutWidget - - name - Layout5 - - - - margin - 0 - - - spacing - 6 - - - QComboBox - - - text - Default - - - - - text - Monochrome - - - - - text - Grayscale - - - - - text - Color - - - - - text - Do not display - - - - name - show - - - toolTip - Screen display - - - - - name - Spacer23 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QGroupBox name - displaysizeGB + GroupBox5 title - Display size + LyX display - + margin 11 @@ -251,10 +144,10 @@ spacing 6 - + name - Spacer186 + Spacer45 orientation @@ -272,38 +165,83 @@ - - QButtonGroup + + QCheckBox name - ButtonGroup2 + displayCB - frameShape - NoFrame + text + &Show in LyX + + + toolTip + Display image in LyX + + + + + name + Spacer44 - title - + orientation + Vertical - exclusive - true + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLayoutWidget + + name + Layout22 margin - 11 + 0 spacing 6 - + + + name + Spacer42 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + QLayoutWidget name - Layout7_2 + Layout19 @@ -315,46 +253,44 @@ 6 - QLineEdit + QComboBox + + + text + Default + + + + + text + Monochrome + + + + + text + Grayscale + + + + + text + Color + + name - displayscale - - - enabled - false - - - sizePolicy - - 3 - 0 - + showCB toolTip - Percentage to scale by in output - - - - QLabel - - name - TextLabel4_2_2 - - - enabled - false - - - text - % + Screen display name - Spacer12_2 + Spacer18 orientation @@ -374,49 +310,32 @@ - - - name - Spacer20 - - - orientation - Vertical - - - sizeType - Minimum - - - sizeHint - - 20 - 20 - - - - - QRadioButton + + QLabel name - displayscaleRB + TextLabel1 text - Sca&le : + Display : + + + buddy + showCB toolTip - Scale image size + Screen display - + QLayoutWidget name - Layout37 + Layout20 - + margin 0 @@ -426,28 +345,50 @@ 6 - QRadioButton + QLineEdit name - displaycustomRB + displayscale - text - Custo&m : + enabled + true + + + sizePolicy + + 1 + 0 + toolTip - Custom size + Percentage to scale by in LyX + + + + QLabel + + name + TextLabel4_2_2 + + + enabled + false + + + text + % name - Spacer170 + Spacer17_2 orientation - Vertical + Horizontal sizeType @@ -461,343 +402,58 @@ - + - - QLayoutWidget - + + name - Layout32 + Spacer41 - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout21 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout18 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel7 - - - enabled - false - - - text - &Width - - - buddy - displaywidth - - - - QLayoutWidget - - name - Layout16 - - - - margin - 0 - - - spacing - 6 - - - QLineEdit - - name - displaywidth - - - enabled - false - - - sizePolicy - - 7 - 0 - - - - toolTip - Width of image on screen - - - - LengthCombo - - name - displaywidthUnit - - - enabled - false - - - minimumSize - - 30 - 0 - - - - focusPolicy - StrongFocus - - - - - - - - QLayoutWidget - - name - Layout19 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel7_2 - - - enabled - false - - - text - &Height - - - buddy - displayheight - - - - QLayoutWidget - - name - Layout17 - - - - margin - 0 - - - spacing - 6 - - - QLineEdit - - name - displayheight - - - enabled - false - - - toolTip - Height of image on screen - - - - LengthCombo - - name - displayheightUnit - - - enabled - false - - - minimumSize - - 30 - 0 - - - - focusPolicy - StrongFocus - - - - - - - - - - QLayoutWidget - - name - Layout31 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - displayratioCB - - - enabled - false - - - text - &Keep aspect ratio - - - - - name - Spacer17 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - - QRadioButton + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLabel name - displaydefaultRB + scaleLA text - Ima&ge size + Scale : - - checked - true + + buddy + displayscale toolTip - Original image size + Percentage to scale by in LyX - - - - QLayoutWidget - - name - Layout18 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - draft - - - text - &Draft mode - - - toolTip - Draft mode - - name - Spacer8 + Spacer43 orientation - Horizontal + Vertical sizeType @@ -811,169 +467,31 @@ - + - - - - QWidget - - name - tab - - - title - Output si&ze - - - - margin - 11 - - - spacing - 6 - - QButtonGroup + QGroupBox name - ButtonGroup19 - - - frameShape - NoFrame + GroupBox11 title - + Output - + margin 11 spacing - 6 - - - QRadioButton - - name - scaleRB - - - text - &Scale - - - checked - false - - - toolTip - Scale the image size - - - - QRadioButton - - name - defaultRB - - - text - &Image size - - - checked - true - - - toolTip - Use the image's natural size - - - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - - - spacing - 6 - - - QLineEdit - - name - scale - - - enabled - false - - - sizePolicy - - 3 - 0 - - - - toolTip - Percentage to scale by in output - - - - QLabel - - name - TextLabel4_2 - - - enabled - false - - - text - % - - - - - name - Spacer12 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - + 6 + + name - Spacer119 + Spacer47 orientation @@ -981,7 +499,7 @@ sizeType - Minimum + Expanding sizeHint @@ -991,66 +509,13 @@ - - QLayoutWidget - - name - Layout34 - - - - margin - 0 - - - spacing - 6 - - - QRadioButton - - name - customRB - - - text - &Custom - - - toolTip - Define a custom size - - - - - name - Spacer150 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - + QLayoutWidget name - Layout35 + Layout23 - + margin 0 @@ -1063,9 +528,9 @@ QLayoutWidget name - Layout33 + Layout32_2 - + margin 0 @@ -1078,9 +543,9 @@ QLayoutWidget name - Layout32 + Layout26_2 - + margin 0 @@ -1089,13 +554,32 @@ spacing 6 + + QLabel + + name + sizewidthL_2 + + + enabled + true + + + text + &Width + + + buddy + width + + QLayoutWidget name - Layout26 + Layout18_2 - + margin 0 @@ -1105,171 +589,57 @@ 6 - QLabel + QLineEdit name - sizewidthL + width enabled - false - - - text - &Width + true - buddy - width + toolTip + Width of image in output - QLayoutWidget + LengthCombo name - Layout18 + widthUnit - - - margin - 0 - - - spacing - 6 - - - QLineEdit - - name - width - - - enabled - false - - - - LengthCombo - - name - widthUnit - - - enabled - false - - - minimumSize - - 30 - 0 - - - - focusPolicy - StrongFocus - - - - - - - - QLayoutWidget - - name - Layout31 - - - - margin - 0 - - - spacing - 6 - - - QLabel - name - sizeheightL + enabled + true - enabled - false + minimumSize + + 50 + 0 + - text - &Height + focusPolicy + StrongFocus - buddy - height - - - - QLayoutWidget - - name - Layout19 + toolTip + Width unit - - - margin - 0 - - - spacing - 6 - - - QLineEdit - - name - height - - - enabled - false - - - - LengthCombo - - name - heightUnit - - - enabled - false - - - minimumSize - - 30 - 0 - - - - focusPolicy - StrongFocus - - - - + - + QLayoutWidget name - Layout8 + Layout31_2 - + margin 0 @@ -1279,53 +649,325 @@ 6 - QCheckBox + QLabel name - aspectratio + sizeheightL_2 enabled - false + true text - &Keep aspect ratio + &Height - - - name - Spacer13 - - - orientation - Horizontal + buddy + height + + + QLayoutWidget - sizeType - Expanding - - - sizeHint - - 20 - 20 - + name + Layout19_2 - - + + + margin + 0 + + + spacing + 6 + + + QLineEdit + + name + height + + + enabled + true + + + toolTip + Height of image in output + + + + LengthCombo + + name + heightUnit + + + enabled + true + + + minimumSize + + 50 + 0 + + + + focusPolicy + StrongFocus + + + toolTip + Height unit + + + + + - + + + + + name + Spacer46 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + QCheckBox + + name + aspectratio + + + enabled + true + + + text + &Maintain aspect ratio + + + toolTip + Maintain aspect ratio with largest dimension + + + + + name + Spacer50 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + QGroupBox + + name + rotateGB + + + title + Rotation + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout22 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + angleL_2 + + + text + A&ngle: + + + buddy + angle + + + toolTip + Angle to rotate image by + + + + QLineEdit + + name + angle + + + toolTip + Angle to rotate image by + + + + QLabel + + name + originL_2 + + + text + &Origin: + + + buddy + origin + + + toolTip + The origin of the rotation + + + + QComboBox + + + text + default + + + + + text + Top left + + + + + text + Bottom left + + + + + text + Left baseline + + + + + text + Center + + + + + text + Top center + + + + + text + Bottom center + + + + + text + Center baseline + + + + + text + Top right + + + + + text + Bottom right + + + + + text + Right baseline + + + + + text + Reference point + + + + name + origin + + + toolTip + The origin of the rotation + name - Spacer151 + Spacer21 orientation - Vertical + Horizontal sizeType @@ -1339,11 +981,11 @@ - + - + - + QWidget @@ -1365,85 +1007,25 @@ 6 - QGroupBox + QLayoutWidget name - bbGB - - - enabled - true - - - title - Bounding box + Layout23 margin - 11 + 0 spacing 6 - - QLabel - - name - lbL - - - text - &Left bottom: - - - buddy - lbX - - - - QLabel - - name - rtL - - - text - Right &top: - - - buddy - rtX - - - - QLabel - - name - yL - - - text - Y - - - - QLabel - - name - xL - - - text - X - - - + QLayoutWidget name - Layout25 + Layout25_2 @@ -1458,11 +1040,7 @@ QLineEdit name - lbX - - - toolTip - + rtX @@ -1487,16 +1065,63 @@ name - lbXunit + rtXunit - + + QLabel + + name + xL + + + text + x + + + + + name + Spacer22 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLabel + + name + lbL + + + text + &Left bottom: + + + buddy + lbX + + + QLayoutWidget name - Layout25_2 + Layout25 @@ -1511,7 +1136,11 @@ QLineEdit name - rtX + lbX + + + toolTip + @@ -1536,7 +1165,7 @@ name - rtXunit + lbXunit @@ -1585,7 +1214,7 @@ name - rtYXunit + rtYunit @@ -1639,60 +1268,86 @@ - - QLayoutWidget + + QLabel + + name + yL + + + text + y + + + + QLabel + + name + rtL + + + text + Right &top: + + + buddy + rtX + + + + + + QLayoutWidget + + name + Layout24 + + + + margin + 0 + + + spacing + 6 + + + QPushButton name - Layout16 + getPB + + + text + &Get from file + + + toolTip + Get bounding box from the EPS file - - - margin - 0 - - - spacing - 6 - - - - name - Spacer6 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - getPB - - - text - &Get from file - - - toolTip - Get bounding box from the EPS file - - - - + + + name + Spacer48 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + QLayoutWidget @@ -1747,6 +1402,27 @@ + + + name + Spacer47_2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + @@ -1757,7 +1433,7 @@ title - E&xtra + E&xtra options @@ -1768,20 +1444,52 @@ spacing 6 + + + name + Spacer72 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + - QGroupBox + QCheckBox name - rotateGB + subfigure - title - Rotation + text + Su&bfigure + + + toolTip + Is this just one part of a figure float ? + + + + QLayoutWidget + + name + Layout22 margin - 11 + 0 spacing @@ -1791,165 +1499,206 @@ QLabel name - angleL + CaptionLA text - A&ngle: + Ca&ption : buddy - angle + subcaption toolTip - Angle to rotate image by + The caption for the sub-figure QLineEdit name - angle + subcaption + + + enabled + false toolTip - Angle to rotate image by + The caption for the sub-figure + + + + + name + Spacer73 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLayoutWidget + + name + Layout26 + + + + margin + 0 + + + spacing + 6 + QLabel name - originL + latexoptionsLA text - Ori&gin: + LaTeX &options: buddy - origin + latexoptions + + + toolTip + Additional LaTeX options - QComboBox - - - text - default - - - - - text - Top left - - - - - text - Bottom left - - - - - text - Left baseline - - - - - text - Center - - - - - text - Top center - - - - - text - Bottom center - - - - - text - Center baseline - - - - - text - Top right - - - - - text - Bottom right - - - - - text - Right baseline - - - - - text - Reference point - - + QLineEdit name - origin + latexoptions toolTip - The origin of the rotation + Additional LaTeX options + + + name + Spacer74 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + - QGroupBox + QLayoutWidget name - latexoptionsGB + Layout18 + + + + margin + 0 + + + spacing + 6 + + + QCheckBox + + name + draftCB + + + text + &Draft mode + + + toolTip + Draft mode + + + + + name + Spacer8_3 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + + name + Spacer75 - title - LaTeX options + orientation + Vertical - - - margin - 11 - - - spacing - 6 - - - QLineEdit - - name - latexoptions - - - - + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + QLayoutWidget name - Layout6 + Layout18_3 @@ -1964,38 +1713,44 @@ QCheckBox name - subfigure + unzipCB text - Su&bfigure + Don't un&zip on export toolTip - Is this just one part of a figure float ? + Don't uncompress image before exporting to LaTeX - - QLineEdit - + + name - subcaption + Spacer8_2_2 - enabled - false + orientation + Horizontal + + + sizeType + Expanding - toolTip - The sub-caption for the figure + sizeHint + + 20 + 20 + - + name - Spacer26 + Spacer76 orientation @@ -2079,11 +1834,11 @@ text - &OK + OK autoDefault - false + true default @@ -2166,48 +1921,6 @@ - - scaleRB - toggled(bool) - scale - setEnabled(bool) - - - scaleRB - toggled(bool) - TextLabel4_2 - setEnabled(bool) - - - customRB - toggled(bool) - width - setEnabled(bool) - - - customRB - toggled(bool) - height - setEnabled(bool) - - - customRB - toggled(bool) - sizewidthL - setEnabled(bool) - - - customRB - toggled(bool) - sizeheightL - setEnabled(bool) - - - customRB - toggled(bool) - aspectratio - setEnabled(bool) - subfigure toggled(bool) @@ -2220,54 +1933,12 @@ QGraphicsDialogBase browse_clicked() - - getPB - clicked() - QGraphicsDialogBase - get_clicked() - - - customRB - toggled(bool) - widthUnit - setEnabled(bool) - - - customRB - toggled(bool) - heightUnit - setEnabled(bool) - filename textChanged(const QString&) QGraphicsDialogBase change_adaptor() - - displaywidth - textChanged(const QString&) - QGraphicsDialogBase - change_adaptor() - - - displayheight - textChanged(const QString&) - QGraphicsDialogBase - change_adaptor() - - - displaywidthUnit - selectionChanged(LyXLength::UNIT) - QGraphicsDialogBase - change_adaptor() - - - displayheightUnit - selectionChanged(LyXLength::UNIT) - QGraphicsDialogBase - change_adaptor() - subcaption textChanged(const QString&) @@ -2281,73 +1952,55 @@ change_adaptor() - defaultRB - stateChanged(int) - QGraphicsDialogBase - change_adaptor() - - - scaleRB - stateChanged(int) + latexoptions + textChanged(const QString&) QGraphicsDialogBase change_adaptor() - customRB + clip stateChanged(int) QGraphicsDialogBase change_adaptor() - angle - textChanged(const QString&) - QGraphicsDialogBase - change_adaptor() - - - latexoptions + lbX textChanged(const QString&) QGraphicsDialogBase change_adaptor() - clip - stateChanged(int) - QGraphicsDialogBase - change_adaptor() - - - draft - stateChanged(int) + lbXunit + activated(int) QGraphicsDialogBase change_adaptor() - lbX - textChanged(const QString&) + lbYunit + activated(int) QGraphicsDialogBase change_adaptor() - lbY - returnPressed() + rtXunit + activated(int) QGraphicsDialogBase change_adaptor() - rtX - returnPressed() + rtYunit + activated(int) QGraphicsDialogBase change_adaptor() - rtY - returnPressed() + showCB + activated(int) QGraphicsDialogBase change_adaptor() - scale + displayscale textChanged(const QString&) QGraphicsDialogBase change_adaptor() @@ -2364,12 +2017,6 @@ QGraphicsDialogBase change_adaptor() - - height - textChanged(const QString&) - QGraphicsDialogBase - change_adaptor() - heightUnit selectionChanged(LyXLength::UNIT) @@ -2383,116 +2030,86 @@ change_adaptor() - lbXunit - activated(int) - QGraphicsDialogBase - change_adaptor() - - - lbYunit - activated(int) - QGraphicsDialogBase - change_adaptor() - - - rtXunit - activated(int) - QGraphicsDialogBase - change_adaptor() - - - rtYXunit - activated(int) + displayCB + stateChanged(int) QGraphicsDialogBase change_adaptor() - origin - activated(int) + draftCB + stateChanged(int) QGraphicsDialogBase change_adaptor() - show - activated(int) + unzipCB + stateChanged(int) QGraphicsDialogBase change_adaptor() - displayscaleRB - toggled(bool) - displayscale - setEnabled(bool) - - - displaycustomRB - toggled(bool) - displaywidth - setEnabled(bool) - - - displaycustomRB + displayCB toggled(bool) - displayheight + showCB setEnabled(bool) - displayscaleRB + displayCB toggled(bool) - TextLabel4_2_2 + displayscale setEnabled(bool) - displaycustomRB - toggled(bool) - TextLabel7 - setEnabled(bool) + height + textChanged(const QString&) + QGraphicsDialogBase + change_adaptor() - displaycustomRB - toggled(bool) - displaywidthUnit - setEnabled(bool) + height + returnPressed() + QGraphicsDialogBase + change_adaptor() - displaycustomRB - toggled(bool) - displayheightUnit - setEnabled(bool) + angle + textChanged(const QString&) + QGraphicsDialogBase + change_adaptor() - displaycustomRB - toggled(bool) - TextLabel7_2 - setEnabled(bool) + origin + textChanged(const QString&) + QGraphicsDialogBase + change_adaptor() - displaycustomRB - toggled(bool) - displayratioCB - setEnabled(bool) + rtX + textChanged(const QString&) + QGraphicsDialogBase + change_adaptor() - displaycustomRB - stateChanged(int) + rtY + textChanged(const QString&) QGraphicsDialogBase change_adaptor() - displayscaleRB - stateChanged(int) + lbY + textChanged(const QString&) QGraphicsDialogBase change_adaptor() - displayratioCB - stateChanged(int) + getPB + clicked() QGraphicsDialogBase - change_adaptor() + get_clicked() - displayscale - textChanged(const QString&) + getPB + clicked() QGraphicsDialogBase change_adaptor() @@ -2504,25 +2121,16 @@ TabWidget filename browsePB - show - displaydefaultRB - displayscaleRB - displaycustomRB + displayCB + showCB displayscale - displaywidth - displaywidthUnit - displayheight - displayheightUnit - draft - restorePB - scaleRB - scale - defaultRB width widthUnit height heightUnit aspectratio + angle + origin lbX lbXunit lbY @@ -2530,17 +2138,17 @@ rtX rtXunit rtY - rtYXunit + rtYunit getPB - clip - angle - origin - latexoptions subfigure subcaption + latexoptions + draftCB + unzipCB + restorePB okPB applyPB closePB - customRB + clip -- 2.39.5