fix bug 2910:

* src/frontends/qt3/QDocumentDialog.C (updateNumbering): don't include headings
	that have no counter in their label.
* src/frontends/qt3/ui/NumberingModuleBase.ui: show scrollbar when appropriate.

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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15352 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2006-10-16 16:21:52 +00:00
parent c0a61f6c18
commit a41bb78a0e
3 changed files with 6 additions and 4 deletions

View File

@ -436,7 +436,8 @@ void QDocumentDialog::updateNumbering()
QListViewItem * item = 0;
for ( ; cit != end ; ++cit) {
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, qt_((*cit)->name()));
item->setText(1, (toclevel <= depth) ? yes : no);

View File

@ -144,10 +144,10 @@
<enum>AutoOneFit</enum>
</property>
<property name="vScrollBarMode">
<enum>AlwaysOff</enum>
<enum>Auto</enum>
</property>
<property name="hScrollBarMode">
<enum>AlwaysOff</enum>
<enum>Auto</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>

View File

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