fix bug 2910:

* QDocumentDialog.C (updateNumbering): don't include headings
	that have no counter in their label.

* ui/NumberingModuleBase.ui: show scrollbar when appropriate. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@15351 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2006-10-16 16:20:08 +00:00
parent 06836918b8
commit d0b141506f
4 changed files with 14 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2006-10-16 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* QDocumentDialog.C (updateNumbering): don't include headings
that have no counter in their label (bug 2910).
* ui/NumberingModuleBase.ui: show scrollbar when appropriate.
2006-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2006-09-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* QtView.C (hasFocus): always return true. This is a temporary * QtView.C (hasFocus): always return true. This is a temporary

View File

@ -390,7 +390,8 @@ void QDocumentDialog::updateNumbering()
QListViewItem * item = 0; QListViewItem * item = 0;
for ( ; cit != end ; ++cit) { for ( ; cit != end ; ++cit) {
int const toclevel = (*cit)->toclevel; int const toclevel = (*cit)->toclevel;
if (toclevel != LyXLayout::NOT_IN_TOC) { if (toclevel != LyXLayout::NOT_IN_TOC
&& (*cit)->labeltype == LABEL_COUNTER) {
item = new QListViewItem(numberingModule->tocLV, item = new QListViewItem(numberingModule->tocLV,
item, qt_((*cit)->name())); item, qt_((*cit)->name()));
item->setText(1, (toclevel <= depth) ? yes : no); item->setText(1, (toclevel <= depth) ? yes : no);

View File

@ -13,7 +13,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>310</width> <width>306</width>
<height>323</height> <height>323</height>
</rect> </rect>
</property> </property>
@ -185,11 +185,11 @@
</property> </property>
<property stdset="1"> <property stdset="1">
<name>vScrollBarMode</name> <name>vScrollBarMode</name>
<enum>AlwaysOff</enum> <enum>Auto</enum>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>hScrollBarMode</name> <name>hScrollBarMode</name>
<enum>AlwaysOff</enum> <enum>Auto</enum>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>rootIsDecorated</name> <name>rootIsDecorated</name>

View File

@ -58,6 +58,8 @@ What's new
- Fix import of \fullcite commands from LaTeX. - Fix import of \fullcite commands from LaTeX.
- Don't show starred sections in Document->Numbering & TOC (bug 2910)
* Build/installation: * Build/installation: