do what the FIXME suggested

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

diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp
index bd4b58b1ec0073b44b16a178692c83fcf03267cb..95ae76a64a09e62819d68632735f1a07e725415e 100644 (file)
--- a/src/frontends/qt4/GuiHyperlink.cpp
+++ b/src/frontends/qt4/GuiHyperlink.cpp
@@ -18,7 +18,6 @@
 #include "insets/InsetCommand.h"
 
 #include <QCheckBox>
-#include <QCloseEvent>
 #include <QLineEdit>
 #include <QPushButton>
 
@@ -26,34 +25,33 @@
 namespace lyx {
 namespace frontend {
 
-GuiHyperlink::GuiHyperlink(LyXView & lv)
-       : GuiCommand(lv, "href")
+GuiHyperlink::GuiHyperlink(GuiView & lv)
+       : GuiCommand(lv, "href",qt_("Hyperlink"))
 {
        setupUi(this);
-       setViewTitle( _("Hyperlink"));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-       connect(urlED, SIGNAL(textChanged(const QString &)),
+       connect(targetED, SIGNAL(textChanged(const QString &)),
                this, SLOT(changed_adaptor()));
        connect(nameED, SIGNAL(textChanged(const QString &)),
                this, SLOT(changed_adaptor()));
-       connect(WebRB, SIGNAL(clicked()),
+       connect(webRB, SIGNAL(clicked()),
                this, SLOT(changed_adaptor()));
-       connect(EmailRB, SIGNAL(clicked()),
+       connect(emailRB, SIGNAL(clicked()),
                this, SLOT(changed_adaptor()));
-       connect(FileRB, SIGNAL(clicked()),
+       connect(fileRB, SIGNAL(clicked()),
                this, SLOT(changed_adaptor()));
 
-       setFocusProxy(urlED);
+       setFocusProxy(targetED);
 
        bc().setOK(okPB);
        bc().setCancel(closePB);
-       bc().addReadOnly(urlED);
+       bc().addReadOnly(targetED);
        bc().addReadOnly(nameED);
-       bc().addReadOnly(WebRB);
-       bc().addReadOnly(EmailRB);
-       bc().addReadOnly(FileRB);
+       bc().addReadOnly(webRB);
+       bc().addReadOnly(emailRB);
+       bc().addReadOnly(fileRB);
 }
 
 
@@ -63,36 +61,29 @@ void GuiHyperlink::changed_adaptor()
 }
 
 
-void GuiHyperlink::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiHyperlink::updateContents()
 {
-       urlED->setText(toqstr(params_["target"]));
+       targetED->setText(toqstr(params_["target"]));
        nameED->setText(toqstr(params_["name"]));
        if (params_["type"] == "")
-               WebRB->setChecked(true);
+               webRB->setChecked(true);
        else if (params_["type"] == "mailto:")
-               EmailRB->setChecked(true);
+               emailRB->setChecked(true);
        else if (params_["type"] == "file:")
-               FileRB->setChecked(true);
+               fileRB->setChecked(true);
        bc().setValid(isValid());
 }
 
 
 void GuiHyperlink::applyView()
 {
-       params_["target"] = qstring_to_ucs4(urlED->text());
+       params_["target"] = qstring_to_ucs4(targetED->text());
        params_["name"] = qstring_to_ucs4(nameED->text());
-       if (WebRB->isChecked())
+       if (webRB->isChecked())
                params_["type"] = qstring_to_ucs4("");
-       else if (EmailRB->isChecked())
+       else if (emailRB->isChecked())
                params_["type"] = qstring_to_ucs4("mailto:");
-       else if (FileRB->isChecked())
+       else if (fileRB->isChecked())
                params_["type"] = qstring_to_ucs4("file:");
        params_.setCmdName("href");
 }
@@ -100,14 +91,14 @@ void GuiHyperlink::applyView()
 
 bool GuiHyperlink::isValid()
 {
-       QString const u = urlED->text();
+       QString const u = targetED->text();
        QString const n = nameED->text();
 
        return !u.isEmpty() || !n.isEmpty();
 }
 
 
-Dialog * createGuiHyperlink(LyXView & lv) { return new GuiHyperlink(lv); }
+Dialog * createGuiHyperlink(GuiView & lv) { return new GuiHyperlink(lv); }
 
 
 } // namespace frontend