fixed Note submenu issues

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7447 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index cc9108dfccaca2c2cb7a6fbe66b0f800b19fc0b0..93ef6eedaa91d0330412ae84c5ae7e2a0eef7d76 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29     Martin Vermeer <martin.vermeer@hut.fi>
+
+       * ui/stdmenus.ui: fixed Note submenu issues
+
 2003-07-29     Martin Vermeer <martin.vermeer@hut.fi>
 
        * ui/stdmenus.ui: submenu for Note/Comment/Greyedout

diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui
index 189f23fc5822aa3eb8fb403322fbc8032e503450..4e7cd2f163239cb0b606a1ecc0ae53ba6c93449c 100644 (file)
--- a/lib/ui/stdmenus.ui
+++ b/lib/ui/stdmenus.ui
@@ -326,9 +326,9 @@ Menuset
        End
 
        Menu "insert_note"
-               Item "Yellow Note" "note-insert Note"
-               Item "LaTeX Comment" "note-insert Comment"
-               Item "Greyed Out" "note-insert Greyedout"
+               Item "LyX Note|N" "note-insert Note"
+               Item "Comment|C" "note-insert Comment"
+               Item "Greyed Out|G" "note-insert Greyedout"
        End
 
 #

diff --git a/src/ChangeLog b/src/ChangeLog
index 91e759a3cf10c2c1c37a79a55e0c14c73b6699c7..d35ddb2868570f5328818378df61904b05395ce3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-30     Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * factory.C: fixed Note submenu issues
+
 2003-07-30     Martin Vermeer  <martin.vermeer@hut.fi>
 
        * factory.C: submenu for Note/Comment/Greyedout

diff --git a/src/factory.C b/src/factory.C
index c8a4965ef516b53d50be292c18b56ae98d01264e..d6cd83b8c5ce5270b3f5b014c2e8d44f0502bd16 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -62,6 +62,7 @@ InsetOld * createInset(FuncRequest const & cmd)
 {
        BufferView * bv = cmd.view();
        BufferParams const & params = bv->buffer()->params;
+       string arg;
 
        switch (cmd.action) {
        case LFUN_HFILL:
@@ -71,7 +72,10 @@ InsetOld * createInset(FuncRequest const & cmd)
                return new InsetMinipage(params);
 
        case LFUN_INSERT_NOTE:
-               return new InsetNote(params, cmd.getArg(0));
+               arg = cmd.getArg(0);
+               if (arg.empty())
+                       arg = "Note";
+               return new InsetNote(params, arg);
 
        case LFUN_INSET_ERT:
                return new InsetERT(params);