support for Qt3

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3128 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2001-12-01 02:24:28 +00:00
parent c130d5dbfd
commit 3454ed1bc2
12 changed files with 2565 additions and 9 deletions

View File

@ -1,3 +1,20 @@
2001-12-01 Maks Orlovich <mo002j@mail.rochester.edu>
* moc/Makefile.am:
* Makefile.am:
* QBibtexDialog.C:
* QExternalDialog.C:
* QParagraphDialog.h:
* QPreambleDialog.C:
* emptytable.C:
* qttableview.C:
* qttableview.C:
* qttableview.h: fixes for Qt3
2001-12-01 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am: add Alert_pimpl.lo
2001-11-06 John Levon <moz@compsoc.man.ac.uk>
* Makefile.am: link in new DropDown.lo
@ -9,7 +26,7 @@
2001-10-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ui/moc/Makefile.am: remove unportable # at beginning of
declaration.
declaration.
* ui/Makefile.am:
* Makefile.am: remove extra DISTCLEANFILES declaration

View File

@ -20,6 +20,7 @@ libqt2_la_LIBADD = \
ui/moc/libqt2uimoc.la \
../controllers/ButtonControllerBase.lo \
../xforms/combox.lo \
../xforms/Alert_pimpl.lo \
../xforms/Color.lo \
../xforms/DropDown.lo \
../xforms/FormBaseDeprecated.lo \
@ -78,4 +79,6 @@ libqt2_la_SOURCES = \
emptytable.C \
emptytable.h \
lengthcombo.C \
lengthcombo.h
lengthcombo.h \
qttableview.h \
qttableview.C

View File

@ -10,6 +10,7 @@
#include <qpushbutton.h>
#include <qcombobox.h>
#include <qlistbox.h>
#include <qlineedit.h>
#include <qcheckbox.h>
#include <qfiledialog.h>

View File

@ -13,7 +13,7 @@
#include <qfiledialog.h>
#include <qcombobox.h>
#include <qtextview.h>
#include <qlineedit.h>
#include "gettext.h"
#include "QExternalDialog.h"

View File

@ -37,13 +37,13 @@ void QIndex::build_dialog()
void QIndex::update_contents()
{
dialog_->keywordED->setText(controller().params().getContents().c_str());
dialog_->keywordED->setText(controller().getContents().c_str());
}
void QIndex::apply()
{
controller().params().setContents(dialog_->keywordED->text().latin1());
controller().setContents(dialog_->keywordED->text().latin1());
}

View File

@ -15,6 +15,7 @@
#include "ui/QParagraphDialogBase.h"
#include "vspace.h"
#include "paragraph.h"
#include "layout.h"
class QParagraph;

View File

@ -60,7 +60,8 @@ void QPreambleDialog::editClicked()
if (editor.empty()) {
static string lastentry = "";
editor = QInputDialog::getText(
_("Enter editor program"), _("Editor"), lastentry.c_str()).latin1();
_("Enter editor program"), _("Editor"), QLineEdit::Normal,
lastentry.c_str()).latin1();
if (editor.empty())
return;
lastentry = editor;

View File

@ -15,7 +15,7 @@
const unsigned int cellsize = 20;
EmptyTable::EmptyTable(QWidget * parent, const char * name)
: QTableView(parent,name)
: QtTableView(parent,name)
{
setNumCols(5);
setNumRows(5);

View File

@ -10,13 +10,13 @@
#define EMPTYTABLE_H
#include <qpainter.h>
#include <qtableview.h>
#include "qttableview.h"
/**
* A simple widget for a quick "preview" in TabularCreateDialog.
* The user can drag on the widget to change the table dimensions.
*/
class EmptyTable : public QTableView {
class EmptyTable : public QtTableView {
Q_OBJECT
public:
EmptyTable(QWidget * parent = 0, const char * name = 0);

View File

@ -16,6 +16,7 @@ include ../Makefile.dialogs
libqt2moc_la_SOURCES := FileDialog_private_moc.C \
emptytable_moc.C \
lengthcombo_moc.C \
qttableview_moc.C \
Qt2Base_moc.C \
$(MOCDIALOGS)

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,251 @@
/**********************************************************************
** $Id: qttableview.h,v 1.1 2001/12/01 02:24:27 levon Exp $
**
** Definition of QtTableView class
**
** Created : 941115
**
** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
**
** This file contains a class moved out of the Qt GUI Toolkit API. It
** may be used, distributed and modified without limitation.
**
**********************************************************************/
#ifndef QTTABLEVIEW_H
#define QTTABLEVIEW_H
#ifndef QT_H
#include "qframe.h"
#endif // QT_H
#ifndef QT_NO_QTTABLEVIEW
class QScrollBar;
class QCornerSquare;
class QtTableView : public QFrame
{
Q_OBJECT
public:
virtual void setBackgroundColor( const QColor & );
virtual void setPalette( const QPalette & );
void show();
void repaint( bool erase=TRUE );
void repaint( int x, int y, int w, int h, bool erase=TRUE );
void repaint( const QRect &, bool erase=TRUE );
protected:
QtTableView( QWidget *parent=0, const char *name=0, WFlags f=0 );
~QtTableView();
int numRows() const;
virtual void setNumRows( int );
int numCols() const;
virtual void setNumCols( int );
int topCell() const;
virtual void setTopCell( int row );
int leftCell() const;
virtual void setLeftCell( int col );
virtual void setTopLeftCell( int row, int col );
int xOffset() const;
virtual void setXOffset( int );
int yOffset() const;
virtual void setYOffset( int );
virtual void setOffset( int x, int y, bool updateScrBars = TRUE );
virtual int cellWidth( int col );
virtual int cellHeight( int row );
int cellWidth() const;
int cellHeight() const;
virtual void setCellWidth( int );
virtual void setCellHeight( int );
virtual int totalWidth();
virtual int totalHeight();
uint tableFlags() const;
bool testTableFlags( uint f ) const;
virtual void setTableFlags( uint f );
void clearTableFlags( uint f = ~0 );
bool autoUpdate() const;
virtual void setAutoUpdate( bool );
void updateCell( int row, int column, bool erase=TRUE );
QRect cellUpdateRect() const;
QRect viewRect() const;
int lastRowVisible() const;
int lastColVisible() const;
bool rowIsVisible( int row ) const;
bool colIsVisible( int col ) const;
QScrollBar *verticalScrollBar() const;
QScrollBar *horizontalScrollBar() const;
private slots:
void horSbValue( int );
void horSbSliding( int );
void horSbSlidingDone();
void verSbValue( int );
void verSbSliding( int );
void verSbSlidingDone();
protected:
virtual void paintCell( QPainter *, int row, int col ) = 0;
virtual void setupPainter( QPainter * );
void paintEvent( QPaintEvent * );
void resizeEvent( QResizeEvent * );
int findRow( int yPos ) const;
int findCol( int xPos ) const;
bool rowYPos( int row, int *yPos ) const;
bool colXPos( int col, int *xPos ) const;
int maxXOffset();
int maxYOffset();
int maxColOffset();
int maxRowOffset();
int minViewX() const;
int minViewY() const;
int maxViewX() const;
int maxViewY() const;
int viewWidth() const;
int viewHeight() const;
void scroll( int xPixels, int yPixels );
void updateScrollBars();
void updateTableSize();
private:
void coverCornerSquare( bool );
void snapToGrid( bool horizontal, bool vertical );
virtual void setHorScrollBar( bool on, bool update = TRUE );
virtual void setVerScrollBar( bool on, bool update = TRUE );
void updateView();
int findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0,
bool goOutsideView = FALSE ) const;
int findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0,
bool goOutsideView = FALSE ) const;
int maxColsVisible() const;
void updateScrollBars( uint );
void updateFrameSize();
void doAutoScrollBars();
void showOrHideScrollBars();
int nRows;
int nCols;
int xOffs, yOffs;
int xCellOffs, yCellOffs;
short xCellDelta, yCellDelta;
short cellH, cellW;
uint eraseInPaint : 1;
uint verSliding : 1;
uint verSnappingOff : 1;
uint horSliding : 1;
uint horSnappingOff : 1;
uint coveringCornerSquare : 1;
uint sbDirty : 8;
uint inSbUpdate : 1;
uint tFlags;
QRect cellUpdateR;
QScrollBar *vScrollBar;
QScrollBar *hScrollBar;
QCornerSquare *cornerSquare;
private: // Disabled copy constructor and operator=
#if defined(Q_DISABLE_COPY)
QtTableView( const QtTableView & );
QtTableView &operator=( const QtTableView & );
#endif
};
const uint Tbl_vScrollBar = 0x00000001;
const uint Tbl_hScrollBar = 0x00000002;
const uint Tbl_autoVScrollBar = 0x00000004;
const uint Tbl_autoHScrollBar = 0x00000008;
const uint Tbl_autoScrollBars = 0x0000000C;
const uint Tbl_clipCellPainting = 0x00000100;
const uint Tbl_cutCellsV = 0x00000200;
const uint Tbl_cutCellsH = 0x00000400;
const uint Tbl_cutCells = 0x00000600;
const uint Tbl_scrollLastHCell = 0x00000800;
const uint Tbl_scrollLastVCell = 0x00001000;
const uint Tbl_scrollLastCell = 0x00001800;
const uint Tbl_smoothHScrolling = 0x00002000;
const uint Tbl_smoothVScrolling = 0x00004000;
const uint Tbl_smoothScrolling = 0x00006000;
const uint Tbl_snapToHGrid = 0x00008000;
const uint Tbl_snapToVGrid = 0x00010000;
const uint Tbl_snapToGrid = 0x00018000;
inline int QtTableView::numRows() const
{ return nRows; }
inline int QtTableView::numCols() const
{ return nCols; }
inline int QtTableView::topCell() const
{ return yCellOffs; }
inline int QtTableView::leftCell() const
{ return xCellOffs; }
inline int QtTableView::xOffset() const
{ return xOffs; }
inline int QtTableView::yOffset() const
{ return yOffs; }
inline int QtTableView::cellHeight() const
{ return cellH; }
inline int QtTableView::cellWidth() const
{ return cellW; }
inline uint QtTableView::tableFlags() const
{ return tFlags; }
inline bool QtTableView::testTableFlags( uint f ) const
{ return (tFlags & f) != 0; }
inline QRect QtTableView::cellUpdateRect() const
{ return cellUpdateR; }
inline bool QtTableView::autoUpdate() const
{ return isUpdatesEnabled(); }
inline void QtTableView::repaint( bool erase )
{ repaint( 0, 0, width(), height(), erase ); }
inline void QtTableView::repaint( const QRect &r, bool erase )
{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
inline void QtTableView::updateScrollBars()
{ updateScrollBars( 0 ); }
#endif // QT_NO_QTTABLEVIEW
#endif // QTTABLEVIEW_H