#include "GuiDocument.h"
-#include "BaseClassList.h"
+#include "LayoutFile.h"
#include "BranchList.h"
#include "buffer_funcs.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Color.h"
-#include "EmbeddedFiles.h"
#include "Encoding.h"
#include "FloatPlacement.h"
#include "FuncRequest.h"
#include "support/debug.h"
#include "support/FileName.h"
+#include "support/FileFilterList.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "frontends/alert.h"
-#include <boost/bind.hpp>
-
#include <QCloseEvent>
#include <QScrollBar>
#include <QTextCursor>
-#include <algorithm>
#include <sstream>
using namespace std;
namespace {
-///
-template<class Pair>
-vector<typename Pair::second_type> const
-getSecond(vector<Pair> const & pr)
-{
- vector<typename Pair::second_type> tmp(pr.size());
- transform(pr.begin(), pr.end(), tmp.begin(),
- boost::bind(&Pair::second, _1));
- return tmp;
-}
-
char const * const tex_graphics[] =
{
// Ordering criteria:
// 1. Availability of text class
// 2. Description (lexicographic)
- LayoutFile const & tc1 = BaseClassList::get()[lhs];
- LayoutFile const & tc2 = BaseClassList::get()[rhs];
+ LayoutFile const & tc1 = LayoutFileList::get()[lhs];
+ LayoutFile const & tc2 = LayoutFileList::get()[rhs];
return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
(tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
_(tc1.description()) < _(tc2.description()));
: GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
{
setupUi(this);
-
- lang_ = getSecond(getLanguageData(false));
+
+ QList<LanguagePair> langs = languageData(false);
+ for (int i = 0; i != langs.size(); ++i)
+ lang_.append(langs[i].second);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
// language & quotes
- vector<LanguagePair> const langs = getLanguageData(false);
- vector<LanguagePair>::const_iterator lit = langs.begin();
- vector<LanguagePair>::const_iterator lend = langs.end();
- for (; lit != lend; ++lit) {
- langModule->languageCO->addItem(toqstr(lit->first));
- }
+
+ QList<LanguagePair>::const_iterator lit = langs.begin();
+ QList<LanguagePair>::const_iterator lend = langs.end();
+ for (; lit != lend; ++lit)
+ langModule->languageCO->addItem(lit->first);
// Always put the default encoding in the first position.
// It is special because the displayed text is translated.
langModule->quoteStyleCO->addItem(qt_(">>text<<"));
-
numberingModule = new UiWidget<Ui::NumberingUi>;
// numbering
connect(numberingModule->depthSL, SIGNAL(valueChanged(int)),
this, SLOT(classChanged()));
connect(latexModule->classCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(latexModule->layoutPB, SIGNAL(clicked()),
+ this, SLOT(browseLayout()));
selectionManager =
new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV,
}
// latex classes
latexModule->classCO->setModel(&classes_model_);
- BaseClassList const & bcl = BaseClassList::get();
+ LayoutFileList const & bcl = LayoutFileList::get();
vector<LayoutFileIndex> classList = bcl.classList();
sort(classList.begin(), classList.end(), less_textclass_avail_desc());
// embedded files
embeddedFilesModule = new UiWidget<Ui::EmbeddedFilesUi>;
- connect(embeddedFilesModule->bundleCB, SIGNAL(toggled(bool)),
- this, SLOT(change_adaptor()));
connect(embeddedFilesModule->addPB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(addExtraEmbeddedFile()));
connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(removeExtraEmbeddedFile()));
// PDF support
pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
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(pdfSupportModule, _("PDF Properties"));
- docPS->addPanel(mathsModule, _("Math Options"));
- docPS->addPanel(floatModule, _("Float Placement"));
- docPS->addPanel(bulletsModule, _("Bullets"));
- docPS->addPanel(branchesModule, _("Branches"));
- docPS->addPanel(embeddedFilesModule, _("Embedded Files"));
- docPS->addPanel(preambleModule, _("LaTeX Preamble"));
- docPS->setCurrentPanel(_("Document Class"));
+ docPS->addPanel(latexModule, qt_("Document Class"));
+ docPS->addPanel(fontModule, qt_("Fonts"));
+ docPS->addPanel(textLayoutModule, qt_("Text Layout"));
+ docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
+ docPS->addPanel(marginsModule, qt_("Page Margins"));
+ docPS->addPanel(langModule, qt_("Language"));
+ docPS->addPanel(numberingModule, qt_("Numbering & TOC"));
+ docPS->addPanel(biblioModule, qt_("Bibliography"));
+ docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
+ docPS->addPanel(mathsModule, qt_("Math Options"));
+ docPS->addPanel(floatModule, qt_("Float Placement"));
+ docPS->addPanel(bulletsModule, qt_("Bullets"));
+ docPS->addPanel(branchesModule, qt_("Branches"));
+ docPS->addPanel(embeddedFilesModule, qt_("Embedded Files"));
+ docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
+ docPS->setCurrentPanel(qt_("Document Class"));
// FIXME: hack to work around resizing bug in Qt >= 4.2
// bug verified with Qt 4.2.{0-3} (JSpitzm)
#if QT_VERSION >= 0x040200
void GuiDocument::showPreamble()
{
- docPS->setCurrentPanel(_("LaTeX Preamble"));
+ docPS->setCurrentPanel(qt_("LaTeX Preamble"));
}
}
+void GuiDocument::browseLayout()
+{
+ QString const label1 = qt_("Layouts|#o#O");
+ QString const dir1 = toqstr(lyxrc.document_path);
+ FileFilterList const filter(_("LyX Layout (*.layout)"));
+ QString file = browseRelFile(QString(), bufferFilepath(),
+ qt_("Local layout file"), filter, false,
+ label1, dir1);
+
+ if (!suffixIs(fromqstr(file), ".layout"))
+ return;
+
+ FileName layoutFile = makeAbsPath(fromqstr(file),
+ fromqstr(bufferFilepath()));
+
+ // load the layout file
+ LayoutFileList & bcl = LayoutFileList::get();
+ string classname = layoutFile.onlyFileName();
+ LayoutFileIndex name = bcl.addLayoutFile(
+ classname.substr(0, classname.size() - 7),
+ layoutFile.onlyPath().absFilename());
+
+ if (name.empty()) {
+ Alert::error(_("Error"),
+ _("Unable to read local layout file."));
+ return;
+ }
+
+ // do not trigger classChanged if there is no change.
+ if (latexModule->classCO->currentText() == toqstr(name))
+ return;
+
+ // add to combo box
+ int idx = latexModule->classCO->findText(toqstr(name));
+ if (idx == -1) {
+ classes_model_.insertRow(0, toqstr(name), name);
+ latexModule->classCO->setCurrentIndex(0);
+ } else
+ latexModule->classCO->setCurrentIndex(idx);
+ classChanged();
+}
+
+
void GuiDocument::classChanged()
{
int idx = latexModule->classCO->currentIndex();
return;
string const classname = classes_model_.getIDString(idx);
// check if this is a local layout file
- if (prefixIs(classname, BaseClassList::localPrefix)) {
+ if (prefixIs(classname, LayoutFileList::localPrefix)) {
int const ret = Alert::prompt(_("Local layout file"),
- _("The layout file you have selected is a local layout"
- "file, not one in the system or user directory. Your"
- "document may not work with this layout if you do not"
+ _("The layout file you have selected is a local layout\n"
+ "file, not one in the system or user directory. Your\n"
+ "document may not work with this layout if you do not\n"
"keep the layout file in the same directory."),
1, 1, _("&Set Layout"), _("&Cancel"));
if (ret == 1) {
if (lyxrc.auto_reset_options) {
if (applyPB->isEnabled()) {
int const ret = Alert::prompt(_("Unapplied changes"),
- _("Some changes in the dialog were not yet applied."
+ _("Some changes in the dialog were not yet applied.\n"
"If you do not apply now, they will be lost after this action."),
1, 1, _("&Apply"), _("&Dismiss"));
if (ret == 0)
}
-void GuiDocument::updateEmbeddedFileList()
+void GuiDocument::setExtraEmbeddedFileList()
{
- embeddedFilesModule->filesLW->clear();
+ embeddedFilesModule->extraLW->clear();
// add current embedded files
- EmbeddedFileList & files = buffer().embeddedFiles();
- files.update(buffer());
- EmbeddedFileList::iterator fit = files.begin();
- EmbeddedFileList::iterator fit_end = files.end();
- for (; fit != fit_end; ++fit) {
- QString label = toqstr(fit->relFilename(buffer().filePath()));
- if (fit->refCount() > 1)
- label += " (" + QString::number(fit->refCount()) + ")";
- QListWidgetItem * item = new QListWidgetItem(label);
- item->setFlags(item->flags() | Qt::ItemIsSelectable
- | Qt::ItemIsUserCheckable);
- if(fit->embedded())
- item->setCheckState(Qt::Checked);
- else
- item->setCheckState(Qt::Unchecked);
- // index of the currently used ParConstIterator
- embeddedFilesModule->filesLW->addItem(item);
- }
+ vector<string> const & files = buffer().params().extraEmbeddedFiles();
+ vector<string>::const_iterator fit = files.begin();
+ vector<string>::const_iterator fit_end = files.end();
+ for (; fit != fit_end; ++fit)
+ embeddedFilesModule->extraLW->addItem(toqstr(*fit));
+}
+
+
+void GuiDocument::addExtraEmbeddedFile()
+{
+ QString file = browseRelFile(QString(), bufferFilepath(),
+ qt_("Extra embedded file"), FileFilterList(), true);
+
+ if (embeddedFilesModule->extraLW->findItems(file, Qt::MatchExactly).empty())
+ embeddedFilesModule->extraLW->addItem(file);
+}
+
+
+void GuiDocument::removeExtraEmbeddedFile()
+{
+ int index = embeddedFilesModule->extraLW->currentRow();
+ delete embeddedFilesModule->extraLW->takeItem(index);
}
QString const no = qt_("No");
QString const yes = qt_("Yes");
QTreeWidgetItem * item = 0;
- for (size_t i = 0; i != tclass.layoutCount(); ++i) {
- Layout const & lt = *tclass.layout(i);
- int const toclevel = lt.toclevel;
- if (toclevel != Layout::NOT_IN_TOC && lt.labeltype == LABEL_COUNTER) {
+
+ DocumentClass::const_iterator lit = tclass.begin();
+ DocumentClass::const_iterator len = tclass.end();
+ for (; lit != len; ++lit) {
+ int const toclevel = lit->toclevel;
+ if (toclevel != Layout::NOT_IN_TOC && lit->labeltype == LABEL_COUNTER) {
item = new QTreeWidgetItem(numberingModule->tocTW);
- item->setText(0, toqstr(translateIfPossible(lt.name())));
+ item->setText(0, toqstr(translateIfPossible(lit->name())));
item->setText(1, (toclevel <= depth) ? yes : no);
item->setText(2, (toclevel <= toc) ? yes : no);
}
params.quotes_language = lga;
int const pos = langModule->languageCO->currentIndex();
- params.language = lyx::languages.getLanguage(lang_[pos]);
+ params.language = lyx::languages.getLanguage(fromqstr(lang_[pos]));
// numbering
if (params.documentClass().hasTocLevels()) {
params.orientation = ORIENTATION_PORTRAIT;
// margins
- params.use_geometry =
- (!marginsModule->marginCB->isChecked()
- || geom_papersize);
+ params.use_geometry = !marginsModule->marginCB->isChecked()
+ || geom_papersize;
- Ui::MarginsUi const * m(marginsModule);
+ Ui::MarginsUi const * m = marginsModule;
params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
params.topmargin = widgetsToLength(m->topLE, m->topUnit);
pdf.pagemode = pdf.pagemode_fullscreen;
else
pdf.pagemode.clear();
- pdf.quoted_options = fromqstr(pdfSupportModule->optionsLE->text());
+ pdf.quoted_options = pdf.quoted_options_check(
+ fromqstr(pdfSupportModule->optionsLE->text()));
// Embedded files
- // FIXME
+ vector<string> & files = params.extraEmbeddedFiles();
+ files.clear();
+ for (int i = 0; i < embeddedFilesModule->extraLW->count(); ++i) {
+ QListWidgetItem * item = embeddedFilesModule->extraLW->item(i);
+ files.push_back(fromqstr(item->text()));
+ }
}
-/** Return the position of val in the vector if found.
- If not found, return 0.
- */
-template<class A>
-static size_t findPos(vector<A> const & vec, A const & val)
+static int findPos(QStringList const & vec, QString const & val)
{
- typename vector<A>::const_iterator it =
- find(vec.begin(), vec.end(), val);
- if (it == vec.end())
- return 0;
- return distance(vec.begin(), it);
+ for (int i = 0; i != vec.size(); ++i)
+ if (vec[i] == val)
+ return i;
+ return 0;
}
params.use_bibtopic);
// language & quotes
- int const pos = int(findPos(lang_,
- params.language->lang()));
+ int const pos = findPos(lang_, toqstr(params.language->lang()));
langModule->languageCO->setCurrentIndex(pos);
langModule->quoteStyleCO->setCurrentIndex(
pdfSupportModule->optionsLE->setText(
toqstr(pdf.quoted_options));
-
- // embedded files
- updateEmbeddedFileList();
+
+ setExtraEmbeddedFileList();
}
modules_av_model_.clear();
vector<modInfoStruct> const modInfoList = getModuleInfo();
int const mSize = modInfoList.size();
- for (int i = 0; i < mSize; ++i) {
+ for (int i = 0; i != mSize; ++i) {
modInfoStruct const & modInfo = modInfoList[i];
modules_av_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
}
void GuiDocument::updateSelectedModules()
{
- //and selected ones, too
+ // and selected ones, too
modules_sel_model_.clear();
vector<modInfoStruct> const selModList = getSelectedModules();
int const sSize = selModList.size();
- for (int i = 0; i < sSize; ++i) {
+ for (int i = 0; i != sSize; ++i) {
modInfoStruct const & modInfo = selModList[i];
modules_sel_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
}
{
if (applyPB->isEnabled()) {
int const ret = Alert::prompt(_("Unapplied changes"),
- _("Some changes in the dialog were not yet applied."
+ _("Some changes in the dialog were not yet applied.\n"
"If you do not apply now, they will be lost after this action."),
1, 1, _("&Apply"), _("&Dismiss"));
if (ret == 0)
bool GuiDocument::isValid()
{
- return (validate_listings_params().empty() &&
- (textLayoutModule->skipCO->currentIndex() != 3 ||
- !textLayoutModule->skipLE->text().isEmpty()));
+ return validate_listings_params().empty()
+ && (textLayoutModule->skipCO->currentIndex() != 3
+ || !textLayoutModule->skipLE->text().isEmpty());
}
projects / lyx.git / blobdiff