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

2010-10-10 14:23 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbxbp/xbpfiledialog.prg
    ! Fixed: a regression bug surfaced after recent changes.
      QDialog() was not setting the focus to original widger at "close".

  * contrib/hbqt/qtcore/hbqt_hbqslots.cpp
    Fixed: "windowStateChanged(Qt::WindowStates,Qt::WindowStates)" signal parameters.

  * contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.cpp
  * contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
  * contrib/hbqt/qtgui/hbqt_hbqtableview.h
    ! Minor.

  * contrib/hbqt/utils/qtgui.qtp
    + Added: new class QSortFilterProxyModel.qth
This commit is contained in:
Pritpal Bedi
2010-10-10 21:34:18 +00:00
parent e77873cfa3
commit e30041996e
7 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -16,6 +16,22 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-10 14:23 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbxbp/xbpfiledialog.prg
! Fixed: a regression bug surfaced after recent changes.
QDialog() was not setting the focus to original widger at "close".
* contrib/hbqt/qtcore/hbqt_hbqslots.cpp
Fixed: "windowStateChanged(Qt::WindowStates,Qt::WindowStates)" signal parameters.
* contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.cpp
* contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
* contrib/hbqt/qtgui/hbqt_hbqtableview.h
! Minor.
* contrib/hbqt/utils/qtgui.qtp
+ Added: new class QSortFilterProxyModel.qth
2010-10-10 13:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qscintilla/qth/*.qth
* contrib/hbqt/qtcore/qth/*.qth

2
harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp
View File

@@ -240,7 +240,7 @@ static bool connect_signal( QString signal, QObject * object, HBQSlots * t_slots
if( signal == ( QString ) "subWindowActivated(QMdiSubWindow)" ) return object->connect( object, SIGNAL( subWindowActivated( QMdiSubWindow * ) ), t_slots, SLOT( subWindowActivated( QMdiSubWindow * ) ), Qt::AutoConnection );
/* QMdiSubWindow */
if( signal == ( QString ) "aboutToActivate()" ) return object->connect( object, SIGNAL( aboutToActivate() ), t_slots, SLOT( aboutToActivate() ), Qt::AutoConnection );
if( signal == ( QString ) "windowStateChanged(Qt::WindowStates,Qt::WindowStates)" ) return object->connect( object, SIGNAL( windowStateChanged( Qt::WindowStates, Qt::WindowStates ) ), t_slots, SLOT( windowStateChanged( int, int ) ), Qt::AutoConnection );
if( signal == ( QString ) "windowStateChanged(Qt::WindowStates,Qt::WindowStates)" ) return object->connect( object, SIGNAL( windowStateChanged( Qt::WindowStates, Qt::WindowStates ) ), t_slots, SLOT( windowStateChanged( Qt::WindowStates, Qt::WindowStates ) ), Qt::AutoConnection );
/* QAbstractItemDelegate */
if( signal == ( QString ) "closeEditor(QWidget,int)" ) return object->connect( object, SIGNAL( closeEditor( QWidget *, QAbstractItemDelegate::EndEditHint ) ), t_slots, SLOT( closeEditor( QWidget *, QAbstractItemDelegate::EndEditHint ) ), Qt::AutoConnection );
if( signal == ( QString ) "commitData(QWidget)" ) return object->connect( object, SIGNAL( commitData( QWidget * ) ), t_slots, SLOT( commitData( QWidget * ) ), Qt::AutoConnection );

2
harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsitem.cpp
View File

@@ -6,7 +6,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009-2010 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2010 Pritpal Bedi <bedipritpal@hotmail.com>
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify

4
harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.cpp
View File

@@ -6,9 +6,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <bedipritpal@hotmail.com>
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify

5
harbour/contrib/hbqt/qtgui/hbqt_hbqtableview.h
View File

@@ -6,9 +6,7 @@
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* Copyright 2009-2010 Pritpal Bedi <bedipritpal@hotmail.com>
* www - http://harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
@@ -68,6 +66,7 @@ public:
HBQTableView( QWidget * parent = 0 );
virtual ~HBQTableView();
public slots:
void keyPressEvent( QKeyEvent * event );
void mouseDoubleClickEvent( QMouseEvent * event );
void mouseMoveEvent( QMouseEvent * event );

1
harbour/contrib/hbqt/utils/qtgui.qtp
View File

@@ -178,6 +178,7 @@ QShowEvent.qth
QSizeGrip.qth
QSizePolicy.qth
QSlider.qth
QSortFilterProxyModel.qth
QSound.qth
QSpacerItem.qth
QSpinBox.qth

9
harbour/contrib/hbxbp/xbpfiledialog.prg
View File

@@ -167,7 +167,7 @@ STATIC FUNCTION Xbp_ArrayToFileFilter( aFilter )
METHOD XbpFileDialog:open( cDefaultFile, lCenter, lAllowMultiple, lCreateNewFiles )
LOCAL cFiles := NIL
LOCAL i, oList, nResult, cPath, cFile, cExt
LOCAL i, oList, nResult, cPath, cFile, cExt, qFocus
HB_SYMBOL_UNUSED( lCreateNewFiles )
@@ -219,14 +219,16 @@ METHOD XbpFileDialog:open( cDefaultFile, lCenter, lAllowMultiple, lCreateNewFile
::setPos()
ENDIF
qFocus := QApplication():focusWidget()
nResult := ::oWidget:exec()
qFocus:setFocus( 0 )
RETURN IF( nResult == QDialog_Accepted, ::extractFileNames( lAllowMultiple ), NIL )
/*----------------------------------------------------------------------*/
METHOD XbpFileDialog:saveAs( cDefaultFile, lFileList, lCenter )
LOCAL nResult, i, oList
LOCAL nResult, i, oList, qFocus
DEFAULT lFileList TO .T.
@@ -265,7 +267,10 @@ METHOD XbpFileDialog:saveAs( cDefaultFile, lFileList, lCenter )
IF !( lCenter )
::setPos()
ENDIF
qFocus := QApplication():focusWidget()
nResult := ::oWidget:exec()
qFocus:setFocus( 0 )
RETURN IF( nResult == QDialog_Accepted, ::extractFileNames(), NIL )