]> git.lyx.org Git - lyx.git/commitdiff
Connect to InsetInfo
authorPavel Sanda <sanda@lyx.org>
Fri, 12 Feb 2010 01:44:04 +0000 (01:44 +0000)
committerPavel Sanda <sanda@lyx.org>
Fri, 12 Feb 2010 01:44:04 +0000 (01:44 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33426 a592a061-630c-0410-9148-cb99ea01b6c8

src/Buffer.cpp
src/insets/InsetInfo.cpp

index 14dac1d46c3fabe65ee05a8af99d4807826d4612..7aa037a580107408d659cd31f0c7745c8bdc2ffb 100644 (file)
@@ -3490,11 +3490,13 @@ bool Buffer::loadLyXFile(FileName const & s)
                  && !LyXVC::file_not_found_hook(s))
                return false;
        
-       if (s.isReadableFile()
-                 && readFileHelper(s)) {
+       if (s.isReadableFile()){
+               // InsetInfo needs to know if file is under VCS
                lyxvc().file_found_hook(s);
-               setReadonly(!s.isWritable());
-               return true;
+               if (readFileHelper(s)) {
+                       setReadonly(!s.isWritable());
+                       return true;
+               }
        }
        return false;
 }
index 10b16bbef1bf4811ea7be2463aace67c6947fb7e..0df2fd59411f9cf6b4f4d81cc33cede5b95870e4 100644 (file)
@@ -23,6 +23,7 @@
 #include "LayoutFile.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
+#include "LyXVC.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
@@ -173,7 +174,8 @@ bool InsetInfo::validateModifyArgument(docstring const & arg) const
        case TEXTCLASS_INFO:
                return true;
        case BUFFER_INFO:
-               return name == "name" || name == "path" || name == "class";
+               return name == "name" || name == "path" || name == "class" ||
+                      name == "file-revision";
        }
        return false;
 }
@@ -371,6 +373,9 @@ void InsetInfo::updateInfo()
                        setText(from_utf8(buffer().filePath()));
                else if (name_ == "class")
                        setText(from_utf8(bp.documentClass().name()));
+               else if (name_ == "file-revision" && buffer().lyxvc().inUse() &&
+                        !buffer().lyxvc().revisionInfo(LyXVC::File).empty())
+                       setText(from_utf8(buffer().lyxvc().revisionInfo(LyXVC::File)));
                else
                        setText(_("Unknown buffer info"));
                break;