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

2010-06-22 14:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/THbQtUI.prg
    % Little more syncronization.
    + Added: method ::connect(). It is identical to :signal()
      But for uniformity with other hbXBP and hbIDE classes
      this method name seems appropriate.
    % Reworked: method create(). Now both types of implementations,
      viz., .ui and .uic will be entertained with one creator.
         oUI := HbQtUI():new( "MainWindow.ui" ):create()
         oUI := HbQtUI():new( "MainWindow.uic" ):create()
      with do the job. :build() is still active but will be depricated.
This commit is contained in:
Pritpal Bedi
2010-06-22 21:32:18 +00:00
parent 11c4faee46
commit aca7461f3d
2 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -16,6 +16,18 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-22 14:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/THbQtUI.prg
% Little more syncronization.
+ Added: method ::connect(). It is identical to :signal()
But for uniformity with other hbXBP and hbIDE classes
this method name seems appropriate.
% Reworked: method create(). Now both types of implementations,
viz., .ui and .uic will be entertained with one creator.
oUI := HbQtUI():new( "MainWindow.ui" ):create()
oUI := HbQtUI():new( "MainWindow.uic" ):create()
with do the job. :build() is still active but will be depricated.
2010-06-22 23:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/macro/macrolex.c
* Added casts to pacify long-time msvc warnings.

43
harbour/contrib/hbqt/THbQtUI.prg
View File

@@ -81,6 +81,8 @@ CLASS HbQtUI
DATA oWidget
DATA cMainWidgetName
DATA cLoadingMode INIT ""
DATA qObj INIT hb_hash()
DATA widgets INIT {}
DATA aCommands INIT {}
@@ -97,6 +99,7 @@ CLASS HbQtUI
METHOD event( cWidget, nEvent, bBlock )
METHOD signal( cWidget, cSignal, bBlock )
METHOD connect( cWidget, cSignal, bBlock )
METHOD loadWidgets()
METHOD loadContents( cUiFull )
METHOD loadUI( cUiFull, qParent )
@@ -119,6 +122,7 @@ METHOD HbQtUI:new( cFile, qParent )
/*----------------------------------------------------------------------*/
METHOD HbQtUI:create( cFile, qParent )
LOCAL cExt
DEFAULT cFile TO ::cFile
DEFAULT qParent TO ::qParent
@@ -127,14 +131,24 @@ METHOD HbQtUI:create( cFile, qParent )
::qParent := qParent
IF !empty( ::cFile ) .AND. hb_fileExists( ::cFile )
hb_hCaseMatch( ::qObj, .f. )
hb_fNameSplit( cFile, , , @cExt )
::loadContents( ::cFile, ::qParent )
IF lower( cExt ) == ".uic"
::cLoadingMode := "uic"
::build( ::cFile, ::qParent )
::oWidget := ::loadUI( ::cFile, ::qParent )
ELSE
::cLoadingMode := "ui"
IF !empty( ::oWidget )
::loadWidgets()
hb_hCaseMatch( ::qObj, .f. )
::loadContents( ::cFile, ::qParent )
::oWidget := ::loadUI( ::cFile, ::qParent )
IF !empty( ::oWidget )
::loadWidgets()
ENDIF
ENDIF
ENDIF
@@ -161,7 +175,6 @@ METHOD HbQtUI:destroy()
i := a_:__enumIndex()
IF i > 0
IF type( a_[ 3 ] ) == "UI"
//HB_TRACE( HB_TR_ALWAYS, 400, i, pad( a_[ 1 ], 20 ), pad( a_[ 2 ], 20 ), iif( i > 1, pad( ::widgets[ i - 1, 1 ],20 ), NIL ), i, len( ::widgets ) )
::qObj[ a_[ 2 ] ] := NIL
ENDIF
ENDIF
@@ -186,6 +199,12 @@ METHOD HbQtUI:event( cWidget, nEvent, bBlock )
/*----------------------------------------------------------------------*/
METHOD HbQtUI:connect( cWidget, cSignal, bBlock )
RETURN ::signal( cWidget, cSignal, bBlock )
/*----------------------------------------------------------------------*/
METHOD HbQtUI:signal( cWidget, cSignal, bBlock )
IF hb_hHasKey( ::qObj, cWidget )
@@ -299,7 +318,11 @@ METHOD HbQtUI:OnError( ... )
ENDIF
IF left( cMsg, 2 ) == "Q_"
xReturn := ::qObj[ substr( cMsg, 3 ) ]
IF hb_hHasKey( ::qObj, substr( cMsg, 3 ) )
xReturn := ::qObj[ substr( cMsg, 3 ) ]
ELSE
MsgBox( "Control < " + substr( cMsg, 3 ) + " > does not exists!" )
ENDIF
ELSE
xReturn := ::oWidget:&cMsg( ... )
ENDIF
@@ -319,6 +342,8 @@ METHOD HbQtUI:build( cFileOrBuffer, qParent )
::cFile := cFileOrBuffer
::qParent := qParent
::cLoadingMode := "uic"
IF empty( ::cFile )
RETURN Self
ENDIF
@@ -347,7 +372,7 @@ METHOD HbQtUI:build( cFileOrBuffer, qParent )
hbq_stripFront( @cMCls, "(" )
hbq_stripRear( @cMNam, ")" )
//
// HB_TRACE( HB_TR_ALWAYS, "Widget ", pad( cMNam, 20 ), pad( cMCls, 20 ), cMCls+"():new()" )
// HB_TRACE( HB_TR_ALWAYS, "Widget ", pad( cMNam, 20 ), pad( cMCls, 20 ), cMCls+"():new()" )
// Validator Constructor
aadd( ::widgets, { cMCls, cMNam, cMCls+"()", cMCls+"():new()" } )
@@ -541,7 +566,7 @@ METHOD HbQtUI:build( cFileOrBuffer, qParent )
ELSE
cBlock := "{|o,v| o[v]:" + cCmd + "}"
//HB_TRACE( HB_TR_ALWAYS, pad( a_[ 1 ], 20 ), cBlock )
* HB_TRACE( HB_TR_ALWAYS, pad( a_[ 1 ], 20 ), cBlock, 0, cNam )
bBlock := &( cBlock )
eval( bBlock, ::qObj, cNam )