diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C
index ea126db12e..1c6fe43561 100644
--- a/src/frontends/qt2/BulletsModule.C
+++ b/src/frontends/qt2/BulletsModule.C
@@ -15,20 +15,29 @@
 #pragma implementation
 #endif
 
+#include <functional> // for operator %
+
+#include <qinputdialog.h>
 #include <qpopupmenu.h>
 #include <qpixmap.h>
 #include <qtoolbutton.h>
-#include <qlineedit.h>
+#include <qlistview.h>
 #include <qcombobox.h>
+#include <qlabel.h>
 #include "BulletsModule.h"
+#include "Bullet.h"
 #include "ui/BulletsModuleBase.h"
 #include "QBrowseBox.h"
 #include "support/filetools.h"
 #include "bulletstrings.h"
 
 BulletsModule::BulletsModule(QWidget * parent,  char const * name, WFlags fl)
-	: BulletsModuleBase(parent, name, fl), le_(bullet1LE)
+	: BulletsModuleBase(parent, name, fl)
 {
+	for (int iter = 0; iter < 4; ++iter) {
+		bullets_[iter] = ITEMIZE_DEFAULTS[iter];
+	}
+	
 	QPopupMenu * pm = new QPopupMenu(this);
 
 	QPopupMenu * pm1 = new QPopupMenu(pm);
@@ -58,11 +67,9 @@ BulletsModule::BulletsModule(QWidget * parent,  char const * name, WFlags fl)
 	pm->insertItem("Ding 2",pm4);
 	pm->insertItem("Ding 3",pm5);
 	pm->insertItem("Ding 4",pm6);
+	pm->insertItem("Custom...", this, SLOT(setCustom()));
 
-	setbullet1TB->setPopup(pm);
-	setbullet2TB->setPopup(pm);
-	setbullet3TB->setPopup(pm);
-	setbullet4TB->setPopup(pm);
+	setbulletTB->setPopup(pm);
 
 	// insert pixmaps
 	string bmfile;
@@ -102,18 +109,12 @@ BulletsModule::BulletsModule(QWidget * parent,  char const * name, WFlags fl)
 	connect(ding4_, SIGNAL(selected(int, int)),
 		this, SLOT(ding4(int, int)));
 
-	connect(setbullet1TB, SIGNAL(pressed()),
-		this, SLOT(setlevel1()));
-
-	connect(setbullet2TB, SIGNAL(pressed()),
-		this, SLOT(setlevel2()));
-
-	connect(setbullet3TB, SIGNAL(pressed()),
-		this, SLOT(setlevel3()));
-
-	connect(setbullet4TB, SIGNAL(pressed()),
-		this, SLOT(setlevel4()));
-
+	// update the view
+	for (int iter = 0; iter < 4; ++iter) {
+		setBullet(iter,bullets_[iter]);
+	}
+	activeitem_ = bulletsLV->firstChild();
+	activebullet_ = &bullets_[0];
 }
 
 
@@ -121,52 +122,148 @@ BulletsModule::~BulletsModule()
 {
 }
 
+
+QPixmap BulletsModule::getPixmap(int font, int character)
+{
+	int col = character%6;
+	int row = (character - col)/6;
+	switch(font) {
+	case 0:
+		return standard_->pixmap(row,col);
+	case 1:
+		return maths_->pixmap(row,col);
+	case 2:
+		return ding1_->pixmap(row,col);
+	case 3:
+		return ding2_->pixmap(row,col);
+	case 4:
+		return ding3_->pixmap(row,col);
+	case 5:
+		return ding4_->pixmap(row,col);
+	default:
+		return standard_->pixmap(row,col);
+	}
+}
+
+
+QListViewItem *  BulletsModule::getItem(int level)
+{
+	QListViewItemIterator it(bulletsLV->firstChild());
+	for(int i=0; i<level; ++i) {
+		++it;
+	}
+	return it.current();
+}
+
+
+void BulletsModule::setActive(int level)
+{
+	activeitem_ = getItem(level);
+	activebullet_ = &bullets_[level];
+}
+
+
+void BulletsModule::setActive(QListViewItem * item)
+{
+	activeitem_ = item;
+	activebullet_ = &bullets_[item->depth()];
+}
+
+
+void BulletsModule::setBullet(int font, int character)
+{
+	activeitem_->setText(0,"");
+	activeitem_->setPixmap(0,getPixmap(font,character));
+	
+	activebullet_->setFont(font);
+	activebullet_->setCharacter(character);
+}
+
+
+void BulletsModule::setBullet(string text)
+{
+	activeitem_->setPixmap(0,QPixmap());
+	activeitem_->setText(0,text.c_str());
+	
+	activebullet_->setText(text);
+}
+
+
+void BulletsModule::setBullet(int level, const Bullet & bullet)
+{
+	setActive(level);
+	bullets_[level] = bullet;
+	// set size
+	setSize(bullet.getSize()+1);
+	// set pixmap
+	if (bullet.getFont()!=-1) {
+		setBullet(bullet.getFont(),
+			  bullet.getCharacter());
+	} else {
+		setBullet(bullet.getText());
+	}
+}
+
+
+Bullet BulletsModule::getBullet(int level)
+{
+	return bullets_[level];
+}
+
+
+void BulletsModule::setSize(int size)
+{
+	activeitem_->setText(1,bulletsizeCO->text(size));
+	activebullet_->setSize(size-1);
+}
+
+
 void BulletsModule::standard(int row, int col)
 {
-	le_->setText(bullets_standard[6*row + col]);
+	setBullet(0,6*row + col);
 }
 
 void BulletsModule::maths(int row, int col)
 {
-	le_->setText(bullets_amssymb[6*row + col]);
+	setBullet(1,6*row + col);
 }
 
+
 void BulletsModule::ding1(int row, int col)
 {
-	le_->setText(bullets_psnfss1[6*row + col]);
+	setBullet(2,6*row + col);
 }
 
+
 void BulletsModule::ding2(int row, int col)
 {
-	le_->setText(bullets_psnfss2[6*row + col]);
+	setBullet(3,6*row + col);
 }
 
+
 void BulletsModule::ding3(int row, int col)
 {
-	le_->setText(bullets_psnfss3[6*row + col]);
-}
+	setBullet(4,6*row + col);
+}	
+
 
 void BulletsModule::ding4(int row, int col)
 {
-	le_->setText(bullets_psnfss4[6*row + col]);
+	setBullet(5,6*row + col);
 }
 
-void BulletsModule::setlevel1()
-{
-	le_ = bullet1LE;
-}
 
-void BulletsModule::setlevel2()
+void BulletsModule::setCustom()
 {
-	le_ = bullet2LE;
-}
-
-void BulletsModule::setlevel3()
-{
-	le_ = bullet3LE;
-}
-
-void BulletsModule::setlevel4()
-{
-	le_ = bullet4LE;
+	bool ok = FALSE;
+	QString text = QInputDialog::getText(
+		_( "Bullets" ),
+		_( "Enter a custom bullet" ),
+		QLineEdit::Normal,
+		QString::null, &ok, this );
+	
+	activeitem_->setPixmap(0,QPixmap());
+	activeitem_->setText(0,text);
+	activebullet_->setText(text.latin1());
+	activebullet_->setFont(-1);
 }
diff --git a/src/frontends/qt2/BulletsModule.h b/src/frontends/qt2/BulletsModule.h
index 97fe0a8e5d..e0c0a4e119 100644
--- a/src/frontends/qt2/BulletsModule.h
+++ b/src/frontends/qt2/BulletsModule.h
@@ -19,9 +19,11 @@
 #include "ui/BulletsModuleBase.h"
 #include "LString.h"
 #include <vector>
+#include "Bullet.h"
+#include <boost/array.hpp>
 
 class QBrowseBox;
-class QLineEdit;
+class QListViewItem;
 
 
 class BulletsModule : public BulletsModuleBase {
@@ -31,6 +33,11 @@ public:
 		      WFlags fl = 0);
 	~BulletsModule();
 
+	///
+	void setBullet(int level, const Bullet & bullet);
+	///
+	Bullet getBullet(int level);
+	
 protected slots:
 	///
 	void standard(int row, int col);
@@ -44,26 +51,37 @@ protected slots:
 	void ding3(int row, int col);
 	///
 	void ding4(int row, int col);
-	///
-	void setlevel1();
-	///
-	void setlevel2();
-	///
-	void setlevel3();
-	///
-	void setlevel4();
-
-
+	/// set custom (text) bullet
+	void setCustom();
+	/// make level active
+	void setActive(QListViewItem*);
+	/// set size
+	void setSize(int size);
+	
 private:
-	QLineEdit * le_;
-
+	/// get the pixmap that matches font/character
+	QPixmap getPixmap(int font, int character);
+	/// get the qlistviewitem of level
+	QListViewItem *  getItem(int level);
+	/// make level active
+	void setActive(int level);
+	/// set bullet for standard font/character
+	void setBullet(int font, int character);
+	/// set bullet for custom text
+	void setBullet(string text);
+	/// pointer to the bullet of the level we're at
+	Bullet * activebullet_;
+	/// qlistviewitem of the level we're at
+	QListViewItem * activeitem_;
+	/// store results
+	boost::array<Bullet,4> bullets_;
+	
 	QBrowseBox * standard_;
 	QBrowseBox * maths_;
 	QBrowseBox * ding1_;
 	QBrowseBox * ding2_;
 	QBrowseBox * ding3_;
 	QBrowseBox * ding4_;
-
 };
 
 #endif // BULLETSMODULE_H
diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index a278e41c51..0e4e3372c2 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-16  Edwin Leuven  <e.leuven@uva.nl>
+
+	* BulletsModule.[Ch]: Fix bulletstuff
+	* QDocument.C:
+	* QDocumentDialog.C:
+	* ui/BulletsModuleBase.ui:
+	
 2002-12-12  John Levon  <levon@movementarian.org>
 
 	* QSpellcheckerDialog.h:
diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 9ee32ce63a..2ef8641292 100644
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -20,8 +20,6 @@ libqt2_la_SOURCES = \
 	Alert_pimpl.C \
 	qgridview.h \
 	qgridview.cpp \
-	bulletstrings.h \
-	bulletstrings.C \
 	BulletsModule.C \
 	BulletsModule.h \
 	QBrowseBox.C \
diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index acc1cea0c2..fc94045f09 100644
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -206,15 +206,10 @@ void QDocument::apply()
 		dialog_->numberingModule->sectionnrDepthSB->value();
 
 	// bullets
-	params.user_defined_bullets[0].setText(dialog_->bulletsModule->bullet1LE->text().latin1());
-	params.user_defined_bullets[1].setText(dialog_->bulletsModule->bullet2LE->text().latin1());
-	params.user_defined_bullets[2].setText(dialog_->bulletsModule->bullet3LE->text().latin1());
-	params.user_defined_bullets[3].setText(dialog_->bulletsModule->bullet4LE->text().latin1());
-
-	params.user_defined_bullets[0].setSize(dialog_->bulletsModule->bulletsize1CO->currentItem()-1);
-	params.user_defined_bullets[1].setSize(dialog_->bulletsModule->bulletsize2CO->currentItem()-1);
-	params.user_defined_bullets[2].setSize(dialog_->bulletsModule->bulletsize3CO->currentItem()-1);
-	params.user_defined_bullets[3].setSize(dialog_->bulletsModule->bulletsize4CO->currentItem()-1);
+	params.user_defined_bullets[0] = dialog_->bulletsModule->getBullet(0);
+	params.user_defined_bullets[1] = dialog_->bulletsModule->getBullet(1);
+	params.user_defined_bullets[2] = dialog_->bulletsModule->getBullet(2);
+	params.user_defined_bullets[3] = dialog_->bulletsModule->getBullet(3);
 
 	// packages
 	switch (dialog_->packagesModule->lspacingCO->currentItem()) {
@@ -427,24 +422,10 @@ void QDocument::update_contents()
 		params.tocdepth);
 
 	// bullets
-	QString s;
-	s = params.user_defined_bullets[0].getText().c_str();
-	dialog_->bulletsModule->bullet1LE->setText(s);
-	s = params.user_defined_bullets[1].getText().c_str();
-	dialog_->bulletsModule->bullet2LE->setText(s);
-	s = params.user_defined_bullets[2].getText().c_str();
-	dialog_->bulletsModule->bullet3LE->setText(s);
-	s = params.user_defined_bullets[3].getText().c_str();
-	dialog_->bulletsModule->bullet4LE->setText(s);
-
-	dialog_->bulletsModule->bulletsize1CO->setCurrentItem(
-		params.user_defined_bullets[0].getSize() + 1);
-	dialog_->bulletsModule->bulletsize2CO->setCurrentItem(
-		params.user_defined_bullets[1].getSize() + 1);
-	dialog_->bulletsModule->bulletsize3CO->setCurrentItem(
-		params.user_defined_bullets[2].getSize() + 1);
-	dialog_->bulletsModule->bulletsize4CO->setCurrentItem(
-		params.user_defined_bullets[3].getSize() + 1);
+	dialog_->bulletsModule->setBullet(0,params.user_defined_bullets[0]);
+	dialog_->bulletsModule->setBullet(1,params.user_defined_bullets[1]);
+	dialog_->bulletsModule->setBullet(2,params.user_defined_bullets[2]);
+	dialog_->bulletsModule->setBullet(3,params.user_defined_bullets[3]);
 
 	// packages
 	char const * enc[] = {
diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index 37c09d4d94..323c703b07 100644
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -41,6 +41,7 @@
 #include <qlabel.h>
 #include <qmultilineedit.h>
 #include <qlineedit.h>
+#include <qlistview.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
@@ -237,24 +238,11 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
 	connect(paperModule->facingPagesCB, SIGNAL(toggled(bool)),
 		 this , SLOT(change_adaptor()));
 
-	// bullets
-	connect(bulletsModule->bullet1LE, SIGNAL(textChanged(const QString&)),
+	// bullets 
+	connect(bulletsModule->bulletsizeCO, SIGNAL(activated(int)),
 		 this , SLOT(change_adaptor()));
-	connect(bulletsModule->bulletsize1CO, SIGNAL(activated(int)),
+	connect(bulletsModule->bulletsLV, SIGNAL(selectionChanged()),
 		 this , SLOT(change_adaptor()));
-	connect(bulletsModule->bullet2LE, SIGNAL(textChanged(const QString&)),
-		 this , SLOT(change_adaptor()));
-	connect(bulletsModule->bulletsize2CO, SIGNAL(activated(int)),
-		 this , SLOT(change_adaptor()));
-	connect(bulletsModule->bullet3LE, SIGNAL(textChanged(const QString&)),
-		 this , SLOT(change_adaptor()));
-	connect(bulletsModule->bulletsize3CO, SIGNAL(activated(int)),
-		 this , SLOT(change_adaptor()));
-	connect(bulletsModule->bullet4LE, SIGNAL(textChanged(const QString&)),
-		 this , SLOT(change_adaptor()));
-	connect(bulletsModule->bulletsize4CO, SIGNAL(activated(int)),
-		 this , SLOT(change_adaptor()));
-
 }
 
 
diff --git a/src/frontends/qt2/ui/BulletsModuleBase.ui b/src/frontends/qt2/ui/BulletsModuleBase.ui
index 1e70e074f4..3e42853499 100644
--- a/src/frontends/qt2/ui/BulletsModuleBase.ui
+++ b/src/frontends/qt2/ui/BulletsModuleBase.ui
@@ -13,19 +13,15 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>335</width>
-            <height>216</height>
+            <width>199</width>
+            <height>166</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string>Form3</string>
+        <string>Form1</string>
     </property>
-    <property stdset="1">
-        <name>mouseTracking</name>
-        <bool>true</bool>
-    </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
@@ -34,631 +30,136 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget>
-            <class>QLayoutWidget</class>
+        <widget row="0"  column="0" >
+            <class>QListView</class>
+            <column>
+                <property>
+                    <name>text</name>
+                    <string>Bullets</string>
+                </property>
+                <property>
+                    <name>clickable</name>
+                    <bool>true</bool>
+                </property>
+                <property>
+                    <name>resizeable</name>
+                    <bool>true</bool>
+                </property>
+            </column>
+            <column>
+                <property>
+                    <name>text</name>
+                    <string>Size</string>
+                </property>
+                <property>
+                    <name>clickable</name>
+                    <bool>true</bool>
+                </property>
+                <property>
+                    <name>resizeable</name>
+                    <bool>true</bool>
+                </property>
+            </column>
+        <item>
+            <property>
+                <name>text</name>
+                <string></string>
+            </property>
+            <property>
+                <name>text</name>
+                <string>default</string>
+            </property>
+            <property>
+                <name>pixmap</name>
+                <pixmap></pixmap>
+            </property>
+            <property>
+                <name>pixmap</name>
+                <pixmap></pixmap>
+            </property>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string></string>
+                </property>
+                <property>
+                    <name>text</name>
+                    <string>default</string>
+                </property>
+                <property>
+                    <name>pixmap</name>
+                    <pixmap></pixmap>
+                </property>
+                <property>
+                    <name>pixmap</name>
+                    <pixmap></pixmap>
+                </property>
+                <item>
+                    <property>
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                    <property>
+                        <name>text</name>
+                        <string>default</string>
+                    </property>
+                    <property>
+                        <name>pixmap</name>
+                        <pixmap></pixmap>
+                    </property>
+                    <property>
+                        <name>pixmap</name>
+                        <pixmap></pixmap>
+                    </property>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string></string>
+                        </property>
+                        <property>
+                            <name>text</name>
+                            <string>default</string>
+                        </property>
+                        <property>
+                            <name>pixmap</name>
+                            <pixmap></pixmap>
+                        </property>
+                        <property>
+                            <name>pixmap</name>
+                            <pixmap></pixmap>
+                        </property>
+                    </item>
+                </item>
+            </item>
+        </item>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout5</cstring>
+                <cstring>bulletsLV</cstring>
+            </property>
+            <property stdset="1">
+                <name>enabled</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>5</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>allColumnsShowFocus</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>rootIsDecorated</name>
+                <bool>true</bool>
             </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="4"  column="3" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>default</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>tiny</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>script</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>footnote</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>small</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>normal</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>LARGE</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>huge</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Huge</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bulletsize4CO</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 4 bullet size</string>
-                    </property>
-                </widget>
-                <widget row="3"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bullet3LE</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 3 bullet</string>
-                    </property>
-                </widget>
-                <widget row="2"  column="2" >
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>setbullet2TB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>focusPolicy</name>
-                        <enum>TabFocus</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Choose</string>
-                    </property>
-                    <property stdset="1">
-                        <name>popupDelay</name>
-                        <number>1</number>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Shows menu with bullet options</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="2" >
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>setbullet1TB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>focusPolicy</name>
-                        <enum>TabFocus</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Choose</string>
-                    </property>
-                    <property stdset="1">
-                        <name>popupDelay</name>
-                        <number>1</number>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Shows menu with bullet options</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bullet1LE</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 1 bullet</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="3" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>default</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>tiny</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>script</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>footnote</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>small</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>normal</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>LARGE</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>huge</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Huge</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bulletsize1CO</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 1 bullet size</string>
-                    </property>
-                </widget>
-                <spacer row="0"  column="0" >
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer3</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Vertical</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget row="0"  column="3" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>sizeL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Si&amp;ze:</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>bulletsize1CO</cstring>
-                    </property>
-                </widget>
-                <widget row="4"  column="2" >
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>setbullet4TB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>focusPolicy</name>
-                        <enum>TabFocus</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Choose</string>
-                    </property>
-                    <property stdset="1">
-                        <name>popupDelay</name>
-                        <number>1</number>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Shows menu with bullet options</string>
-                    </property>
-                </widget>
-                <widget row="0"  column="1" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>latexL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Name</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>bullet1LE</cstring>
-                    </property>
-                </widget>
-                <widget row="3"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel1_3</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Level &amp;3 :</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>bullet3LE</cstring>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel1</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Level &amp;1 :</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>bullet1LE</cstring>
-                    </property>
-                </widget>
-                <spacer row="0"  column="2" >
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Vertical</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget row="4"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel1_4</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Level &amp;4 :</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>bullet4LE</cstring>
-                    </property>
-                </widget>
-                <widget row="2"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bullet2LE</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 2 bullet</string>
-                    </property>
-                </widget>
-                <widget row="4"  column="1" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bullet4LE</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 4 bullet</string>
-                    </property>
-                </widget>
-                <widget row="3"  column="2" >
-                    <class>QToolButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>setbullet3TB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>focusPolicy</name>
-                        <enum>TabFocus</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Choose</string>
-                    </property>
-                    <property stdset="1">
-                        <name>popupDelay</name>
-                        <number>1</number>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Shows menu with bullet options</string>
-                    </property>
-                </widget>
-                <widget row="3"  column="3" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>default</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>tiny</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>script</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>footnote</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>small</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>normal</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>LARGE</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>huge</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Huge</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bulletsize3CO</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 3 bullet size</string>
-                    </property>
-                </widget>
-                <widget row="2"  column="3" >
-                    <class>QComboBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>default</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>tiny</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>script</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>footnote</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>small</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>normal</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Large</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>LARGE</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>huge</string>
-                        </property>
-                    </item>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>Huge</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>bulletsize2CO</cstring>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Level 2 bullet size</string>
-                    </property>
-                </widget>
-                <widget row="2"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>TextLabel1_2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Level &amp;2 :</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>bullet2LE</cstring>
-                    </property>
-                </widget>
-            </grid>
         </widget>
-        <spacer>
+        <spacer row="2"  column="0" >
             <property>
                 <name>name</name>
-                <cstring>Spacer25</cstring>
+                <cstring>Spacer2</cstring>
             </property>
             <property stdset="1">
                 <name>orientation</name>
@@ -676,20 +177,163 @@
                 </size>
             </property>
         </spacer>
-    </vbox>
+        <widget row="1"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout1</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QToolButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>setbulletTB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Set &amp;Bullet</string>
+                    </property>
+                    <property stdset="1">
+                        <name>popupDelay</name>
+                        <number>1</number>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer1</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Expanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabel1</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Size:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>bulletsizeCO</cstring>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QComboBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>default</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>tiny</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>script</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>footnote</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>small</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>normal</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>large</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Large</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>LARGE</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>huge</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>Huge</string>
+                        </property>
+                    </item>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>bulletsizeCO</cstring>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+    </grid>
 </widget>
-<tabstops>
-    <tabstop>bullet1LE</tabstop>
-    <tabstop>setbullet1TB</tabstop>
-    <tabstop>bulletsize1CO</tabstop>
-    <tabstop>bullet2LE</tabstop>
-    <tabstop>setbullet2TB</tabstop>
-    <tabstop>bulletsize2CO</tabstop>
-    <tabstop>bullet3LE</tabstop>
-    <tabstop>setbullet3TB</tabstop>
-    <tabstop>bulletsize3CO</tabstop>
-    <tabstop>bullet4LE</tabstop>
-    <tabstop>setbullet4TB</tabstop>
-    <tabstop>bulletsize4CO</tabstop>
-</tabstops>
+<connections>
+    <connection>
+        <sender>bulletsizeCO</sender>
+        <signal>activated(int)</signal>
+        <receiver>BulletsModuleBase</receiver>
+        <slot>setSize(int)</slot>
+    </connection>
+    <connection>
+        <sender>bulletsLV</sender>
+        <signal>selectionChanged(QListViewItem*)</signal>
+        <receiver>BulletsModuleBase</receiver>
+        <slot>setActive(QListViewItem*)</slot>
+    </connection>
+    <slot access="protected">setActive(QListViewItem*)</slot>
+    <slot access="protected">setSize(int)</slot>
+</connections>
 </UI>