mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
build fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5256 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon
parent
cbb3dc4564
commit
985ccb6218
@ -1,3 +1,11 @@
|
||||
2002-09-10 John Levon <levon@movementarian.org>
|
||||
|
||||
* ui/QIncludeDialog.ui:
|
||||
* QInclude.h:
|
||||
* QInclude.C: remove don't typeset
|
||||
|
||||
* Dialogs2.C: add empty showWrap
|
||||
|
||||
2002-09-08 John Levon <levon@movementarian.org>
|
||||
|
||||
* QFloat.C: another fix
|
||||
|
||||
@ -272,3 +272,9 @@ void Dialogs::showVCLogFile()
|
||||
{
|
||||
pimpl_->vclogfile.controller().show();
|
||||
}
|
||||
|
||||
|
||||
void Dialogs::showWrap(InsetWrap * i)
|
||||
{
|
||||
// FIXME
|
||||
}
|
||||
|
||||
@ -45,6 +45,7 @@
|
||||
#include "ControlToc.h"
|
||||
#include "ControlUrl.h"
|
||||
#include "ControlVCLog.h"
|
||||
#include "ControlWrap.h"
|
||||
|
||||
#include "QAbout.h"
|
||||
#include "QAboutDialog.h"
|
||||
|
||||
@ -41,7 +41,6 @@ void QInclude::build_dialog()
|
||||
bc().setCancel(dialog_->closePB);
|
||||
bc().addReadOnly(dialog_->filenameED);
|
||||
bc().addReadOnly(dialog_->browsePB);
|
||||
bc().addReadOnly(dialog_->typesetCB);
|
||||
bc().addReadOnly(dialog_->visiblespaceCB);
|
||||
bc().addReadOnly(dialog_->typeCO);
|
||||
}
|
||||
@ -53,34 +52,32 @@ void QInclude::update_contents()
|
||||
|
||||
string const cmdname = controller().params().cparams.getCmdName();
|
||||
|
||||
dialog_->typesetCB->setChecked(controller().params().noload);
|
||||
|
||||
dialog_->visiblespaceCB->setChecked(false);
|
||||
dialog_->visiblespaceCB->setEnabled(false);
|
||||
|
||||
lyxerr << cmdname << endl;
|
||||
|
||||
if (cmdname == "input")
|
||||
dialog_->typeCO->setCurrentItem(1);
|
||||
dialog_->typeCO->setCurrentItem(0);
|
||||
else if (!cmdname.empty()) {
|
||||
dialog_->typeCO->setCurrentItem(2);
|
||||
dialog_->visiblespaceCB->setChecked(cmdname == "verbatiminput*");
|
||||
dialog_->visiblespaceCB->setEnabled(true);
|
||||
} else {
|
||||
dialog_->typeCO->setCurrentItem(1);
|
||||
}
|
||||
else dialog_->typeCO->setCurrentItem(0);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void QInclude::apply()
|
||||
{
|
||||
controller().params().noload = dialog_->typesetCB->isChecked();
|
||||
|
||||
controller().params().cparams.
|
||||
setContents(dialog_->filenameED->text().latin1());
|
||||
|
||||
int const item = dialog_->typeCO->currentItem();
|
||||
if (item==1)
|
||||
if (item == 0)
|
||||
controller().params().flag = InsetInclude::INPUT;
|
||||
else if (item==0)
|
||||
else if (item == 1)
|
||||
controller().params().flag = InsetInclude::INCLUDE;
|
||||
else {
|
||||
if (dialog_->visiblespaceCB->isChecked())
|
||||
@ -97,9 +94,9 @@ void QInclude::browse()
|
||||
|
||||
int const item = dialog_->typeCO->currentItem();
|
||||
if (item==0)
|
||||
type = ControlInclude::INCLUDE;
|
||||
else if (item==1)
|
||||
type = ControlInclude::INPUT;
|
||||
else if (item==1)
|
||||
type = ControlInclude::INCLUDE;
|
||||
else
|
||||
type = ControlInclude::VERBATIM;
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ QAbout
|
||||
|
||||
QCommandBuffer
|
||||
|
||||
- finish off
|
||||
- fix !! I HATE Qt
|
||||
|
||||
QContentPane
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>416</width>
|
||||
<height>225</height>
|
||||
<width>311</width>
|
||||
<height>158</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
@ -39,13 +39,13 @@
|
||||
<item>
|
||||
<property>
|
||||
<name>text</name>
|
||||
<string>Include</string>
|
||||
<string>Input</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property>
|
||||
<name>text</name>
|
||||
<string>Input</string>
|
||||
<string>Include</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
@ -142,28 +142,6 @@
|
||||
<string>FIXME</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="2" column="1" rowspan="1" colspan="3" >
|
||||
<class>QCheckBox</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>typesetCB</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>sizePolicy</name>
|
||||
<sizepolicy>
|
||||
<hsizetype>3</hsizetype>
|
||||
<vsizetype>0</vsizetype>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>text</name>
|
||||
<string>&Don't typeset</string>
|
||||
</property>
|
||||
<property>
|
||||
<name>toolTip</name>
|
||||
<string>FIXME</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="1" column="4" >
|
||||
<class>QPushButton</class>
|
||||
<property stdset="1">
|
||||
@ -308,12 +286,6 @@
|
||||
</grid>
|
||||
</widget>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>typesetCB</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>QIncludeDialogBase</receiver>
|
||||
<slot>change_adaptor()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>visiblespaceCB</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
@ -338,6 +310,12 @@
|
||||
<receiver>QIncludeDialogBase</receiver>
|
||||
<slot>browseClicked()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>typeCO</sender>
|
||||
<signal>activated(int)</signal>
|
||||
<receiver>QIncludeDialogBase</receiver>
|
||||
<slot>typeChanged(int)</slot>
|
||||
</connection>
|
||||
<slot access="public">browseClicked()</slot>
|
||||
<slot access="public">change_adaptor()</slot>
|
||||
<slot access="public">loadClicked()</slot>
|
||||
@ -347,7 +325,6 @@
|
||||
<tabstop>filenameED</tabstop>
|
||||
<tabstop>browsePB</tabstop>
|
||||
<tabstop>typeCO</tabstop>
|
||||
<tabstop>typesetCB</tabstop>
|
||||
<tabstop>visiblespaceCB</tabstop>
|
||||
<tabstop>loadPB</tabstop>
|
||||
<tabstop>okPB</tabstop>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user