]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiDocument.cpp
cosmetics
[lyx.git] / src / frontends / qt4 / GuiDocument.cpp
index 7960fa55a8900aebfb4a034916c023dd7c90137f..bfedf55bf066530255519b8ccc5d17bf3d372c3e 100644 (file)
@@ -43,7 +43,6 @@
 
 #include "support/debug.h"
 #include "support/FileName.h"
-#include "support/FileFilterList.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
@@ -924,13 +923,6 @@ GuiDocument::GuiDocument(GuiView & lv)
        connect(bulletsModule, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
 
-       // embedded files
-       embeddedFilesModule = new UiWidget<Ui::EmbeddedFilesUi>;
-       connect(embeddedFilesModule->addPB, SIGNAL(clicked()),
-               this, SLOT(addExtraEmbeddedFile()));
-       connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
-               this, SLOT(removeExtraEmbeddedFile()));
-
        // PDF support
        pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
 
@@ -987,7 +979,6 @@ GuiDocument::GuiDocument(GuiView & lv)
        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
@@ -1231,12 +1222,12 @@ void GuiDocument::browseLayout()
 {
        QString const label1 = qt_("Layouts|#o#O");
        QString const dir1 = toqstr(lyxrc.document_path);
-       FileFilterList const filter(_("LyX Layout (*.layout)"));
+       QStringList const filter(qt_("LyX Layout (*.layout)"));
        QString file = browseRelFile(QString(), bufferFilepath(),
                qt_("Local layout file"), filter, false,
                label1, dir1);
 
-       if (!suffixIs(fromqstr(file), ".layout"))
+       if (!file.endsWith(".layout"))
                return;
 
        FileName layoutFile = makeAbsPath(fromqstr(file),
@@ -1290,16 +1281,6 @@ void GuiDocument::classChanged()
                        setLayoutComboByIDString(bp_.baseClassID());
                        return;
                }
-       } else if (prefixIs(classname, LayoutFileList::embeddedPrefix)) {
-               int const ret = Alert::prompt(_("Embedded layout"),
-                               _("The layout file you have selected is an embedded layout that\n"
-                                 "is embedded to a buffer. You cannot make use of it unless\n"
-                                 "it is already embedded to this buffer.\n"),
-                                 1, 1, _("&Set Layout"), _("&Cancel"));
-               if (ret == 1) {
-                       setLayoutComboByIDString(bp_.baseClassID());
-                       return;
-               }
        }
        // FIXME Note that by doing things this way, we load the TextClass
        // as soon as it is selected. So, if you use the scroll wheel when
@@ -1422,41 +1403,6 @@ void GuiDocument::updateModuleInfo()
 }
 
 
-void GuiDocument::setExtraEmbeddedFileList()
-{
-       embeddedFilesModule->extraLW->clear();
-       // add current embedded files
-       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 const label1 = qt_("Documents|#o#O");
-       QString const dir1 = toqstr(lyxrc.document_path);
-       FileFilterList const filter(_("LyX Layout (*.layout);;LaTeX Classes (*.{cls,sty});;BibTeX Databases (*.{bib,bst})"));
-       QString file = browseRelFile(QString(), bufferFilepath(),
-               qt_("Extra embedded file"), filter, true, label1, dir1);
-
-       if (file.isEmpty())
-               return;
-
-       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);
-}
-
-
 void GuiDocument::updateNumbering()
 {
        DocumentClass const & tclass = bp_.documentClass();
@@ -1493,18 +1439,18 @@ void GuiDocument::apply(BufferParams & params)
        preambleModule->apply(params);
 
        // biblio
-       params.setCiteEngine(biblio::ENGINE_BASIC);
+       params.setCiteEngine(ENGINE_BASIC);
 
        if (biblioModule->citeNatbibRB->isChecked()) {
                bool const use_numerical_citations =
                        biblioModule->citeStyleCO->currentIndex();
                if (use_numerical_citations)
-                       params.setCiteEngine(biblio::ENGINE_NATBIB_NUMERICAL);
+                       params.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
                else
-                       params.setCiteEngine(biblio::ENGINE_NATBIB_AUTHORYEAR);
+                       params.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
 
        } else if (biblioModule->citeJurabibRB->isChecked())
-               params.setCiteEngine(biblio::ENGINE_JURABIB);
+               params.setCiteEngine(ENGINE_JURABIB);
 
        params.use_bibtopic =
                biblioModule->bibtopicCB->isChecked();
@@ -1759,14 +1705,6 @@ void GuiDocument::apply(BufferParams & params)
                pdf.pagemode.clear();
        pdf.quoted_options = pdf.quoted_options_check(
                                fromqstr(pdfSupportModule->optionsLE->text()));
-
-       // Embedded files
-       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()));
-       }
 }
 
 
@@ -1815,17 +1753,17 @@ void GuiDocument::updateParams(BufferParams const & params)
 
        // biblio
        biblioModule->citeDefaultRB->setChecked(
-               params.citeEngine() == biblio::ENGINE_BASIC);
+               params.citeEngine() == ENGINE_BASIC);
 
        biblioModule->citeNatbibRB->setChecked(
-               params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
-               params.citeEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
+               params.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
+               params.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
 
        biblioModule->citeStyleCO->setCurrentIndex(
-               params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
+               params.citeEngine() == ENGINE_NATBIB_NUMERICAL);
 
        biblioModule->citeJurabibRB->setChecked(
-               params.citeEngine() == biblio::ENGINE_JURABIB);
+               params.citeEngine() == ENGINE_JURABIB);
 
        biblioModule->bibtopicCB->setChecked(
                params.use_bibtopic);
@@ -2071,8 +2009,6 @@ void GuiDocument::updateParams(BufferParams const & params)
 
        pdfSupportModule->optionsLE->setText(
                toqstr(pdf.quoted_options));
-       
-       setExtraEmbeddedFileList();
 }
 
 
@@ -2093,11 +2029,12 @@ void GuiDocument::saveDocDefault()
 void GuiDocument::updateAvailableModules() 
 {
        modules_av_model_.clear();
-       vector<modInfoStruct> const modInfoList = getModuleInfo();
+       vector<modInfoStruct> const modInfoList = getModuleInfo();
        int const mSize = modInfoList.size();
        for (int i = 0; i != mSize; ++i) {
                modInfoStruct const & modInfo = modInfoList[i];
-               modules_av_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+               modules_av_model_.insertRow(i, modInfo.name, modInfo.id, 
+                               modInfo.description);
        }
 }
 
@@ -2110,7 +2047,8 @@ void GuiDocument::updateSelectedModules()
        int const sSize = selModList.size();
        for (int i = 0; i != sSize; ++i) {
                modInfoStruct const & modInfo = selModList[i];
-               modules_sel_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+               modules_sel_model_.insertRow(i, modInfo.name, modInfo.id,
+                               modInfo.description);
        }
 }
 
@@ -2228,9 +2166,9 @@ vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
                m.id = *it;
                LyXModule * mod = moduleList[*it];
                if (mod)
-                       m.name = mod->getName();
+                       m.name = qt_(mod->getName());
                else 
-                       m.name = *it + " (Not Found)";
+                       m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")");
                mInfo.push_back(m);
        }
        return mInfo;
@@ -2361,7 +2299,13 @@ void GuiDocument::loadModuleInfo()
        for (; it != end; ++it) {
                modInfoStruct m;
                m.id = it->getID();
-               m.name = it->getName();
+               m.name = qt_(it->getName());
+               // this is supposed to give us the first sentence of the description
+               QString desc = qt_(it->getDescription());
+               int const pos = desc.indexOf(".");
+               if (pos > 0)
+                       desc.truncate(pos + 1);
+               m.description = desc;
                moduleNames_.push_back(m);
        }
 }