Compile fixes. Qt2 should now build (and fail immediately when you start it,

some assert related to grfx, help me Angus :)


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

src/frontends/qt2/ChangeLog

@@ -1,3 +1,19 @@
+2002-07-11  John Levon  <moz@compsoc.man.ac.uk>
+
+	* dialog files: add unused Dialogs paramater to allow compile
+ 
+	* QtView.C:
+	* QMiniBuffer.h:
+	* QMiniBuffer.C:
+	* Makefile.am: add QMiniBuffer (placeholder)
+ 
+	* TODO: add
+ 
+	* Toolbar_pimpl.h:
+	* Toolbar_pimpl.C: compile fix
+
+	* lyx_gui.C: add hexname() place holder
+ 
 2002-07-04  André Pönitz  <poenitz@lyx.org>
 
 	* xforms/Makefile.am: replace XFORMSGIMAGE by XFORMSIMAGE

src/frontends/qt2/Makefile.am

@@ -18,7 +18,6 @@ AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR
 include $(srcdir)/Makefile.dialogs
 
 libqt2_la_SOURCES = \
-	$(DIALOGSOURCES) \
 	Alert_pimpl.C \
 	Dialogs.C \
 	FileDialog.C \
@@ -37,6 +36,8 @@ libqt2_la_SOURCES = \
 	QLPainter.h \
 	QLyXKeySym.C \
 	QLyXKeySym.h \
+	QMiniBuffer.C \
+	QMiniBuffer.h \
 	Qt2Base.C \
 	Qt2Base.h \
 	Qt2BC.C	\
@@ -59,6 +60,7 @@ libqt2_la_SOURCES = \
 	qscreen.h \
 	qscreen.C \
 	qttableview.h \
-	qttableview.C
+	qttableview.C \
+	$(DIALOGSOURCES)
 
 libqt2.la: $(libqt2_la_OBJECTS) $(libqt2_la_DEPENDENCIES)

src/frontends/qt2/QAbout.C

@@ -28,7 +28,7 @@ using std::getline;
 
 typedef Qt2CB<ControlAboutlyx, Qt2DB<QAboutDialog> > base_class;
 
-QAbout::QAbout(ControlAboutlyx & c)
+QAbout::QAbout(ControlAboutlyx & c, Dialogs &)
 	: base_class(c, _("About LyX"))
 {
 }

src/frontends/qt2/QAbout.h

@@ -22,7 +22,7 @@ class QAbout
 	: public Qt2CB<ControlAboutlyx, Qt2DB<QAboutDialog> >
 {
 public:
-	QAbout(ControlAboutlyx &);
+	QAbout(ControlAboutlyx &, Dialogs &);
 
 private:
 	/// not needed

src/frontends/qt2/QBibitem.C

@@ -23,7 +23,7 @@
  
 typedef Qt2CB<ControlBibitem, Qt2DB<QBibitemDialog> > base_class;
 
-QBibitem::QBibitem(ControlBibitem & c)
+QBibitem::QBibitem(ControlBibitem & c, Dialogs &)
 	: base_class(c, _("Bibliography Item"))
 {
 }

src/frontends/qt2/QBibitem.h

@@ -21,7 +21,7 @@ class QBibitem :
 	friend class QBibitemDialog;
 
 public:
-	QBibitem(ControlBibitem &);
+	QBibitem(ControlBibitem &, Dialogs &);
 
 protected:
 	virtual bool isValid();

src/frontends/qt2/QBibtex.C

@@ -26,7 +26,7 @@
  
 typedef Qt2CB<ControlBibtex, Qt2DB<QBibtexDialog> > base_class;
 
-QBibtex::QBibtex(ControlBibtex & c)
+QBibtex::QBibtex(ControlBibtex & c, Dialogs &)
 	: base_class(c, _("BibTeX"))
 {
 }

src/frontends/qt2/QBibtex.h

@@ -21,7 +21,7 @@ class QBibtex :
 	friend class QBibtexDialog;
 
 public:
-	QBibtex(ControlBibtex &);
+	QBibtex(ControlBibtex &, Dialogs &);
 
 protected:
 	virtual bool isValid();

src/frontends/qt2/QCharacter.C

@@ -27,7 +27,7 @@ using std::vector;
 
 typedef Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> > base_class;
 
-QCharacter::QCharacter(ControlCharacter & c)
+QCharacter::QCharacter(ControlCharacter & c, Dialogs &)
 	: base_class(c, _("Character"))
 {
 }

src/frontends/qt2/QCharacter.h

@@ -22,6 +22,7 @@
 
 class ControlCharacter;
 class QCharacterDialog;
+class Dialogs;
 
 class QCharacter :
 	public Qt2CB<ControlCharacter, Qt2DB<QCharacterDialog> >
@@ -29,7 +30,7 @@ class QCharacter :
 	friend class QCharacterDialog;
 
 public:
-	QCharacter(ControlCharacter &);
+	QCharacter(ControlCharacter &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QCitation.C

@@ -41,7 +41,7 @@ using std::vector;
 
 typedef Qt2CB<ControlCitation, Qt2DB<QCitationDialog> > base_class;
 
-QCitation::QCitation(ControlCitation & c)
+QCitation::QCitation(ControlCitation & c, Dialogs &)
 	: base_class(c, _("Citation"))
 {}
 
@@ -181,7 +181,7 @@ void QCitation::updateBrowser(QListBox* browser,
 		it < keys.end(); ++it) {
 		string const key = frontStrip(strip(*it));
 		// FIXME: why the .empty() test ?
-		if(!key.empty())
+		if (!key.empty())
 			browser->insertItem(key.c_str());
 	}
 }

src/frontends/qt2/QCitation.h

@@ -21,6 +21,7 @@ class QListBox;
 
 class ControlCitation;
 class QCitationDialog;
+class Dialogs;
 
 class QCitation : public Qt2CB<ControlCitation, Qt2DB<QCitationDialog> >
 {
@@ -28,7 +29,7 @@ class QCitation : public Qt2CB<ControlCitation, Qt2DB<QCitationDialog> >
 
 public:
 	///
-	QCitation(ControlCitation &);
+	QCitation(ControlCitation &, Dialogs &);
 
 private:
 	///

src/frontends/qt2/QERT.C

@@ -20,7 +20,7 @@
  
 typedef Qt2CB<ControlERT, Qt2DB<QERTDialog> > base_class;
 
-QERT::QERT(ControlERT & c)
+QERT::QERT(ControlERT & c, Dialogs &)
 	: base_class(c, _("LaTeX ERT"))
 {
 }

src/frontends/qt2/QERT.h

@@ -14,6 +14,7 @@
 
 class ControlERT;
 class QERTDialog;
+class Dialogs;
 
 class QERT :
 	public Qt2CB<ControlERT, Qt2DB<QERTDialog> >
@@ -21,7 +22,7 @@ class QERT :
 	friend class QERTDialog;
 
 public:
-	QERT(ControlERT &);
+	QERT(ControlERT &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QError.C

@@ -20,7 +20,7 @@
  
 typedef Qt2CB<ControlError, Qt2DB<QErrorDialog> > base_class;
 
-QError::QError(ControlError & c)
+QError::QError(ControlError & c, Dialogs &)
 	: base_class(c, _("LaTeX Error"))
 {
 }

src/frontends/qt2/QError.h

@@ -14,6 +14,7 @@
 
 class ControlError;
 class QErrorDialog;
+class Dialogs;
 
 class QError :
 	public Qt2CB<ControlError, Qt2DB<QErrorDialog> >
@@ -21,7 +22,7 @@ class QError :
 	friend class QErrorDialog;
 
 public:
-	QError(ControlError &);
+	QError(ControlError &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QExternal.C

@@ -23,7 +23,7 @@
  
 typedef Qt2CB<ControlExternal, Qt2DB<QExternalDialog> > base_class;
 
-QExternal::QExternal(ControlExternal & c)
+QExternal::QExternal(ControlExternal & c, Dialogs &)
 	: base_class(c, _("External"))
 {
 }

src/frontends/qt2/QExternal.h

@@ -21,7 +21,7 @@ class QExternal :
 	friend class QExternalDialog;
 
 public:
-	QExternal(ControlExternal &);
+	QExternal(ControlExternal &, Dialogs &);
 
 protected:
 	virtual bool isValid();

src/frontends/qt2/QFloat.C

@@ -27,7 +27,7 @@
 
 typedef Qt2CB<ControlFloat, Qt2DB<QFloatDialog> > base_class;
 
-QFloat::QFloat(ControlFloat & c)
+QFloat::QFloat(ControlFloat & c, Dialogs &)
 	: base_class(c, _("LaTeX Information"))
 {
 }

src/frontends/qt2/QFloat.h

@@ -27,7 +27,7 @@ public:
 	///
 	friend class QFloatDialog;
 	///
-	QFloat(ControlFloat &);
+	QFloat(ControlFloat &, Dialogs &);
 private:
 	/// Apply changes
 	virtual void apply();

src/frontends/qt2/QGraphics.C

@@ -41,7 +41,7 @@
 
 typedef Qt2CB<ControlGraphics, Qt2DB<QGraphicsDialog> > base_class;
 
-QGraphics::QGraphics(ControlGraphics & c)
+QGraphics::QGraphics(ControlGraphics & c, Dialogs &)
 	: base_class(c, _("Graphics"))
 {
 }

src/frontends/qt2/QGraphics.h

@@ -28,7 +28,7 @@ public:
 	///
 	friend class QGraphicsDialog;
 	///
-	QGraphics(ControlGraphics &);
+	QGraphics(ControlGraphics &, Dialogs &);
 
 protected:
 	virtual bool isValid();

src/frontends/qt2/QInclude.C

@@ -27,7 +27,7 @@
 
 typedef Qt2CB<ControlInclude, Qt2DB<QIncludeDialog> > base_class;
 
-QInclude::QInclude(ControlInclude & c)
+QInclude::QInclude(ControlInclude & c, Dialogs &)
 	: base_class(c, _("Include"))
 {
 }

src/frontends/qt2/QInclude.h

@@ -27,7 +27,7 @@ public:
 	///
 	friend class QIncludeDialog;
 	///
-	QInclude(ControlInclude &);
+	QInclude(ControlInclude &, Dialogs &);
 
 protected:
 	virtual bool isValid();

src/frontends/qt2/QIndex.C

@@ -19,7 +19,7 @@
 
 typedef Qt2CB<ControlIndex, Qt2DB<QIndexDialog> > base_class;
 
-QIndex::QIndex(ControlIndex & c)
+QIndex::QIndex(ControlIndex & c, Dialogs &)
 	: base_class(c, _("Index"))
 {
 }

src/frontends/qt2/QIndex.h

@@ -15,6 +15,7 @@
 
 class ControlIndex;
 class QIndexDialog;
+class Dialogs;
 
 class QIndex :
 	public Qt2CB<ControlIndex, Qt2DB<QIndexDialog> >
@@ -22,7 +23,7 @@ class QIndex :
 	friend class QIndexDialog;
 
 public:
-	QIndex(ControlIndex &);
+	QIndex(ControlIndex &, Dialogs &);
 
 protected:
 	virtual bool isValid();

src/frontends/qt2/QLog.C

@@ -29,7 +29,7 @@ using std::getline;
 
 typedef Qt2CB<ControlLog, Qt2DB<QLogDialog> > base_class;
 
-QLog::QLog(ControlLog & c)
+QLog::QLog(ControlLog & c, Dialogs &)
 	: base_class(c, _("Log"))
 {
 }

src/frontends/qt2/QLog.h

@@ -27,7 +27,7 @@ public:
 	///
 	friend class QLogDialog;
 	///
-	QLog(ControlLog &);
+	QLog(ControlLog &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QMiniBuffer.C

@@ -0,0 +1,50 @@
+// -*- C++ -*-
+/**
+ * \file QMiniBuffer.C
+ * Copyright 1995-2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Lars
+ * \author Asger and Juergen
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "QMiniBuffer.h"
+
+QMiniBuffer::QMiniBuffer(LyXView * o)
+	: MiniBuffer(o)
+{
+}
+
+
+QMiniBuffer::~QMiniBuffer()
+{
+}
+
+ 
+bool QMiniBuffer::isEditingMode() const
+{
+	return false;
+}
+ 
+ 
+void QMiniBuffer::editingMode()
+{
+}
+
+
+ 
+void QMiniBuffer::messageMode()
+{
+}
+ 
+ 
+void QMiniBuffer::set_input(string const &)
+{
+}

src/frontends/qt2/QMiniBuffer.h

@@ -0,0 +1,45 @@
+// -*- C++ -*-
+/**
+ * \file QMiniBuffer.h
+ * Copyright 1995-2002 the LyX Team
+ * Read the file COPYING
+ *
+ * \author Lars
+ * \author Asger and Juergen
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#ifndef QMINIBUFFER_H
+#define QMINIBUFFER_H
+
+#include "LString.h"
+
+#include "MiniBuffer.h"
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+/// FIXME: place holder only 
+class QMiniBuffer : public MiniBuffer {
+public:
+	///
+	QMiniBuffer(LyXView *);
+	
+	/// destructor
+	virtual ~QMiniBuffer();
+	
+protected:
+	/// Are we in editing mode?
+	virtual bool isEditingMode() const;
+	/// enter editing mode
+	virtual void editingMode();
+	/// enter message display mode
+	virtual void messageMode();
+	
+	/// set the minibuffer content in editing mode
+	virtual void set_input(string const &);
+	
+};
+ 
+#endif // QMINIBUFFER_H

src/frontends/qt2/QMinipage.C

@@ -29,7 +29,7 @@
 
 typedef Qt2CB<ControlMinipage, Qt2DB<QMinipageDialog> > base_class;
 
-QMinipage::QMinipage(ControlMinipage & c)
+QMinipage::QMinipage(ControlMinipage & c, Dialogs &)
 	: base_class(c, _("Minipage"))
 {
 }

src/frontends/qt2/QMinipage.h

@@ -27,7 +27,7 @@ public:
 	///
 	friend class QMinipageDialog;
 	///
-	QMinipage(ControlMinipage &);
+	QMinipage(ControlMinipage &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QPreamble.C

@@ -26,7 +26,7 @@
 
 typedef Qt2CB<ControlPreamble, Qt2DB<QPreambleDialog> > base_class;
 
-QPreamble::QPreamble(ControlPreamble & c)
+QPreamble::QPreamble(ControlPreamble & c, Dialogs &)
 	: base_class(c, _("LaTeX Preamble"))
 {
 }

src/frontends/qt2/QPreamble.h

@@ -27,7 +27,7 @@ public:
 	///
 	friend class QPreambleDialog;
 	///
-	QPreamble(ControlPreamble &);
+	QPreamble(ControlPreamble &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QPrint.C

@@ -32,7 +32,7 @@
  
 typedef Qt2CB<ControlPrint, Qt2DB<QPrintDialog> > base_class;
 
-QPrint::QPrint(ControlPrint & c)
+QPrint::QPrint(ControlPrint & c, Dialogs &)
 	: base_class(c, _("Print"))
 {
 }

src/frontends/qt2/QPrint.h

@@ -19,6 +19,7 @@
 
 class ControlPrint;
 class QPrintDialog;
+class Dialogs;
 
 ///
 class QPrint
@@ -28,7 +29,7 @@ public:
 	///
 	friend class QPrintDialog;
 	///
-	QPrint(ControlPrint &);
+	QPrint(ControlPrint &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QRef.C

@@ -28,7 +28,7 @@ using std::endl;
 
 typedef Qt2CB<ControlRef, Qt2DB<QRefDialog> > base_class;
 
-QRef::QRef(ControlRef & c)
+QRef::QRef(ControlRef & c, Dialogs &)
 	: base_class(c, _("Cross Reference")),
 	sort_(false), at_ref_(false)
 {

src/frontends/qt2/QRef.h

@@ -17,6 +17,7 @@
 
 class ControlRef;
 class QRefDialog;
+class Dialogs;
 
 class QRef :
 	public Qt2CB<ControlRef, Qt2DB<QRefDialog> >
@@ -24,7 +25,7 @@ class QRef :
 	friend class QRefDialog;
 
 public:
-	QRef(ControlRef & c);
+	QRef(ControlRef & c, Dialogs &);
 
 private:
 	/// apply changes

src/frontends/qt2/QSearch.C

@@ -27,7 +27,7 @@
 
 typedef Qt2CB<ControlSearch, Qt2DB<QSearchDialog> > base_class;
 
-QSearch::QSearch(ControlSearch & c)
+QSearch::QSearch(ControlSearch & c, Dialogs &)
 	: base_class(c, _("Search"))
 {
 }

src/frontends/qt2/QSearch.h

@@ -18,6 +18,7 @@
 
 class ControlSearch;
 class QSearchDialog;
+class Dialogs;
 
 ///
 class QSearch
@@ -27,7 +28,7 @@ public:
 	///
 	friend class QSearchDialog;
 	///
-	QSearch(ControlSearch &);
+	QSearch(ControlSearch &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QShowFile.C

@@ -20,7 +20,7 @@
 
 typedef Qt2CB<ControlShowFile, Qt2DB<QShowFileDialog> > base_class;
 
-QShowFile::QShowFile(ControlShowFile & c)
+QShowFile::QShowFile(ControlShowFile & c, Dialogs &)
 	: base_class(c, _("ShowFile"))
 {
 }

src/frontends/qt2/QShowFile.h

@@ -14,6 +14,7 @@
 
 class ControlShowFile;
 class QShowFileDialog;
+class Dialogs;
 
 class QShowFile :
 	public Qt2CB<ControlShowFile, Qt2DB<QShowFileDialog> >
@@ -21,7 +22,7 @@ class QShowFile :
 	friend class QShowFileDialog;
 
 public:
-	QShowFile(ControlShowFile &);
+	QShowFile(ControlShowFile &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QSpellchecker.C

@@ -23,7 +23,7 @@
 
 typedef Qt2CB<ControlSpellchecker, Qt2DB<QSpellcheckerDialog> > base_class;
 
-QSpellchecker::QSpellchecker(ControlSpellchecker & c)
+QSpellchecker::QSpellchecker(ControlSpellchecker & c, Dialogs &)
 	: base_class(c, _("Spellchecker"))
 {
 }

src/frontends/qt2/QSpellchecker.h

@@ -16,6 +16,7 @@
 
 class ControlSpellchecker;
 class QSpellcheckerDialog;
+class Dialogs;
 
 class QSpellchecker :
 	public Qt2CB<ControlSpellchecker, Qt2DB<QSpellcheckerDialog> >
@@ -23,7 +24,7 @@ class QSpellchecker :
 	friend class QSpellcheckerDialog;
 
 public:
-	QSpellchecker(ControlSpellchecker &);
+	QSpellchecker(ControlSpellchecker &, Dialogs &);
 
 	/// update from controller
 	void partialUpdate(int id);

src/frontends/qt2/QTabularCreate.C

@@ -24,7 +24,7 @@
 
 typedef Qt2CB<ControlTabularCreate, Qt2DB<QTabularCreateDialog> > base_class;
 
-QTabularCreate::QTabularCreate(ControlTabularCreate & c)
+QTabularCreate::QTabularCreate(ControlTabularCreate & c, Dialogs &)
 	: base_class(c, _("Insert table"))
 {
 }

src/frontends/qt2/QTabularCreate.h

@@ -18,6 +18,7 @@
 
 class ControlTabularCreate;
 class QTabularCreateDialog;
+class Dialogs;
 
 ///
 class QTabularCreate
@@ -27,7 +28,7 @@ public:
 	///
 	friend class QTabularCreateDialog;
 	///
-	QTabularCreate(ControlTabularCreate &);
+	QTabularCreate(ControlTabularCreate &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/QTexinfo.C

@@ -31,7 +31,7 @@ using std::vector;
 
 typedef Qt2CB<ControlTexinfo, Qt2DB<QTexinfoDialog> > base_class;
 
-QTexinfo::QTexinfo(ControlTexinfo & c)
+QTexinfo::QTexinfo(ControlTexinfo & c, Dialogs &)
 	: base_class(c, _("LaTeX Information")), warningPosted(false), activeStyle(ControlTexinfo::cls)
 
 {

src/frontends/qt2/QTexinfo.h

@@ -28,7 +28,7 @@ public:
 	///
 	friend class QTexinfoDialog;
 	///
-	QTexinfo(ControlTexinfo &);
+	QTexinfo(ControlTexinfo &, Dialogs &);
 private:
 	/// Apply changes
 	virtual void apply() { };

src/frontends/qt2/QThesaurus.C

@@ -24,7 +24,7 @@
 
 typedef Qt2CB<ControlThesaurus, Qt2DB<QThesaurusDialog> > base_class;
 
-QThesaurus::QThesaurus(ControlThesaurus & c)
+QThesaurus::QThesaurus(ControlThesaurus & c, Dialogs &)
 	: base_class(c, _("Thesaurus"))
 {
 }

src/frontends/qt2/QThesaurus.h

@@ -27,7 +27,7 @@ public:
 	///
 	friend class QThesaurusDialog;
 	///
-	QThesaurus(ControlThesaurus &);
+	QThesaurus(ControlThesaurus &, Dialogs &);
 private:
 	/// Apply changes
 	virtual void apply() { };

src/frontends/qt2/QToc.C

@@ -35,7 +35,7 @@ using std::vector;
 
 typedef Qt2CB<ControlToc, Qt2DB<QTocDialog> > base_class;
 
-QToc::QToc(ControlToc & c)
+QToc::QToc(ControlToc & c, Dialogs &)
 	: base_class(c, _("Table of contents"))
 {}
 

src/frontends/qt2/QToc.h

@@ -26,7 +26,7 @@ class QToc :
 	public Qt2CB<ControlToc, Qt2DB<QTocDialog> >
 {
 public:
-	QToc(ControlToc &);
+	QToc(ControlToc &, Dialogs &);
 
 	friend class QTocDialog;
 

src/frontends/qt2/QURL.C

@@ -22,7 +22,7 @@
 
 typedef Qt2CB<ControlUrl, Qt2DB<QURLDialog> > base_class;
 
-QURL::QURL(ControlUrl & c)
+QURL::QURL(ControlUrl & c, Dialogs &)
 	: base_class(c, _("URL"))
 {
 }

src/frontends/qt2/QURL.h

@@ -13,13 +13,14 @@
 
 class ControlUrl;
 class QURLDialog;
+class Dialogs;
 
 class QURL :
 	public Qt2CB<ControlUrl, Qt2DB<QURLDialog> >
 {
 	friend class QURLDialog;
 public:
-	QURL(ControlUrl & c);
+	QURL(ControlUrl & c, Dialogs &);
 
 protected:
 	virtual bool isValid();

src/frontends/qt2/QVCLog.C

@@ -26,7 +26,7 @@
 
 typedef Qt2CB<ControlVCLog, Qt2DB<QVCLogDialog> > base_class;
 
-QVCLog::QVCLog(ControlVCLog & c)
+QVCLog::QVCLog(ControlVCLog & c, Dialogs &)
 	: base_class(c, _("VCLog"))
 {
 }

src/frontends/qt2/QVCLog.h

@@ -27,7 +27,7 @@ public:
 	///
 	friend class QVCLogDialog;
 	///
-	QVCLog(ControlVCLog &);
+	QVCLog(ControlVCLog &, Dialogs &);
 
 private:
 	/// Apply changes

src/frontends/qt2/Qt2Base.h

@@ -1,16 +1,13 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- *		   LyX, The Document Processor
- *
- *		   Copyright 2000 The LyX Team.
- *
- * ======================================================
+/**
+ * \file Qt2Base.h
+ * Copyright 2000-2002 the LyX Team
+ * Read the file COPYING
  *
  * \author Angus Leeming <a.leeming@ic.ac.uk>
  */
 
+ 
 #ifndef QT2BASE_H
 #define QT2BASE_H
 

src/frontends/qt2/QtView.C

@@ -13,12 +13,12 @@
 #pragma implementation
 #endif
 
-//#include "minibuffer.h"
 #include "debug.h"
 #include "intl.h"
 #include "lyx_cb.h"
 #include "support/filetools.h"
 #include "MenuBackend.h"
+#include "QMiniBuffer.h"
 #include "ToolbarDefaults.h"
 #include "lyxfunc.h"
 #include "BufferView.h"
@@ -54,10 +54,10 @@ QtView::QtView(unsigned int width, unsigned int height)
 	connect(menuBar(), SIGNAL(activated(int)),
 		this, SLOT(activated(int)));
  
-	toolbar_.reset(new Toolbar(this, 0, 0, toolbardefaults));
+	toolbar_.reset(new Toolbar(this, *getDialogs(), 0, 0, toolbardefaults));
 	toolbar_->set(true);
 
-	// FIXME minibuffer_.reset(new MiniBuffer(this, 0, 0, 30, 30));
+	minibuffer_.reset(new QMiniBuffer(this)); 
  
 	bufferview_.reset(new BufferView(this, 0, 0, width, height));
 	::current_view = bufferview_.get();
@@ -71,19 +71,6 @@ QtView::QtView(unsigned int width, unsigned int height)
 	if (!iconname.empty())
 		setIcon(QPixmap(iconname.c_str()));
 
-#if 0
-	minibuffer_.reset(new MiniBuffer(this, air, height - (25 + air), 
-		width - (2 * air), 25));
-
-	// connect the minibuffer signals
-	minibuffer_->stringReady.connect(SigC::slot(getLyXFunc(),
-						&LyXFunc::miniDispatch));
-	minibuffer_->timeout.connect(SigC::slot(getLyXFunc(),
-					       &LyXFunc::initMiniBuffer));
-	minibuffer_->dd_init(); 
- 
-#endif
-	
 	// make sure the buttons are disabled if needed
 	updateToolbar();
 }

src/frontends/qt2/TODO

@@ -0,0 +1,152 @@
+This file is intended to be a list of stuff that must be done before
+we can say the first iteration of the Qt frontend is "finished".
+
+Those with asterisks are what I perceive as being "big jobs"
+
+ColorHandler
+
+	- remove mentions in core code
+ 
+FileDialog
+
+	- add buttons for Documents, Templates, etc. to the file dialog toolbar
+	- work around Qt crash bug with double click
+ 
+GraphicsImage
+
+	- remove X dependencies here (?) (*)
+ 
+LyXServer
+
+	- remove xforms dependency
+ 
+lyx_gui (qt)
+
+	- move out lyxserver
+	- do dpi
+	- initialise graphics
+ 
+Menubar_pimpl
+
+	- remove menubar-switching as discussed
+	- implement menu key shortcuts
+	- implement on/off switches in menus, enable/disable
+	- parse the submenus (*)
+	- implement dynamic menus (may need serious backend changes) (*)(*)
+		- dynamic last files
+		- import/export/view/update
+		- navigate
+	- remove openByName
+
+QAbout
+
+	- give good default size 
+
+QBibtex 
+
+	- implement H. Voss's style browser facility, style tooltip, check for duplicates
+
+QCitation
+
+	- loop round searching not working perhaps ??
+
+QContentPane 
+
+	- triple click
+	- figure out why a scroll doesn't update quickly, which leaves cursor artifacts
+	  whilst holding down page down etc. 
+ 
+QDocument
+
+	- implement me. Need MVC (*)
+
+qfont_loader
+
+	- use lyxrc, check for failure, implement available()
+	- fix usage outside of qt2/ (frontends/font_laoder.h)
+ 
+qfont_metrics
+
+	- per char ascent/descent
+ 
+QForks
+
+	- don't implement me
+ 
+QGraphics
+	
+	- UI cleanups. Maybe not vital
+ 
+QInclude
+
+	- check no load stuff works ?
+
+qlkey
+
+	- finish off the lists
+ 
+QLPainter
+
+	- work out why buttons look ugly and fix
+	- check ::arc() works
+	- implement ::image + image loader grfx stuff etc. (*)(*)
+
+QLyXKeySym
+
+	- isOK() - meaningful or not ?
+	- getISOEncoded - get this to work (*)
+	 
+QMiniBuffer
+
+	- implement as a QStatusBar and a separate QToolbar containing a QComboBox (*)
+	- make the necessary GUII API changes for this to work (*)
+
+QParagraph
+
+	- implement me (MVCed already) (*)
+
+QPreferences
+
+	- implement me (*)
+ 
+QRef
+
+	- need buffer combo
+
+QSendTo
+
+	- implement me
+ 
+QShowInfo
+
+	- dunno about this one
+ 
+QTabular
+
+	- implement me (need MVC) (*)
+ 
+QTexinfo
+
+	- fix "View" when path not shown
+
+QWorkArea
+
+	- clipboard code missing
+
+QtView
+
+	- decide what to do about prohibit/allowInput 
+	- fix show() 
+	- remove redraw() and others
+	- add minibuffer
+	- add autosave timeout
+
+ 
+Toolbar_pimpl (variously maybe *)
+
+	- mathed symbols
+	- activate/deactivate
+	- openLayoutList() (?)
+	- ::set() ???
+	- push() ??
+	- tooltips

src/frontends/qt2/Toolbar_pimpl.C

@@ -90,7 +90,7 @@ string const getPixmap(int action)
 } // namespace anon
 
  
-Toolbar::Pimpl::Pimpl(LyXView * o, int, int)
+Toolbar::Pimpl::Pimpl(LyXView * o, Dialogs &, int, int)
 	: owner_(static_cast<QtView *>(o)), 
 	combo_(0)
 {
@@ -158,8 +158,8 @@ void Toolbar::Pimpl::changed_layout(string const & sel)
 	LyXTextClass::const_iterator end = tc.end();
 	for (LyXTextClass::const_iterator cit = tc.begin();
 	     cit != end; ++cit) {
-		if (_(cit->name()) == sel) {
-			owner_->getLyXFunc()->dispatch(LFUN_LAYOUT, cit->name());
+		if (_((*cit)->name()) == sel) {
+			owner_->getLyXFunc()->dispatch(LFUN_LAYOUT, (*cit)->name());
 			return;
 		}
 	}
@@ -173,7 +173,7 @@ void Toolbar::Pimpl::setLayout(string const & layout)
 	LyXTextClass const & tc =
 		textclasslist[owner_->buffer()->params.textclass];
  
-	string const & name = _(tc[layout].name());
+	string const & name = _(tc[layout]->name());
  
 	int i;
  
@@ -209,8 +209,8 @@ void Toolbar::Pimpl::updateLayoutList(bool force)
 	LyXTextClass::const_iterator end = tc.end();
 	for (; cit != end; ++cit) {
 		// ignore obsolete entries
-		if (cit->obsoleted_by().empty())
-			combo_->insertItem(_(cit->name()).c_str());
+		if ((*cit)->obsoleted_by().empty())
+			combo_->insertItem(_((*cit)->name()).c_str());
 	}
 
 	// needed to recalculate size hint

src/frontends/qt2/Toolbar_pimpl.h

@@ -37,7 +37,7 @@ struct Toolbar::Pimpl {
  
 public:
 	///
-	Pimpl(LyXView * o, int x, int y);
+	Pimpl(LyXView * o, Dialogs &, int x, int y);
 	///
 	~Pimpl();
 	

src/frontends/qt2/lyx_gui.C

@@ -111,3 +111,10 @@ void lyx_gui::init_graphics()
 {
 	// FIXME
 }
+
+
+string const lyx_gui::hexname(LColor::color col)
+{
+	// FIXME
+	return "";
+}