X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FBulletsModule.h;h=b0577fb6c4e119818757f48dd6424c6ac834505a;hb=ba76bf5eb85db5a10839fccee3430d906d3f7b70;hp=38e0880ed4bf44226fe65e2db33c419aeef0f071;hpb=12e5a52b92efc3ff9946493176cbf7b73d878e81;p=lyx.git

diff --git a/src/frontends/qt4/BulletsModule.h b/src/frontends/qt4/BulletsModule.h
index 38e0880ed4..b0577fb6c4 100644
--- a/src/frontends/qt4/BulletsModule.h
+++ b/src/frontends/qt4/BulletsModule.h
@@ -13,81 +13,49 @@
 #define QBULLETSMODULE_H
 
 
-#include "ui/BulletsUi.h"
+#include "ui_BulletsUi.h"
 #include "Bullet.h"
-#include <boost/array.hpp>
 
-#include <QDialog>
+#include <QWidget>
 
-class QBrowseBox;
-class QPushButton;
-class QComboBox;
-class QPixmap;
 
-class BulletsModule : public QDialog, public Ui::BulletsUi {
+namespace lyx {
+
+class BulletsModule : public QWidget, public Ui::BulletsUi {
 	Q_OBJECT
-public:
 
+public:
+	///
 	BulletsModule(QWidget * parent = 0, const char * name = 0, Qt::WFlags fl = 0);
 
-	~BulletsModule();
-
 	/// set a bullet
-	void setBullet(int level, const Bullet & bullet);
-
+	void setBullet(int level, Bullet const & bullet);
 	/// get bullet setting
 	Bullet const & getBullet(int level) const;
+	/// update 1st level
+	void init();
 
-signals:
+Q_SIGNALS:
 	void changed();
 
-protected slots:
-
-	/// menu callbacks
-	void standard(int row, int col);
-	void maths(int row, int col);
-	void ding1(int row, int col);
-	void ding2(int row, int col);
-	void ding3(int row, int col);
-	void ding4(int row, int col);
-
-	void updateSizes();
-
-	void clicked1();
-	void clicked2();
-	void clicked3();
-	void clicked4();
-
-	void selected1();
-	void selected2();
-	void selected3();
-	void selected4();
-
-	/// set custom (text) bullet
-	void setCustom();
+protected Q_SLOTS:
+	void on_bulletsizeCO_activated(int level);
+	void on_customCB_clicked(bool);
+	void on_customLE_textEdited(const QString &);
+	void bulletSelected(QListWidgetItem *, QListWidgetItem *);
+	void showLevel(int);
 
 private:
-	QPixmap getPixmap(int font, int character);
-
-	/// update GUI view
-	void setBullet(QPushButton * pb, QComboBox * co, Bullet const & b);
-
-	/// set from menu
-	void setCurrentBullet(int font, int character);
-
-	bool tmpbulletset;
-	Bullet tmpbullet;
+	void selectItem(int font, int character, bool select);
+	void setupPanel(QListWidget * lw, QString const & panelname,
+		std::string const & fname);
 
 	/// store results
-	boost::array<Bullet, 4> bullets_;
-
-	QBrowseBox * standard_;
-	QBrowseBox * maths_;
-	QBrowseBox * ding1_;
-	QBrowseBox * ding2_;
-	QBrowseBox * ding3_;
-	QBrowseBox * ding4_;
-	Bullet * bullet_pressed_;
+	Bullet bullets_[4];
+	int current_font_;
+	int current_char_;
 };
 
+} // namespace lyx
+
 #endif // BULLETSMODULE_H