From 4136852121f408f1b5eb074a86d47e7f83af2a86 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sun, 5 Jul 2009 03:08:56 +0000 Subject: [PATCH] 2009-07-04 20:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/hbqt/hbqt.ch * harbour/contrib/hbqt/hbqt_slots.h * harbour/contrib/hbqt/hbqt_slots.cpp * harbour/contrib/hbqt/moc_slots.cpp * harbour/contrib/hbqt/hbqt_qicon.cpp * harbour/contrib/hbqt/hbqt_qpixmap.cpp * harbour/contrib/hbqt/TQPixmap.prg * harbour/contrib/hbqt/qth/QIcon.qth * harbour/contrib/hbqt/qth/QPixmap.qth ! Constructors redefined. + Added more constants and event handlers. --- harbour/ChangeLog | 15 +++ harbour/contrib/hbqt/TQPixmap.prg | 4 +- harbour/contrib/hbqt/hbqt.ch | 84 +++++++++++++ harbour/contrib/hbqt/hbqt_qicon.cpp | 9 +- harbour/contrib/hbqt/hbqt_qpixmap.cpp | 21 +++- harbour/contrib/hbqt/hbqt_slots.cpp | 165 +++++++++++++++++++++----- harbour/contrib/hbqt/hbqt_slots.h | 13 +- harbour/contrib/hbqt/moc_slots.cpp | 35 +++++- harbour/contrib/hbqt/qth/QIcon.qth | 9 +- harbour/contrib/hbqt/qth/QPixmap.qth | 19 ++- 10 files changed, 326 insertions(+), 48 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a53f3354fb..0f9ba60163 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-04 20:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * harbour/contrib/hbqt/hbqt.ch + * harbour/contrib/hbqt/hbqt_slots.h + * harbour/contrib/hbqt/hbqt_slots.cpp + * harbour/contrib/hbqt/moc_slots.cpp + + * harbour/contrib/hbqt/hbqt_qicon.cpp + * harbour/contrib/hbqt/hbqt_qpixmap.cpp + * harbour/contrib/hbqt/TQPixmap.prg + + * harbour/contrib/hbqt/qth/QIcon.qth + * harbour/contrib/hbqt/qth/QPixmap.qth + ! Constructors redefined. + + Added more constants and event handlers. + 2009-07-04 19:16 UTC+0600 April White (april users.sourceforge.net) * contrib/hbbtree/test.prg + erase all target files diff --git a/harbour/contrib/hbqt/TQPixmap.prg b/harbour/contrib/hbqt/TQPixmap.prg index 220d6b6bb7..2b74630731 100644 --- a/harbour/contrib/hbqt/TQPixmap.prg +++ b/harbour/contrib/hbqt/TQPixmap.prg @@ -86,8 +86,8 @@ CREATE CLASS QPixmap INHERIT QPaintDevice METHOD rect() INLINE Qt_QPixmap_rect( ::pPtr ) METHOD save( cFileName, pFormat, nQuality ) INLINE Qt_QPixmap_save( ::pPtr, cFileName, pFormat, nQuality ) METHOD save_1( pDevice, pFormat, nQuality ) INLINE Qt_QPixmap_save_1( ::pPtr, pDevice, pFormat, nQuality ) - METHOD scaled( pSize, nAspectRatioMode, nTransformMode ) INLINE Qt_QPixmap_scaled( ::pPtr, pSize, nAspectRatioMode, nTransformMode ) - METHOD scaled_1( nWidth, nHeight, nAspectRatioMode, nTransformMode ) INLINE Qt_QPixmap_scaled_1( ::pPtr, nWidth, nHeight, nAspectRatioMode, nTransformMode ) + METHOD scaled( nWidth, nHeight, nAspectRatioMode, nTransformMode ) INLINE Qt_QPixmap_scaled( ::pPtr, nWidth, nHeight, nAspectRatioMode, nTransformMode ) + METHOD scaled_1( pSize, nAspectRatioMode, nTransformMode ) INLINE Qt_QPixmap_scaled_1( ::pPtr, pSize, nAspectRatioMode, nTransformMode ) METHOD scaledToHeight( nHeight, nMode ) INLINE Qt_QPixmap_scaledToHeight( ::pPtr, nHeight, nMode ) METHOD scaledToWidth( nWidth, nMode ) INLINE Qt_QPixmap_scaledToWidth( ::pPtr, nWidth, nMode ) METHOD setAlphaChannel( pAlphaChannel ) INLINE Qt_QPixmap_setAlphaChannel( ::pPtr, pAlphaChannel ) diff --git a/harbour/contrib/hbqt/hbqt.ch b/harbour/contrib/hbqt/hbqt.ch index d67be087c4..3a80a0d658 100644 --- a/harbour/contrib/hbqt/hbqt.ch +++ b/harbour/contrib/hbqt/hbqt.ch @@ -1531,6 +1531,90 @@ #define QWebPage_WebBrowserWindow 0 // The window is a regular web browser window. #define QWebPage_WebModalDialog 1 // The window acts as modal dialog. + +#define QStyle_SP_TitleBarMinButton 1 // Minimize button on title bars (e.g., in QWorkspace). +#define QStyle_SP_TitleBarMenuButton 0 // Menu button on a title bar. +#define QStyle_SP_TitleBarMaxButton 2 // Maximize button on title bars. +#define QStyle_SP_TitleBarCloseButton 3 // Close button on title bars. +#define QStyle_SP_TitleBarNormalButton 4 // Normal (restore) button on title bars. +#define QStyle_SP_TitleBarShadeButton 5 // Shade button on title bars. +#define QStyle_SP_TitleBarUnshadeButton 6 // Unshade button on title bars. +#define QStyle_SP_TitleBarContextHelpButton 7 // The Context help button on title bars. +#define QStyle_SP_MessageBoxInformation 9 // The "information" icon. +#define QStyle_SP_MessageBoxWarning 10 // The "warning" icon. +#define QStyle_SP_MessageBoxCritical 11 // The "critical" icon. +#define QStyle_SP_MessageBoxQuestion 12 // The "question" icon. +#define QStyle_SP_DesktopIcon 13 // The "desktop" icon. +#define QStyle_SP_TrashIcon 14 // The "trash" icon. +#define QStyle_SP_ComputerIcon 15 // The "My computer" icon. +#define QStyle_SP_DriveFDIcon 16 // The floppy icon. +#define QStyle_SP_DriveHDIcon 17 // The harddrive icon. +#define QStyle_SP_DriveCDIcon 18 // The CD icon. +#define QStyle_SP_DriveDVDIcon 19 // The DVD icon. +#define QStyle_SP_DriveNetIcon 20 // The network icon. +#define QStyle_SP_DirHomeIcon 55 // The home directory icon. +#define QStyle_SP_DirOpenIcon 21 // The open directory icon. +#define QStyle_SP_DirClosedIcon 22 // The closed directory icon. +#define QStyle_SP_DirIcon 37 // The directory icon. +#define QStyle_SP_DirLinkIcon 23 // The link to directory icon. +#define QStyle_SP_FileIcon 24 // The file icon. +#define QStyle_SP_FileLinkIcon 25 // The link to file icon. +#define QStyle_SP_FileDialogStart 28 // The "start" icon in a file dialog. +#define QStyle_SP_FileDialogEnd 29 // The "end" icon in a file dialog. +#define QStyle_SP_FileDialogToParent 30 // The "parent directory" icon in a file dialog. +#define QStyle_SP_FileDialogNewFolder 31 // The "create new folder" icon in a file dialog. +#define QStyle_SP_FileDialogDetailedView 32 // The detailed view icon in a file dialog. +#define QStyle_SP_FileDialogInfoView 33 // The file info icon in a file dialog. +#define QStyle_SP_FileDialogContentsView 34 // The contents view icon in a file dialog. +#define QStyle_SP_FileDialogListView 35 // The list view icon in a file dialog. +#define QStyle_SP_FileDialogBack 36 // The back arrow in a file dialog. +#define QStyle_SP_DockWidgetCloseButton 8 // Close button on dock windows (see also QDockWidget). +#define QStyle_SP_ToolBarHorizontalExtensionButton 26 // Extension button for horizontal toolbars. +#define QStyle_SP_ToolBarVerticalExtensionButton 27 // Extension button for vertical toolbars. +#define QStyle_SP_DialogOkButton 38 // Icon for a standard OK button in a QDialogButtonBox. +#define QStyle_SP_DialogCancelButton 39 // Icon for a standard Cancel button in a QDialogButtonBox. +#define QStyle_SP_DialogHelpButton 40 // Icon for a standard Help button in a QDialogButtonBox. +#define QStyle_SP_DialogOpenButton 41 // Icon for a standard Open button in a QDialogButtonBox. +#define QStyle_SP_DialogSaveButton 42 // Icon for a standard Save button in a QDialogButtonBox. +#define QStyle_SP_DialogCloseButton 43 // Icon for a standard Close button in a QDialogButtonBox. +#define QStyle_SP_DialogApplyButton 44 // Icon for a standard Apply button in a QDialogButtonBox. +#define QStyle_SP_DialogResetButton 45 // Icon for a standard Reset button in a QDialogButtonBox. +#define QStyle_SP_DialogDiscardButton 46 // Icon for a standard Discard button in a QDialogButtonBox. +#define QStyle_SP_DialogYesButton 47 // Icon for a standard Yes button in a QDialogButtonBox. +#define QStyle_SP_DialogNoButton 48 // Icon for a standard No button in a QDialogButtonBox. +#define QStyle_SP_ArrowUp 49 // Icon arrow pointing up. +#define QStyle_SP_ArrowDown 50 // Icon arrow pointing down. +#define QStyle_SP_ArrowLeft 51 // Icon arrow pointing left. +#define QStyle_SP_ArrowRight 52 // Icon arrow pointing right. +#define QStyle_SP_ArrowBack 53 // Equivalent to SP_ArrowLeft when the current layout direction is Qt::LeftToRight, otherwise SP_ArrowRight. +#define QStyle_SP_ArrowForward 54 // Equivalent to SP_ArrowRight when the current layout direction is Qt::LeftToRight, otherwise SP_ArrowLeft. +#define QStyle_SP_CommandLink 56 // Icon used to indicate a Vista style command link glyph. +#define QStyle_SP_VistaShield 57 // Icon used to indicate UAC prompts on Windows Vista. This will return a null pixmap or icon on all other platforms. +#define QStyle_SP_BrowserReload 58 // Icon indicating that the current page should be reloaded. +#define QStyle_SP_BrowserStop 59 // Icon indicating that the page loading should stop. +#define QStyle_SP_MediaPlay 60 // Icon indicating that media should begin playback. +#define QStyle_SP_MediaStop 61 // Icon indicating that media should stop playback. +#define QStyle_SP_MediaPause 62 // Icon indicating that media should pause playback. +#define QStyle_SP_MediaSkipForward 63 // Icon indicating that media should skip forward. +#define QStyle_SP_MediaSkipBackward 64 // Icon indicating that media should skip backward. +#define QStyle_SP_MediaSeekForward 65 // Icon indicating that media should seek forward. +#define QStyle_SP_MediaSeekBackward 66 // Icon indicating that media should seek backward. +#define QStyle_SP_MediaVolume 67 // Icon indicating a volume control. +#define QStyle_SP_MediaVolumeMuted 68 // Icon indicating a muted volume control. +#define QStyle_SP_CustomBase 0xf0000000 // Base value for custom standard pixmaps; custom values must be greater than this value. + + +#define QIcon_Normal 0 // Display the pixmap when the user is not interacting with the icon, but the functionality represented by the icon is available. +#define QIcon_Disabled 1 // Display the pixmap when the functionality represented by the icon is not available. +#define QIcon_Active 2 // Display the pixmap when the functionality represented by the icon is available and the user is interacting with the icon, for example, moving the mouse over it or clicking it. +#define QIcon_Selected 3 // Display the pixmap when the item represented by the icon is selected. + +//enum #define QIcon_State +//This enum describes the state for which a pixmap is intended to be used. The state can be: +// +#define QIcon_On 0 // Display the pixmap when the widget is in an "on" state +#define QIcon_Off 1 // Display the pixmap when the widget is in an "off" state + /*----------------------------------------------------------------------*/ #define _HBQT_CH diff --git a/harbour/contrib/hbqt/hbqt_qicon.cpp b/harbour/contrib/hbqt/hbqt_qicon.cpp index ec5287e61f..5ae7a6db62 100644 --- a/harbour/contrib/hbqt/hbqt_qicon.cpp +++ b/harbour/contrib/hbqt/hbqt_qicon.cpp @@ -83,7 +83,14 @@ */ HB_FUNC( QT_QICON ) { - hb_retptr( ( QIcon* ) new QIcon() ); + if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) + { + hb_retptr( ( QIcon* ) new QIcon( hbqt_par_QString( 1 ) ) ); + } + else + { + hb_retptr( ( QIcon* ) new QIcon() ); + } } /* diff --git a/harbour/contrib/hbqt/hbqt_qpixmap.cpp b/harbour/contrib/hbqt/hbqt_qpixmap.cpp index 4cab95c6b5..bffa476d75 100644 --- a/harbour/contrib/hbqt/hbqt_qpixmap.cpp +++ b/harbour/contrib/hbqt/hbqt_qpixmap.cpp @@ -74,7 +74,18 @@ */ HB_FUNC( QT_QPIXMAP ) { - hb_retptr( ( QPixmap* ) new QPixmap() ); + if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) + { + hb_retptr( ( QPixmap* ) new QPixmap( hbqt_par_QString( 1 ), ( const char * ) 0, Qt::AutoColor ) ); + } + else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) + { + hb_retptr( ( QPixmap* ) new QPixmap( *hbqt_par_QPixmap( 1 ) ) ); + } + else + { + hb_retptr( ( QPixmap* ) new QPixmap() ); + } } /* @@ -262,19 +273,19 @@ HB_FUNC( QT_QPIXMAP_SAVE_1 ) } /* - * QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + * QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const */ HB_FUNC( QT_QPIXMAP_SCALED ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* - * QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + * QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const */ HB_FUNC( QT_QPIXMAP_SCALED_1 ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/hbqt_slots.cpp b/harbour/contrib/hbqt/hbqt_slots.cpp index d24825da69..1ba783a528 100644 --- a/harbour/contrib/hbqt/hbqt_slots.cpp +++ b/harbour/contrib/hbqt/hbqt_slots.cpp @@ -295,6 +295,38 @@ static void SlotsExecUrl( QWidget* widget, char* event, const QUrl & url ) } } +static void SlotsExecFont( QWidget* widget, char* event, const QFont & font ) +{ + if( widget ) + { + int i = widget->property( event ).toInt(); + if( ( i > 0 ) && ( s_s->listActv.at( i - 1 ) == true ) ) + { + PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget* ) widget ); + PHB_ITEM p1 = hb_itemPutPtr( NULL, new QFont( font ) ); + hb_vmEvalBlockV( ( PHB_ITEM ) s_s->listBlock.at( i - 1 ), 2, pWidget, p1 ); + hb_itemRelease( pWidget ); + hb_itemRelease( p1 ); + } + } +} + +static void SlotsExecStringList( QWidget* widget, char* event, const QStringList & stringList ) +{ + if( widget ) + { + int i = widget->property( event ).toInt(); + if( ( i > 0 ) && ( s_s->listActv.at( i - 1 ) == true ) ) + { + PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget* ) widget ); + PHB_ITEM p1 = hb_itemPutPtr( NULL, new QStringList( stringList ) ); + hb_vmEvalBlockV( ( PHB_ITEM ) s_s->listBlock.at( i - 1 ), 2, pWidget, p1 ); + hb_itemRelease( pWidget ); + hb_itemRelease( p1 ); + } + } +} + static void SlotsExecNetworkRequest( QWidget* widget, char* event, const QNetworkRequest & request ) { if( widget ) @@ -765,7 +797,57 @@ void Slots::urlChanged( const QUrl & url ) QWidget *object = qobject_cast( sender() ); SlotsExecUrl( object, ( char* ) "urlChanged(QUrl)", url ); } - +/* QDialog (s)*/ +void Slots::currentFontChanged( const QFont & font ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecFont( oWidget, ( char* ) "currentFontChanged(QFont)", font ); +} +void Slots::fontSelected( const QFont & font ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecFont( oWidget, ( char* ) "fontSelected(QFont)", font ); +} +void Slots::accepted() +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExec( oWidget, ( char* ) "accepted()" ); +} +void Slots::finished( int result ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecInt( oWidget, ( char* ) "finished(int)", result ); +} +void Slots::rejected() +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExec( oWidget, ( char* ) "rejected()" ); +} +void Slots::currentChanged( const QString & path ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecString( oWidget, ( char* ) "currentChanged(QString)", path ); +} +void Slots::directoryEntered( const QString & directory ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecString( oWidget, ( char* ) "directoryEntered(QString)", directory ); +} +void Slots::fileSelected( const QString & file ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecString( oWidget, ( char* ) "fileSelected(QString)", file ); +} +void Slots::filesSelected( const QStringList & selected ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecStringList( oWidget, ( char* ) "filesSelected(QStringList)", selected ); +} +void Slots::filterSelected( const QString & filter ) +{ + QWidget *oWidget = qobject_cast( sender() ); + SlotsExecString( oWidget, ( char* ) "filterSelected(QString)", filter ); +} /* @@ -997,36 +1079,6 @@ HB_FUNC( QT_CONNECT_SIGNAL ) ret = widget->connect( widget, SIGNAL( urlChanged( const QUrl & ) ), s_s, SLOT( urlChanged( const QUrl & ) ), Qt::AutoConnection ); } - -#if 0 -"iconChanged()" -"titleChanged(QString)" -"urlChanged(QUrl)" - -"contentsChanged()" -"databaseQuotaExceeded(QWebFrame,QString)" -"downloadRequested(QNetworkRequest)" -"frameCreated(QWebFrame)" -"geometryChangeRequested(QRect)" -"linkClicked(QUrl)" -"linkHovered(QString,QString,QString)" -"loadFinished(bool)" -"loadProgress(int)" -"loadStarted()" -"menuBarVisibilityChangeRequested(bool)" -"microFocusChanged()" -"printRequested(QWebFrame)" -"repaintRequested(QRect)" -"restoreFrameStateRequested(QWebFrame)" -"saveFrameStateRequested(QWebFrame,QWebHistoryItem)" -"scrollRequested(int,int,QRect)" -"statusBarMessage(QString)" -"statusBarVisibilityChangeRequested(bool)" -"toolBarVisibilityChangeRequested(bool)" -"unsupportedContent(QNetworkReply)" -"windowCloseRequested()" - -#endif /* QWebPage */ if( signal == ( QString ) "contentsChanged()" ) { @@ -1138,6 +1190,57 @@ HB_FUNC( QT_CONNECT_SIGNAL ) ret = widget->connect( widget, SIGNAL( windowCloseRequested() ), s_s, SLOT( windowCloseRequested() ), Qt::AutoConnection ); } + /* QDialog (s) QFontDialog, QFileDialog */ + if( signal == ( QString ) "currentFontChanged(QFont)" ) + { + ret = widget->connect( widget, SIGNAL( currentFontChanged( const QFont & ) ), + s_s, SLOT( currentFontChanged( const QFont & ) ), Qt::AutoConnection ); + } + if( signal == ( QString ) "fontSelected(QFont)" ) + { + ret = widget->connect( widget, SIGNAL( fontSelected( const QFont & ) ), + s_s, SLOT( fontSelected( const QFont & ) ), Qt::AutoConnection ); + } + if( signal == ( QString ) "accepted()" ) + { + ret = widget->connect( widget, SIGNAL( accepted() ), + s_s, SLOT( accepted() ), Qt::AutoConnection ); + } + if( signal == ( QString ) "finished(int)" ) + { + ret = widget->connect( widget, SIGNAL( finished( int ) ), + s_s, SLOT( finished( int ) ), Qt::AutoConnection ); + } + if( signal == ( QString ) "rejected()" ) + { + ret = widget->connect( widget, SIGNAL( rejected() ), + s_s, SLOT( rejected() ), Qt::AutoConnection ); + } + if( signal == ( QString ) "currentChanged(QString)" ) + { + ret = widget->connect( widget, SIGNAL( currentChanged( const QString & ) ), + s_s, SLOT( currentChanged( const QString & ) ), Qt::AutoConnection ); + } + if( signal == ( QString ) "directoryEntered(QString)" ) + { + ret = widget->connect( widget, SIGNAL( directoryEntered( const QString & ) ), + s_s, SLOT( directoryEntered( const QString & ) ), Qt::AutoConnection ); + } + if( signal == ( QString ) "fileSelected(QString)" ) + { + ret = widget->connect( widget, SIGNAL( fileSelected( const QString & ) ), + s_s, SLOT( fileSelected( const QString & ) ), Qt::AutoConnection ); + } + if( signal == ( QString ) "filesSelected(QStringList)" ) + { + ret = widget->connect( widget, SIGNAL( filesSelected( const QStringList & ) ), + s_s, SLOT( filesSelected( const QStringList & ) ), Qt::AutoConnection ); + } + if( signal == ( QString ) "filterSelected(QString)" ) + { + ret = widget->connect( widget, SIGNAL( filterSelected( const QString & ) ), + s_s, SLOT( filterSelected( const QString & ) ), Qt::AutoConnection ); + } hb_retl( ret ); diff --git a/harbour/contrib/hbqt/hbqt_slots.h b/harbour/contrib/hbqt/hbqt_slots.h index 392957fed0..d03048dd03 100644 --- a/harbour/contrib/hbqt/hbqt_slots.h +++ b/harbour/contrib/hbqt/hbqt_slots.h @@ -186,6 +186,17 @@ public slots: void iconChanged(); void titleChanged( const QString & title ); void urlChanged( const QUrl & url ); + /* QDialog - QFontDialog QFileDialog */ + void currentFontChanged( const QFont & font ); + void fontSelected( const QFont & font ); + void accepted(); + void finished( int result ); + void rejected(); + void currentChanged( const QString & path ); + void directoryEntered( const QString & directory ); + void fileSelected( const QString & file ); + void filesSelected( const QStringList & selected ); + void filterSelected( const QString & filter ); }; class Events: public QObject @@ -205,5 +216,3 @@ protected: /*----------------------------------------------------------------------*/ #endif - - diff --git a/harbour/contrib/hbqt/moc_slots.cpp b/harbour/contrib/hbqt/moc_slots.cpp index e59993d8f3..fc76eca06b 100644 --- a/harbour/contrib/hbqt/moc_slots.cpp +++ b/harbour/contrib/hbqt/moc_slots.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'hbqt_slots.h' ** -** Created: Wed Jul 1 01:16:08 2009 +** Created: Fri Jul 3 16:24:08 2009 ** by: The Qt Meta Object Compiler version 61 (Qt 4.5.0) ** ** WARNING! All changes made in this file will be lost! @@ -137,7 +137,7 @@ static const uint qt_meta_data_Slots[] = { 2, // revision 0, // classname 0, 0, // classinfo - 65, 12, // methods + 75, 12, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -208,6 +208,16 @@ static const uint qt_meta_data_Slots[] = { 1800, 6, 6, 6, 0x0a, 1820, 1814, 6, 6, 0x0a, 1842, 1204, 6, 6, 0x0a, + 1864, 1859, 6, 6, 0x0a, + 1890, 1859, 6, 6, 0x0a, + 1910, 6, 6, 6, 0x0a, + 1928, 1921, 6, 6, 0x0a, + 1942, 6, 6, 6, 0x0a, + 1958, 1953, 6, 6, 0x0a, + 1992, 1982, 6, 6, 0x0a, + 2023, 2018, 6, 6, 0x0a, + 2054, 2045, 6, 6, 0x0a, + 2088, 2081, 6, 6, 0x0a, 0 // eod }; @@ -263,7 +273,14 @@ static const char qt_meta_stringdata_Slots[] = { "reply\0unsupportedContent(QNetworkReply*)\0" "windowCloseRequested()\0iconChanged()\0" "title\0titleChanged(QString)\0" - "urlChanged(QUrl)\0" + "urlChanged(QUrl)\0font\0currentFontChanged(QFont)\0" + "fontSelected(QFont)\0accepted()\0result\0" + "finished(int)\0rejected()\0path\0" + "currentChanged(QString)\0directory\0" + "directoryEntered(QString)\0file\0" + "fileSelected(QString)\0selected\0" + "filesSelected(QStringList)\0filter\0" + "filterSelected(QString)\0" }; const QMetaObject Slots::staticMetaObject = { @@ -356,9 +373,19 @@ int Slots::qt_metacall(QMetaObject::Call _c, int _id, void **_a) case 62: iconChanged(); break; case 63: titleChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break; case 64: urlChanged((*reinterpret_cast< const QUrl(*)>(_a[1]))); break; + case 65: currentFontChanged((*reinterpret_cast< const QFont(*)>(_a[1]))); break; + case 66: fontSelected((*reinterpret_cast< const QFont(*)>(_a[1]))); break; + case 67: accepted(); break; + case 68: finished((*reinterpret_cast< int(*)>(_a[1]))); break; + case 69: rejected(); break; + case 70: currentChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 71: directoryEntered((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 72: fileSelected((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 73: filesSelected((*reinterpret_cast< const QStringList(*)>(_a[1]))); break; + case 74: filterSelected((*reinterpret_cast< const QString(*)>(_a[1]))); break; default: ; } - _id -= 65; + _id -= 75; } return _id; } diff --git a/harbour/contrib/hbqt/qth/QIcon.qth b/harbour/contrib/hbqt/qth/QIcon.qth index 8a486b3de5..cb098be4a7 100644 --- a/harbour/contrib/hbqt/qth/QIcon.qth +++ b/harbour/contrib/hbqt/qth/QIcon.qth @@ -74,7 +74,14 @@ New = */ HB_FUNC( QT_QICON ) { - hb_retptr( ( QIcon* ) new QIcon() ); + if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) + { + hb_retptr( ( QIcon* ) new QIcon( hbqt_par_QString( 1 ) ) ); + } + else + { + hb_retptr( ( QIcon* ) new QIcon() ); + } } diff --git a/harbour/contrib/hbqt/qth/QPixmap.qth b/harbour/contrib/hbqt/qth/QPixmap.qth index 5f94f7d106..fa79bcd689 100644 --- a/harbour/contrib/hbqt/qth/QPixmap.qth +++ b/harbour/contrib/hbqt/qth/QPixmap.qth @@ -75,7 +75,18 @@ New = */ HB_FUNC( QT_QPIXMAP ) { - hb_retptr( ( QPixmap* ) new QPixmap() ); + if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) + { + hb_retptr( ( QPixmap* ) new QPixmap( hbqt_par_QString( 1 ), ( const char * ) 0, Qt::AutoColor ) ); + } + else if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) + { + hb_retptr( ( QPixmap* ) new QPixmap( *hbqt_par_QPixmap( 1 ) ) ); + } + else + { + hb_retptr( ( QPixmap* ) new QPixmap() ); + } } @@ -124,8 +135,12 @@ QBitmap mask () const QRect rect () const bool save ( const QString & fileName, const char * format = 0, int quality = -1 ) const bool save ( QIODevice * device, const char * format = 0, int quality = -1 ) const -QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const + +# Swapped QPixmap scaled ( int width, int height, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const +QPixmap scaled ( const QSize & size, Qt::AspectRatioMode aspectRatioMode = Qt::IgnoreAspectRatio, Qt::TransformationMode transformMode = Qt::FastTransformation ) const +# + QPixmap scaledToHeight ( int height, Qt::TransformationMode mode = Qt::FastTransformation ) const QPixmap scaledToWidth ( int width, Qt::TransformationMode mode = Qt::FastTransformation ) const void setAlphaChannel ( const QPixmap & alphaChannel )