* development/scons/scons_manifest.py:

* src/frontends/qt4/Makefile.dialogs:
* src/frontends/qt4/QPrefsDialog.C:
* src/frontends/qt4/QPrefsDialog.h:
* src/frontends/qt4/ui/compile_uic.sh:
* src/frontends/qt4/ui/QPrefAsciiUi.ui:
* src/frontends/qt4/ui/QPrefPlaintextUi.ui: rename QPrefAsciiUi.ui to QPrefPlaintextUi.ui; 
rename PrefAscii to PrefPlaintext

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16714 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2007-01-16 22:29:33 +00:00
parent e8f78cea7a
commit bdadc8d496
6 changed files with 14 additions and 14 deletions

View File

@ -632,7 +632,7 @@ src_frontends_qt4_ui_files = Split('''
QNomenclUi.ui
QNoteUi.ui
QParagraphUi.ui
QPrefAsciiUi.ui
QPrefPlaintextUi.ui
QPrefColorsUi.ui
QPrefConvertersUi.ui
QPrefCopiersUi.ui

View File

@ -40,7 +40,6 @@ UIFILES = \
QNomenclUi.ui \
QNoteUi.ui \
QParagraphUi.ui \
QPrefAsciiUi.ui \
QPrefColorsUi.ui \
QPrefConvertersUi.ui \
QPrefCopiersUi.ui \
@ -53,6 +52,7 @@ UIFILES = \
QPrefLanguageUi.ui \
QPrefLatexUi.ui \
QPrefPathsUi.ui \
QPrefPlaintextUi.ui \
QPrefPrinterUi.ui \
QPrefScreenFontsUi.ui \
QPrefsUi.ui \

View File

@ -190,7 +190,7 @@ string const internal_path_list(QString const & input)
} // end namespace anon
PrefAscii::PrefAscii(QWidget * parent)
PrefPlaintext::PrefPlaintext(QWidget * parent)
: PrefModule(_(Outputs), _("Plain text"), 0, parent)
{
setupUi(this);
@ -201,14 +201,14 @@ PrefAscii::PrefAscii(QWidget * parent)
}
void PrefAscii::apply(LyXRC & rc) const
void PrefPlaintext::apply(LyXRC & rc) const
{
rc.plaintext_linelen = plaintextLinelengthSB->value();
rc.plaintext_roff_command = fromqstr(plaintextRoffED->text());
}
void PrefAscii::update(LyXRC const & rc)
void PrefPlaintext::update(LyXRC const & rc)
{
plaintextLinelengthSB->setValue(rc.plaintext_linelen);
plaintextRoffED->setText(toqstr(rc.plaintext_roff_command));
@ -1800,7 +1800,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
connect(restorePB, SIGNAL(clicked()),
form, SLOT(slotRestore()));
add(new PrefAscii);
add(new PrefPlaintext);
add(new PrefDate);
add(new PrefKeyboard(form_));
add(new PrefLatex(form_));

View File

@ -23,7 +23,7 @@
#include <QDialog>
#include <QCloseEvent>
#include "ui/QPrefAsciiUi.h"
#include "ui/QPrefPlaintextUi.h"
#include "ui/QPrefDateUi.h"
#include "ui/QPrefKeyboardUi.h"
#include "ui/QPrefLatexUi.h"
@ -87,12 +87,12 @@ Q_SIGNALS:
};
class PrefAscii : public PrefModule, public Ui::QPrefAsciiUi
class PrefPlaintext : public PrefModule, public Ui::QPrefPlaintextUi
{
Q_OBJECT
public:
PrefAscii(QWidget * parent = 0);
~PrefAscii() {}
PrefPlaintext(QWidget * parent = 0);
~PrefPlaintext() {}
virtual void apply(LyXRC & rc) const;
virtual void update(LyXRC const & rc);

View File

@ -2,8 +2,8 @@
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QPrefAsciiUi</class>
<widget class="QWidget" name="QPrefAsciiUi" >
<class>QPrefPlaintextUi</class>
<widget class="QWidget" name="QPrefPlaintextUi" >
<property name="geometry" >
<rect>
<x>0</x>
@ -51,7 +51,7 @@
<item>
<widget class="QSpinBox" name="plaintextLinelengthSB" >
<property name="toolTip" >
<string>Max. line length of exported plain text/LaTeX/SGML files</string>
<string>Max. line length of exported plain text/LaTeX/SGML files. If set to 0, paragraphs are output in a single line; if the line length is > 0, paragraphs are separated by a blank line.</string>
</property>
<property name="maximum" >
<number>120</number>

View File

@ -56,7 +56,7 @@ uic QErrorListUi.ui -o QErrorListUi.h
uic QFloatUi.ui -o QFloatUi.h
uic QIndexUi.ui -o QIndexUi.h
uic QMathMatrixUi.ui -o QMathMatrixUi.h
uic QPrefAsciiUi.ui -o QPrefAsciiUi.h
uic QPrefPlaintextUi.ui -o QPrefPlaintextUi.h
uic QPrefCopiersUi.ui -o QPrefCopiersUi.h
uic QPrefDisplayUi.ui -o QPrefDisplayUi.h
uic QPrefKeyboardUi.ui -o QPrefKeyboardUi.h