* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / BulletsModule.cpp

diff --git a/src/frontends/qt4/BulletsModule.cpp b/src/frontends/qt4/BulletsModule.cpp
index 20d028e843952b27c7434f60633c3886badc0e26..c06904bf495b972282e9d1963b2baa4dbea662bb 100644 (file)
--- a/src/frontends/qt4/BulletsModule.cpp
+++ b/src/frontends/qt4/BulletsModule.cpp
@@ -13,20 +13,15 @@
 #include "BulletsModule.h"
 #include "qt_helpers.h"
 
-#include "support/filetools.h"
-
 #include <QPixmap>
 #include <QPainter>
 
-#include <boost/assert.hpp>
+using namespace std;
 
 namespace lyx {
 
-using support::libFileSearch;
-
-using std::string;
-
-BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
+BulletsModule::BulletsModule(QWidget * parent)
+    : QWidget(parent)
 {
        setupUi(this);
 
@@ -43,7 +38,7 @@ BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
        levelLW->addItem("4");
 
        // insert pixmaps
-       setupPanel(new QListWidget(bulletpaneSW), qt_("Standard"), "standard");
+       setupPanel(new QListWidget(bulletpaneSW), qt_("Standard[[Bullets]]"), "standard");
        setupPanel(new QListWidget(bulletpaneSW), qt_("Maths"), "amssymb");
        setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 1"), "psnfss1");
        setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 2"), "psnfss2");
@@ -58,7 +53,7 @@ BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
 
 
 void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname,
-       std::string const & fname)
+       string const & fname)
 {
        connect(lw, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
                this, SLOT(bulletSelected(QListWidgetItem *, QListWidgetItem*)));
@@ -67,7 +62,7 @@ void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname,
        bulletpaneCO->addItem(panelname);
 
        // get pixmap with bullets
-       QPixmap pixmap = QPixmap(toqstr(libFileSearch("images", fname, "png").absFilename()));
+       QPixmap pixmap(":/images/" + toqstr(fname) + ".png");
 
        int const w = pixmap.width() / 6;
        int const h = pixmap.height() / 6;
@@ -82,7 +77,7 @@ void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname,
        lw->setGridSize(QSize(w, h));
        // the widening by 21 is needed to avoid wrapping
        lw->resize(6 * w + 21, 6 * h);
-       bulletpaneSW->setMinimumSize(6 * w, 6 * h + 6);
+       bulletpaneSW->setMinimumSize(6 * w + 5, 6 * h + 6);
 
        // get individual bullets from pixmap
        for (int row = 0; row < 6; ++row) {
@@ -192,7 +187,7 @@ void BulletsModule::setBullet(int level, Bullet const & bullet)
 }
 
 
-Bullet const & BulletsModule::getBullet(int level) const
+Bullet const & BulletsModule::bullet(int level) const
 {
        return bullets_[level];
 }
@@ -200,4 +195,4 @@ Bullet const & BulletsModule::getBullet(int level) const
 } // namespace lyx
 
 
-#include "BulletsModule_moc.cpp"
+#include "moc_BulletsModule.cpp"