adjust

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index c5795bfb557faf7105fdf2586b63e4191475cf91..c95b90787cdbce684500e52ee4cd787548ed2252 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1060,8 +1060,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_URL_INSERT: {
-               InsetCommandParams p("url");
+       case LFUN_HYPERLINK_INSERT: {
+               InsetCommandParams p("href");
                docstring content;
                if (cur.selection()) {
                        content = cur.selectionAsString(false);
@@ -1069,28 +1069,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                }
                p["target"] = (cmd.argument().empty()) ?
                        content : cmd.argument();
-               string const data = InsetCommandMailer::params2string("url", p);
+               string const data = InsetCommandMailer::params2string("href", p);
                if (p["target"].empty()) {
-                       bv->showInsetDialog("url", data, 0);
-               } else {
-                       FuncRequest fr(LFUN_INSET_INSERT, data);
-                       dispatch(cur, fr);
-               }
-               break;
-       }
-
-       case LFUN_HTML_INSERT: {
-               InsetCommandParams p("htmlurl");
-               docstring content;
-               if (cur.selection()) {
-                       content = cur.selectionAsString(false);
-                       cutSelection(cur, true, false);
-               }
-               p["target"] = (cmd.argument().empty()) ?
-                       content : cmd.argument();
-               string const data = InsetCommandMailer::params2string("url", p);
-               if (p["target"].empty()) {
-                       bv->showInsetDialog("url", data, 0);
+                       bv->showInsetDialog("href", data, 0);
                } else {
                        FuncRequest fr(LFUN_INSET_INSERT, data);
                        dispatch(cur, fr);
@@ -1116,16 +1097,18 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_INFO_INSERT: {
-               if (!cur.selection())
-                       break;
                Inset * inset = createInset(&cur.bv(), cmd);
                if (!inset)
                        break;
-               // use selected text as info to avoid a separate UI
-               docstring ds = cur.selectionAsString(false);
-               cutSelection(cur, true, false);
+               // if an empty inset is created (cmd.argument() is empty)
+               // use current selection as parameter.
+               if (cmd.argument().empty() && cur.selection()) {
+                       // use selected text as info to avoid a separate UI
+                       docstring ds = cur.selectionAsString(false);
+                       cutSelection(cur, true, false);
+                       static_cast<InsetInfo *>(inset)->setInfo(to_utf8(ds));
+               }
                insertInset(cur, inset);
-               static_cast<InsetInfo *>(inset)->setInfo(to_utf8(ds));
                cur.posRight();
                break;
        }
@@ -1637,6 +1620,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        code = FLOAT_CODE;
                else if (cmd.argument() == "graphics")
                        code = GRAPHICS_CODE;
+               else if (cmd.argument() == "href")
+                       code = HYPERLINK_CODE;
                else if (cmd.argument() == "include")
                        code = INCLUDE_CODE;
                else if (cmd.argument() == "index")
@@ -1651,8 +1636,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        code = REF_CODE;
                else if (cmd.argument() == "toc")
                        code = TOC_CODE;
-               else if (cmd.argument() == "url")
-                       code = URL_CODE;
                else if (cmd.argument() == "vspace")
                        code = VSPACE_CODE;
                else if (cmd.argument() == "wrap")
@@ -1747,9 +1730,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_TOC_INSERT:
                code = TOC_CODE;
                break;
-       case LFUN_HTML_INSERT:
-       case LFUN_URL_INSERT:
-               code = URL_CODE;
+       case LFUN_HYPERLINK_INSERT:
+               code = HYPERLINK_CODE;
                break;
        case LFUN_QUOTE_INSERT:
                // always allow this, since we will inset a raw quote