From 2208b5c264eecab159a5cdf5063135317623058f Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Sat, 19 Apr 2008 15:57:17 +0000 Subject: [PATCH] Remove embedding stuff from Document>Settings. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24358 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiDocument.cpp | 53 ----------------- src/frontends/qt4/GuiDocument.h | 5 -- src/frontends/qt4/Makefile.am | 1 - src/frontends/qt4/ui/EmbeddedFilesUi.ui | 76 ------------------------- 4 files changed, 135 deletions(-) delete mode 100644 src/frontends/qt4/ui/EmbeddedFilesUi.ui diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 5b07599360..cb9aefaa8f 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -924,13 +924,6 @@ GuiDocument::GuiDocument(GuiView & lv) connect(bulletsModule, SIGNAL(changed()), this, SLOT(change_adaptor())); - // embedded files - embeddedFilesModule = new UiWidget; - connect(embeddedFilesModule->addPB, SIGNAL(clicked()), - this, SLOT(addExtraEmbeddedFile())); - connect(embeddedFilesModule->removePB, SIGNAL(clicked()), - this, SLOT(removeExtraEmbeddedFile())); - // PDF support pdfSupportModule = new UiWidget; @@ -987,7 +980,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 @@ -1422,41 +1414,6 @@ void GuiDocument::updateModuleInfo() } -void GuiDocument::setExtraEmbeddedFileList() -{ - embeddedFilesModule->extraLW->clear(); - // add current embedded files - vector const & files = buffer().params().extraEmbeddedFiles(); - vector::const_iterator fit = files.begin(); - vector::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(); @@ -1759,14 +1716,6 @@ void GuiDocument::apply(BufferParams & params) pdf.pagemode.clear(); pdf.quoted_options = pdf.quoted_options_check( fromqstr(pdfSupportModule->optionsLE->text())); - - // Embedded files - vector & 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())); - } } @@ -2071,8 +2020,6 @@ void GuiDocument::updateParams(BufferParams const & params) pdfSupportModule->optionsLE->setText( toqstr(pdf.quoted_options)); - - setExtraEmbeddedFileList(); } diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h index 7cefd593d6..92965adea2 100644 --- a/src/frontends/qt4/GuiDocument.h +++ b/src/frontends/qt4/GuiDocument.h @@ -22,7 +22,6 @@ #include "GuiSelectionManager.h" #include "ui_DocumentUi.h" -#include "ui_EmbeddedFilesUi.h" #include "ui_FontUi.h" #include "ui_TextLayoutUi.h" #include "ui_MathsUi.h" @@ -138,9 +137,6 @@ private Q_SLOTS: void browseLayout(); void classChanged(); void updateModuleInfo(); - void setExtraEmbeddedFileList(); - void addExtraEmbeddedFile(); - void removeExtraEmbeddedFile(); private: UiWidget *textLayoutModule; @@ -153,7 +149,6 @@ private: UiWidget *mathsModule; UiWidget *latexModule; UiWidget *pdfSupportModule; - UiWidget *embeddedFilesModule; PreambleModule *preambleModule; GuiBranches *branchesModule; diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 844bb66678..eba02e902a 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -241,7 +241,6 @@ UIFILES = \ ErrorListUi.ui \ ERTUi.ui \ ExternalUi.ui \ - EmbeddedFilesUi.ui \ FloatPlacementUi.ui \ FloatUi.ui \ FontUi.ui \ diff --git a/src/frontends/qt4/ui/EmbeddedFilesUi.ui b/src/frontends/qt4/ui/EmbeddedFilesUi.ui deleted file mode 100644 index 236c925b4f..0000000000 --- a/src/frontends/qt4/ui/EmbeddedFilesUi.ui +++ /dev/null @@ -1,76 +0,0 @@ - - EmbeddedFilesUi - - - - 0 - 0 - 409 - 346 - - - - EmbeddedFiles - - - - 9 - - - 6 - - - - - Extra embedded files: - - - - - - - - 7 - 7 - 0 - 0 - - - - - - - - Add - - - - - - - Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - qt_helpers.h - - - - -- 2.39.5