do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiGraphics.cpp

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index 7194868b65c000339a76b4f039f3b1f17997c16e..b7286edbce5288e3280ce6deca6fcfd533d5098e 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -16,7 +16,6 @@
 
 #include "GuiGraphics.h"
 
-#include "support/debug.h"
 #include "LengthCombo.h"
 #include "Length.h"
 #include "LyXRC.h"
@@ -24,7 +23,6 @@
 #include "Validator.h"
 
 #include "FuncRequest.h"
-#include "support/gettext.h"
 
 #include "graphics/GraphicsCache.h"
 #include "graphics/GraphicsCacheItem.h"
@@ -33,8 +31,10 @@
 #include "insets/InsetGraphicsParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/FileFilterList.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
@@ -43,7 +43,6 @@
 #include <boost/bind.hpp>
 
 #include <QCheckBox>
-#include <QCloseEvent>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
@@ -205,10 +204,6 @@ GuiGraphics::GuiGraphics(GuiView & lv)
        // setChecked(). Note, too, that clicked() would get called whenever it
        // is clicked, even right clicked (I think), not just whenever it is
        // toggled.
-       connect(subfigure, SIGNAL(toggled(bool)),
-               this, SLOT(change_adaptor()));
-       connect(subcaption, SIGNAL(textChanged(const QString&)),
-               this, SLOT(change_adaptor()));
        connect(displayGB, SIGNAL(toggled(bool)),
                this, SLOT(change_adaptor()));
        connect(showCB, SIGNAL(currentIndexChanged(int)),
@@ -224,7 +219,6 @@ GuiGraphics::GuiGraphics(GuiView & lv)
        bc().setCancel(closePB);
 
        bc().addReadOnly(latexoptions);
-       bc().addReadOnly(subfigure);
        bc().addReadOnly(filenameL);
        bc().addReadOnly(filename);
        bc().addReadOnly(browsePB);
@@ -501,10 +495,6 @@ void GuiGraphics::updateContents()
        clip->setChecked(igp.clip);
        unzipCB->setChecked(igp.noUnzip);
 
-       // Update the subcaption check button and input field
-       subfigure->setChecked(igp.subcaption);
-       subcaption->setText(toqstr(igp.subcaptionText));
-
        int item = 0;
        switch (igp.display) {
                case graphics::DefaultDisplay: item = 0; break;
@@ -625,8 +615,6 @@ void GuiGraphics::applyView()
 
        igp.draft = draftCB->isChecked();
        igp.clip = clip->isChecked();
-       igp.subcaption = subfigure->isChecked();
-       igp.subcaptionText = fromqstr(subcaption->text());
 
        switch (showCB->currentIndex()) {
                case 0: igp.display = graphics::DefaultDisplay; break;