replaced last convenience class in iconpallete

browsebox is not build anymore and commented out in bulletsmodule

bullets are disabled in documentdialog: wasn't working before either

remove qt3support!



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13809 a592a061-630c-0410-9148-cb99ea01b6c8

config/qt.m4

@@ -367,8 +367,8 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 		AC_LANG_CPLUSPLUS
 		SAVE_CXXFLAGS=$CXXFLAGS
 		CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
-		for libname in '-lQtCore -lQtGui -lQt3Support' \
-		               '-lQtCore4 -lQtGui4 -lQt3Support4'
+		for libname in '-lQtCore -lQtGui' \
+		               '-lQtCore4 -lQtGui4'
 		do
 			QT4_TRY_LINK($libname)
 			if test -n "$qt4_cv_libname"; then
@@ -453,7 +453,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
 	QT4_LDFLAGS=
 	if test -n "$qt4_cv_includes"; then
 		QT4_INCLUDES="-I$qt4_cv_includes"
-		for i in Qt QtCore QtGui Qt3Support; do
+		for i in Qt QtCore QtGui; do
 			QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
 		done
 	fi

src/frontends/qt4/BulletsModule.C

@@ -12,17 +12,16 @@
 #include <config.h>
 
 #include "BulletsModule.h"
-#include "QBrowseBox.h"
+// #include "QBrowseBox.h"
 #include "qt_helpers.h"
-//Added by qt3to4:
-#include <QPixmap>
 
 #include "support/filetools.h"
 
-#include <qinputdialog.h>
-#include <qmenu.h>
-#include <qpushbutton.h>
+#include <QInputDialog>
+#include <QMenu>
+#include <QPushButton>
 #include <QComboBox>
+#include <QPixmap>
 
 #include <boost/assert.hpp>
 
@@ -49,6 +48,9 @@ BulletsModule::BulletsModule(QWidget * parent,  const char * name, Qt::WFlags fl
 	QMenu * pm5 = new QMenu(pm);
 	QMenu * pm6 = new QMenu(pm);
 
+// FIXME: We need a Qt4 compatible browsebox type widget
+// which can act as a popup to a toolbutton
+/*
 	standard_ = new QBrowseBox(6, 6, pm1);
 	maths_ = new QBrowseBox(6, 6, pm2);
 	ding1_ = new QBrowseBox(6, 6, pm3);
@@ -57,14 +59,13 @@ BulletsModule::BulletsModule(QWidget * parent,  const char * name, Qt::WFlags fl
 	ding4_ = new QBrowseBox(6, 6, pm6);
 
 	///\todo See how to insert those BrowseBox:
-/*
 	pm1->addMenu((QMenu*) standard_);
 	pm2->addMenu((QMenu*)maths_);
 	pm3->addMenu((QMenu*)ding1_);
 	pm4->addMenu((QMenu*)ding2_);
 	pm5->addMenu((QMenu*)ding3_);
 	pm6->addMenu((QMenu*)ding4_);
-*/
+
 	pm->insertItem(qt_("&Standard"), pm1, 0);
 	pm->insertItem(qt_("&Maths"), pm2, 1);
 	pm->insertItem(qt_("Dings &1"), pm3, 2);
@@ -137,6 +138,7 @@ BulletsModule::BulletsModule(QWidget * parent,  const char * name, Qt::WFlags fl
 	// update the view
 	for (int i = 0; i < 4; ++i)
 		setBullet(bullet1PB, bulletsize1CO, bullets_[i]);
+*/
 }
 
 
@@ -232,7 +234,7 @@ QPixmap BulletsModule::getPixmap(int font, int character)
 	int col = character % 6;
 	int row = (character - col) / 6;
 
-	switch (font) {
+/*	switch (font) {
 	case 0:
 		return standard_->pixmap(row,col);
 	case 1:
@@ -247,7 +249,7 @@ QPixmap BulletsModule::getPixmap(int font, int character)
 		return ding4_->pixmap(row,col);
 	default:
 		return standard_->pixmap(row,col);
-	}
+	}*/
 }
 
 
@@ -269,6 +271,8 @@ void BulletsModule::setBullet(QPushButton * pb, QComboBox * co, Bullet const & b
 void BulletsModule::setBullet(int level, const Bullet & bullet)
 {
 	bullets_[level] = bullet;
+	// FIXME: backout until we fixed the browsebox
+	return;
 
 	QPushButton * pb = 0;
 	QComboBox * co = 0;

src/frontends/qt4/BulletsModule.h

@@ -19,7 +19,7 @@
 
 #include <QWidget>
 
-class QBrowseBox;
+// class QBrowseBox;
 class QPushButton;
 class QComboBox;
 class QPixmap;
@@ -81,12 +81,12 @@ private:
 	/// store results
 	boost::array<Bullet, 4> bullets_;
 
-	QBrowseBox * standard_;
+/*	QBrowseBox * standard_;
 	QBrowseBox * maths_;
 	QBrowseBox * ding1_;
 	QBrowseBox * ding2_;
 	QBrowseBox * ding3_;
-	QBrowseBox * ding4_;
+	QBrowseBox * ding4_;*/
 	Bullet * bullet_pressed_;
 };
 

src/frontends/qt4/Makefile.dialogs

@@ -85,7 +85,6 @@ MOCFILES = \
 	QBoxDialog.C QBoxDialog.h \
 	QBranchDialog.C QBranchDialog.h \
 	QBranches.C QBranches.h \
-	QBrowseBox.C QBrowseBox.h \
 	QChangesDialog.C QChangesDialog.h \
 	QCharacterDialog.C QCharacterDialog.h \
 	QCitationDialog.C QCitationDialog.h \

src/frontends/qt4/QDocumentDialog.C

@@ -346,6 +346,8 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
 
 
 	bulletsModule = new BulletsModule;
+	// FIXME: disable until we fix browsebox in BulletsModule.[Ch]
+	bulletsModule->setEnabled(false);
 	// bullets
 	connect(bulletsModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
 

src/frontends/qt4/iconpalette.C

@@ -12,11 +12,10 @@
 
 #include "iconpalette.h"
 #include "qt_helpers.h"
-//Added by qt3to4:
 #include <QVBoxLayout>
 #include <QPixmap>
 #include <QHBoxLayout>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QResizeEvent>
 
 #include "debug.h"
@@ -40,7 +39,7 @@ IconPalette::IconPalette(QWidget * parent, char const * name)
 {
 	QVBoxLayout * top = new QVBoxLayout(this);
 	QHBoxLayout * row = new QHBoxLayout(top);
-	layout_ = new Q3GridLayout(row);
+	layout_ = new QGridLayout(row);
 	row->addStretch(0);
 	top->addStretch(0);
 }

src/frontends/qt4/iconpalette.h

@@ -14,9 +14,6 @@
 
 
 #include <QWidget>
-//#include <QPixmap>
-//#include <Q3GridLayout>
-//#include <QResizeEvent>
 
 #include <string>
 #include <utility>
@@ -25,7 +22,7 @@
 
 class QPixmap;
 class QPushButton;
-class Q3GridLayout;
+class QGridLayout;
 class QResizeEvent;
 
 /**
@@ -47,7 +44,7 @@ protected slots:
 private:
 	int maxcol_;
 
-	Q3GridLayout * layout_;
+	QGridLayout * layout_;
 
 	typedef std::pair<QPushButton *, std::string> Button;