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 5c237aaef170e5531214ff340bff1ec9a8423bf2..5ca95d74ffb41ae8b2d0008f1aa84b5a9831d106 100644 (file)
--- 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 fc360c6f1b667dc06ca7a6ffd31da2d3eab9e95f..56095754238d3dbd2e20b4a08cbccf37c04c6ce6 100644 (file)
--- 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