fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-09-15 20:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
+ contrib/hbqt/qtgui/hbqtgui.ch
  * contrib/hbqt/qtgui/hbqtgui.hbc
  * contrib/hbqt/qtgui/hbqtgui.hbp
  + contrib/hbqt/qtwebkit/hbqtwebkit.ch
  * contrib/hbqt/qtwebkit/hbqtwebkit.hbc
  * contrib/hbqt/qtwebkit/hbqtwebkit.hbp
  + contrib/hbqt/qtcore/hbqtcore.ch
  * contrib/hbqt/qtcore/hbqtcore.hbp
    + Monotlithic hbqt.ch split to per-component headers.

  - contrib/hbqt/hbqt.ch
    - Deleted. Please use hbqtcore.ch, hbqtgui.ch instead.
    ; INCOMPATIBLE.
    ; NOTE: hbqt.ch was automatically including hbtrace.ch,
            with per-component headers this is no longer true,
            so if you need it you have to include it explicitly.
    ; NOTE: QT_PTROF() compatibility macro has been removed.
            It was a dummy, so either remove it from your code
            or readd the macro locally until then.

  * contrib/hbqt/qtcore/hbqt.h
    * Changed 'type' form int to unsigned int.

  * contrib/gtwvg/tests/wvgqt.prg
    - Deleted obsolete macro.

  * contrib/hbqt/qtcore/hbqt_misc.prg
  * contrib/hbqt/hbqt_hbmk2_plugin.hbs
  * contrib/hbqt/qtgui/hbqt_errorsys.prg
  * contrib/hbqt/qtgui/THbQtUI.prg
  * contrib/hbqt/qtgui/qth/QColor.qth
  * contrib/hbqt/tests/demoqt.prg
  * contrib/hbqt/tests/testres.prg
  * contrib/hbqt/tests/dialogqt.prg
  * contrib/hbqt/tests/testbrow.prg
  * contrib/hbqt/tests/testqaim.prg
  * contrib/hbxbp/xbpappevent.prg
  * contrib/hbxbp/xbp.ch
  * contrib/hbxbp/xbpstatic.prg
  * contrib/hbxbp/hbpprocess.prg
  * contrib/hbide/hbqtoolbar.prg
  * contrib/hbide/idefindreplace.prg
  * contrib/hbide/ideedit.prg
  * contrib/hbide/idewizard.prg
  * contrib/hbide/hbqreportsmanager.prg
  * contrib/hbide/idefunctions.prg
  * contrib/hbide/idedict.prg
  * contrib/hbide/idethemes.prg
  * contrib/hbide/idesaveload.prg
  * contrib/hbide/idetools.prg
  * contrib/hbide/idedocwriter.prg
  * contrib/hbide/ideharbourhelp.prg
  * contrib/hbide/ideeditor.prg
  * contrib/hbide/ideprojmanager.prg
  * contrib/hbide/ideskeletons.prg
  * contrib/hbide/ideenviron.prg
  * contrib/hbide/idesources.prg
  * contrib/hbide/idehome.prg
  * contrib/hbide/ideshortcuts.prg
  * contrib/hbide/idebrowse.prg
  * contrib/hbide/idedocks.prg
    * Changed to #include hbqtcore.ch/hbqtgui.ch instead of hbqt.ch.

  * contrib/hbqt/qtgui/doc/en/class_qcolor.txt
    * Regenerated.

  ; Everything HBQT related shall be rebuilt.
This commit is contained in:
Viktor Szakats
2010-09-15 18:06:48 +00:00
parent 594fa03023
commit 37040fc4fc
47 changed files with 370 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
harbour/ChangeLog
View File

@@ -16,6 +16,75 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-09-15 20:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+ contrib/hbqt/qtgui/hbqtgui.ch
* contrib/hbqt/qtgui/hbqtgui.hbc
* contrib/hbqt/qtgui/hbqtgui.hbp
+ contrib/hbqt/qtwebkit/hbqtwebkit.ch
* contrib/hbqt/qtwebkit/hbqtwebkit.hbc
* contrib/hbqt/qtwebkit/hbqtwebkit.hbp
+ contrib/hbqt/qtcore/hbqtcore.ch
* contrib/hbqt/qtcore/hbqtcore.hbp
+ Monotlithic hbqt.ch split to per-component headers.
- contrib/hbqt/hbqt.ch
- Deleted. Please use hbqtcore.ch, hbqtgui.ch instead.
; INCOMPATIBLE.
; NOTE: hbqt.ch was automatically including hbtrace.ch,
with per-component headers this is no longer true,
so if you need it you have to include it explicitly.
; NOTE: QT_PTROF() compatibility macro has been removed.
It was a dummy, so either remove it from your code
or readd the macro locally until then.
* contrib/hbqt/qtcore/hbqt.h
* Changed 'type' form int to unsigned int.
* contrib/gtwvg/tests/wvgqt.prg
- Deleted obsolete macro.
* contrib/hbqt/qtcore/hbqt_misc.prg
* contrib/hbqt/hbqt_hbmk2_plugin.hbs
* contrib/hbqt/qtgui/hbqt_errorsys.prg
* contrib/hbqt/qtgui/THbQtUI.prg
* contrib/hbqt/qtgui/qth/QColor.qth
* contrib/hbqt/tests/demoqt.prg
* contrib/hbqt/tests/testres.prg
* contrib/hbqt/tests/dialogqt.prg
* contrib/hbqt/tests/testbrow.prg
* contrib/hbqt/tests/testqaim.prg
* contrib/hbxbp/xbpappevent.prg
* contrib/hbxbp/xbp.ch
* contrib/hbxbp/xbpstatic.prg
* contrib/hbxbp/hbpprocess.prg
* contrib/hbide/hbqtoolbar.prg
* contrib/hbide/idefindreplace.prg
* contrib/hbide/ideedit.prg
* contrib/hbide/idewizard.prg
* contrib/hbide/hbqreportsmanager.prg
* contrib/hbide/idefunctions.prg
* contrib/hbide/idedict.prg
* contrib/hbide/idethemes.prg
* contrib/hbide/idesaveload.prg
* contrib/hbide/idetools.prg
* contrib/hbide/idedocwriter.prg
* contrib/hbide/ideharbourhelp.prg
* contrib/hbide/ideeditor.prg
* contrib/hbide/ideprojmanager.prg
* contrib/hbide/ideskeletons.prg
* contrib/hbide/ideenviron.prg
* contrib/hbide/idesources.prg
* contrib/hbide/idehome.prg
* contrib/hbide/ideshortcuts.prg
* contrib/hbide/idebrowse.prg
* contrib/hbide/idedocks.prg
* Changed to #include hbqtcore.ch/hbqtgui.ch instead of hbqt.ch.
* contrib/hbqt/qtgui/doc/en/class_qcolor.txt
* Regenerated.
; Everything HBQT related shall be rebuilt.
2010-09-15 17:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/utils/hbqtgen.prg
+ Changed HBQT_TYPE_* constants to be crc32 hashes

7
harbour/contrib/gtwvg/tests/wvgqt.prg
View File

@@ -1,8 +1,8 @@
/*
* $Id$
*/
/*
/*
* Pritpal Bedi <bedipritpal@hotmail.com>
*/
/*----------------------------------------------------------------------*/
@@ -12,12 +12,11 @@
#include "wvtwin.ch"
#include "hbgtinfo.ch"
#include "hbgtwvg.ch"
#include "wvgparts.ch"
#include "wvgparts.ch"
/*----------------------------------------------------------------------*/
#ifdef __QT__
#define QT_PTROF( oObj ) ( oObj:pPtr )
INIT PROCEDURE Qt_Start()
qt_qapplication()
RETURN

3
harbour/contrib/hbide/hbqreportsmanager.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#define UNIT 0.1
@@ -2674,4 +2674,3 @@ METHOD HqrGraphicsItem:drawChart( qPainter, qRect )
RETURN Self
/*----------------------------------------------------------------------*/

3
harbour/contrib/hbide/hbqtoolbar.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/
@@ -295,4 +295,3 @@ METHOD HbqToolbar:setItemEnabled( cName, lEnabled )
RETURN lOldEnabled
/*----------------------------------------------------------------------*/

3
harbour/contrib/hbide/idebrowse.prg
View File

@@ -66,7 +66,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbide.ch"
#include "xbp.ch"
#include "appevent.ch"
@@ -2616,4 +2616,3 @@ METHOD IdeBrowse:exists()
RETURN .f.
/*----------------------------------------------------------------------*/

3
harbour/contrib/hbide/idedict.prg
View File

@@ -66,7 +66,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbide.ch"
#include "xbp.ch"
@@ -206,4 +206,3 @@ HB_TRACE( HB_TR_DEBUG, ::cBgColor, valtype( q_ ) )
RETURN Self
/*----------------------------------------------------------------------*/

3
harbour/contrib/hbide/idedocks.prg
View File

@@ -69,7 +69,7 @@
#include "hbclass.ch"
#include "xbp.ch"
#include "appevent.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/
@@ -1943,4 +1943,3 @@ METHOD IdeDocks:animateComponents( nMode )
RETURN Self
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idedocwriter.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/ideedit.prg
View File

@@ -66,7 +66,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbide.ch"
#include "xbp.ch"

3
harbour/contrib/hbide/ideeditor.prg
View File

@@ -66,7 +66,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbide.ch"
#include "xbp.ch"
#include "fileio.ch"
@@ -1934,4 +1934,3 @@ STATIC FUNCTION hbide_qtDesigner()
RETURN NIL
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/ideenviron.prg
View File

@@ -65,7 +65,7 @@
/*----------------------------------------------------------------------*/
#include "hbide.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "common.ch"
#include "hbclass.ch"

2
harbour/contrib/hbide/idefindreplace.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idefunctions.prg
View File

@@ -68,7 +68,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "xbp.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/ideharbourhelp.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idehome.prg
View File

@@ -68,7 +68,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "xbp.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

3
harbour/contrib/hbide/ideprojmanager.prg
View File

@@ -65,7 +65,7 @@
/*----------------------------------------------------------------------*/
#include "hbide.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "common.ch"
#include "hbclass.ch"
@@ -1672,4 +1672,3 @@ METHOD IdeProjManager:outputText( cText )
RETURN Self
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idesaveload.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/ideshortcuts.prg
View File

@@ -65,7 +65,7 @@
/*----------------------------------------------------------------------*/
#include "hbide.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "common.ch"
#include "hbclass.ch"
#include "appevent.ch"

2
harbour/contrib/hbide/ideskeletons.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idesources.prg
View File

@@ -66,7 +66,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbide.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idethemes.prg
View File

@@ -66,7 +66,7 @@
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbide.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idetools.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbide/idewizard.prg
View File

@@ -67,7 +67,7 @@
#include "hbide.ch"
#include "common.ch"
#include "hbclass.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs
View File

@@ -601,7 +601,7 @@ STATIC FUNCTION hbq_gen_ui_prg( cFile, cFuncName )
AAdd( aLinesPRG, "/* WARNING: Automatically generated source file. DO NOT EDIT! */" )
AAdd( aLinesPRG, "" )
AAdd( aLinesPRG, '#include "hbqt.ch"' )
AAdd( aLinesPRG, '#include "hbqtgui.ch"' )
AAdd( aLinesPRG, "" )
AAdd( aLinesPRG, "FUNCTION " + cFuncName + "( qParent )" )

2
harbour/contrib/hbqt/qtcore/hbqt.h
View File

@@ -79,7 +79,7 @@ typedef struct
void * ph;
bool bNew;
PHBQT_GC_FUNC func;
int type;
unsigned int type;
} HBQT_GC_T;
HB_EXTERN_BEGIN

1
harbour/contrib/hbqt/qtcore/hbqt_misc.prg
View File

@@ -53,7 +53,6 @@
#include "hbclass.ch"
#include "common.ch"
#include "error.ch"
#include "hbqt.ch"
/*----------------------------------------------------------------------*/

88
harbour/contrib/hbqt/qtcore/hbqtcore.ch Normal file
View File

@@ -0,0 +1,88 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* http://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 _HBQTCORE_CH
#define _HBQTCORE_CH
// This enum describes the errors that may be returned by the error() function.
#define QFile_NoError 0 // No error occurred.
#define QFile_ReadError 1 // An error occurred when reading from the file.
#define QFile_WriteError 2 // An error occurred when writing to the file.
#define QFile_FatalError 3 // A fatal error occurred.
#define QFile_ResourceError 4 //
#define QFile_OpenError 5 // The file could not be opened.
#define QFile_AbortError 6 // The operation was aborted.
#define QFile_TimeOutError 7 // A timeout occurred.
#define QFile_UnspecifiedError 8 // An unspecified error occurred.
#define QFile_RemoveError 9 // The file could not be removed.
#define QFile_RenameError 10 // The file could not be renamed.
#define QFile_PositionError 11 // The position in the file could not be changed.
#define QFile_ResizeError 12 // The file could not be resized.
#define QFile_PermissionsError 13 // The file could not be accessed.
#define QFile_CopyError 14 // The file could not be copied.
#define QFile_NoOptions 0 // No options.
// This enum is used by the permission() function to report the permissions and ownership of a file. The values may be OR-ed together to test multiple permissions and ownership values.
#define QFile_ReadOwner 0x4000 // The file is readable by the owner of the file.
#define QFile_WriteOwner 0x2000 // The file is writable by the owner of the file.
#define QFile_ExeOwner 0x1000 // The file is executable by the owner of the file.
#define QFile_ReadUser 0x0400 // The file is readable by the user.
#define QFile_WriteUser 0x0200 // The file is writable by the user.
#define QFile_ExeUser 0x0100 // The file is executable by the user.
#define QFile_ReadGroup 0x0040 // The file is readable by the group.
#define QFile_WriteGroup 0x0020 // The file is writable by the group.
#define QFile_ExeGroup 0x0010 // The file is executable by the group.
#define QFile_ReadOther 0x0004 // The file is readable by anyone.
#define QFile_WriteOther 0x0002 // The file is writable by anyone.
#define QFile_ExeOther 0x0001 // The file is executable by anyone.
#endif

1
harbour/contrib/hbqt/qtcore/hbqtcore.hbp
View File

@@ -6,6 +6,7 @@
hbqtcore.hbm
-instfile=inc:hbqtcore.ch
-instfile=inc:hbqtcore.hbx
hbqtcores.hbp

3
harbour/contrib/hbqt/qtgui/THbQtUI.prg
View File

@@ -68,7 +68,8 @@
#include "hbclass.ch"
#include "common.ch"
#include "error.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/qtgui/doc/en/class_qcolor.txt
View File

@@ -82,7 +82,7 @@
*
* $EXAMPLES$
* oColor := QColor():new() // You will supply other parameter later
* oColor := QColor():new( nQt_Color ) // R: hbqt.ch
* oColor := QColor():new( nQt_Color ) // R: hbqtgui.ch
* oColor := QColor():new( nRGB ) // ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) )
* oColor := QColor():new( cColorName ) // #RRGGBB
* oColor := QColor():new( pQColor ) // Pointer to previously obtained QColor

2
harbour/contrib/hbqt/qtgui/hbqt_errorsys.prg
View File

@@ -53,7 +53,7 @@
#include "common.ch"
#include "error.ch"
#include "hbqt.ch"
#include "hbqtgui.ch"
PROCEDURE hbqt_ErrorSys()

160
harbour/contrib/hbqt/hbqt.ch → harbour/contrib/hbqt/qtgui/hbqtgui.ch
View File

@@ -6,7 +6,6 @@
* Harbour Project source code:
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
*
* http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
@@ -49,35 +48,9 @@
* If you do not wish that, delete this exception notice.
*
*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/*
* EkOnkar
* ( The LORD is ONE )
*
* QT Headers
*
* Pritpal Bedi <pritpal@vouchcac.com>
* 10Jun2009
*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
#ifndef _HBQT_CH
#define _HBQT_CH
/*----------------------------------------------------------------------*/
#include "hbtrace.ch"
/*----------------------------------------------------------------------*/
/* Retained for compatibility */
#define QT_PTROF( oObj ) ( oObj )
/*----------------------------------------------------------------------*/
#ifndef _HBQTGUI_CH
#define _HBQTGUI_CH
#define QEvent_None 0 // Not an event.
#define QEvent_Timer 1 // Regular timer events (QTimerEvent).
@@ -1450,101 +1423,6 @@
#define QFrame_Shape_Mask 0x000f // The Shape part of frameStyle()
// enum #define QWebPage_Extension
// This enum describes the types of extensions that the page can support. Before using these extensions, you should verify that the extension is supported by calling supportsExtension().
//
#define QWebPage_ChooseMultipleFilesExtension 0 // Whether the web page supports multiple file selection. This extension is invoked when the web content requests one or more file names, for example as a result of the user clicking on a "file upload" button in a HTML form where multiple file selection is allowed.
// enum QWebPage::FindFlag
// flags QWebPage::FindFlags
// This enum describes the options available to QWebPage's findText() function. The options can be OR-ed together from the following list:
//
#define QWebPage_FindBackward 1 // Searches backwards instead of forwards.
#define QWebPage_FindCaseSensitively 2 // By default findText() works case insensitive. Specifying this option changes the behaviour to a case sensitive find operation.
#define QWebPage_FindWrapsAroundDocument 4 // Makes findText() restart from the beginning of the document if the end was reached and the text was not found.
// The FindFlags type is a typedef for QFlags<FindFlag>. It stores an OR combination of FindFlag values.
// enum QWebPage::LinkDelegationPolicy
// This enum defines the delegation policies a webpage can have when activating links and emitting the linkClicked() signal.
//
#define QWebPage_DontDelegateLinks 0 // No links are delegated. Instead, QWebPage tries to handle them all.
#define QWebPage_DelegateExternalLinks 1 // When activating links that point to documents not stored on the local filesystem or an equivalent - such as the Qt resource system - then linkClicked() is emitted.
#define QWebPage_DelegateAllLinks 2 // Whenever a link is activated the linkClicked() signal is emitted.
// enum QWebPage::NavigationType
// This enum describes the types of navigation available when browsing through hyperlinked documents.
//
#define QWebPage_NavigationTypeLinkClicked 0 // The user clicked on a link or pressed return on a focused link.
#define QWebPage_NavigationTypeFormSubmitted 1 // The user activated a submit button for an HTML form.
#define QWebPage_NavigationTypeBackOrForward 2 // Navigation to a previously shown document in the back or forward history is requested.
#define QWebPage_NavigationTypeReload 3 // The user activated the reload action.
#define QWebPage_NavigationTypeFormResubmitted 4 // An HTML form was submitted a second time.
#define QWebPage_NavigationTypeOther 5 // A navigation to another document using a method not listed above.
// enum QWebPage::WebAction
// This enum describes the types of action which can be performed on the web page. Actions which are related to text editing, cursor movement, and text selection only have an effect if contentEditable is true.
//
#define QWebPage_NoWebAction -1 // No action is triggered.
#define QWebPage_OpenLink 0 // Open the current link.
#define QWebPage_OpenLinkInNewWindow 1 // Open the current link in a new window.
#define QWebPage_OpenFrameInNewWindow 2 // Replicate the current frame in a new window.
#define QWebPage_DownloadLinkToDisk 3 // Download the current link to the disk.
#define QWebPage_CopyLinkToClipboard 4 // Copy the current link to the clipboard.
#define QWebPage_OpenImageInNewWindow 5 // Open the highlighted image in a new window.
#define QWebPage_DownloadImageToDisk 6 // Download the highlighted image to the disk.
#define QWebPage_CopyImageToClipboard 7 // Copy the highlighted image to the clipboard.
#define QWebPage_Back 8 // Navigate back in the history of navigated links.
#define QWebPage_Forward 9 // Navigate forward in the history of navigated links.
#define QWebPage_Stop 10 // Stop loading the current page.
#define QWebPage_Reload 11 // Reload the current page.
#define QWebPage_Cut 12 // Cut the content currently selected into the clipboard.
#define QWebPage_Copy 13 // Copy the content currently selected into the clipboard.
#define QWebPage_Paste 14 // Paste content from the clipboard.
#define QWebPage_Undo 15 // Undo the last editing action.
#define QWebPage_Redo 16 // Redo the last editing action.
#define QWebPage_MoveToNextChar 17 // Move the cursor to the next character.
#define QWebPage_MoveToPreviousChar 18 // Move the cursor to the previous character.
#define QWebPage_MoveToNextWord 19 // Move the cursor to the next word.
#define QWebPage_MoveToPreviousWord 20 // Move the cursor to the previous word.
#define QWebPage_MoveToNextLine 21 // Move the cursor to the next line.
#define QWebPage_MoveToPreviousLine 22 // Move the cursor to the previous line.
#define QWebPage_MoveToStartOfLine 23 // Move the cursor to the start of the line.
#define QWebPage_MoveToEndOfLine 24 // Move the cursor to the end of the line.
#define QWebPage_MoveToStartOfBlock 25 // Move the cursor to the start of the block.
#define QWebPage_MoveToEndOfBlock 26 // Move the cursor to the end of the block.
#define QWebPage_MoveToStartOfDocument 27 // Move the cursor to the start of the document.
#define QWebPage_MoveToEndOfDocument 28 // Move the cursor to the end of the document.
#define QWebPage_SelectNextChar 29 // Select to the next character.
#define QWebPage_SelectPreviousChar 30 // Select to the previous character.
#define QWebPage_SelectNextWord 31 // Select to the next word.
#define QWebPage_SelectPreviousWord 32 // Select to the previous word.
#define QWebPage_SelectNextLine 33 // Select to the next line.
#define QWebPage_SelectPreviousLine 34 // Select to the previous line.
#define QWebPage_SelectStartOfLine 35 // Select to the start of the line.
#define QWebPage_SelectEndOfLine 36 // Select to the end of the line.
#define QWebPage_SelectStartOfBlock 37 // Select to the start of the block.
#define QWebPage_SelectEndOfBlock 38 // Select to the end of the block.
#define QWebPage_SelectStartOfDocument 39 // Select to the start of the document.
#define QWebPage_SelectEndOfDocument 40 // Select to the end of the document.
#define QWebPage_DeleteStartOfWord 41 // Delete to the start of the word.
#define QWebPage_DeleteEndOfWord 42 // Delete to the end of the word.
#define QWebPage_SetTextDirectionDefault 43 // Set the text direction to the default direction.
#define QWebPage_SetTextDirectionLeftToRight 44 // Set the text direction to left-to-right.
#define QWebPage_SetTextDirectionRightToLeft 45 // Set the text direction to right-to-left.
#define QWebPage_ToggleBold 46 // Toggle the formatting between bold and normal weight.
#define QWebPage_ToggleItalic 47 // Toggle the formatting between italic and normal style.
#define QWebPage_ToggleUnderline 48 // Toggle underlining.
#define QWebPage_InspectElement 49 // Show the Web Inspector with the currently highlighted HTML element.
#define QWebPage_InsertParagraphSeparator 50 // Insert a new paragraph.
#define QWebPage_InsertLineSeparator 51 // Insert a new line.
#define QWebPage_SelectAll 52 // Selects all content.
// enum QWebPage::WebWindowType
//
#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.
@@ -2168,39 +2046,6 @@
#define QTextDocument_StyleSheetResource 3 // The resource contains CSS.
#define QTextDocument_UserResource 100 // The first available value for user defined resource types.
// This enum describes the errors that may be returned by the error() function.
#define QFile_NoError 0 // No error occurred.
#define QFile_ReadError 1 // An error occurred when reading from the file.
#define QFile_WriteError 2 // An error occurred when writing to the file.
#define QFile_FatalError 3 // A fatal error occurred.
#define QFile_ResourceError 4 //
#define QFile_OpenError 5 // The file could not be opened.
#define QFile_AbortError 6 // The operation was aborted.
#define QFile_TimeOutError 7 // A timeout occurred.
#define QFile_UnspecifiedError 8 // An unspecified error occurred.
#define QFile_RemoveError 9 // The file could not be removed.
#define QFile_RenameError 10 // The file could not be renamed.
#define QFile_PositionError 11 // The position in the file could not be changed.
#define QFile_ResizeError 12 // The file could not be resized.
#define QFile_PermissionsError 13 // The file could not be accessed.
#define QFile_CopyError 14 // The file could not be copied.
#define QFile_NoOptions 0 // No options.
// This enum is used by the permission() function to report the permissions and ownership of a file. The values may be OR-ed together to test multiple permissions and ownership values.
#define QFile_ReadOwner 0x4000 // The file is readable by the owner of the file.
#define QFile_WriteOwner 0x2000 // The file is writable by the owner of the file.
#define QFile_ExeOwner 0x1000 // The file is executable by the owner of the file.
#define QFile_ReadUser 0x0400 // The file is readable by the user.
#define QFile_WriteUser 0x0200 // The file is writable by the user.
#define QFile_ExeUser 0x0100 // The file is executable by the user.
#define QFile_ReadGroup 0x0040 // The file is readable by the group.
#define QFile_WriteGroup 0x0020 // The file is writable by the group.
#define QFile_ExeGroup 0x0010 // The file is executable by the group.
#define QFile_ReadOther 0x0004 // The file is readable by anyone.
#define QFile_WriteOther 0x0002 // The file is writable by anyone.
#define QFile_ExeOther 0x0001 // The file is executable by anyone.
#define QPlainTextEdit_NoWrap 0
#define QPlainTextEdit_WidgetWidth 1
@@ -2467,4 +2312,3 @@
/*----------------------------------------------------------------------*/
#endif

2
harbour/contrib/hbqt/qtgui/hbqtgui.hbc
View File

@@ -7,7 +7,7 @@
# See COPYING for licensing terms.
# ---------------------------------------------------------------
incpaths=g
incpaths=. g
libs=../qtcore/hbqtcore.hbc

1
harbour/contrib/hbqt/qtgui/hbqtgui.hbp
View File

@@ -6,6 +6,7 @@
hbqtgui.hbm
-instfile=inc:hbqtgui.ch
-instfile=inc:hbqtgui.hbx
hbqtguis.hbp

11
harbour/contrib/hbqt/qtgui/qth/QColor.qth
View File

@@ -56,14 +56,14 @@
<CLASS>
QObject = no
Inherits =
Type = PlainObject
New =
Inherits =
Type = PlainObject
New =
</CLASS>
<DOC>
oColor := QColor():new() // You will supply other parameter later
oColor := QColor():new( nQt_Color ) // R: hbqt.ch
oColor := QColor():new( nQt_Color ) // R: hbqtgui.ch
oColor := QColor():new( nRGB ) // ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) )
oColor := QColor():new( cColorName ) // #RRGGBB
oColor := QColor():new( pQColor ) // Pointer to previously obtained QColor
@@ -95,7 +95,7 @@ HB_FUNC( QT_QCOLOR )
else if( hb_pcount() == 1 && HB_ISNUM( 1 ) )
{
hb_retptr( ( QColor* ) new QColor( ( QRgb ) hb_parni( 1 ) ) );
}
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
hb_retptr( ( QColor* ) new QColor( hbqt_par_QString( 1 ) ) );
@@ -204,4 +204,3 @@ QColor fromRgbF ( qreal r, qreal g, qreal b, qreal a = 1.0 )
QColor fromRgba ( QRgb rgba )
//void setAllowX11ColorNames ( bool enabled )
</PROTOS>

149
harbour/contrib/hbqt/qtwebkit/hbqtwebkit.ch Normal file
View File

@@ -0,0 +1,149 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* http://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 _HBQTWEBKIT_CH
#define _HBQTWEBKIT_CH
// enum #define QWebPage_Extension
// This enum describes the types of extensions that the page can support. Before using these extensions, you should verify that the extension is supported by calling supportsExtension().
//
#define QWebPage_ChooseMultipleFilesExtension 0 // Whether the web page supports multiple file selection. This extension is invoked when the web content requests one or more file names, for example as a result of the user clicking on a "file upload" button in a HTML form where multiple file selection is allowed.
// enum QWebPage::FindFlag
// flags QWebPage::FindFlags
// This enum describes the options available to QWebPage's findText() function. The options can be OR-ed together from the following list:
//
#define QWebPage_FindBackward 1 // Searches backwards instead of forwards.
#define QWebPage_FindCaseSensitively 2 // By default findText() works case insensitive. Specifying this option changes the behaviour to a case sensitive find operation.
#define QWebPage_FindWrapsAroundDocument 4 // Makes findText() restart from the beginning of the document if the end was reached and the text was not found.
// The FindFlags type is a typedef for QFlags<FindFlag>. It stores an OR combination of FindFlag values.
// enum QWebPage::LinkDelegationPolicy
// This enum defines the delegation policies a webpage can have when activating links and emitting the linkClicked() signal.
//
#define QWebPage_DontDelegateLinks 0 // No links are delegated. Instead, QWebPage tries to handle them all.
#define QWebPage_DelegateExternalLinks 1 // When activating links that point to documents not stored on the local filesystem or an equivalent - such as the Qt resource system - then linkClicked() is emitted.
#define QWebPage_DelegateAllLinks 2 // Whenever a link is activated the linkClicked() signal is emitted.
// enum QWebPage::NavigationType
// This enum describes the types of navigation available when browsing through hyperlinked documents.
//
#define QWebPage_NavigationTypeLinkClicked 0 // The user clicked on a link or pressed return on a focused link.
#define QWebPage_NavigationTypeFormSubmitted 1 // The user activated a submit button for an HTML form.
#define QWebPage_NavigationTypeBackOrForward 2 // Navigation to a previously shown document in the back or forward history is requested.
#define QWebPage_NavigationTypeReload 3 // The user activated the reload action.
#define QWebPage_NavigationTypeFormResubmitted 4 // An HTML form was submitted a second time.
#define QWebPage_NavigationTypeOther 5 // A navigation to another document using a method not listed above.
// enum QWebPage::WebAction
// This enum describes the types of action which can be performed on the web page. Actions which are related to text editing, cursor movement, and text selection only have an effect if contentEditable is true.
//
#define QWebPage_NoWebAction -1 // No action is triggered.
#define QWebPage_OpenLink 0 // Open the current link.
#define QWebPage_OpenLinkInNewWindow 1 // Open the current link in a new window.
#define QWebPage_OpenFrameInNewWindow 2 // Replicate the current frame in a new window.
#define QWebPage_DownloadLinkToDisk 3 // Download the current link to the disk.
#define QWebPage_CopyLinkToClipboard 4 // Copy the current link to the clipboard.
#define QWebPage_OpenImageInNewWindow 5 // Open the highlighted image in a new window.
#define QWebPage_DownloadImageToDisk 6 // Download the highlighted image to the disk.
#define QWebPage_CopyImageToClipboard 7 // Copy the highlighted image to the clipboard.
#define QWebPage_Back 8 // Navigate back in the history of navigated links.
#define QWebPage_Forward 9 // Navigate forward in the history of navigated links.
#define QWebPage_Stop 10 // Stop loading the current page.
#define QWebPage_Reload 11 // Reload the current page.
#define QWebPage_Cut 12 // Cut the content currently selected into the clipboard.
#define QWebPage_Copy 13 // Copy the content currently selected into the clipboard.
#define QWebPage_Paste 14 // Paste content from the clipboard.
#define QWebPage_Undo 15 // Undo the last editing action.
#define QWebPage_Redo 16 // Redo the last editing action.
#define QWebPage_MoveToNextChar 17 // Move the cursor to the next character.
#define QWebPage_MoveToPreviousChar 18 // Move the cursor to the previous character.
#define QWebPage_MoveToNextWord 19 // Move the cursor to the next word.
#define QWebPage_MoveToPreviousWord 20 // Move the cursor to the previous word.
#define QWebPage_MoveToNextLine 21 // Move the cursor to the next line.
#define QWebPage_MoveToPreviousLine 22 // Move the cursor to the previous line.
#define QWebPage_MoveToStartOfLine 23 // Move the cursor to the start of the line.
#define QWebPage_MoveToEndOfLine 24 // Move the cursor to the end of the line.
#define QWebPage_MoveToStartOfBlock 25 // Move the cursor to the start of the block.
#define QWebPage_MoveToEndOfBlock 26 // Move the cursor to the end of the block.
#define QWebPage_MoveToStartOfDocument 27 // Move the cursor to the start of the document.
#define QWebPage_MoveToEndOfDocument 28 // Move the cursor to the end of the document.
#define QWebPage_SelectNextChar 29 // Select to the next character.
#define QWebPage_SelectPreviousChar 30 // Select to the previous character.
#define QWebPage_SelectNextWord 31 // Select to the next word.
#define QWebPage_SelectPreviousWord 32 // Select to the previous word.
#define QWebPage_SelectNextLine 33 // Select to the next line.
#define QWebPage_SelectPreviousLine 34 // Select to the previous line.
#define QWebPage_SelectStartOfLine 35 // Select to the start of the line.
#define QWebPage_SelectEndOfLine 36 // Select to the end of the line.
#define QWebPage_SelectStartOfBlock 37 // Select to the start of the block.
#define QWebPage_SelectEndOfBlock 38 // Select to the end of the block.
#define QWebPage_SelectStartOfDocument 39 // Select to the start of the document.
#define QWebPage_SelectEndOfDocument 40 // Select to the end of the document.
#define QWebPage_DeleteStartOfWord 41 // Delete to the start of the word.
#define QWebPage_DeleteEndOfWord 42 // Delete to the end of the word.
#define QWebPage_SetTextDirectionDefault 43 // Set the text direction to the default direction.
#define QWebPage_SetTextDirectionLeftToRight 44 // Set the text direction to left-to-right.
#define QWebPage_SetTextDirectionRightToLeft 45 // Set the text direction to right-to-left.
#define QWebPage_ToggleBold 46 // Toggle the formatting between bold and normal weight.
#define QWebPage_ToggleItalic 47 // Toggle the formatting between italic and normal style.
#define QWebPage_ToggleUnderline 48 // Toggle underlining.
#define QWebPage_InspectElement 49 // Show the Web Inspector with the currently highlighted HTML element.
#define QWebPage_InsertParagraphSeparator 50 // Insert a new paragraph.
#define QWebPage_InsertLineSeparator 51 // Insert a new line.
#define QWebPage_SelectAll 52 // Selects all content.
// enum QWebPage::WebWindowType
//
#define QWebPage_WebBrowserWindow 0 // The window is a regular web browser window.
#define QWebPage_WebModalDialog 1 // The window acts as modal dialog.
#endif

2
harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbc
View File

@@ -7,7 +7,7 @@
# See COPYING for licensing terms.
# ---------------------------------------------------------------
incpaths=g
incpaths=. g
libs=../qtcore/hbqtcore.hbc
libs=../qtgui/hbqtgui.hbc

1
harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
View File

@@ -6,6 +6,7 @@
hbqtwebkit.hbm
-instfile=inc:hbqtwebkit.ch
-instfile=inc:hbqtwebkit.hbx
hbqtwebkits.hbp

4
harbour/contrib/hbqt/tests/demoqt.prg
View File

@@ -52,7 +52,9 @@
*/
/*----------------------------------------------------------------------*/
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbtrace.ch"
#define QT_EVE_TRIGGERED "triggered()"
#define QT_EVE_TRIGGERED_B "triggered(bool)"

4
harbour/contrib/hbqt/tests/dialogqt.prg
View File

@@ -50,7 +50,9 @@
*/
/*----------------------------------------------------------------------*/
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbtrace.ch"
#define QT_EVE_TRIGGERED "triggered()"
#define QT_EVE_TRIGGERED_B "triggered(bool)"

5
harbour/contrib/hbqt/tests/testbrow.prg
View File

@@ -10,7 +10,10 @@
*
*/
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbtrace.ch"
#include "common.ch"
STATIC qApp

5
harbour/contrib/hbqt/tests/testqaim.prg
View File

@@ -10,7 +10,10 @@
*
*/
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbtrace.ch"
#include "common.ch"
STATIC qApp

5
harbour/contrib/hbqt/tests/testres.prg
View File

@@ -10,7 +10,10 @@
*
*/
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "hbtrace.ch"
#include "common.ch"
REQUEST HB_QT

1
harbour/contrib/hbxbp/hbpprocess.prg
View File

@@ -65,7 +65,6 @@
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
#include "hbqt.ch"
#include "common.ch"
#include "hbclass.ch"

3
harbour/contrib/hbxbp/xbp.ch
View File

@@ -6,7 +6,8 @@
/*----------------------------------------------------------------------*/
#include "hbqt.ch"
#include "hbqtcore.ch"
#include "hbqtgui.ch"
#include "hbtrace.ch"

2
harbour/contrib/hbxbp/xbpappevent.prg
View File

@@ -65,7 +65,7 @@
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
#include "hbqt.ch"
#include "hbqtgui.ch"
#include "appevent.ch"

2
harbour/contrib/hbxbp/xbpstatic.prg
View File

@@ -399,7 +399,7 @@ METHOD XbpStatic:setCaption( xCaption, cDll )
OTHERWISE
/* It is a Harbour Extension - you have 60+ icons to display
* Check hbqt.ch : #define QStyle_SP_* constants
* Check hbqtgui.ch : #define QStyle_SP_* constants
*/
oIcon:pPtr := oStyle:standardIcon( ::caption )