#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);
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");
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*)));
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;
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) {
{
// -1 apparently means default...
bullets_[levelLW->currentRow()].setSize(size - 1);
+ changed();
}
}
-Bullet const & BulletsModule::getBullet(int level) const
+Bullet const & BulletsModule::bullet(int level) const
{
return bullets_[level];
}
} // namespace lyx
-#include "BulletsModule_moc.cpp"
+#include "moc_BulletsModule.cpp"