Jürgen Spitzmüller wrote:
> 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"
will fix it
> Also, I'm not sure I understood this feature, but wouldn't a string such as
> "Lock File in Repository" be more adequate?
No, because it doesn't lock anything. Locking is done by svn when
updating/commiting
and this command just tells svn that it should use this locking mechanism.
>I do not like the verb "toggle" in
> the UI context.
Feel free to suggest better naming. We use it anyway in different UIs
$ cat cs.po|grep -i toggle|grep -v ^#|wc -l
16
>Also, I would use a menu checkbox (FuncFlags::setOnOff) that
> is checked if the file is locked. Then you'd have three states:
No, this flag doesn't mean that the file is locked - we already check
this and user can recognize locking status on window title or VC toolbar.
> * 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.
that said i was actually thinking about some tristate, but then i rejected
it because it would need launching some external process any time we
open file under vc control. i dont want to do this and it is also the reason
i'm clueless howto simply add some revision info inset into lyx. see
longer thread with Abdel about insetinfo for revision numbers.
> >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.
yep
> >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?
will check
thanks for review,
pavel
