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

2011-05-18 12:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/idedocks.prg
  * contrib/hbxbp/xbpdialog.prg
  * contrib/hbxbp/xbpwindow.prg
    ! Fixed: a logical glitch causing X button on hbIDE behaving 
      not as intended.
This commit is contained in:
Pritpal Bedi
2011-05-18 19:54:14 +00:00
parent 6d6232d831
commit d6a8d70a29
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-05-18 12:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/idedocks.prg
* contrib/hbxbp/xbpdialog.prg
* contrib/hbxbp/xbpwindow.prg
! Fixed: a logical glitch causing X button on hbIDE behaving
not as intended.
2011-05-18 20:45 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbwin/axcore.c
! added missing AddRef() for OLE object returbed by __AXREGISTERHANDLER()
@@ -39,7 +46,7 @@
* contrib/xhb/hbdll.ch
! several fixes to make it work in Harbour and MT apps
2011-05-18 17:53 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
2011-05-17 17:53 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/idedocks.prg
* contrib/hbide/ideedit.prg
* contrib/hbide/ideeditor.prg

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

@@ -329,7 +329,8 @@ METHOD IdeDocks:buildDialog()
::oDlg:oWidget:setStyleSheet( GetStyleSheet( "QMainWindow", ::nAnimantionMode ) )
::oDlg:close := {|| hbide_setClose( hbide_getYesNo( "hbIDE is about to be closed!", "Are you sure?" ) ) }
::oDlg:close := {|| hbide_setClose( hbide_getYesNo( "hbIDE is about to be closed!", "Are you sure?" ) ), ;
PostAppEvent( xbeP_Close, , , ::oDlg ) }
::oDlg:setDockOptions( QMainWindow_AllowTabbedDocks + QMainWindow_ForceTabbedDocks )
::oDlg:setTabPosition( Qt_BottomDockWidgetArea, QTabWidget_South )
::oDlg:setCorner( Qt_BottomLeftCorner, Qt_LeftDockWidgetArea )

30
harbour/contrib/hbxbp/xbpdialog.prg
View File

@@ -294,19 +294,22 @@ METHOD XbpDialog:destroy()
METHOD XbpDialog:execEvent( nEvent, pEvent )
DO CASE
SWITCH nEvent
CASE nEvent == QEvent_WindowActivate
CASE QEvent_WindowActivate
SetAppEvent( xbeP_SetDisplayFocus, NIL, NIL, Self )
EXIT
CASE nEvent == QEvent_WindowDeactivate
CASE QEvent_WindowDeactivate
SetAppEvent( xbeP_KillDisplayFocus, NIL, NIL, Self )
EXIT
CASE nEvent == QEvent_Close
CASE QEvent_Close
pEvent:ignore()
SetAppEvent( xbeP_Close, NIL, NIL, Self )
::close()
EXIT
ENDCASE
ENDSWITCH
RETURN .F.
@@ -378,24 +381,25 @@ METHOD XbpDialog:showModal()
METHOD XbpDialog:setFrameState( nState )
LOCAL lSuccess := .T.
LOCAL nCurState := ::getFrameState()
LOCAL oWidget := iif( hb_isObject( ::oMdi ), ::oMdi, ::oWidget )
DO CASE
CASE nState == XBPDLG_FRAMESTAT_MINIMIZED
IF nCurState != XBPDLG_FRAMESTAT_MINIMIZED
::oWidget:setWindowState( Qt_WindowMinimized )
oWidget:setWindowState( Qt_WindowMinimized )
ENDIF
CASE nState == XBPDLG_FRAMESTAT_MAXIMIZED
IF nCurState == XBPDLG_FRAMESTAT_MINIMIZED
::oWidget:show()
::oWidget:setWindowState( Qt_WindowMaximized )
oWidget:show()
oWidget:setWindowState( Qt_WindowMaximized )
ELSEIF nCurState == XBPDLG_FRAMESTAT_NORMALIZED
::oWidget:setWindowState( Qt_WindowMaximized )
oWidget:setWindowState( Qt_WindowMaximized )
ENDIF
CASE nState == XBPDLG_FRAMESTAT_NORMALIZED
IF nCurState != XBPDLG_FRAMESTAT_MINIMIZED
::oWidget:show()
oWidget:show()
ENDIF
::oWidget:setWindowState( Qt_WindowNoState )
oWidget:setWindowState( Qt_WindowNoState )
ENDCASE
RETURN lSuccess
@@ -403,7 +407,7 @@ METHOD XbpDialog:setFrameState( nState )
/*----------------------------------------------------------------------*/
METHOD XbpDialog:getFrameState()
LOCAL nState := ::oWidget:windowState()
LOCAL nState := iif( hb_isObject( ::oMdi ), ::oMdi, ::oWidget ):windowState()
IF ( hb_bitAnd( nState, Qt_WindowMinimized ) == Qt_WindowMinimized )
RETURN XBPDLG_FRAMESTAT_MINIMIZED

3
harbour/contrib/hbxbp/xbpwindow.prg
View File

@@ -672,9 +672,6 @@ METHOD XbpWindow:handleEvent( nEvent, mp1, mp2 )
SWITCH ( nEvent )
CASE xbeP_Close
::close()
EXIT
CASE xbeP_Keyboard
::keyboard( mp1 )
EXIT