anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GuiWrap: make the optional options really optional by checkboxes in the dialog

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20478 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2007-09-24 22:35:00 +00:00
parent 4c8544239e
commit 21c4d09a19
3 changed files with 218 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/frontends/qt4/GuiWrap.cpp
View File

@ -49,13 +49,20 @@ GuiWrapDialog::GuiWrapDialog(LyXView & lv)
this, SLOT(change_adaptor())); this, SLOT(change_adaptor()));
connect(valignCO, SIGNAL(highlighted(const QString &)), connect(valignCO, SIGNAL(highlighted(const QString &)),
this, SLOT(change_adaptor())); this, SLOT(change_adaptor()));
connect(overhangCB, SIGNAL(stateChanged(int)),
this, SLOT(change_adaptor()));
connect(overhangED, SIGNAL(textChanged(const QString &)), connect(overhangED, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor())); this, SLOT(change_adaptor()));
connect(overhangUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)), connect(overhangUnitLC, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(change_adaptor())); this, SLOT(change_adaptor()));
connect(linesCB, SIGNAL(stateChanged(int)),
this, SLOT(change_adaptor()));
connect(linesSB, SIGNAL(valueChanged(int)), connect(linesSB, SIGNAL(valueChanged(int)),
this, SLOT(change_adaptor())); this, SLOT(change_adaptor()));
connect(overhangCB, SIGNAL(stateChanged(int)), this, SLOT(overhangChecked(int)));
connect(linesCB, SIGNAL(stateChanged(int)), this, SLOT(linesChecked(int)));
widthED->setValidator(unsignedLengthValidator(widthED)); widthED->setValidator(unsignedLengthValidator(widthED));
// FIXME: // FIXME:
// overhang can be negative, but the unsignedLengthValidator allows this // overhang can be negative, but the unsignedLengthValidator allows this
@ -70,13 +77,15 @@ GuiWrapDialog::GuiWrapDialog(LyXView & lv)
bc().addReadOnly(widthED); bc().addReadOnly(widthED);
bc().addReadOnly(widthUnitLC); bc().addReadOnly(widthUnitLC);
bc().addReadOnly(valignCO); bc().addReadOnly(valignCO);
bc().addReadOnly(overhangCB);
bc().addReadOnly(overhangED); bc().addReadOnly(overhangED);
bc().addReadOnly(overhangUnitLC); bc().addReadOnly(overhangUnitLC);
bc().addReadOnly(linesCB);
bc().addReadOnly(linesSB); bc().addReadOnly(linesSB);
// initialize the length validator // initialize the length validator
bc().addCheckedLineEdit(widthED, widthLA); bc().addCheckedLineEdit(widthED, widthLA);
bc().addCheckedLineEdit(overhangED, overhangLA); bc().addCheckedLineEdit(overhangED, overhangCB);
} }
@ -99,6 +108,26 @@ void GuiWrapDialog::change_adaptor()
} }
void GuiWrapDialog::overhangChecked(int checkState)
{
if (checkState == Qt::Checked) {
overhangED->setEnabled(true);
overhangUnitLC->setEnabled(true);
} else {
overhangED->setEnabled(false);
overhangUnitLC->setEnabled(false);
}
}
void GuiWrapDialog::linesChecked(int checkState)
{
if (checkState == Qt::Checked)
linesSB->setEnabled(true);
else
linesSB->setEnabled(false);
}
void GuiWrapDialog::applyView() void GuiWrapDialog::applyView()
{ {
double const width_value = widthED->text().toDouble(); double const width_value = widthED->text().toDouble();
@ -113,8 +142,20 @@ void GuiWrapDialog::applyView()
InsetWrapParams & params = controller().params(); InsetWrapParams & params = controller().params();
params.width = Length(width_value, widthUnit); params.width = Length(width_value, widthUnit);
params.overhang = Length(overhang_value, overhangUnit);
params.lines = linesSB->value(); if (overhangCB->checkState() == Qt::Checked)
params.overhang = Length(overhang_value, overhangUnit);
else
// when value is "0" the option is not set in the LaTeX-output
// in InsetWrap.cpp
params.overhang = Length("0in");
if (linesCB->checkState() == Qt::Checked)
params.lines = linesSB->value();
else
// when value is "0" the option is not set in the LaTeX-output
// in InsetWrap.cpp
params.lines = 0;
switch (valignCO->currentIndex()) { switch (valignCO->currentIndex()) {
case 0: case 0:

4
src/frontends/qt4/GuiWrap.h
View File

@ -28,6 +28,10 @@ public:
private Q_SLOTS: private Q_SLOTS:
void change_adaptor(); void change_adaptor();
/// overhang checkbox
void overhangChecked(int);
/// lines checkbox
void linesChecked(int);
private: private:
void closeEvent(QCloseEvent * e); void closeEvent(QCloseEvent * e);

295
src/frontends/qt4/ui/WrapUi.ui
View File

@ -15,37 +15,6 @@
<property name="sizeGripEnabled" > <property name="sizeGripEnabled" >
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>110</y>
<width>221</width>
<height>22</height>
</rect>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="nlinesLA" >
<property name="text" >
<string>&amp;Number of needed lines (optional):</string>
</property>
<property name="buddy" >
<cstring>valignCO</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="linesSB" />
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget" > <widget class="QWidget" name="layoutWidget" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
@ -155,62 +124,13 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QLabel" name="valignLA" > <widget class="QWidget" name="" >
<property name="geometry" >
<rect>
<x>292</x>
<y>11</y>
<width>98</width>
<height>16</height>
</rect>
</property>
<property name="text" >
<string>&amp;Placement:</string>
</property>
<property name="buddy" >
<cstring>valignCO</cstring>
</property>
</widget>
<widget class="QComboBox" name="valignCO" >
<property name="geometry" >
<rect>
<x>292</x>
<y>32</y>
<width>98</width>
<height>18</height>
</rect>
</property>
<property name="toolTip" >
<string>Vertical alignment</string>
</property>
<item>
<property name="text" >
<string>Outer (default)</string>
</property>
</item>
<item>
<property name="text" >
<string>Inner</string>
</property>
</item>
<item>
<property name="text" >
<string>Left</string>
</property>
</item>
<item>
<property name="text" >
<string>Right</string>
</property>
</item>
</widget>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>271</width> <width>281</width>
<height>88</height> <height>42</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
@ -235,18 +155,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="1" >
<widget class="QLabel" name="widthLA" > <widget class="QLabel" name="widthUnitLA" >
<property name="text" >
<string>&amp;Width:</string>
</property>
<property name="buddy" >
<cstring>widthED</cstring>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLabel" name="overhangUnitLA" >
<property name="text" > <property name="text" >
<string>&amp;Unit:</string> <string>&amp;Unit:</string>
</property> </property>
@ -255,31 +165,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" >
<widget class="QLineEdit" name="overhangED" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Width value</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="overhangLA" >
<property name="text" >
<string>&amp;Overhang (optional):</string>
</property>
<property name="buddy" >
<cstring>widthED</cstring>
</property>
</widget>
</item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="LengthCombo" name="widthUnitLC" > <widget class="LengthCombo" name="widthUnitLC" >
<property name="sizePolicy" > <property name="sizePolicy" >
@ -300,12 +185,164 @@
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
<property name="toolTip" > <property name="toolTip" >
<string>Units of width value</string> <string>Unit of width value</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" >
<widget class="QLabel" name="widthLA" >
<property name="text" >
<string>&amp;Width:</string>
</property>
<property name="buddy" >
<cstring>widthED</cstring>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="" >
<property name="geometry" >
<rect>
<x>303</x>
<y>11</y>
<width>100</width>
<height>41</height>
</rect>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="valignLA" >
<property name="text" >
<string>&amp;Placement:</string>
</property>
<property name="buddy" >
<cstring>valignCO</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="valignCO" >
<property name="toolTip" >
<string>Vertical alignment</string>
</property>
<item>
<property name="text" >
<string>Outer (default)</string>
</property>
</item>
<item>
<property name="text" >
<string>Inner</string>
</property>
</item>
<item>
<property name="text" >
<string>Left</string>
</property>
</item>
<item>
<property name="text" >
<string>Right</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="" >
<property name="geometry" >
<rect>
<x>10</x>
<y>110</y>
<width>242</width>
<height>22</height>
</rect>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QLabel" name="widthUnitLA" > <widget class="QSpinBox" name="linesSB" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="toolTip" >
<string>number of needed lines</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QCheckBox" name="linesCB" >
<property name="toolTip" >
<string>use number of lines</string>
</property>
<property name="text" >
<string>&amp;Number of needed lines (optional):</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="" >
<property name="geometry" >
<rect>
<x>11</x>
<y>60</y>
<width>281</width>
<height>46</height>
</rect>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="overhangCB" >
<property name="toolTip" >
<string>use overhang</string>
</property>
<property name="text" >
<string>&amp;Overhang (optional):</string>
</property>
<property name="checked" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLineEdit" name="overhangED" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Overhang value</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QLabel" name="overhangUnitLA" >
<property name="text" > <property name="text" >
<string>&amp;Unit:</string> <string>&amp;Unit:</string>
</property> </property>
@ -314,8 +351,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="1" column="1" colspan="2" >
<widget class="LengthCombo" name="overhangUnitLC" > <widget class="LengthCombo" name="overhangUnitLC" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>13</hsizetype> <hsizetype>13</hsizetype>
@ -334,7 +374,7 @@
<enum>Qt::StrongFocus</enum> <enum>Qt::StrongFocus</enum>
</property> </property>
<property name="toolTip" > <property name="toolTip" >
<string>Units of width value</string> <string>Unit of overhang value</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -352,10 +392,15 @@
<tabstop>widthED</tabstop> <tabstop>widthED</tabstop>
<tabstop>widthUnitLC</tabstop> <tabstop>widthUnitLC</tabstop>
<tabstop>valignCO</tabstop> <tabstop>valignCO</tabstop>
<tabstop>overhangCB</tabstop>
<tabstop>overhangED</tabstop>
<tabstop>overhangUnitLC</tabstop>
<tabstop>linesCB</tabstop>
<tabstop>linesSB</tabstop>
<tabstop>restorePB</tabstop> <tabstop>restorePB</tabstop>
<tabstop>okPB</tabstop> <tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>closePB</tabstop> <tabstop>closePB</tabstop>
<tabstop>applyPB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local" >qt_helpers.h</include> <include location="local" >qt_helpers.h</include>