From: José Matox <jamatos@lyx.org>
Date: Wed, 18 Aug 2004 14:00:03 +0000 (+0000)
Subject: show custom bullet instead of "...", change from John.
X-Git-Tag: 1.6.10~15042
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=393d59f296f778f0d84a25afcebca04154ef1cc0;p=features.git

show custom bullet instead of "...", change from John.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8955 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C
index 5c237aaef1..5ca95d74ff 100644
--- a/src/frontends/qt2/BulletsModule.C
+++ b/src/frontends/qt2/BulletsModule.C
@@ -217,7 +217,7 @@ void BulletsModule::setBullet(QPushButton * pb, QComboBox * co, Bullet const & b
 {
 	if (b.getFont() == -1) {
 		pb->setPixmap(QPixmap());
-		pb->setText("...");
+		pb->setText(b.getText());
 	} else {
 		pb->setPixmap(getPixmap(b.getFont(), b.getCharacter()));
 	}
diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index fc360c6f1b..5609575423 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-18  José Matos  <jamatos@lyx.org>
+
+	* BulletsModule.C (setBullet): show custom bullet instead of "...",
+	change from John Levon.
+
 2004-08-15  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* qfontexample.h: add header guards