diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5b7b63f4a0..ae94082873 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,34 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-20 18:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/tests/demoqt.prg + + * contrib/hbxbp/xbpmenubar.prg + * contrib/hbxbp/xbptoolbar.prg + + * contrib/hbide/hbqreportsmanager.prg + * contrib/hbide/ideactions.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/ideedit.prg + * contrib/hbide/ideeditor.prg + * contrib/hbide/idefindreplace.prg + * contrib/hbide/idemain.prg + * contrib/hbide/idemisc.prg + * contrib/hbide/ideskeletons.prg + + * contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt + * contrib/hbqt/qtgui/doc/en/class_qmenu.txt + * contrib/hbqt/qtgui/g/QMainWindow.cpp + * contrib/hbqt/qtgui/g/QMenu.cpp + * contrib/hbqt/qtgui/g/TQMainWindow.prg + * contrib/hbqt/qtgui/g/TQMenu.prg + * Re-generated. + + * contrib/hbqt/qtgui/qth/QMainWindow.qth + * contrib/hbqt/qtgui/qth/QMenu.qth + + Implemented: many-to-one method call protocol. + 2010-09-20 16:34 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idedocks.prg * contrib/hbide/idedocwriter.prg diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index 3d9693d9f0..2fa3caadc0 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -1073,7 +1073,7 @@ METHOD HbqReportsManager:contextMenuScene( p1 ) qMenu:addAction( "Refresh" ) qMenu:addAction( "Zoom+" ) - pAct := qMenu:exec_1( qEvent:screenPos() ) + pAct := qMenu:exec( qEvent:screenPos() ) IF ! hbqt_isEmptyQtPointer( pAct ) SWITCH ( QAction():configure( pAct ) ):text() CASE "Refresh" @@ -1098,7 +1098,7 @@ METHOD HbqReportsManager:contextMenuItem( p1, p2 ) qMenu:addAction( "Cut" ) qMenu:addAction( "Copy" ) - pAct := qMenu:exec_1( qEvent:screenPos() ) + pAct := qMenu:exec( qEvent:screenPos() ) IF ! hbqt_isEmptyQtPointer( pAct ) SWITCH ( QAction():configure( pAct ) ):text() CASE "Cut" @@ -1310,17 +1310,17 @@ METHOD HbqReportsManager:execMenuShapes() IF empty( ::qShapesMenu ) ::qShapesMenu := QMenu() - ::aShapesAct[ SHP_ACT_RECTANGLE ] := ::qShapesMenu:addAction_1( app_image( "rp_rectangle" ), "Rectangle" ) - ::aShapesAct[ SHP_ACT_ROUNDRECT ] := ::qShapesMenu:addAction_1( app_image( "rp_roundrectangle"), "Rounded Rectangle" ) - ::aShapesAct[ SHP_ACT_ELLIPSE ] := ::qShapesMenu:addAction_1( app_image( "rp_ellipse" ), "Ellipse" ) - ::aShapesAct[ SHP_ACT_LINEHORZ ] := ::qShapesMenu:addAction_1( app_image( "rp_linehorz" ), "Horizontal Line" ) - ::aShapesAct[ SHP_ACT_LINEVERT ] := ::qShapesMenu:addAction_1( app_image( "rp_linevert" ), "Vertical Line" ) - ::aShapesAct[ SHP_ACT_LINEDIAGRIGHT ] := ::qShapesMenu:addAction_1( app_image( "rp_linediagright" ), "Diagonal Line Right" ) - ::aShapesAct[ SHP_ACT_LINEDIAGLEFT ] := ::qShapesMenu:addAction_1( app_image( "rp_linediagleft" ), "Diagonal Line Left" ) - ::aShapesAct[ SHP_ACT_ARC ] := ::qShapesMenu:addAction_1( app_image( "rp_arc" ), "Arc" ) - ::aShapesAct[ SHP_ACT_CHORD ] := ::qShapesMenu:addAction_1( app_image( "rp_chord" ), "Chord" ) - ::aShapesAct[ SHP_ACT_DIAMOND ] := ::qShapesMenu:addAction_1( app_image( "rp_diamond" ), "Diamond" ) - ::aShapesAct[ SHP_ACT_TRIANGLE ] := ::qShapesMenu:addAction_1( app_image( "rp_triangle" ), "Triangle" ) + ::aShapesAct[ SHP_ACT_RECTANGLE ] := ::qShapesMenu:addAction( app_image( "rp_rectangle" ), "Rectangle" ) + ::aShapesAct[ SHP_ACT_ROUNDRECT ] := ::qShapesMenu:addAction( app_image( "rp_roundrectangle"), "Rounded Rectangle" ) + ::aShapesAct[ SHP_ACT_ELLIPSE ] := ::qShapesMenu:addAction( app_image( "rp_ellipse" ), "Ellipse" ) + ::aShapesAct[ SHP_ACT_LINEHORZ ] := ::qShapesMenu:addAction( app_image( "rp_linehorz" ), "Horizontal Line" ) + ::aShapesAct[ SHP_ACT_LINEVERT ] := ::qShapesMenu:addAction( app_image( "rp_linevert" ), "Vertical Line" ) + ::aShapesAct[ SHP_ACT_LINEDIAGRIGHT ] := ::qShapesMenu:addAction( app_image( "rp_linediagright" ), "Diagonal Line Right" ) + ::aShapesAct[ SHP_ACT_LINEDIAGLEFT ] := ::qShapesMenu:addAction( app_image( "rp_linediagleft" ), "Diagonal Line Left" ) + ::aShapesAct[ SHP_ACT_ARC ] := ::qShapesMenu:addAction( app_image( "rp_arc" ), "Arc" ) + ::aShapesAct[ SHP_ACT_CHORD ] := ::qShapesMenu:addAction( app_image( "rp_chord" ), "Chord" ) + ::aShapesAct[ SHP_ACT_DIAMOND ] := ::qShapesMenu:addAction( app_image( "rp_diamond" ), "Diamond" ) + ::aShapesAct[ SHP_ACT_TRIANGLE ] := ::qShapesMenu:addAction( app_image( "rp_triangle" ), "Triangle" ) ::qShapesMenu:connect( QEvent_MouseButtonPress , {|p| ::execEvent( "QEvent_MousePressMenu" , p ) } ) ::qShapesMenu:connect( QEvent_MouseMove , {|p| ::execEvent( "QEvent_MouseMoveMenu" , p ) } ) @@ -1333,7 +1333,7 @@ METHOD HbqReportsManager:execMenuShapes() qPos:setX( qPos:x() + qBtn:width() / 2 ) qPos:setY( qPos:y() + qBtn:height() / 2 ) - ::qShapesMenu:exec_1( qPos ) + ::qShapesMenu:exec( qPos ) qBtn:setChecked( .f. ) RETURN Self @@ -1828,7 +1828,7 @@ METHOD HqrGraphicsItem:contextMenu( p1, p2 ) qMenu:addAction( "Cut" ) qMenu:addAction( "Copy" ) - pAct := qMenu:exec_1( qEvent:screenPos() ) + pAct := qMenu:exec( qEvent:screenPos() ) IF ! hbqt_isEmptyQtPointer( pAct ) SWITCH ( QAction():configure( pAct ) ):text() CASE "Cut" diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index e3d94e8c2d..52bba44bf7 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -533,12 +533,12 @@ METHOD IdeActions:buildMainMenu() oSubMenu:addItem( { ::qAnimateAction, {|| oIde:execAction( "Animate" ) } } ) oSubMenu:oWidget:addSeparator() - oSubMenu:oWidget:addAction_4( ::oIde:oMainToolbar:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oIde:oMainToolbar:oWidget:toggleViewAction() ) IF ! ::oIde:lCurEditsMdi - oSubMenu:oWidget:addAction_4( ::qTBarPanels:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::qTBarLines:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::qTBarPanels:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::qTBarLines:toggleViewAction() ) ENDIF - oSubMenu:oWidget:addAction_4( ::qTBarDocks:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::qTBarDocks:toggleViewAction() ) ::oIde:qStatusBarAction := QAction( oSubMenu:oWidget ) ::qStatusBarAction:setText( "Toggle Statusbar" ) @@ -547,29 +547,29 @@ METHOD IdeActions:buildMainMenu() ::qStatusBarAction:setChecked( ::lStatusBarVisible ) oSubMenu:oWidget:addSeparator() - oSubMenu:oWidget:addAction_4( ::oDockPT:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDockED:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oSkltnsTreeDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oDockPT:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oDockED:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oSkltnsTreeDock:oWidget:toggleViewAction() ) oSubMenu:oWidget:addSeparator() - oSubMenu:oWidget:addAction_4( ::oHelpDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDocViewDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDocWriteDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oFuncDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oFunctionsDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oPropertiesDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oEnvironDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oSkeltnDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oThemesDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oFindDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oSourceThumbnailDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oQScintillaDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oHelpDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oDocViewDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oDocWriteDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oFuncDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oFunctionsDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oPropertiesDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oEnvironDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oSkeltnDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oThemesDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oFindDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oSourceThumbnailDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oQScintillaDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oReportsManagerDock:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oReportsManagerDock:toggleViewAction() ) oSubMenu:oWidget:addSeparator() - oSubMenu:oWidget:addAction_4( ::oDockB2:oWidget:toggleViewAction() ) - * oSubMenu:oWidget:addAction_4( ::oDockB1:oWidget:toggleViewAction() ) - * oSubMenu:oWidget:addAction_4( ::oDockB:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction( ::oDockB2:oWidget:toggleViewAction() ) + * oSubMenu:oWidget:addAction( ::oDockB1:oWidget:toggleViewAction() ) + * oSubMenu:oWidget:addAction( ::oDockB:oWidget:toggleViewAction() ) /*----------------------------------------------------------------------------*/ /* Project */ diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index c9fc7eefac..a643df1129 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -427,17 +427,14 @@ METHOD IdeDocks:buildSystemTray() ::oIde:oSys := QSystemTrayIcon( ::oDlg:oWidget ) IF ( ::lSystemTrayAvailable := ::oSys:isSystemTrayAvailable() ) .AND. ::lMinimizeInSystemTray ::oSys:setIcon( hbide_image( "hbide" ) ) - //::connect( ::oSys, "activated(QSystemTrayIcon::ActivationReason)", {|p| ::execEvent( "qSystemTrayIcon_activated", p ) } ) ::oSys:connect( "activated(QSystemTrayIcon::ActivationReason)", {|p| ::execEvent( "qSystemTrayIcon_activated", p ) } ) ::oIde:oSysMenu := QMenu( ::oDlg:oWidget ) - ::qAct1 := QAction():from( ::oSysMenu:addAction_1( hbide_image( "fullscreen" ), "&Show" ) ) + ::qAct1 := QAction():from( ::oSysMenu:addAction( hbide_image( "fullscreen" ), "&Show" ) ) ::oSysMenu:addSeparator() - ::qAct2 := QAction():from( ::oSysMenu:addAction_1( hbide_image( "exit" ), "&Exit" ) ) + ::qAct2 := QAction():from( ::oSysMenu:addAction( hbide_image( "exit" ), "&Exit" ) ) - //::connect( ::qAct1, "triggered(bool)", {|| ::execEvent( "qSystemTrayIcon_show" ) } ) ::qAct1:connect( "triggered(bool)", {|| ::execEvent( "qSystemTrayIcon_show" ) } ) - //::connect( ::qAct2, "triggered(bool)", {|| ::execEvent( "qSystemTrayIcon_close" ) } ) ::qAct2:connect( "triggered(bool)", {|| ::execEvent( "qSystemTrayIcon_close" ) } ) ::oSys:setContextMenu( ::oSysMenu ) @@ -1424,7 +1421,7 @@ METHOD IdeDocks:buildProjectTree() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oDockPT := ::getADockWidget( nAreas, "dockProjectTree", "Projects", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_LeftDockWidgetArea, ::oDockPT:oWidget, Qt_Vertical ) + ::oDlg:oWidget:addDockWidget( Qt_LeftDockWidgetArea, ::oDockPT:oWidget, Qt_Vertical ) ::oIde:oProjTree := XbpTreeView():new() ::oProjTree:hasLines := .T. @@ -1479,7 +1476,7 @@ METHOD IdeDocks:buildEditorTree() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oDockED := ::getADockWidget( nAreas, "dockEditorTabs", "Editors", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_LeftDockWidgetArea, ::oDockED:oWidget, Qt_Vertical ) + ::oDlg:oWidget:addDockWidget( Qt_LeftDockWidgetArea, ::oDockED:oWidget, Qt_Vertical ) ::oIde:oEditTree := XbpTreeView():new() ::oEditTree:hasLines := .T. @@ -1513,7 +1510,7 @@ METHOD IdeDocks:buildSkeletonsTree() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oSkltnsTreeDock := ::getADockWidget( nAreas, "dockSkltnsTree", "Skeletons", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_LeftDockWidgetArea, ::oSkltnsTreeDock:oWidget, Qt_Vertical ) + ::oDlg:oWidget:addDockWidget( Qt_LeftDockWidgetArea, ::oSkltnsTreeDock:oWidget, Qt_Vertical ) ::oSkltnsTreeDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockSkltnsTree_visibilityChanged", p, ::oSkltnsTreeDock:oWidget ) } ) RETURN Self @@ -1524,7 +1521,7 @@ METHOD IdeDocks:buildFuncList() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oFuncDock := ::getADockWidget( nAreas, "dockFuncList", "Functions List", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oFuncDock:oWidget, Qt_Vertical ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oFuncDock:oWidget, Qt_Vertical ) ::oFuncDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "oFuncDock_visibilityChanged", p, ::oFuncDock:oWidget ) } ) ::oIde:oFuncList := XbpListBox():new( ::oFuncDock ):create( , , { 0,0 }, { 100,400 }, , .t. ) @@ -1545,7 +1542,7 @@ METHOD IdeDocks:buildHelpWidget() LOCAL qUrl, qStr ::oIde:oHelpDock := ::getADockWidget( Qt_RightDockWidgetArea, "dockHelp", "hbIDE Help", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oHelpDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oHelpDock:oWidget, Qt_Horizontal ) ::oIde:qHelpBrw := QTextBrowser( ::oHelpDock:oWidget ) ::qHelpBrw:show() @@ -1573,7 +1570,7 @@ METHOD IdeDocks:buildHelpWidget() METHOD IdeDocks:buildCompileResults() ::oIde:oDockB := ::getADockWidget( Qt_BottomDockWidgetArea, "dockCompileResults", "Compile Results" ) - ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_BottomDockWidgetArea, ::oDockB:oWidget, Qt_Horizontal ) ::oIde:oCompileResult := XbpMLE():new( ::oDockB ):create( , , { 0,0 }, { 100,400 }, , .t. ) ::oDockB:oWidget:setWidget( ::oCompileResult:oWidget ) @@ -1585,7 +1582,7 @@ METHOD IdeDocks:buildCompileResults() METHOD IdeDocks:buildLinkResults() ::oIde:oDockB1 := ::getADockWidget( Qt_BottomDockWidgetArea, "dockLinkResults", "Link Results" ) - ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB1:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_BottomDockWidgetArea, ::oDockB1:oWidget, Qt_Horizontal ) ::oIde:oLinkResult := XbpMLE():new( ::oDockB1 ):create( , , { 0,0 }, { 100, 400 }, , .T. ) ::oDockB1:oWidget:setWidget( ::oLinkResult:oWidget ) @@ -1598,7 +1595,7 @@ METHOD IdeDocks:buildOutputResults() LOCAL nAreas := Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oDockB2 := ::getADockWidget( nAreas, "dockOutputResults", "Output Console", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB2:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_BottomDockWidgetArea, ::oDockB2:oWidget, Qt_Horizontal ) ::oIde:oOutputResult := XbpRtf():new( ::oDockB2 ):create( , , { 0,0 }, { 100, 400 }, , .T. ) ::oOutputResult:oWidget:setAcceptRichText( .T. ) @@ -1677,7 +1674,7 @@ METHOD IdeDocks:buildThemesDock() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oThemesDock := ::getADockWidget( nAreas, "dockThemes", "Theme Manager", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oThemesDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oThemesDock:oWidget, Qt_Horizontal ) ::oThemesDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockThemes_visibilityChanged", p, ::oThemesDock:oWidget ) } ) RETURN Self @@ -1688,7 +1685,7 @@ METHOD IdeDocks:buildPropertiesDock() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oPropertiesDock := ::getADockWidget( nAreas, "dockProperties", "Project Properties", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oPropertiesDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oPropertiesDock:oWidget, Qt_Horizontal ) ::oPropertiesDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockProperties_visibilityChanged", p, ::oPropertiesDock:oWidget ) } ) RETURN Self @@ -1699,7 +1696,7 @@ METHOD IdeDocks:buildFindInFiles() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oFindDock := ::getADockWidget( nAreas, "dockFindInFiles", "Find in Files", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oFindDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oFindDock:oWidget, Qt_Horizontal ) ::oFindDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockFindInFiles_visibilityChanged", p, ::oFindDock:oWidget ) } ) RETURN Self @@ -1710,7 +1707,7 @@ METHOD IdeDocks:buildDocViewer() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oDocViewDock := ::getADockWidget( nAreas, "dockDocViewer", "Harbour Documentation", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDocViewDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oDocViewDock:oWidget, Qt_Horizontal ) ::oDocViewDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockDocViewer_visibilityChanged", p, ::oDocViewDock:oWidget ) } ) RETURN Self @@ -1721,7 +1718,7 @@ METHOD IdeDocks:buildDocWriter() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oDocWriteDock := ::getADockWidget( nAreas, "dockDocWriter", "Documentation Writer", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDocWriteDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oDocWriteDock:oWidget, Qt_Horizontal ) ::oDocWriteDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockDocWriter_visibilityChanged", p, ::oDocWriteDock:oWidget ) } ) RETURN Self @@ -1732,7 +1729,7 @@ METHOD IdeDocks:buildFunctionsDock() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oFunctionsDock := ::getADockWidget( nAreas, "dockFunctions", "Projects Functions Lookup", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oFunctionsDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oFunctionsDock:oWidget, Qt_Horizontal ) ::oFunctionsDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "docFunctions_visibilityChanged", p, ::oFunctionsDock:oWidget ) } ) RETURN Self @@ -1743,7 +1740,7 @@ METHOD IdeDocks:buildEnvironDock() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oEnvironDock := ::getADockWidget( nAreas, "dockEnvironments", "Compiler Environments", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oEnvironDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oEnvironDock:oWidget, Qt_Horizontal ) ::oEnvironDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "docEnvironments_visibilityChanged", p, ::oEnvironDock:oWidget ) } ) RETURN Self @@ -1754,7 +1751,7 @@ METHOD IdeDocks:buildSkeletonWidget() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oSkeltnDock := ::getADockWidget( nAreas, "dockSkeleton", "Code Skeletons", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oSkeltnDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oSkeltnDock:oWidget, Qt_Horizontal ) ::oSkeltnDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "docSkeletons_visibilityChanged", p, ::oSkeltnDock:oWidget ) } ) RETURN Self @@ -1766,7 +1763,7 @@ METHOD IdeDocks:buildSourceThumbnail() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea oDock := ::getADockWidget( nAreas, "dockSourceThumbnail", "Source Thumbnail", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, oDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, oDock:oWidget, Qt_Horizontal ) oDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockSourceThumbnail_visibilityChanged", p, oDock:oWidget ) } ) ::oIde:oSourceThumbnailDock := oDock @@ -1778,7 +1775,7 @@ METHOD IdeDocks:buildQScintilla() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oQScintillaDock := ::getADockWidget( nAreas, "dockQScintilla", "ideDBU", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oQScintillaDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oQScintillaDock:oWidget, Qt_Horizontal ) ::oQScintillaDock:oWidget:connect( "visibilityChanged(bool)" , {|p| ::execEvent( "dockQScintilla_visibilityChanged", p, ::oQScintillaDock:oWidget ) } ) RETURN Self @@ -1789,7 +1786,7 @@ METHOD IdeDocks:buildReportsDesignerWidget() LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oReportsManagerDock := ::getADockWidget( nAreas, "dockReportDesigner", "HBReportsManager", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oReportsManagerDock:oWidget, Qt_Horizontal ) + ::oDlg:oWidget:addDockWidget( Qt_RightDockWidgetArea, ::oReportsManagerDock:oWidget, Qt_Horizontal ) ::oReportsManagerDock:oWidget:connect( "visibilityChanged(bool)", {|p| ::execEvent( "dockReportsManager_visibilityChanged", p, ::oReportsManagerDock:oWidget ) } ) RETURN Self diff --git a/harbour/contrib/hbide/ideedit.prg b/harbour/contrib/hbide/ideedit.prg index 7154283ec2..58e7c83554 100644 --- a/harbour/contrib/hbide/ideedit.prg +++ b/harbour/contrib/hbide/ideedit.prg @@ -448,7 +448,7 @@ METHOD IdeEdit:execEvent( nMode, oEdit, p, p1 ) QAction():from( ::oEM:aActions[ 19, 2 ] ):setEnabled( len( ::oEditor:aEdits ) == 0 .OR. ::oEditor:nSplOrient == -1 .OR. ::oEditor:nSplOrient == 2 ) QAction():from( ::oEM:aActions[ 21, 2 ] ):setEnabled( n > 0 ) - pAct := ::oEM:qContextMenu:exec_1( qEdit:mapToGlobal( p ) ) + pAct := ::oEM:qContextMenu:exec( qEdit:mapToGlobal( p ) ) IF !hbqt_isEmptyQtPointer( pAct ) qAct := QAction():configure( pAct ) cAct := strtran( qAct:text(), "&", "" ) diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg index dfa41dd397..1447b92913 100644 --- a/harbour/contrib/hbide/ideeditor.prg +++ b/harbour/contrib/hbide/ideeditor.prg @@ -207,25 +207,25 @@ METHOD IdeEditsManager:create( oIde ) ::qContextMenu := QMenu() - aadd( ::aActions, { "GotoFunc" , ::qContextMenu:addAction_4( ::oAC:getAction( "GotoFunc" ) ) } ) + aadd( ::aActions, { "GotoFunc" , ::qContextMenu:addAction( ::oAC:getAction( "GotoFunc" ) ) } ) aadd( ::aActions, { "" , ::qContextMenu:addSeparator() } ) - aadd( ::aActions, { "TB_Cut" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Cut" ) ) } ) - aadd( ::aActions, { "TB_Copy" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Copy" ) ) } ) - aadd( ::aActions, { "TB_Paste" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Paste" ) ) } ) + aadd( ::aActions, { "TB_Cut" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Cut" ) ) } ) + aadd( ::aActions, { "TB_Copy" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Copy" ) ) } ) + aadd( ::aActions, { "TB_Paste" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Paste" ) ) } ) aadd( ::aActions, { "" , ::qContextMenu:addSeparator() } ) - aadd( ::aActions, { "TB_Undo" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Undo" ) ) } ) - aadd( ::aActions, { "TB_Redo" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Redo" ) ) } ) + aadd( ::aActions, { "TB_Undo" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Undo" ) ) } ) + aadd( ::aActions, { "TB_Redo" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Redo" ) ) } ) aadd( ::aActions, { "" , ::qContextMenu:addSeparator() } ) - aadd( ::aActions, { "TB_Save" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Save" ) ) } ) - aadd( ::aActions, { "TB_Close" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Close" ) ) } ) + aadd( ::aActions, { "TB_Save" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Save" ) ) } ) + aadd( ::aActions, { "TB_Close" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Close" ) ) } ) aadd( ::aActions, { "" , ::qContextMenu:addSeparator() } ) - aadd( ::aActions, { "TB_Compile" , ::qContextMenu:addAction_4( ::oAC:getAction( "TB_Compile" ) ) } ) - aadd( ::aActions, { "TB_CompilePPO", ::qContextMenu:addAction_4( ::oAC:getAction( "TB_CompilePPO" ) ) } ) + aadd( ::aActions, { "TB_Compile" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Compile" ) ) } ) + aadd( ::aActions, { "TB_CompilePPO", ::qContextMenu:addAction( ::oAC:getAction( "TB_CompilePPO" ) ) } ) aadd( ::aActions, { "" , ::qContextMenu:addSeparator() } ) - aadd( ::aActions, { "Apply Theme" , ::qContextMenu:addAction( "Apply Theme" ) } ) - aadd( ::aActions, { "Save as Skltn", ::qContextMenu:addAction( "Save as Skeleton..." ) } ) + aadd( ::aActions, { "Apply Theme" , ::qContextMenu:addAction( "Apply Theme" ) } ) + aadd( ::aActions, { "Save as Skltn", ::qContextMenu:addAction( "Save as Skeleton..." ) } ) - ::qContextSub := QMenu():configure( ::qContextMenu:addMenu_1( "Split" ) ) + ::qContextSub := QMenu():configure( ::qContextMenu:addMenu( "Split" ) ) // aadd( ::aActions, { "Split H" , ::qContextSub:addAction( "Split Horizontally" ) } ) aadd( ::aActions, { "Split V" , ::qContextSub:addAction( "Split Vertically" ) } ) diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index ba0b725788..f11a6c8591 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -974,7 +974,7 @@ METHOD IdeFindInFiles:execContextMenu( p ) qMenu:addAction( "Zoom In" ) qMenu:addAction( "Zoom Out" ) - pAct := qMenu:exec_1( ::oUI:q_editResults:mapToGlobal( p ) ) + pAct := qMenu:exec( ::oUI:q_editResults:mapToGlobal( p ) ) IF !hbqt_isEmptyQtPointer( pAct ) qAct := QAction():configure( pAct ) cAct := qAct:text() diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index eaa2bb4f1b..f14e3a8746 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -1449,12 +1449,12 @@ METHOD HbIde:testPainter( qPainter ) HB_TRACE( HB_TR_DEBUG, "qPainter:isActive()", qP:isActive() ) - qP:setPen_2( Qt_red ) - qP:drawEllipse_2( 100,300,100,150 ) + qP:setPen( Qt_red ) + qP:drawEllipse( 100,300,100,150 ) qP:setFont( ::oFont:oWidget ) - qP:drawText_4( 100,300,"Harbour" ) + qP:drawText( 100,300,"Harbour" ) - //qPainter:fillRect_8( 100, 100, 500, 500, QColor( 175, 175, 255 ) ) + //qPainter:fillRect( 100, 100, 500, 500, QColor( 175, 175, 255 ) ) RETURN NIL diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index 82ff7740e0..553af8637b 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -149,7 +149,7 @@ FUNCTION hbide_execPopup( aPops, aqPos, qParent ) qPop:addSeparator() ELSE IF hb_isObject( aPops[ i, 1 ] ) - qPop:addAction_4( aPops[ i, 1 ] ) + qPop:addAction( aPops[ i, 1 ] ) ELSEIF hb_isArray( aPops[ i, 1 ] ) /* Sub-menu */ qSub := QMenu( qPop ) qSub:setStyleSheet( GetStyleSheet( "QMenuPop", hbide_setIde():nAnimantionMode ) ) @@ -170,7 +170,7 @@ FUNCTION hbide_execPopup( aPops, aqPos, qParent ) ELSE qPoint := QPoint():configure( qParent:mapToGlobal( aqPos ) ) ENDIF - pAct := qPop:exec_1( qPoint ) + pAct := qPop:exec( qPoint ) IF !hbqt_isEmptyQtPointer( pAct ) qAct := QAction():configure( pAct ) cAct := qAct:text() diff --git a/harbour/contrib/hbide/ideskeletons.prg b/harbour/contrib/hbide/ideskeletons.prg index a731ac305b..c7de2625d2 100644 --- a/harbour/contrib/hbide/ideskeletons.prg +++ b/harbour/contrib/hbide/ideskeletons.prg @@ -349,7 +349,7 @@ METHOD IdeSkeletons:selectByMenuAndPostText( qEdit ) qMenu:addAction( a_[ 1 ] ) NEXT - pAct := qMenu:exec_1( qEdit:mapToGlobal( QPoint( qRect:x(), qRect:y() ) ) ) + pAct := qMenu:exec( qEdit:mapToGlobal( QPoint( qRect:x(), qRect:y() ) ) ) IF !hbqt_isEmptyQtPointer( pAct ) qAct := QAction():from( pAct ) diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt index c4a2ca678f..436ab43117 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmainwindow.txt @@ -26,11 +26,8 @@ * $RETURNS$ * An instance of the object of type QMainWindow * $METHODS$ - * :addDockWidget( nArea, pDockwidget ) -> NIL - * :addDockWidget_1( nArea, pDockwidget, nOrientation ) -> NIL - * :addToolBar( nArea, pToolbar ) -> NIL - * :addToolBar_1( pToolbar ) -> NIL - * :addToolBar_2( cTitle ) -> pQToolBar + * :addDockWidget( ... ) -> NIL + * :addToolBar( ... ) -> NIL * :addToolBarBreak( nArea ) -> NIL * :centralWidget() -> pQWidget * :corner( nCorner ) -> nQt::DockWidgetArea diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt index 3b8c6f0efe..3b8c078cf1 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qmenu.txt @@ -29,17 +29,11 @@ * :actionAt( pPt ) -> pQAction * :actionGeometry( pAct ) -> pQRect * :activeAction() -> pQAction - * :addAction( cText ) -> pQAction - * :addAction_1( pIcon, cText ) -> pQAction - * :addAction_2( cText, pReceiver, pMember, pShortcut ) -> pQAction - * :addAction_3( pIcon, cText, pReceiver, pMember, pShortcut ) -> pQAction - * :addAction_4( pAction ) -> NIL - * :addMenu( pMenu ) -> pQAction + * :addAction( ... ) -> pQAction * :addSeparator() -> pQAction * :clear() -> NIL * :defaultAction() -> pQAction - * :exec() -> pQAction - * :exec_1( pP, pAction ) -> pQAction + * :exec( ... ) -> pQAction * :hideTearOffMenu() -> NIL * :icon() -> pQIcon * :insertMenu( pBefore, pMenu ) -> pQAction diff --git a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp index e1f2f6dff6..b7a8ef9c49 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMainWindow.cpp @@ -72,12 +72,21 @@ */ /* - * Constructed[ 49/50 [ 98.00% ] ] + * Constructed[ 46/53 [ 86.79% ] ] * * *** Unconvered Prototypes *** * ----------------------------- * * } + * } + * + * *** Commented out protos which construct fine but do not compile *** + * + * //void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) + * //void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) + * // void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) + * // void addToolBar ( QToolBar * toolbar ) + * // QToolBar * addToolBar ( const QString & title ) // NOT implemented */ #include @@ -180,77 +189,44 @@ HB_FUNC( QT_QMAINWINDOW ) } /* - * void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) + * void addDockWidget ( ... ) */ HB_FUNC( QT_QMAINWINDOW_ADDDOCKWIDGET ) { QMainWindow * p = hbqt_par_QMainWindow( 1 ); if( p ) { - ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) ); - } -} - -/* - * void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) - */ -HB_FUNC( QT_QMAINWINDOW_ADDDOCKWIDGET_1 ) -{ - QMainWindow * p = hbqt_par_QMainWindow( 1 ); - if( p ) - { - ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni( 4 ) ); - } -} - -/* - * void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) - */ -HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR ) -{ - HBQT_GC_T_QMainWindow * q = ( HBQT_GC_T_QMainWindow * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); - - HB_TRACE( HB_TR_DEBUG, ("QMAINWINDOW_ADDTOOLBAR" ) ); - HB_TRACE( HB_TR_DEBUG, ( "QT_QMAINWINDOW_ADDTOOLBAR() Qt object: %p to: %p", (void *) p, (void *) q) ); - HB_TRACE( HB_TR_DEBUG, ( "QT_QMAINWINDOW_ADDTOOLBAR() Qt object: %p to: %p", (void *) p->ph, (void *) q->ph) ); - - if ( p && p->ph && q && q->ph ) - { - HB_TRACE( HB_TR_DEBUG, ( "QT_QMAINWINDOW_ADDTOOLBAR() Qt object: %p is attached to: %p", (void *) p->ph, (void *) q->ph) ); - p->bNew = HB_FALSE; - if ( q && q->ph ) - ( q->ph )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), ( ( QToolBar *) p->ph )); - else + if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) { - HB_TRACE( HB_TR_DEBUG, ( "F=QT_QTOOLBAR_ADDACTION FP=( p )->addAction( hbqt_par_QAction( 2 ) ); p is NULL" )); + ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) ); + } + if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) + { + ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni( 4 ) ); } } } /* - * void addToolBar ( QToolBar * toolbar ) + * void addToolBar ( ... ) */ -HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_1 ) +HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR ) { QMainWindow * p = hbqt_par_QMainWindow( 1 ); if( p ) { - ( p )->addToolBar( hbqt_par_QToolBar( 2 ) ); - } -} - -/* - * QToolBar * addToolBar ( const QString & title ) - */ -HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_2 ) -{ - QMainWindow * p = hbqt_par_QMainWindow( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QToolBar( ( p )->addToolBar( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); - hb_strfree( pText ); + if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + ( q )->bNew = false; + ( p )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), hbqt_par_QToolBar( 3 ) ); + } + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + ( q )->bNew = false; + ( p )->addToolBar( hbqt_par_QToolBar( 2 ) ); + } } } diff --git a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp index d5cb713f02..52a105dd6d 100644 --- a/harbour/contrib/hbqt/qtgui/g/QMenu.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QMenu.cpp @@ -67,15 +67,27 @@ /*----------------------------------------------------------------------*/ /* - * Constructed[ 33/36 [ 91.67% ] ] + * Constructed[ 26/41 [ 63.41% ] ] * * *** Unconvered Prototypes *** * ----------------------------- * * } + * } + * } * * *** Commented out protos which construct fine but do not compile *** * + * //QAction * addAction ( const QString & text ) + * //QAction * addAction ( const QIcon & icon, const QString & text ) + * //QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + * //QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) + * //QAction * addAction ( QAction * action ) + * //QAction * addMenu ( QMenu * menu ) + * //QMenu * addMenu ( const QString & title ) + * //QMenu * addMenu ( const QIcon & icon, const QString & title ) + * //QAction * exec () + * //QAction * exec ( const QPoint & p, QAction * action = 0 ) * // OSMenuRef macMenu ( OSMenuRef merge = 0 ) * // HMENU wceMenu ( bool create = false ) */ @@ -209,7 +221,7 @@ HB_FUNC( QT_QMENU_ACTIVEACTION ) } /* - * QAction * addAction ( const QString & text ) + * QAction * addAction ( ... ) */ HB_FUNC( QT_QMENU_ADDACTION ) { @@ -217,107 +229,64 @@ HB_FUNC( QT_QMENU_ADDACTION ) if( p ) { void * pText; - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); - hb_strfree( pText ); + + if( hb_pcount() >= 5 ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); + } + else if( hb_pcount() >= 4 ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ), false ) ); + } + else if( hb_pcount() == 3 ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); + } + else if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + q->bNew = HB_FALSE; + ( p )->addAction( hbqt_par_QAction( 2 ) ); + } + + if( pText ) + { + hb_strfree( pText ); + } } } /* - * QAction * addAction ( const QIcon & icon, const QString & text ) - */ -HB_FUNC( QT_QMENU_ADDACTION_1 ) -{ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); - hb_strfree( pText ); - } -} - -/* - * QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) - */ -HB_FUNC( QT_QMENU_ADDACTION_2 ) -{ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ), false ) ); - hb_strfree( pText ); - } -} - -/* - * QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) - */ -HB_FUNC( QT_QMENU_ADDACTION_3 ) -{ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); - hb_strfree( pText ); - } -} - -/* - * void addAction ( QAction * action ) - */ -HB_FUNC( QT_QMENU_ADDACTION_4 ) -{ - HBQT_GC_T_QMenu * q = ( HBQT_GC_T_QMenu * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QMENU_ADDACTION()" ) ); - if( p && p->ph && q && q->ph ) - { - HB_TRACE( HB_TR_DEBUG, ( "QT_QMENU_ADDACTION() Qt oject: %p is attached to: %p", ( void * ) p->ph, ( void * ) q->ph ) ); - p->bNew = HB_FALSE; - ( q->ph )->addAction( ( QAction * ) p->ph ); - } -} - -/* - * QAction * addMenu ( QMenu * menu ) + * QMenu * addMenu ( ... ) */ HB_FUNC( QT_QMENU_ADDMENU ) -{ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addMenu( hbqt_par_QMenu( 2 ) ), false ) ); - } -} - -/* - * QMenu * addMenu ( const QString & title ) - */ -HB_FUNC( QT_QMENU_ADDMENU_1 ) { QMenu * p = hbqt_par_QMenu( 1 ); if( p ) { void * pText; - hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); - hb_strfree( pText ); - } -} -/* - * QMenu * addMenu ( const QIcon & icon, const QString & title ) - */ -HB_FUNC( QT_QMENU_ADDMENU_2 ) -{ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); - hb_strfree( pText ); + if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addMenu( hbqt_par_QMenu( 2 ) ), false ) ); + } + else if( hb_pcount() == 3 ) + { + hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); + } + + if( pText ) + { + hb_strfree( pText ); + } } } @@ -358,26 +327,21 @@ HB_FUNC( QT_QMENU_DEFAULTACTION ) } /* - * QAction * exec () + * QAction * exec ( ... ) */ HB_FUNC( QT_QMENU_EXEC ) { QMenu * p = hbqt_par_QMenu( 1 ); if( p ) { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec(), false ) ); - } -} - -/* - * QAction * exec ( const QPoint & p, QAction * action = 0 ) - */ -HB_FUNC( QT_QMENU_EXEC_1 ) -{ - QMenu * p = hbqt_par_QMenu( 1 ); - if( p ) - { - hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec( *hbqt_par_QPoint( 2 ), hbqt_par_QAction( 3 ) ), false ) ); + if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec( *hbqt_par_QPoint( 2 ), hbqt_par_QAction( 3 ) ), false ) ); + } + else + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec(), false ) ); + } } } diff --git a/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg b/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg index bf9accdb92..e3245baa8c 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQMainWindow.prg @@ -71,11 +71,8 @@ CREATE CLASS QMainWindow INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QMain METHOD new( ... ) - METHOD addDockWidget( nArea, pDockwidget ) - METHOD addDockWidget_1( nArea, pDockwidget, nOrientation ) - METHOD addToolBar( nArea, pToolbar ) - METHOD addToolBar_1( pToolbar ) - METHOD addToolBar_2( cTitle ) + METHOD addDockWidget( ... ) + METHOD addToolBar( ... ) METHOD addToolBarBreak( nArea ) METHOD centralWidget() METHOD corner( nCorner ) @@ -133,24 +130,20 @@ METHOD QMainWindow:new( ... ) RETURN Self -METHOD QMainWindow:addDockWidget( nArea, pDockwidget ) - RETURN Qt_QMainWindow_addDockWidget( ::pPtr, nArea, hbqt_ptr( pDockwidget ) ) +METHOD QMainWindow:addDockWidget( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QMainWindow_addDockWidget( ::pPtr, ... ) -METHOD QMainWindow:addDockWidget_1( nArea, pDockwidget, nOrientation ) - RETURN Qt_QMainWindow_addDockWidget_1( ::pPtr, nArea, hbqt_ptr( pDockwidget ), nOrientation ) - - -METHOD QMainWindow:addToolBar( nArea, pToolbar ) - RETURN Qt_QMainWindow_addToolBar( ::pPtr, nArea, hbqt_ptr( pToolbar ) ) - - -METHOD QMainWindow:addToolBar_1( pToolbar ) - RETURN Qt_QMainWindow_addToolBar_1( ::pPtr, hbqt_ptr( pToolbar ) ) - - -METHOD QMainWindow:addToolBar_2( cTitle ) - RETURN Qt_QMainWindow_addToolBar_2( ::pPtr, cTitle ) +METHOD QMainWindow:addToolBar( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QMainWindow_addToolBar( ::pPtr, ... ) METHOD QMainWindow:addToolBarBreak( nArea ) diff --git a/harbour/contrib/hbqt/qtgui/g/TQMenu.prg b/harbour/contrib/hbqt/qtgui/g/TQMenu.prg index f8f51c3f09..5e0ccb75a1 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQMenu.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQMenu.prg @@ -74,19 +74,12 @@ CREATE CLASS QMenu INHERIT HbQtObjectHandler, HB_QWidget FUNCTION HB_QMenu METHOD actionAt( pPt ) METHOD actionGeometry( pAct ) METHOD activeAction() - METHOD addAction( cText ) - METHOD addAction_1( pIcon, cText ) - METHOD addAction_2( cText, pReceiver, pMember, pShortcut ) - METHOD addAction_3( pIcon, cText, pReceiver, pMember, pShortcut ) - METHOD addAction_4( pAction ) - METHOD addMenu( pMenu ) - METHOD addMenu_1( cTitle ) - METHOD addMenu_2( pIcon, cTitle ) + METHOD addAction( ... ) + METHOD addMenu( ... ) METHOD addSeparator() METHOD clear() METHOD defaultAction() - METHOD exec() - METHOD exec_1( pP, pAction ) + METHOD exec( ... ) METHOD hideTearOffMenu() METHOD icon() METHOD insertMenu( pBefore, pMenu ) @@ -129,36 +122,20 @@ METHOD QMenu:activeAction() RETURN Qt_QMenu_activeAction( ::pPtr ) -METHOD QMenu:addAction( cText ) - RETURN Qt_QMenu_addAction( ::pPtr, cText ) +METHOD QMenu:addAction( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QMenu_addAction( ::pPtr, ... ) -METHOD QMenu:addAction_1( pIcon, cText ) - RETURN Qt_QMenu_addAction_1( ::pPtr, hbqt_ptr( pIcon ), cText ) - - -METHOD QMenu:addAction_2( cText, pReceiver, pMember, pShortcut ) - RETURN Qt_QMenu_addAction_2( ::pPtr, cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ), hbqt_ptr( pShortcut ) ) - - -METHOD QMenu:addAction_3( pIcon, cText, pReceiver, pMember, pShortcut ) - RETURN Qt_QMenu_addAction_3( ::pPtr, hbqt_ptr( pIcon ), cText, hbqt_ptr( pReceiver ), hbqt_ptr( pMember ), hbqt_ptr( pShortcut ) ) - - -METHOD QMenu:addAction_4( pAction ) - RETURN Qt_QMenu_addAction_4( ::pPtr, hbqt_ptr( pAction ) ) - - -METHOD QMenu:addMenu( pMenu ) - RETURN Qt_QMenu_addMenu( ::pPtr, hbqt_ptr( pMenu ) ) - - -METHOD QMenu:addMenu_1( cTitle ) - RETURN Qt_QMenu_addMenu_1( ::pPtr, cTitle ) - - -METHOD QMenu:addMenu_2( pIcon, cTitle ) - RETURN Qt_QMenu_addMenu_2( ::pPtr, hbqt_ptr( pIcon ), cTitle ) +METHOD QMenu:addMenu( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QMenu_addMenu( ::pPtr, ... ) METHOD QMenu:addSeparator() @@ -173,12 +150,12 @@ METHOD QMenu:defaultAction() RETURN Qt_QMenu_defaultAction( ::pPtr ) -METHOD QMenu:exec() - RETURN Qt_QMenu_exec( ::pPtr ) - - -METHOD QMenu:exec_1( pP, pAction ) - RETURN Qt_QMenu_exec_1( ::pPtr, hbqt_ptr( pP ), hbqt_ptr( pAction ) ) +METHOD QMenu:exec( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QMenu_exec( ::pPtr, ... ) METHOD QMenu:hideTearOffMenu() diff --git a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth index 3d833fbde6..18de2fd851 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMainWindow.qth @@ -94,30 +94,46 @@ flags DockOptions -void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) -void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) -void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ){ - HBQT_GC_T_QMainWindow * q = ( HBQT_GC_T_QMainWindow * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); - HB_TRACE( HB_TR_DEBUG, ("QMAINWINDOW_ADDTOOLBAR" ) ); - HB_TRACE( HB_TR_DEBUG, ( "QT_QMAINWINDOW_ADDTOOLBAR() Qt object: %p to: %p", (void *) p, (void *) q) ); - HB_TRACE( HB_TR_DEBUG, ( "QT_QMAINWINDOW_ADDTOOLBAR() Qt object: %p to: %p", (void *) p->ph, (void *) q->ph) ); - - if ( p && p->ph && q && q->ph ) +void addDockWidget ( ... ){ + QMainWindow * p = hbqt_par_QMainWindow( 1 ); + if( p ) { - HB_TRACE( HB_TR_DEBUG, ( "QT_QMAINWINDOW_ADDTOOLBAR() Qt object: %p is attached to: %p", (void *) p->ph, (void *) q->ph) ); - p->bNew = HB_FALSE; - if ( q && q->ph ) - ( q->ph )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), ( ( QToolBar *) p->ph )); - else + if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) { - HB_TRACE( HB_TR_DEBUG, ( "F=QT_QTOOLBAR_ADDACTION FP=( p )->addAction( hbqt_par_QAction( 2 ) ); p is NULL" )); - } + ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) ); + } + if( hb_pcount() == 4 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) + { + ( p )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni( 4 ) ); + } } } -void addToolBar ( QToolBar * toolbar ) -QToolBar * addToolBar ( const QString & title ) +//void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) +//void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orientation orientation ) + +void addToolBar ( ... ){ + QMainWindow * p = hbqt_par_QMainWindow( 1 ); + if( p ) + { + if( hb_pcount() == 3 && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + ( q )->bNew = false; + ( p )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), hbqt_par_QToolBar( 3 ) ); + } + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + ( q )->bNew = false; + ( p )->addToolBar( hbqt_par_QToolBar( 2 ) ); + } + } +} +// void addToolBar ( Qt::ToolBarArea area, QToolBar * toolbar ) +// void addToolBar ( QToolBar * toolbar ) +// QToolBar * addToolBar ( const QString & title ) // NOT implemented + void addToolBarBreak ( Qt::ToolBarArea area = Qt::TopToolBarArea ) QWidget * centralWidget () const Qt::DockWidgetArea corner ( Qt::Corner corner ) const diff --git a/harbour/contrib/hbqt/qtgui/qth/QMenu.qth b/harbour/contrib/hbqt/qtgui/qth/QMenu.qth index 3ceb58b210..d4db0924f5 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QMenu.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QMenu.qth @@ -85,30 +85,98 @@ HB_FUNC( QT_QMENU ) QAction * actionAt ( const QPoint & pt ) const QRect actionGeometry ( QAction * act ) const QAction * activeAction () const -QAction * addAction ( const QString & text ) -QAction * addAction ( const QIcon & icon, const QString & text ) -QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) -QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) -void addAction ( QAction * action ){ - HBQT_GC_T_QMenu * q = ( HBQT_GC_T_QMenu * ) hb_parptrGC( hbqt_gcFuncs(), 1 ); - HBQT_GC_T * p = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); - HB_TRACE( HB_TR_DEBUG, ( "Entering function QT_QMENU_ADDACTION()" ) ); - if( p && p->ph && q && q->ph ) - { - HB_TRACE( HB_TR_DEBUG, ( "QT_QMENU_ADDACTION() Qt oject: %p is attached to: %p", ( void * ) p->ph, ( void * ) q->ph ) ); - p->bNew = HB_FALSE; - ( q->ph )->addAction( ( QAction * ) p->ph ); - } +QAction * addAction ( ... ){ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + void * pText; + + if( hb_pcount() >= 5 ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); + } + else if( hb_pcount() >= 4 ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ), hbqt_par_QObject( 3 ), hbqt_par_char( 4 ), *hbqt_par_QKeySequence( 5 ) ), false ) ); + } + else if( hb_pcount() == 3 ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); + } + else if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + q->bNew = HB_FALSE; + ( p )->addAction( hbqt_par_QAction( 2 ) ); + } + + if( pText ) + { + hb_strfree( pText ); + } + } } -QAction * addMenu ( QMenu * menu ) -QMenu * addMenu ( const QString & title ) -QMenu * addMenu ( const QIcon & icon, const QString & title ) +//QAction * addAction ( const QString & text ) +//QAction * addAction ( const QIcon & icon, const QString & text ) +//QAction * addAction ( const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) +//QAction * addAction ( const QIcon & icon, const QString & text, const QObject * receiver, const char * member, const QKeySequence & shortcut = 0 ) +//QAction * addAction ( QAction * action ) + +QMenu * addMenu ( ... ){ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + void * pText; + + if( hb_pcount() == 2 && HB_ISCHAR( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( hb_parstr_utf8( 2, &pText, NULL ) ), false ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addMenu( hbqt_par_QMenu( 2 ) ), false ) ); + } + else if( hb_pcount() == 3 ) + { + hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISCHAR( 2 ) ? QIcon( hbqt_par_QString( 2 ) ) : *hbqt_par_QIcon( 2 )), hb_parstr_utf8( 3, &pText, NULL ) ), false ) ); + } + + if( pText ) + { + hb_strfree( pText ); + } + } +} +//QAction * addMenu ( QMenu * menu ) +//QMenu * addMenu ( const QString & title ) +//QMenu * addMenu ( const QIcon & icon, const QString & title ) + QAction * addSeparator () void clear () QAction * defaultAction () const -QAction * exec () -QAction * exec ( const QPoint & p, QAction * action = 0 ) + +QAction * exec ( ... ){ + QMenu * p = hbqt_par_QMenu( 1 ); + if( p ) + { + if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec( *hbqt_par_QPoint( 2 ), hbqt_par_QAction( 3 ) ), false ) ); + } + else + { + hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->exec(), false ) ); + } + } +} +//QAction * exec () +//QAction * exec ( const QPoint & p, QAction * action = 0 ) + void hideTearOffMenu () QIcon icon () const QAction * insertMenu ( QAction * before, QMenu * menu ) diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg index ae003a9a86..5f8ca7dd74 100644 --- a/harbour/contrib/hbqt/tests/demoqt.prg +++ b/harbour/contrib/hbqt/tests/demoqt.prg @@ -238,14 +238,14 @@ STATIC FUNCTION Build_MenuBar( oWnd ) oActNew:setText( "&New" ) oActNew:setIcon( "new.png" ) oActNew:connect( "triggered(bool)", {|w,l| FileDialog( "New" , w, l ) } ) - oMenu1:addAction_4( oActNew ) + oMenu1:addAction( oActNew ) - oActOpen := QAction():from( oMenu1:addAction_1( "open.png", "&Open" ) ) + oActOpen := QAction():from( oMenu1:addAction( "open.png", "&Open" ) ) oActOpen:connect( QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open" , w, l ) } ) oMenu1:addSeparator() - oActSave := QAction():from( oMenu1:addAction_1( "save.png", "&Save" ) ) + oActSave := QAction():from( oMenu1:addAction( "save.png", "&Save" ) ) oActSave:connect( QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save" , w, l ) } ) oMenu1:addSeparator() @@ -331,7 +331,7 @@ STATIC FUNCTION Build_ToolBar( oWnd ) oTB:addAction( oActSave ) /* Add this toolbar with main window */ - oWnd:addToolBar_1( oTB ) + oWnd:addToolBar( oTB ) RETURN { oActNew, oActOpen, oActSave, oTB } @@ -631,12 +631,12 @@ FUNCTION ShowInSystemTray( oWnd ) oMenuSys := QMenu( oWnd ) oMenuSys:setTitle( "&File" ) - oActShow := QAction():from( oMenuSys:addAction_1( "new.png" , "&Show" ) ) + oActShow := QAction():from( oMenuSys:addAction( "new.png" , "&Show" ) ) oActShow:connect( QT_EVE_TRIGGERED_B, {|| oWnd:show() } ) oMenuSys:addSeparator() - oActHide := QAction():from( oMenuSys:addAction_1( "new.png" , "&Show" ) ) + oActHide := QAction():from( oMenuSys:addAction( "new.png" , "&Show" ) ) oActHide:connect( QT_EVE_TRIGGERED_B, {|| oWnd:hide() } ) oSys := QSystemTrayIcon( oWnd ) diff --git a/harbour/contrib/hbxbp/xbpmenubar.prg b/harbour/contrib/hbxbp/xbpmenubar.prg index e066dd864b..c3386e5038 100644 --- a/harbour/contrib/hbxbp/xbpmenubar.prg +++ b/harbour/contrib/hbxbp/xbpmenubar.prg @@ -328,7 +328,7 @@ METHOD xbpMenuBar:placeItem( xCaption, bAction, nStyle, nAttrb, nMode, nPos ) ENDIF IF nMode == QTC_MENUITEM_ADD - ::oWidget:addAction_4( oAction ) + ::oWidget:addAction( oAction ) ELSE ::oWidget:insertAction( pOldAct, oAction ) ENDIF @@ -362,7 +362,7 @@ METHOD xbpMenuBar:placeItem( xCaption, bAction, nStyle, nAttrb, nMode, nPos ) ENDIF IF nMode == QTC_MENUITEM_ADD - ::oWidget:addAction_4( oAction ) + ::oWidget:addAction( oAction ) ELSE ::oWidget:insertAction( pOldAct, oAction ) ENDIF diff --git a/harbour/contrib/hbxbp/xbptoolbar.prg b/harbour/contrib/hbxbp/xbptoolbar.prg index 463a619029..ad1d433ef2 100644 --- a/harbour/contrib/hbxbp/xbptoolbar.prg +++ b/harbour/contrib/hbxbp/xbptoolbar.prg @@ -155,7 +155,7 @@ METHOD XbpToolbar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::oWidget := QToolBar( ::oParent:oWidget ) ::oWidget:setObjectName( "XBPTOOLBARMAIN" ) ::oWidget:setWindowTitle( "Toolbar: Main" ) - ::oParent:oWidget:addToolBar_1( ::oWidget ) + ::oParent:oWidget:addToolBar( ::oWidget ) IF ::imageWidth > 0 .and. ::imageHeight > 0 ::oWidget:setIconSize( QSize( ::imageWidth, ::imageHeight ) )