un-break display of toolbuttons wiuth delimiters

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 23431d5f2177150df4bf14a48af5ff02c3be7fda..b3d135fc5a50a55114f2dde8e642de4aa46a8987 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -158,7 +158,7 @@ void reconfigure(LyXView & lv, string const & option)
        string configure_command = package().configure_command();
        configure_command += option;
        Systemcall one;
-       one.startscript(Systemcall::Wait, configure_command);
+       int ret = one.startscript(Systemcall::Wait, configure_command);
        p.pop();
        // emit message signal.
        lv.message(_("Reloading configuration..."));
@@ -166,7 +166,15 @@ void reconfigure(LyXView & lv, string const & option)
        // Re-read packages.lst
        LaTeXFeatures::getAvailable();
 
-       Alert::information(_("System reconfigured"),
+       if (ret)
+               Alert::information(_("System reconfiguration failed"),
+                          _("The system reconfiguration has failed.\n"
+                                 "Default textclass is used but LyX may "
+                                 "not be able to work properly.\n"
+                                 "Please reconfigure again if needed."));
+       else
+
+               Alert::information(_("System reconfigured"),
                           _("The system has been reconfigured.\n"
                             "You need to restart LyX to make use of any\n"
                             "updated document class specifications."));
@@ -574,8 +582,8 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                        if (!view())
                                enable = false;
                        else {
-                               Inset::Code ic = view()->cursor().inset().lyxCode();
-                               enable = ic != Inset::ERT_CODE && ic != Inset::LISTINGS_CODE;
+                               InsetCode ic = view()->cursor().inset().lyxCode();
+                               enable = ic != ERT_CODE && ic != LISTINGS_CODE;
                        }
                }
                else if (name == "latexlog")
@@ -1401,7 +1409,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                            name == "nomenclature" ||
                            name == "ref" ||
                            name == "toc" ||
-                           name == "url") {
+                           name == "href") {
                                InsetCommandParams p(name);
                                data = InsetCommandMailer::params2string(name, p);
                        } else if (name == "include") {
@@ -1686,8 +1694,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        BOOST_ASSERT(lyx_view_);
                        string action;
                        string const name = split(argument, action, ' ');
-                       Inset::Code const inset_code =
-                               Inset::translate(name);
+                       InsetCode const inset_code = insetCode(name);
 
                        Cursor & cur = view()->cursor();
                        FuncRequest fr(LFUN_INSET_TOGGLE, action);
@@ -1697,7 +1704,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        InsetIterator const end = inset_iterator_end(inset);
                        for (; it != end; ++it) {
                                if (!it->asInsetMath()
-                                   && (inset_code == Inset::NO_CODE
+                                   && (inset_code == NO_CODE
                                    || inset_code == it->lyxCode())) {
                                        Cursor tmpcur = cur;
                                        tmpcur.pushLeft(*it);
@@ -1783,7 +1790,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                InsetIterator it  = inset_iterator_begin(inset);
                                InsetIterator const end = inset_iterator_end(inset);
                                for (; it != end; ++it)
-                                       if (it->lyxCode() == Inset::CITE_CODE)
+                                       if (it->lyxCode() == CITE_CODE)
                                                it->dispatch(cur, fr);
                        }