Pavel Sanda wrote:
> Juergen, i would like to have this in branch too. pavel
OK, but I have some minor question and comments on the changes:
>Modified: lyx-devel/trunk/lib/ui/stdmenus.inc
>============================================================================
>== --- lyx-devel/trunk/lib/ui/stdmenus.inc Thu Jun 25 16:48:03 2009
> (r30254) +++ lyx-devel/trunk/lib/ui/stdmenus.inc Thu Jun 25 16:48:11 2009
> (r30255) @@ -66,6 +66,7 @@
> OptItem "Revert to Repository Version|R" "vc-revert"
> OptItem "Undo Last Check In|U" "vc-undo-last"
> OptItem "Show History...|H" "dialog-show vclog"
>+ OptItem "Toggle locking property|T" "vc-locking-toggle"
Please unify the casing, i.e. "Toggle Locking Property|T"
Also, I'm not sure I understood this feature, but wouldn't a string such as
"Lock File in Repository" be more adequate? I do not like the verb "toggle" in
the UI context. Also, I would use a menu checkbox (FuncFlags::setOnOff) that
is checked if the file is locked. Then you'd have three states:
* VC does not support locking: menu item hidden, toolbar button greyed out
* VC does support locking, file already locked: menu item checked, toolbar
button pressed
* VC does support locking, file not locked: menu item unchecked, toolbar
button unpressed.
>Modified: lyx-devel/trunk/lib/ui/stdtoolbars.inc
>============================================================================
>== --- lyx-devel/trunk/lib/ui/stdtoolbars.inc Thu Jun 25 16:48:03 2009
> (r30254) +++ lyx-devel/trunk/lib/ui/stdtoolbars.inc Thu Jun 25
> 16:48:11 2009 (r30255) @@ -242,6 +242,8 @@
> Item "Check-in changes" "vc-check-in"
> Item "View revision log" "dialog-show vclog"
> Item "Revert changes" "vc-revert"
>+ Separator
>+ Item "Toggle svn file locking property" "vc-locking-toggle"
see above.
>Modified: lyx-devel/trunk/src/LyXVC.cpp
>============================================================================
>== --- lyx-devel/trunk/src/LyXVC.cpp Thu Jun 25 16:48:03 2009
> (r30254) +++ lyx-devel/trunk/src/LyXVC.cpp Thu Jun 25 16:48:11 2009
> (r30255) @@ -170,6 +170,13 @@
> }
>
>
>+string LyXVC::lockingToggle()
>+{
>+ LYXERR(Debug::LYXVC, "LyXVC: toggle locking property");
>+ return vcs->lockingToggle();
Here, you don't need to check if vcs is valid, i.e.
return vcs && vcs->lockingToggle();
as in lockingToggleEnabled() below?
>+}
>+
>+
> void LyXVC::revert()
> {
> LYXERR(Debug::LYXVC, "LyXVC: revert");
>@@ -266,6 +273,12 @@
> }
>
>
>+bool LyXVC::lockingToggleEnabled()
>+{
>+ return vcs && vcs->lockingToggleEnabled();
>+}
>+
>+
> bool LyXVC::undoLastEnabled()
> {
> return vcs && vcs->undoLastEnabled();
>
Jürgen
