#include <QCloseEvent>
-#include "floatplacement.h"
+#include "FloatPlacement.h"
#include "lengthcombo.h"
#include "validators.h"
#include "panelstack.h"
#include "qt_helpers.h"
#include "bufferparams.h"
-#include "floatplacement.h"
#include "gettext.h"
#include "helper_funcs.h" // getSecond()
#include "language.h"
textLayoutModule->skipLE->setValidator(unsignedLengthValidator(
textLayoutModule->skipLE));
- textLayoutModule->skipCO->insertItem(qt_("SmallSkip"));
- textLayoutModule->skipCO->insertItem(qt_("MedSkip"));
- textLayoutModule->skipCO->insertItem(qt_("BigSkip"));
- textLayoutModule->skipCO->insertItem(qt_("Length"));
+ textLayoutModule->skipCO->addItem(qt_("SmallSkip"));
+ textLayoutModule->skipCO->addItem(qt_("MedSkip"));
+ textLayoutModule->skipCO->addItem(qt_("BigSkip"));
+ textLayoutModule->skipCO->addItem(qt_("Length"));
// remove the %-items from the unit choice
textLayoutModule->skipLengthCO->noPercents();
textLayoutModule->lspacingCO->insertItem(
- qt_("Single"), Spacing::Single);
+ Spacing::Single, qt_("Single"));
textLayoutModule->lspacingCO->insertItem(
- qt_("OneHalf"), Spacing::Onehalf);
+ Spacing::Onehalf, qt_("OneHalf"));
textLayoutModule->lspacingCO->insertItem(
- qt_("Double"), Spacing::Double);
+ Spacing::Double, qt_("Double"));
textLayoutModule->lspacingCO->insertItem(
- qt_("Custom"), Spacing::Other);
+ Spacing::Other, qt_("Custom"));
// initialize the length validator
addCheckedLineEdit(form_->bcview(), textLayoutModule->skipLE);
QString font = toqstr(tex_fonts_roman_gui[n]);
if (!form_->controller().isFontAvailable(tex_fonts_roman[n]))
font += qt_(" (not installed)");
- fontModule->fontsRomanCO->insertItem(font);
+ fontModule->fontsRomanCO->addItem(font);
}
for (int n = 0; tex_fonts_sans[n][0]; ++n) {
QString font = toqstr(tex_fonts_sans_gui[n]);
if (!form_->controller().isFontAvailable(tex_fonts_sans[n]))
font += qt_(" (not installed)");
- fontModule->fontsSansCO->insertItem(font);
+ fontModule->fontsSansCO->addItem(font);
}
for (int n = 0; tex_fonts_monospaced[n][0]; ++n) {
QString font = toqstr(tex_fonts_monospaced_gui[n]);
if (!form_->controller().isFontAvailable(tex_fonts_monospaced[n]))
font += qt_(" (not installed)");
- fontModule->fontsTypewriterCO->insertItem(font);
+ fontModule->fontsTypewriterCO->addItem(font);
}
- fontModule->fontsizeCO->insertItem(qt_("default"));
- fontModule->fontsizeCO->insertItem(qt_("10"));
- fontModule->fontsizeCO->insertItem(qt_("11"));
- fontModule->fontsizeCO->insertItem(qt_("12"));
+ fontModule->fontsizeCO->addItem(qt_("default"));
+ fontModule->fontsizeCO->addItem(qt_("10"));
+ fontModule->fontsizeCO->addItem(qt_("11"));
+ fontModule->fontsizeCO->addItem(qt_("12"));
for (int n = 0; ControlDocument::fontfamilies_gui[n][0]; ++n)
- fontModule->fontsDefaultCO->insertItem(
+ fontModule->fontsDefaultCO->addItem(
qt_(ControlDocument::fontfamilies_gui[n]));
connect(pageLayoutModule->landscapeRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(pageLayoutModule->facingPagesCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(pageLayoutModule->pagestyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
- pageLayoutModule->pagestyleCO->insertItem(qt_("default"));
- pageLayoutModule->pagestyleCO->insertItem(qt_("empty"));
- pageLayoutModule->pagestyleCO->insertItem(qt_("plain"));
- pageLayoutModule->pagestyleCO->insertItem(qt_("headings"));
- pageLayoutModule->pagestyleCO->insertItem(qt_("fancy"));
+ pageLayoutModule->pagestyleCO->addItem(qt_("default"));
+ pageLayoutModule->pagestyleCO->addItem(qt_("empty"));
+ pageLayoutModule->pagestyleCO->addItem(qt_("plain"));
+ pageLayoutModule->pagestyleCO->addItem(qt_("headings"));
+ pageLayoutModule->pagestyleCO->addItem(qt_("fancy"));
addCheckedLineEdit(form_->bcview(), pageLayoutModule->paperheightLE,
pageLayoutModule->paperheightL);
addCheckedLineEdit(form_->bcview(), pageLayoutModule->paperwidthLE,
// paper
QComboBox * cb = pageLayoutModule->papersizeCO;
- cb->insertItem(qt_("Default"));
- cb->insertItem(qt_("Custom"));
- cb->insertItem(qt_("US letter"));
- cb->insertItem(qt_("US legal"));
- cb->insertItem(qt_("US executive"));
- cb->insertItem(qt_("A3"));
- cb->insertItem(qt_("A4"));
- cb->insertItem(qt_("A5"));
- cb->insertItem(qt_("B3"));
- cb->insertItem(qt_("B4"));
- cb->insertItem(qt_("B5"));
+ cb->addItem(qt_("Default"));
+ cb->addItem(qt_("Custom"));
+ cb->addItem(qt_("US letter"));
+ cb->addItem(qt_("US legal"));
+ cb->addItem(qt_("US executive"));
+ cb->addItem(qt_("A3"));
+ cb->addItem(qt_("A4"));
+ cb->addItem(qt_("A5"));
+ cb->addItem(qt_("B3"));
+ cb->addItem(qt_("B4"));
+ cb->addItem(qt_("B5"));
// remove the %-items from the unit choice
pageLayoutModule->paperwidthUnitCO->noPercents();
pageLayoutModule->paperheightUnitCO->noPercents();
vector<LanguagePair>::const_iterator lit = langs.begin();
vector<LanguagePair>::const_iterator lend = langs.end();
for (; lit != lend; ++lit) {
- langModule->languageCO->insertItem(
+ langModule->languageCO->addItem(
toqstr(lit->first));
}
int k = 0;
while (encodings[k]) {
- langModule->encodingCO->insertItem(qt_(encodings[k++]));
+ langModule->encodingCO->addItem(qt_(encodings[k++]));
}
- langModule->quoteStyleCO->insertItem(qt_("``text''"));
- langModule->quoteStyleCO->insertItem(qt_("''text''"));
- langModule->quoteStyleCO->insertItem(qt_(",,text``"));
- langModule->quoteStyleCO->insertItem(qt_(",,text''"));
- langModule->quoteStyleCO->insertItem(qt_("<<text>>"));
- langModule->quoteStyleCO->insertItem(qt_(">>text<<"));
+ langModule->quoteStyleCO->addItem(qt_("``text''"));
+ langModule->quoteStyleCO->addItem(qt_("''text''"));
+ langModule->quoteStyleCO->addItem(qt_(",,text``"));
+ langModule->quoteStyleCO->addItem(qt_(",,text''"));
+ langModule->quoteStyleCO->addItem(qt_("<<text>>"));
+ langModule->quoteStyleCO->addItem(qt_(">>text<<"));
connect(biblioModule->citeJurabibRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
connect(biblioModule->bibtopicCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
// biblio
- biblioModule->citeStyleCO->insertItem(qt_("Author-year"));
- biblioModule->citeStyleCO->insertItem(qt_("Numerical"));
- biblioModule->citeStyleCO->setCurrentItem(0);
+ biblioModule->citeStyleCO->addItem(qt_("Author-year"));
+ biblioModule->citeStyleCO->addItem(qt_("Numerical"));
+ biblioModule->citeStyleCO->setCurrentIndex(0);
// packages
for (int n = 0; tex_graphics[n][0]; ++n) {
QString enc = tex_graphics[n];
- latexModule->psdriverCO->insertItem(enc);
+ latexModule->psdriverCO->addItem(enc);
}
// latex
for (LyXTextClassList::const_iterator cit = textclasslist.begin();
cit != textclasslist.end(); ++cit) {
if (cit->isTeXClassAvailable()) {
- latexModule->classCO->insertItem(toqstr(cit->description()));
+ latexModule->classCO->addItem(toqstr(cit->description()));
} else {
- string item =
- bformat(_("Unavailable: %1$s"), cit->description());
- latexModule->classCO->insertItem(toqstr(item));
+ docstring item =
+ bformat(_("Unavailable: %1$s"), lyx::from_utf8(cit->description()));
+ latexModule->classCO->addItem(toqstr(item));
}
}
connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
- preambleModule = new UiWidget<Ui::PreambleUi>;
// preamble
+ preambleModule = new UiWidget<Ui::PreambleUi>;
connect(preambleModule->preambleTE, SIGNAL(textChanged()), this, SLOT(change_adaptor()));
- bulletsModule = new BulletsModule;
- // FIXME: disable until we fix browsebox in BulletsModule.[Ch]
- bulletsModule->setEnabled(false);
// bullets
+ bulletsModule = new BulletsModule;
connect(bulletsModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
- floatModule = new FloatPlacement;
// float
+ floatModule = new FloatPlacement;
connect(floatModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
- docPS->addPanel(latexModule, _("Document Class"));
- docPS->addPanel(fontModule, _("Fonts"));
- docPS->addPanel(textLayoutModule, _("Text Layout"));
- docPS->addPanel(pageLayoutModule, _("Page Layout"));
- docPS->addPanel(marginsModule, _("Page Margins"));
- docPS->addPanel(langModule, _("Language"));
- docPS->addPanel(numberingModule, _("Numbering & TOC"));
- docPS->addPanel(biblioModule, _("Bibliography"));
- docPS->addPanel(mathsModule, _("Math Options"));
- docPS->addPanel(floatModule, _("Float Placement"));
- docPS->addPanel(bulletsModule, _("Bullets"));
- docPS->addPanel(branchesModule, _("Branches"));
- docPS->addPanel(preambleModule, _("LaTeX Preamble"));
- docPS->setCurrentPanel(_("Document Class"));
+ docPS->addPanel(latexModule, lyx::to_utf8(_("Document Class")));
+ docPS->addPanel(fontModule, lyx::to_utf8(_("Fonts")));
+ docPS->addPanel(textLayoutModule, lyx::to_utf8(_("Text Layout")));
+ docPS->addPanel(pageLayoutModule, lyx::to_utf8(_("Page Layout")));
+ docPS->addPanel(marginsModule, lyx::to_utf8(_("Page Margins")));
+ docPS->addPanel(langModule, lyx::to_utf8(_("Language")));
+ docPS->addPanel(numberingModule, lyx::to_utf8(_("Numbering & TOC")));
+ docPS->addPanel(biblioModule, lyx::to_utf8(_("Bibliography")));
+ docPS->addPanel(mathsModule, lyx::to_utf8(_("Math Options")));
+ docPS->addPanel(floatModule, lyx::to_utf8(_("Float Placement")));
+ docPS->addPanel(bulletsModule, lyx::to_utf8(_("Bullets")));
+ docPS->addPanel(branchesModule, lyx::to_utf8(_("Branches")));
+ docPS->addPanel(preambleModule, lyx::to_utf8(_("LaTeX Preamble")));
+ docPS->setCurrentPanel(lyx::to_utf8(_("Document Class")));
}
void QDocumentDialog::showPreamble()
{
- docPS->setCurrentPanel(_("LaTeX Preamble"));
+ docPS->setCurrentPanel(lyx::to_utf8(_("LaTeX Preamble")));
}
textLayoutModule->skipLE->setEnabled(skip);
textLayoutModule->skipLengthCO->setEnabled(skip);
if (skip)
- setSkip(textLayoutModule->skipCO->currentItem());
+ setSkip(textLayoutModule->skipCO->currentIndex());
}
void QDocumentDialog::portraitChanged()
{
- setMargins(pageLayoutModule->papersizeCO->currentItem());
+ setMargins(pageLayoutModule->papersizeCO->currentIndex());
}
void QDocumentDialog::setMargins(bool custom)
void QDocumentDialog::updateFontsize(string const & items, string const & sel)
{
fontModule->fontsizeCO->clear();
- fontModule->fontsizeCO->insertItem(qt_("default"));
+ fontModule->fontsizeCO->addItem(qt_("default"));
for (int n = 0; !token(items,'|',n).empty(); ++n)
fontModule->fontsizeCO->
- insertItem(toqstr(token(items,'|',n)));
+ addItem(toqstr(token(items,'|',n)));
for (int n = 0; n < fontModule->fontsizeCO->count(); ++n) {
- if (fromqstr(fontModule->fontsizeCO->text(n)) == sel) {
- fontModule->fontsizeCO->setCurrentItem(n);
+ if (fromqstr(fontModule->fontsizeCO->itemText(n)) == sel) {
+ fontModule->fontsizeCO->setCurrentIndex(n);
break;
}
}
void QDocumentDialog::updatePagestyle(string const & items, string const & sel)
{
pageLayoutModule->pagestyleCO->clear();
- pageLayoutModule->pagestyleCO->insertItem("default");
+ pageLayoutModule->pagestyleCO->addItem("default");
for (int n=0; !token(items,'|',n).empty(); ++n)
pageLayoutModule->pagestyleCO->
- insertItem(toqstr(token(items,'|',n)));
+ addItem(toqstr(token(items,'|',n)));
for (int n = 0; n<pageLayoutModule->pagestyleCO->count(); ++n) {
- if (fromqstr(pageLayoutModule->pagestyleCO->text(n))==sel) {
- pageLayoutModule->pagestyleCO->setCurrentItem(n);
+ if (fromqstr(pageLayoutModule->pagestyleCO->itemText(n))==sel) {
+ pageLayoutModule->pagestyleCO->setCurrentIndex(n);
break;
}
}
ControlDocument & cntrl = form_->controller();
BufferParams & params = cntrl.params();
- lyx::textclass_type const tc = latexModule->classCO->currentItem();
+ lyx::textclass_type const tc = latexModule->classCO->currentIndex();
if (form_->controller().loadTextclass(tc)) {
params.textclass = tc;
params.useClassDefaults();
form_->update_contents();
} else {
- latexModule->classCO->setCurrentItem(params.textclass);
+ latexModule->classCO->setCurrentIndex(params.textclass);
}
}
if (biblioModule->citeNatbibRB->isChecked()) {
bool const use_numerical_citations =
- biblioModule->citeStyleCO->currentItem();
+ biblioModule->citeStyleCO->currentIndex();
if (use_numerical_citations)
params.cite_engine = biblio::ENGINE_NATBIB_NUMERICAL;
else
if (langModule->defaultencodingCB->isChecked()) {
params.inputenc = "auto";
} else {
- int i = langModule->encodingCO->currentItem();
+ int i = langModule->encodingCO->currentIndex();
if (i == 0) {
params.inputenc = "default";
} else {
}
InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
- switch (langModule->quoteStyleCO->currentItem()) {
+ switch (langModule->quoteStyleCO->currentIndex()) {
case 0:
lga = InsetQuotes::EnglishQ;
break;
}
params.quotes_language = lga;
- int const pos = langModule->languageCO->currentItem();
+ int const pos = langModule->languageCO->currentIndex();
params.language = languages.getLanguage(lang_[pos]);
// numbering
// text layout
params.textclass =
- latexModule->classCO->currentItem();
+ latexModule->classCO->currentIndex();
params.pagestyle =
fromqstr(pageLayoutModule->pagestyleCO->currentText());
- switch (textLayoutModule->lspacingCO->currentItem()) {
+ switch (textLayoutModule->lspacingCO->currentIndex()) {
case 0:
params.spacing().set(Spacing::Single);
break;
else
params.paragraph_separation = BufferParams::PARSEP_SKIP;
- switch (textLayoutModule->skipCO->currentItem()) {
+ switch (textLayoutModule->skipCO->currentIndex()) {
case 0:
params.setDefSkip(VSpace(VSpace::SMALLSKIP));
break;
// fonts
params.fontsRoman =
- tex_fonts_roman[fontModule->fontsRomanCO->currentItem()];
+ tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
params.fontsSans =
- tex_fonts_sans[fontModule->fontsSansCO->currentItem()];
+ tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
params.fontsTypewriter =
- tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentItem()];
+ tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
params.fontsSansScale = fontModule->scaleSansSB->value();
params.fontsOSF = fontModule->fontOsfCB->isChecked();
params.fontsDefaultFamily = ControlDocument::fontfamilies[
- fontModule->fontsDefaultCO->currentItem()];
+ fontModule->fontsDefaultCO->currentIndex()];
- if (fontModule->fontsizeCO->currentItem() == 0)
+ if (fontModule->fontsizeCO->currentIndex() == 0)
params.fontsize = "default";
else
params.fontsize =
// paper
params.papersize = PAPER_SIZE(
- pageLayoutModule->papersizeCO->currentItem());
+ pageLayoutModule->papersizeCO->currentIndex());
// custom, A3, B3 and B4 paper sizes need geometry
- int psize = pageLayoutModule->papersizeCO->currentItem();
+ int psize = pageLayoutModule->papersizeCO->currentIndex();
bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
params.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
params.cite_engine == biblio::ENGINE_NATBIB_NUMERICAL ||
params.cite_engine == biblio::ENGINE_NATBIB_AUTHORYEAR);
- biblioModule->citeStyleCO->setCurrentItem(
+ biblioModule->citeStyleCO->setCurrentIndex(
params.cite_engine == biblio::ENGINE_NATBIB_NUMERICAL);
biblioModule->citeJurabibRB->setChecked(
// language & quotes
int const pos = int(findPos(lang_,
params.language->lang()));
- langModule->languageCO->setCurrentItem(pos);
+ langModule->languageCO->setCurrentIndex(pos);
- langModule->quoteStyleCO->setCurrentItem(
+ langModule->quoteStyleCO->setCurrentIndex(
params.quotes_language);
langModule->defaultencodingCB->setChecked(true);
if (params.inputenc != "auto") {
langModule->defaultencodingCB->setChecked(false);
if (params.inputenc == "default") {
- langModule->encodingCO->setCurrentItem(0);
+ langModule->encodingCO->setCurrentIndex(0);
} else {
int i = 0;
while (encodings[i]) {
if (encodings[i] == params.inputenc)
- langModule->encodingCO->setCurrentItem(i);
+ langModule->encodingCO->setCurrentIndex(i);
++i;
}
}
int const max_toclevel = form_->controller().textClass().max_toclevel();
if (form_->controller().textClass().hasTocLevels()) {
numberingModule->setEnabled(true);
- numberingModule->depthSL->setMinValue(min_toclevel - 1);
- numberingModule->depthSL->setMaxValue(max_toclevel);
+ numberingModule->depthSL->setMinimum(min_toclevel - 1);
+ numberingModule->depthSL->setMaximum(max_toclevel);
numberingModule->depthSL->setValue(params.secnumdepth);
- numberingModule->tocSL->setMinValue(min_toclevel - 1);
- numberingModule->tocSL->setMaxValue(max_toclevel);
+ numberingModule->tocSL->setMaximum(min_toclevel - 1);
+ numberingModule->tocSL->setMaximum(max_toclevel);
numberingModule->tocSL->setValue(params.tocdepth);
updateNumbering();
} else {
}
// bullets
- bulletsModule->setBullet(0,params.user_defined_bullet(0));
- bulletsModule->setBullet(1,params.user_defined_bullet(1));
- bulletsModule->setBullet(2,params.user_defined_bullet(2));
- bulletsModule->setBullet(3,params.user_defined_bullet(3));
+ bulletsModule->setBullet(0, params.user_defined_bullet(0));
+ bulletsModule->setBullet(1, params.user_defined_bullet(1));
+ bulletsModule->setBullet(2, params.user_defined_bullet(2));
+ bulletsModule->setBullet(3, params.user_defined_bullet(3));
+ bulletsModule->init();
// packages
QString text = toqstr(params.graphicsDriver);
for (int n = 0; n < nitem ; ++n) {
QString enc = tex_graphics[n];
if (enc == text) {
- latexModule->psdriverCO->setCurrentItem(n);
+ latexModule->psdriverCO->setCurrentIndex(n);
}
}
}
// text layout
- latexModule->classCO->setCurrentItem(params.textclass);
+ latexModule->classCO->setCurrentIndex(params.textclass);
updatePagestyle(form_->controller().textClass().opt_pagestyle(),
params.pagestyle);
- textLayoutModule->lspacingCO->setCurrentItem(nitem);
+ textLayoutModule->lspacingCO->setCurrentIndex(nitem);
if (params.spacing().getSpace() == Spacing::Other) {
textLayoutModule->lspacingLE->setText(
toqstr(params.spacing().getValueAsString()));
skip = 0;
break;
}
- textLayoutModule->skipCO->setCurrentItem(skip);
+ textLayoutModule->skipCO->setCurrentIndex(skip);
setSkip(skip);
textLayoutModule->twoColumnCB->setChecked(
int n = findToken(tex_fonts_roman, params.fontsRoman);
if (n >= 0)
- fontModule->fontsRomanCO->setCurrentItem(n);
+ fontModule->fontsRomanCO->setCurrentIndex(n);
n = findToken(tex_fonts_sans, params.fontsSans);
if (n >= 0)
- fontModule->fontsSansCO->setCurrentItem(n);
+ fontModule->fontsSansCO->setCurrentIndex(n);
n = findToken(tex_fonts_monospaced, params.fontsTypewriter);
if (n >= 0)
- fontModule->fontsTypewriterCO->setCurrentItem(n);
+ fontModule->fontsTypewriterCO->setCurrentIndex(n);
fontModule->fontScCB->setChecked(params.fontsSC);
fontModule->fontOsfCB->setChecked(params.fontsOSF);
form_->controller().providesScale(params.fontsTypewriter));
n = findToken(ControlDocument::fontfamilies, params.fontsDefaultFamily);
if (n >= 0)
- fontModule->fontsDefaultCO->setCurrentItem(n);
+ fontModule->fontsDefaultCO->setCurrentIndex(n);
// paper
int const psize = params.papersize;
- pageLayoutModule->papersizeCO->setCurrentItem(psize);
+ pageLayoutModule->papersizeCO->setCurrentIndex(psize);
setCustomPapersize(psize);
bool const landscape =
projects / lyx.git / blobdiff