Michael Gerz wrote:
> "review" was already defined. Just have a look four lines above (not
> visible in this code snippet). I am going to revert your patch.
Toolbars
"standard" "on,top"
"extra" "on,top"
"review" "off,top"
"table" "table,bottom"
"math" "math,bottom"
"minibuffer" "off,bottom"
End
Ah, I've overlooked it, but it must be "review" "review,top"
if not the flag ToolbarBackend::REVIEW will not be set on the
CT toolbar.
>> URL:
>> http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/LyXView.C?rev=15598
>>
>> ==============================================================================
>>
>> --- lyx-devel/trunk/src/frontends/LyXView.C (original)
>> +++ lyx-devel/trunk/src/frontends/LyXView.C Sun Oct 29 12:13:46 2006
>> @@ -290,7 +290,10 @@
>> bool const math = work_area_->bufferView().cursor().inMathed();
>> bool const table =
>> lyx::getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
>> - toolbars_->update(math, table);
>> + // TODO: How should we handle the CT toolbar?
>> + bool const change_tracking = true;
>> +
>> + toolbars_->update(math, table, change_tracking);
>>
>>
> I guess that you want to activate the toolbar if you are in CT mode. The
> attached patch fixes this...
I also want to prepare the context sensitive solution and the "disable by menu"
solution. But we still have to decide which way to go.
>> URL:
>> http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/Toolbars.C?rev=15598
>>
>> ==============================================================================
>>
>> --- lyx-devel/trunk/src/frontends/Toolbars.C (original)
>> +++ lyx-devel/trunk/src/frontends/Toolbars.C Sun Oct 29 12:13:46 2006
>> @@ -65,7 +65,7 @@
>> }
>>
>>
>> -void Toolbars::update(bool in_math, bool in_table)
>> +void Toolbars::update(bool in_math, bool in_table, bool change_tracking)
>>
>>
> I prefer sticking to the term "review" for consistency. The toolbar
> covers more than just change tracking.
I also saw the problem, but the function calls LFUN_CHANGES_TRACK.
> void LyXView::updateToolbars()
> {
> - bool const math = work_area_->bufferView().cursor().inMathed();
> + bool const math =
> + work_area_->bufferView().cursor().inMathed();
> bool const table =
> lyx::getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
> - // TODO: How should we handle the CT toolbar?
> - bool const change_tracking = true;
> + bool const review =
> + lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).enabled() &&
> + lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onoff(true);
I don't like to see the CT toolbar all the time, but no problem, now
we will wait for Po's comments/patch.
Peter
