From 2749683873442414d25aa097efe6f13b9e222bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Thu, 1 Nov 2007 17:49:17 +0000 Subject: [PATCH] GuiHyperlink.cpp /HyperlinkUi.ui: follow the LyX naming conventions git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21350 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiHyperlink.cpp | 36 +++++++++++----------- src/frontends/qt4/ui/HyperlinkUi.ui | 46 ++++++++++++++--------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp index bd4b58b1ec..b94e08138d 100644 --- a/src/frontends/qt4/GuiHyperlink.cpp +++ b/src/frontends/qt4/GuiHyperlink.cpp @@ -34,26 +34,26 @@ GuiHyperlink::GuiHyperlink(LyXView & lv) 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); } @@ -72,27 +72,27 @@ void GuiHyperlink::closeEvent(QCloseEvent * e) 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,7 +100,7 @@ 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(); diff --git a/src/frontends/qt4/ui/HyperlinkUi.ui b/src/frontends/qt4/ui/HyperlinkUi.ui index c3bc58b95b..49b60e16fa 100644 --- a/src/frontends/qt4/ui/HyperlinkUi.ui +++ b/src/frontends/qt4/ui/HyperlinkUi.ui @@ -17,7 +17,7 @@ - + URL @@ -25,12 +25,12 @@ &Target: - urlED + targetED - + URL @@ -57,11 +57,11 @@ - + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">specify the link target</p></body></html> @@ -69,11 +69,11 @@ p, li { white-space: pre-wrap; } - + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">Link to the web or to every other target</p></body></html> @@ -82,11 +82,11 @@ p, li { white-space: pre-wrap; } - + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;">Link to an email address</p></body></html> @@ -95,11 +95,11 @@ p, li { white-space: pre-wrap; } - + - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Link to a file</p></body></html> @@ -178,11 +178,11 @@ p, li { white-space: pre-wrap; } - urlED + targetED nameED - WebRB - EmailRB - FileRB + webRB + emailRB + fileRB okPB closePB