[LyX/master] Fix checkmark on current entry for InsetSeparator context menu

[Jean-Marc Lasgouttes]

commit 01ba22efffaa06e8c8ee4730b5d63ffd16e95c9f
Author: Jean-Marc Lasgouttes lasgout...@lyx.org
Date:   Fri Jun 13 10:30:25 2014 +0200

Fix checkmark on current entry for InsetSeparator context menu

The code supposed to do that contained a typo and was not completely 
correct.

diff --git a/src/insets/InsetSeparator.cpp b/src/insets/InsetSeparator.cpp
index eaf376f..05aa456 100644
--- a/src/insets/InsetSeparator.cpp
+++ b/src/insets/InsetSeparator.cpp
@@ -60,7 +60,7 @@ void InsetSeparatorParams::read(Lexer  lex)
 {
string token;
lex.setContext(InsetSeparatorParams::read);
-   lex  token;   
+   lex  token;
if (token == plain)
kind = InsetSeparatorParams::PLAIN;
else if (token == parbreak)
@@ -108,17 +108,19 @@ bool InsetSeparator::getStatus(Cursor  cur, FuncRequest 
const  cmd,
 {
switch (cmd.action()) {
// we handle these
-   case LFUN_INSET_MODIFY:
-   if (cmd.getArg(0) == plain) {
-   InsetSeparatorParams params;
-   string2params(to_utf8(cmd.argument()), params);
-   status.setOnOff(params_.kind == params.kind);
-   }
+   case LFUN_INSET_MODIFY: {
+   if (cmd.getArg(0) != separator)
+   break;
+   InsetSeparatorParams params;
+   string2params(to_utf8(cmd.argument()), params);
+   status.setOnOff(params_.kind == params.kind);
status.setEnabled(true);
return true;
+   }
default:
return Inset::getStatus(cur, cmd, status);
}
+   return false;
 }
 
 

[LyX/master] Fix checkmark on current entry for InsetSeparator context menu

[Jean-Marc Lasgouttes]

commit 01ba22efffaa06e8c8ee4730b5d63ffd16e95c9f
Author: Jean-Marc Lasgouttes 
Date:   Fri Jun 13 10:30:25 2014 +0200

Fix checkmark on current entry for InsetSeparator context menu

The code supposed to do that contained a typo and was not completely 
correct.

diff --git a/src/insets/InsetSeparator.cpp b/src/insets/InsetSeparator.cpp
index eaf376f..05aa456 100644
--- a/src/insets/InsetSeparator.cpp
+++ b/src/insets/InsetSeparator.cpp
@@ -60,7 +60,7 @@ void InsetSeparatorParams::read(Lexer & lex)
 {
string token;
lex.setContext("InsetSeparatorParams::read");
-   lex >> token;   
+   lex >> token;
if (token == "plain")
kind = InsetSeparatorParams::PLAIN;
else if (token == "parbreak")
@@ -108,17 +108,19 @@ bool InsetSeparator::getStatus(Cursor & cur, FuncRequest 
const & cmd,
 {
switch (cmd.action()) {
// we handle these
-   case LFUN_INSET_MODIFY:
-   if (cmd.getArg(0) == "plain") {
-   InsetSeparatorParams params;
-   string2params(to_utf8(cmd.argument()), params);
-   status.setOnOff(params_.kind == params.kind);
-   }
+   case LFUN_INSET_MODIFY: {
+   if (cmd.getArg(0) != "separator")
+   break;
+   InsetSeparatorParams params;
+   string2params(to_utf8(cmd.argument()), params);
+   status.setOnOff(params_.kind == params.kind);
status.setEnabled(true);
return true;
+   }
default:
return Inset::getStatus(cur, cmd, status);
}
+   return false;
 }