X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FBulletsModule.C;h=7704b80261c2a231affd23c6dc4a3202e5b4f7dd;hb=c6b932f4677029826468e65f63d8ed4660ef9296;hp=66083955b430ce1aa9c964ab1deba0ac25318510;hpb=5d28253e20637aef23ac44280d0c2c4748843d03;p=lyx.git

diff --git a/src/frontends/qt4/BulletsModule.C b/src/frontends/qt4/BulletsModule.C
index 66083955b4..7704b80261 100644
--- a/src/frontends/qt4/BulletsModule.C
+++ b/src/frontends/qt4/BulletsModule.C
@@ -16,10 +16,13 @@
 #include "support/filetools.h"
 
 #include <QPixmap>
+#include <QPainter>
 
 #include <boost/assert.hpp>
 
-using lyx::support::libFileSearch;
+namespace lyx {
+
+using support::libFileSearch;
 
 using std::string;
 
@@ -27,9 +30,9 @@ BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
 {
 	setupUi(this);
 
-	for (int iter = 0; iter < 4; ++iter) {
+	for (int iter = 0; iter < 4; ++iter)
 		bullets_[iter] = ITEMIZE_DEFAULTS[iter];
-	}
+
 	current_font_ = -1;
 	current_char_ = 0;
 
@@ -47,17 +50,15 @@ BulletsModule::BulletsModule(QWidget * , char const * , Qt::WFlags)
 	setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 3"), "psnfss3");
 	setupPanel(new QListWidget(bulletpaneSW), qt_("Dings 4"), "psnfss4");
 
-	connect(levelLW, SIGNAL(currentRowChanged(int)), this, SLOT(showLevel(int)));
-	connect(bulletpaneCO, SIGNAL(activated(int)), bulletpaneSW, SLOT(setCurrentIndex(int)));
+	connect(levelLW, SIGNAL(currentRowChanged(int)),
+		this, SLOT(showLevel(int)));
+	connect(bulletpaneCO, SIGNAL(activated(int)), bulletpaneSW,
+		SLOT(setCurrentIndex(int)));
 }
 
 
-BulletsModule::~BulletsModule()
-{
-}
-
-
-void BulletsModule::setupPanel(QListWidget * lw, QString panelname, std::string fname)
+void BulletsModule::setupPanel(QListWidget * lw, QString const & panelname,
+	std::string const & fname)
 {
 	connect(lw, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
 		this, SLOT(bulletSelected(QListWidgetItem *, QListWidgetItem*)));
@@ -66,7 +67,8 @@ void BulletsModule::setupPanel(QListWidget * lw, QString panelname, std::string
 	bulletpaneCO->addItem(panelname);
 
 	// get pixmap with bullets
-	QPixmap pixmap = QPixmap(toqstr(libFileSearch("images", fname, "xpm")));
+	QPixmap pixmap = QPixmap(toqstr(libFileSearch("images", fname, "xpm").absFilename()));
+
 	int const w = pixmap.width() / 6;
 	int const h = pixmap.height() / 6;
 
@@ -77,17 +79,19 @@ void BulletsModule::setupPanel(QListWidget * lw, QString panelname, std::string
 	lw->setFlow(QListView::LeftToRight);
 	lw->setMovement(QListView::Static);
 	lw->setUniformItemSizes(true);
-	lw->setGridSize( QSize(w , h) );
-	lw->resize( 6 * w + 6 , 6* h);
-	bulletpaneSW->setMinimumSize( 6 * w + 6 , 6 * h);
+	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);
 
 	// get individual bullets from pixmap
 	for (int row = 0; row < 6; ++row) {
 		for (int col = 0; col < 6; ++col) {
-			QPixmap small(w,h);
+			QPixmap small(w, h);
 			small.fill();
-			bitBlt(&small, 0, 0, &pixmap, col * w, row * h,	w, h);
-			new QListWidgetItem(QIcon(small), "" , lw, (6*row + col));
+			QPainter painter(&small);
+			painter.drawPixmap(small.rect(), pixmap, QRect(col * w, row * h, w, h));
+			new QListWidgetItem(QIcon(small), "" , lw, (6 * row + col));
 		}
 	}
 
@@ -103,7 +107,7 @@ void BulletsModule::showLevel(int level)
 
 	current_font_ = bullets_[level].getFont();
 
-	if (bullets_[level].getFont()<0) {
+	if (bullets_[level].getFont() < 0) {
 		customCB->setCheckState(Qt::Checked);
 		customLE->setText(toqstr(bullets_[level].getText()));
 	} else {
@@ -139,10 +143,10 @@ void BulletsModule::bulletSelected(QListWidgetItem * item, QListWidgetItem *)
 }
 
 
-void BulletsModule::on_customCB_toggled(bool custom)
+void BulletsModule::on_customCB_clicked(bool custom)
 {
 	if (!custom) {
-		if (current_font_<0)
+		if (current_font_ < 0)
 			current_font_ = bulletpaneCO->currentIndex();
 		return;
 	}
@@ -156,7 +160,7 @@ void BulletsModule::on_customCB_toggled(bool custom)
 
 void BulletsModule::selectItem(int font, int character, bool select)
 {
-	if (font<0)
+	if (font < 0)
 		return;
 
 	QListWidget * lw = static_cast<QListWidget *>(bulletpaneSW->widget(font));
@@ -170,7 +174,7 @@ void BulletsModule::on_customLE_textEdited(const QString & text)
 		return;
 
 	bullets_[levelLW->currentRow()].setFont(current_font_);
-	bullets_[levelLW->currentRow()].setText(fromqstr(text));
+	bullets_[levelLW->currentRow()].setText(qstring_to_ucs4(text));
 	changed();
 }
 
@@ -193,5 +197,7 @@ Bullet const & BulletsModule::getBullet(int level) const
 	return bullets_[level];
 }
 
+} // namespace lyx
+
 
 #include "BulletsModule_moc.cpp"