Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / insets / InsetBranch.cpp

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index f9d302554fc41aad04f0bde5bec4f9bea92442ba..db047c2f3d3085e5bbbd08fa7dea03dc6f44013d 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -23,6 +23,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Lexer.h"
+#include "LyX.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
 #include "TextClass.h"
@@ -32,6 +33,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
 #include "frontends/Application.h"
 
 #include <sstream>
@@ -158,13 +160,25 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
                        // call recordUndo..., because the master may be hidden, and
                        // the code presently assumes that hidden documents can never
                        // be dirty. See GuiView::closeBufferAll(), for example.
+                       // An option would be to check if the master is hidden.
+                       // If it is, unhide.
                        if (!master)
                                buffer().undo().recordUndoFullDocument(cur);
+                       else
+                               // at least issue a warning for now (ugly, but better than dataloss).
+                               frontend::Alert::warning(_("Branch state changes in master document"),
+                                   lyx::support::bformat(_("The state of the branch '%1$s' "
+                                       "was changed in the master file. "
+                                       "Please make sure to save the master."), params_.branch), true);
                        our_branch->setSelected(activate);
-                       cur.forceBufferUpdate();
+                       // cur.forceBufferUpdate() is not enough
+                       buf->updateBuffer();
                }
                break;
        }
+       case LFUN_BRANCH_ADD:
+               lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, params_.branch));
+               break;
        case LFUN_INSET_TOGGLE:
                if (cmd.argument() == "assign")
                        setStatus(cur, isBranchSelected() ? Open : Collapsed);
@@ -182,13 +196,20 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
+       bool const known_branch =
+               buffer().params().branchlist().find(params_.branch);
+
        switch (cmd.action()) {
        case LFUN_INSET_MODIFY:
                flag.setEnabled(true);
                break;
 
        case LFUN_BRANCH_ACTIVATE:
-               flag.setEnabled(!isBranchSelected(true));
+               flag.setEnabled(known_branch && !isBranchSelected(true));
+               break;
+
+       case LFUN_BRANCH_ADD:
+               flag.setEnabled(!known_branch);
                break;
 
        case LFUN_BRANCH_DEACTIVATE:
@@ -196,7 +217,9 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
                break;
 
        case LFUN_BRANCH_MASTER_ACTIVATE:
-               flag.setEnabled(buffer().parent() && !isBranchSelected());
+               flag.setEnabled(buffer().parent()
+                               && buffer().masterBuffer()->params().branchlist().find(params_.branch)
+                               && !isBranchSelected());
                break;
 
        case LFUN_BRANCH_MASTER_DEACTIVATE: