2011-04-11 17:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/hbqtgui.hbm
* contrib/hbqt/qtgui/hbqtgui.hbx
+ contrib/hbqt/qtgui/gtqtc.cpp
+ contrib/hbqt/qtgui/gtqtc.h
+ Reintroduced: half-cooked console implementation of hbQT.
This time it is targeted to provide a console widget inside
GUI MDI inetrface to run Clipper console code alongside GUI
controls.
DISCLAIMER: this is an effort and still don't know if I
will succeed or be failure. But if I do succeed,
it will allow the migration of existing Harbour
console applications to GUI world easily.
* contrib/hbxbp/xbpparthandler.prg
* contrib/hbxbp/xbpwindow.prg
! Fixed: error generated at after an owned XbpDialog() is deleted.
This commit is contained in:
@@ -16,6 +16,25 @@
|
||||
The license applies to all entries newer than 2009-04-28.
|
||||
*/
|
||||
|
||||
2011-04-11 17:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
|
||||
* contrib/hbqt/qtgui/hbqtgui.hbm
|
||||
* contrib/hbqt/qtgui/hbqtgui.hbx
|
||||
+ contrib/hbqt/qtgui/gtqtc.cpp
|
||||
+ contrib/hbqt/qtgui/gtqtc.h
|
||||
+ Reintroduced: half-cooked console implementation of hbQT.
|
||||
This time it is targeted to provide a console widget inside
|
||||
GUI MDI inetrface to run Clipper console code alongside GUI
|
||||
controls.
|
||||
|
||||
DISCLAIMER: this is an effort and still don't know if I
|
||||
will succeed or be failure. But if I do succeed,
|
||||
it will allow the migration of existing Harbour
|
||||
console applications to GUI world easily.
|
||||
|
||||
* contrib/hbxbp/xbpparthandler.prg
|
||||
* contrib/hbxbp/xbpwindow.prg
|
||||
! Fixed: error generated at after an owned XbpDialog() is deleted.
|
||||
|
||||
2011-04-11 15:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
|
||||
* contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
|
||||
! Minor.
|
||||
|
||||
2775
harbour/contrib/hbqt/qtgui/gtqtc.cpp
Normal file
2775
harbour/contrib/hbqt/qtgui/gtqtc.cpp
Normal file
File diff suppressed because it is too large
Load Diff
343
harbour/contrib/hbqt/qtgui/gtqtc.h
Normal file
343
harbour/contrib/hbqt/qtgui/gtqtc.h
Normal file
@@ -0,0 +1,343 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
*
|
||||
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
|
||||
* www - http://www.harbour-project.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this software; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||||
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
||||
*
|
||||
* As a special exception, the Harbour Project gives permission for
|
||||
* additional uses of the text contained in its release of Harbour.
|
||||
*
|
||||
* The exception is that, if you link the Harbour libraries with other
|
||||
* files to produce an executable, this does not by itself cause the
|
||||
* resulting executable to be covered by the GNU General Public License.
|
||||
* Your use of that executable is in no way restricted on account of
|
||||
* linking the Harbour library code into it.
|
||||
*
|
||||
* This exception does not however invalidate any other reasons why
|
||||
* the executable file might be covered by the GNU General Public License.
|
||||
*
|
||||
* This exception applies only to the code released by the Harbour
|
||||
* Project under the name Harbour. If you copy code from other
|
||||
* Harbour Project or Free Software Foundation releases into a copy of
|
||||
* Harbour, as the General Public License permits, the exception does
|
||||
* not apply to the code that you add in this way. To avoid misleading
|
||||
* anyone as to the status of such modified files, you must delete
|
||||
* this exception notice from them.
|
||||
*
|
||||
* If you write modifications of your own for Harbour, it is your choice
|
||||
* whether to permit this exception to apply to your modifications.
|
||||
* If you do not wish that, delete this exception notice.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef HB_QTC_H_
|
||||
|
||||
#define HB_QTC_H_
|
||||
|
||||
#define HB_GT_NAME QTC
|
||||
|
||||
#include <QtGui/QtGui>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QList>
|
||||
#include <QtGui/QApplication>
|
||||
#include <QtGui/QMainWindow>
|
||||
#include <QtGui/QDesktopWidget>
|
||||
#include <QtGui/QWidget>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPaintDevice>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <QtGui/QClipboard>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
#include "hbset.h"
|
||||
#include "hbgtcore.h"
|
||||
#include "hbapicdp.h"
|
||||
#include "hbapierr.h"
|
||||
#include "hbapiitm.h"
|
||||
#include "inkey.ch"
|
||||
#include "hbvm.h"
|
||||
#include "hbthread.h"
|
||||
|
||||
#define WVT_CHAR_QUEUE_SIZE 4096 // 128
|
||||
#define WVT_MAX_TITLE_SIZE 128
|
||||
#define WVT_MAX_ROWS 256
|
||||
#define WVT_MAX_COLS 256
|
||||
#define WVT_MAX_WINDOWS 256
|
||||
#define WVT_DEFAULT_ROWS 25
|
||||
#define WVT_DEFAULT_COLS 80
|
||||
#define WVT_DEFAULT_FONT_HEIGHT 20
|
||||
#define WVT_DEFAULT_FONT_WIDTH 10
|
||||
#define WVT_DEFAULT_FONT_NAME "Courier New"
|
||||
|
||||
#define QQRGB( r,g,b ) ( qRgb( r,g,b ) )
|
||||
|
||||
#define C_BLACK RGB( 0x0 ,0x0 ,0x0 )
|
||||
#define C_BLUE RGB( 0x0 ,0x0 ,0x85 )
|
||||
#define C_GREEN RGB( 0x0 ,0x85,0x0 )
|
||||
#define C_CYAN RGB( 0x0 ,0x85,0x85 )
|
||||
#define C_RED RGB( 0x85,0x0 ,0x0 )
|
||||
#define C_MAGENTA RGB( 0x85,0x0 ,0x85 )
|
||||
#define C_BROWN RGB( 0x85,0x85,0x0 )
|
||||
#define C_WHITE RGB( 0xC6,0xC6,0xC6 )
|
||||
#define C_LIGHT_GRAY RGB( 0x60,0x60,0x60 )
|
||||
#define C_BRIGHT_BLUE RGB( 0x00,0x00,0xFF )
|
||||
#define C_BRIGHT_GREEN RGB( 0x60,0xFF,0x60 )
|
||||
#define C_BRIGHT_CYAN RGB( 0x60,0xFF,0xFF )
|
||||
#define C_BRIGHT_RED RGB( 0xF8,0x00,0x26 )
|
||||
#define C_BRIGHT_MAGENTA RGB( 0xFF,0x60,0xFF )
|
||||
#define C_YELLOW RGB( 0xFF,0xFF,0x00 )
|
||||
#define C_BRIGHT_WHITE RGB( 0xFF,0xFF,0xFF )
|
||||
|
||||
#define BLACK QQRGB( 0x0 ,0x0 ,0x0 )
|
||||
#define BLUE QQRGB( 0x0 ,0x0 ,0x85 )
|
||||
#define GREEN QQRGB( 0x0 ,0x85,0x0 )
|
||||
#define CYAN QQRGB( 0x0 ,0x85,0x85 )
|
||||
#define RED QQRGB( 0x85,0x0 ,0x0 )
|
||||
#define MAGENTA QQRGB( 0x85,0x0 ,0x85 )
|
||||
#define BROWN QQRGB( 0x85,0x85,0x0 )
|
||||
#define WHITE QQRGB( 0xC6,0xC6,0xC6 )
|
||||
#define LIGHT_GRAY QQRGB( 0x60,0x60,0x60 )
|
||||
#define BRIGHT_BLUE QQRGB( 0x00,0x00,0xFF )
|
||||
#define BRIGHT_GREEN QQRGB( 0x60,0xFF,0x60 )
|
||||
#define BRIGHT_CYAN QQRGB( 0x60,0xFF,0xFF )
|
||||
#define BRIGHT_RED QQRGB( 0xF8,0x00,0x26 )
|
||||
#define BRIGHT_MAGENTA QQRGB( 0xFF,0x60,0xFF )
|
||||
#define YELLOW QQRGB( 0xFF,0xFF,0x00 )
|
||||
#define BRIGHT_WHITE QQRGB( 0xFF,0xFF,0xFF )
|
||||
|
||||
/* xHarbour compatible definitions */
|
||||
#if !defined( K_SH_LEFT )
|
||||
#define K_SH_LEFT K_LEFT /* Shift-Left == Left */
|
||||
#define K_SH_UP K_UP /* Shift-Up == Up */
|
||||
#define K_SH_RIGHT K_RIGHT /* Shift-Right == Right */
|
||||
#define K_SH_DOWN K_DOWN /* Shift-Down == Down */
|
||||
#define K_SH_INS K_INS /* Shift-Ins == Ins */
|
||||
#define K_SH_DEL K_DEL /* Shift-Del == Del */
|
||||
#define K_SH_HOME K_HOME /* Shift-Home == Home */
|
||||
#define K_SH_END K_END /* Shift-End == End */
|
||||
#define K_SH_PGUP K_PGUP /* Shift-PgUp == PgUp */
|
||||
#define K_SH_PGDN K_PGDN /* Shift-PgDn == PgDn */
|
||||
#define K_SH_RETURN K_RETURN /* Shift-Enter == Enter */
|
||||
#define K_SH_ENTER K_ENTER /* Shift-Enter == Enter */
|
||||
#endif
|
||||
|
||||
#ifndef WM_MOUSEWHEEL
|
||||
# define WM_MOUSEWHEEL 0x020A
|
||||
#endif
|
||||
#ifndef WM_ENTERSIZEMOVE
|
||||
# define WM_ENTERSIZEMOVE 561
|
||||
#endif
|
||||
#ifndef WM_EXITSIZEMOVE
|
||||
# define WM_EXITSIZEMOVE 562
|
||||
#endif
|
||||
|
||||
#ifndef SWP_DEFERERASE
|
||||
# define SWP_DEFERERASE 0x2000
|
||||
#endif
|
||||
#ifndef SW_NORMAL
|
||||
# define SW_NORMAL 1
|
||||
#endif
|
||||
#ifndef SC_MAXIMIZE
|
||||
# define SC_MAXIMIZE 0xF030
|
||||
#endif
|
||||
|
||||
#define SYS_EV_MARK 1000
|
||||
|
||||
void hb_ToOutDebug( const char * sTraceMsg, ... );
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
class MainWindow;
|
||||
|
||||
class DrawingArea : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
DrawingArea( QWidget *parent = 0 );
|
||||
virtual ~DrawingArea( void );
|
||||
|
||||
PHB_GT pGT;
|
||||
|
||||
void resetWindowSize( void );
|
||||
void redrawBuffer( const QRect & rect );
|
||||
|
||||
bool createCaret( int iWidth, int iHeight );
|
||||
void showCaret( void );
|
||||
void hideCaret( void );
|
||||
void setCaretPos( int iRow, int iCol );
|
||||
void destroyCaret();
|
||||
|
||||
void displayCell( int iRow, int iCol );
|
||||
void displayBlock( int iRow, int iCol );
|
||||
void resizeImage( const QSize &newSize );
|
||||
void drawBoxCharacter( QPainter *painter, USHORT usChar, BYTE bColor, int x, int y );
|
||||
void copyTextOnClipboard( void );
|
||||
void paintCopyOperation( void );
|
||||
|
||||
QImage *_image;
|
||||
QFont _qFont;
|
||||
|
||||
QRgb _COLORS[ 16 ];
|
||||
|
||||
int _fontHeight;
|
||||
int _fontWidth;
|
||||
int _fontAscent;
|
||||
|
||||
int _iROWS, _iCOLS;
|
||||
int _wndWidth, _wndHeight;
|
||||
|
||||
int _crtHeight;
|
||||
int _crtWidth;
|
||||
bool _bBlinking;
|
||||
int _crtLastRow;
|
||||
int _crtLastCol;
|
||||
|
||||
bool _bFirst;
|
||||
bool _bSizing;
|
||||
bool _bInvertRect;
|
||||
|
||||
bool _bCopying;
|
||||
QRect _rCopying;
|
||||
QRect _rCopyingP;
|
||||
|
||||
QBasicTimer *_basicTimer;
|
||||
|
||||
protected:
|
||||
void keyPressEvent( QKeyEvent *event );
|
||||
void keyReleaseEvent( QKeyEvent *event );
|
||||
void mousePressEvent( QMouseEvent *event );
|
||||
void mouseMoveEvent( QMouseEvent *event );
|
||||
void mouseReleaseEvent( QMouseEvent *event );
|
||||
void mouseDoubleClickEvent( QMouseEvent * event );
|
||||
void paintEvent( QPaintEvent *event );
|
||||
void resizeEvent( QResizeEvent *event );
|
||||
void wheelEvent( QWheelEvent *event );
|
||||
void timerEvent( QTimerEvent *event );
|
||||
void focusInEvent( QFocusEvent *event );
|
||||
void focusOutEvent( QFocusEvent *event );
|
||||
void moveEvent( QMoveEvent *event );
|
||||
bool event( QEvent *event );
|
||||
|
||||
};
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
class MainWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
MainWindow();
|
||||
virtual ~MainWindow();
|
||||
|
||||
DrawingArea *_drawingArea;
|
||||
PHB_GT pGT;
|
||||
|
||||
void setWindowSize( void );
|
||||
|
||||
protected:
|
||||
void closeEvent( QCloseEvent *event );
|
||||
|
||||
};
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
PHB_GT pGT; /* core GT pointer */
|
||||
int iHandle; /* window number */
|
||||
|
||||
QApplication *qApplctn;
|
||||
MainWindow *qWnd;
|
||||
QFont *qFont;
|
||||
QFont *qFontBox;
|
||||
QEventLoop *qEventLoop;
|
||||
|
||||
int iCmdShow;
|
||||
|
||||
USHORT ROWS; /* number of displayable rows in window */
|
||||
USHORT COLS; /* number of displayable columns in window */
|
||||
|
||||
bool CaretExist; /* TRUE if a caret has been created */
|
||||
bool CaretHidden; /* TRUE if a caret has been hiden */
|
||||
int CaretSize; /* Height of solid caret */
|
||||
int CaretWidth; /* Width of solid caret */
|
||||
|
||||
QPoint MousePos; /* the last mouse position */
|
||||
bool MouseMove; /* Flag to say whether to return mouse movement events */
|
||||
|
||||
int Keys[ WVT_CHAR_QUEUE_SIZE ]; /* Array to hold the characters & events */
|
||||
int keyPointerIn; /* Offset into key array for character to be placed */
|
||||
int keyPointerOut; /* Offset into key array of next character to read */
|
||||
int keyLast; /* last inkey code value in buffer */
|
||||
|
||||
QPoint PTEXTSIZE; /* size of the fixed width font */
|
||||
bool FixedFont; /* TRUE if current font is a fixed font */
|
||||
int FixedSize[ WVT_MAX_COLS ]; /* buffer for ExtTextOut() to emulate fixed pitch when Proportional font selected */
|
||||
int fontHeight; /* requested font height */
|
||||
int fontWidth; /* requested font width */
|
||||
int fontWeight; /* Bold level */
|
||||
int fontQuality; /* requested font quality */
|
||||
char fontFace[ WVT_MAX_COLS ]; /* requested font face name LF_FACESIZE #defined in wingdi.h */
|
||||
|
||||
bool fInit; /* logical variable indicating that window should be open */
|
||||
|
||||
PHB_CODEPAGE hostCDP; /* Host/HVM CodePage for unicode output translations */
|
||||
PHB_CODEPAGE inCDP; /* Host/HVM CodePage for unicode input translations */
|
||||
PHB_CODEPAGE boxCDP; /* CodePage for legacy drawing chars: IBM437 */
|
||||
|
||||
QIcon qIcon; /* Title Bar and Task List icon. Can be NULL. */
|
||||
bool bIconToFree; /* Do we need to free this icon when it's not NULL? */
|
||||
|
||||
int CodePage; /* Code page to use for display characters */
|
||||
bool AltF4Close; /* Can use Alt+F4 to close application */
|
||||
bool CenterWindow; /* True if window is to be Reset into centre of window */
|
||||
|
||||
bool bMaximized; /* Flag is set when window has been maximized */
|
||||
bool bBeingMarked; /* Flag to control DOS window like copy operation */
|
||||
bool bBeginMarked;
|
||||
|
||||
bool bResizable;
|
||||
bool bSelectCopy;
|
||||
char * pszSelectCopy;
|
||||
bool bClosable;
|
||||
|
||||
int ResizeMode; /* Sets the resizing mode either to FONT or ROWS */
|
||||
bool bResizing;
|
||||
bool bAlreadySizing;
|
||||
|
||||
#if !defined( UNICODE )
|
||||
BYTE keyTransTbl[ 256 ];
|
||||
BYTE chrTransTbl[ 256 ];
|
||||
#endif
|
||||
|
||||
} HB_GTWVT, * PHB_GTWVT;
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
|
||||
#endif /* HB_QTC_H_ */
|
||||
@@ -16,12 +16,14 @@ hbqt_hbqsyntaxhighlighter.cpp
|
||||
hbqt_hbqtableview.cpp
|
||||
hbqt_init.cpp
|
||||
hbqt_utils.cpp
|
||||
gtqtc.cpp
|
||||
|
||||
hbqt_hbqabstractitemmodel.h
|
||||
hbqt_hbqgraphicsscene.h
|
||||
hbqt_hbqplaintextedit.h
|
||||
hbqt_hbqsyntaxhighlighter.h
|
||||
hbqt_hbqtableview.h
|
||||
gtqtc.h
|
||||
|
||||
hbqt_errorsys.prg
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ DYNAMIC HBQTUI
|
||||
DYNAMIC HBQT_ERRORSYS
|
||||
DYNAMIC HBQT_QMAINWINDOW_RESTSETTINGS
|
||||
DYNAMIC HBQT_QMAINWINDOW_SAVESETTINGS
|
||||
DYNAMIC HB_GT_QTC
|
||||
DYNAMIC HB_HBQABSTRACTITEMMODEL
|
||||
DYNAMIC HB_HBQGRAPHICSITEM
|
||||
DYNAMIC HB_HBQGRAPHICSSCENE
|
||||
|
||||
@@ -91,6 +91,7 @@ CLASS XbpPartHandler
|
||||
METHOD childFromName( nNameId )
|
||||
METHOD childList()
|
||||
METHOD delChild( oXbp )
|
||||
METHOD delOwned( oXbp )
|
||||
METHOD setName( nNameId )
|
||||
METHOD setOwner( oOwner )
|
||||
METHOD setParent( oParent )
|
||||
@@ -127,6 +128,8 @@ METHOD create( oParent, oOwner ) CLASS XbpPartHandler
|
||||
::oParent := oParent
|
||||
::oOwner := oOwner
|
||||
|
||||
// DEFAULT ::oOwner TO ::oParent
|
||||
|
||||
IF hb_isObject( ::oOwner )
|
||||
::oOwner:addAsOwned( Self )
|
||||
ENDIF
|
||||
@@ -237,9 +240,20 @@ METHOD delChild( oXbp ) CLASS XbpPartHandler
|
||||
|
||||
n := ascan( ::aChildren, {|o| o == oXbp } )
|
||||
IF n > 0
|
||||
oXbp:oOwner:delOwned( oXbp )
|
||||
oXbp:destroy()
|
||||
adel( ::aChildren, n )
|
||||
asize( ::aChildren, len( ::aChildren )-1 )
|
||||
hb_adel( ::aChildren, n, .t. )
|
||||
endif
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD delOwned( oXbp ) CLASS XbpPartHandler
|
||||
LOCAL n
|
||||
|
||||
IF ( n := ascan( ::aOwned, {|o| o == oXbp } ) ) > 0
|
||||
hb_adel( ::aOwned, n, .t. )
|
||||
endif
|
||||
|
||||
RETURN Self
|
||||
|
||||
@@ -450,6 +450,10 @@ METHOD XbpWindow:destroy()
|
||||
|
||||
::aPresParams := NIL
|
||||
|
||||
IF !empty( ::oOwner )
|
||||
::oOwner:delOwned( Self ) /* Not a public function */
|
||||
ENDIF
|
||||
|
||||
::oParent := NIL
|
||||
::oOwner := NIL
|
||||
|
||||
|
||||
Reference in New Issue
Block a user