diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 909af22b7d..0710546b90 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,30 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-08 15:44 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/hbqt_hbslots.cpp + ! Fixed a very bad omission : + if( object->property( signal ).toInt() == i ) + => + if( object->property( signal ).toInt() == i + 1 ) + It fixes if an action is not already defined for a widget. + TO WATCH: Is is desirable ? + + * contrib/hbxbp/xbpfiledialog.prg + ! Small optimization. + + * contrib/hbide/hbide.prg + * contrib/hbide/ideactions.prg + ! Separated toolbar and menu actions, the whole point of + recent reported issues, because toolbar and menu implementation + call different methods with different intensions. + + Please test if toolbar and menu option behave correctly. + + GROUP DECISION: should I go for QProcess() to manage build phase + or keep Harbour centric implementation as well ? Qt seems to be + proper choice under this context. + 2010-01-08 18:28 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/vm/dynsym.c + accept also function name (not only symbol index) as parameter diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 87fc45773b..37a7f91714 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -859,8 +859,6 @@ METHOD HbIde:revertSource( nTab ) METHOD HbIde:openSource() LOCAL aSrc, cSource - hbide_dbg( "openSource()" ) - IF !empty( aSrc := ::selectSource( "openmany" ) ) FOR EACH cSource IN aSrc ::editSource( cSource ) @@ -1320,8 +1318,6 @@ METHOD HbIde:updateProjectMenu() RETURN Self ENDIF -* msgbox( ToString( oMenuBar:aMenuItems[ n ] )) - IF Empty( ::cWrkProject ) oItem[ 2 ]:setDisabled( .T. ) RETURN Self diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index ab2fb5171d..9e80301a9a 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -143,7 +143,8 @@ METHOD IdeActions:buildActions() IF !hb_hHasKey( ::hActions, a_[ ACT_NAME ] ) qAction := QAction():new( ::qDlg ) - qAction:setCheckable( .f. ) + qAction:setCheckable( iif( empty( a_[ ACT_CHECKABLE ] ), .F., ; + iif( upper( a_[ ACT_CHECKABLE ] ) == "YES", .T., .F. ) ) ) qAction:setText( strtran( a_[ ACT_TEXT ], "~", "&" ) ) IF !empty( a_[ ACT_IMAGE ] ) qAction:setIcon( ::resPath + a_[ ACT_IMAGE ] + ".png" ) @@ -170,84 +171,118 @@ METHOD IdeActions:loadActions() // can be loaded from .ini or similar mechanism given // - // Name Text Image Shortcut Checkable IconVisInMenu + // Name Text Image Shortcut Checkable IconVisInMenu // - aadd( aAct, { "Exit" , "E~xit" , "exit" , "Sh+^W", "No", "Yes" } ) - aadd( aAct, { "New" , "~Source" , "new" , "^N" , "No", "Yes" } ) - aadd( aAct, { "Open" , "~Open" , "open" , "^O" , "No", "Yes" } ) - aadd( aAct, { "Save" , "~Save" , "save" , "^S" , "No", "Yes" } ) - aadd( aAct, { "Close" , "~Close" , "close" , "^W" , "No", "Yes" } ) - aadd( aAct, { "Print" , "~Print" , "print" , "^P" , "No", "Yes" } ) - aadd( aAct, { "Compile" , "Co~mpile" , "compile" , "" , "No", "Yes" } ) - aadd( aAct, { "CompilePPO" , "Com~pile to PPO" , "ppo" , "" , "No", "Yes" } ) - aadd( aAct, { "Build" , "Build Project" , "build" , "" , "No", "Yes" } ) - aadd( aAct, { "BuildLaunch" , "Build and Launch" , "buildlaunch" , "" , "No", "Yes" } ) - aadd( aAct, { "Rebuild" , "Rebuild Project" , "rebuild" , "" , "No", "Yes" } ) - aadd( aAct, { "RebuildLaunch" , "Rebuild and Launch" , "rebuildlaunch" , "" , "No", "Yes" } ) - aadd( aAct, { "ToggleProjectTree" , "Toggle Project Tree" , "properties" , "" , "No", "Yes" } ) - aadd( aAct, { "ToggleBuildInfo" , "Toggle Build Info" , "builderror" , "" , "No", "Yes" } ) - aadd( aAct, { "ToggleFuncList" , "Toggle Function List" , "modulelist" , "" , "No", "Yes" } ) - aadd( aAct, { "Undo" , "~Undo" , "undo" , "" , "No", "Yes" } ) - aadd( aAct, { "Redo" , "~Redo" , "redo" , "" , "No", "Yes" } ) - aadd( aAct, { "Cut" , "C~ut" , "cut" , "" , "No", "Yes" } ) - aadd( aAct, { "Copy" , "~Copy" , "copy" , "" , "No", "Yes" } ) - aadd( aAct, { "Paste" , "~Paste" , "paste" , "" , "No", "Yes" } ) - aadd( aAct, { "SelectAll" , "Select ~All" , "selectall" , "" , "No", "Yes" } ) - aadd( aAct, { "SelectionMode" , "Toggle Selection Mode" , "stream" , "" , "No", "Yes" } ) - aadd( aAct, { "Find" , "~Find / Replace" , "find" , "^F" , "No", "Yes" } ) - aadd( aAct, { "Search" , "Search" , "search" , "" , "No", "Yes" } ) - aadd( aAct, { "SetMark" , "Set Mark" , "placeremovemark", "" , "No", "Yes" } ) - aadd( aAct, { "GotoMark" , "Goto Mark" , "gotomark" , "" , "No", "Yes" } ) - aadd( aAct, { "Goto" , "~Goto Line" , "gotoline" , "^G" , "No", "Yes" } ) - aadd( aAct, { "ToUpper" , "To Upper" , "toupper" , "" , "No", "Yes" } ) - aadd( aAct, { "ToLower" , "To Lower" , "tolower" , "" , "No", "Yes" } ) - aadd( aAct, { "Invert" , "Invert" , "invertcase" , "" , "No", "Yes" } ) - aadd( aAct, { "MatchPairs" , "Match Pairs" , "matchobj" , "" , "No", "Yes" } ) - aadd( aAct, { "ZoomIn" , "ZoomIn" , "zoomin" , "" , "No", "Yes" } ) - aadd( aAct, { "ZoomOut" , "ZoomOut" , "zoomout" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Exit" , "E~xit" , "exit" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_New" , "~Source" , "new" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Open" , "~Open" , "open" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Save" , "~Save" , "save" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Close" , "~Close" , "close" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Print" , "~Print" , "print" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Compile" , "Co~mpile" , "compile" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_CompilePPO" , "Com~pile to PPO" , "ppo" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Build" , "Build Project" , "build" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_BuildLaunch" , "Build and Launch" , "buildlaunch" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Rebuild" , "Rebuild Project" , "rebuild" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_RebuildLaunch" , "Rebuild and Launch" , "rebuildlaunch" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_ToggleProjectTree" , "Toggle Project Tree" , "properties" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_ToggleBuildInfo" , "Toggle Build Info" , "builderror" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_ToggleFuncList" , "Toggle Function List" , "modulelist" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Undo" , "~Undo" , "undo" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Redo" , "~Redo" , "redo" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Cut" , "C~ut" , "cut" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Copy" , "~Copy" , "copy" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Paste" , "~Paste" , "paste" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_SelectAll" , "Select ~All" , "selectall" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_SelectionMode" , "Toggle Selection Mode" , "stream" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Find" , "~Find / Replace" , "find" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Search" , "Search" , "search" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_SetMark" , "Set Mark" , "placeremovemark", "" , "No", "Yes" } ) + aadd( aAct, { "TB_GotoMark" , "Goto Mark" , "gotomark" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Goto" , "~Goto Line" , "gotoline" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_ToUpper" , "To Upper" , "toupper" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_ToLower" , "To Lower" , "tolower" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_Invert" , "Invert" , "invertcase" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_MatchPairs" , "Match Pairs" , "matchobj" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_ZoomIn" , "ZoomIn" , "zoomin" , "" , "No", "Yes" } ) + aadd( aAct, { "TB_ZoomOut" , "ZoomOut" , "zoomout" , "" , "No", "Yes" } ) // - aadd( aAct, { "NewProject" , "~Project" , "project" , "" , "No", "Yes" } ) - aadd( aAct, { "LoadProject" , "Open Projec~t" , "" , "" , "No", "Yes" } ) - aadd( aAct, { "SaveAs" , "Save ~As" , "saveas" , "" , "No", "Yes" } ) - aadd( aAct, { "SaveAll" , "Save A~ll" , "saveall" , "Sh+^s", "No", "Yes" } ) - aadd( aAct, { "CloseAll" , "Clos~e All" , "closeall" , "" , "No", "Yes" } ) - aadd( aAct, { "Revert" , "~Revert to Saved" , "" , "Sh+^R", "No", "Yes" } ) - aadd( aAct, { "ExportHTML" , "~Export to HTML" , "exporthtml" , "" , "No", "Yes" } ) - aadd( aAct, { "InsertDateTime" , "~Date && Time" , "insert-datetime", "Sh+F7", "No", "Yes" } ) - aadd( aAct, { "InsertRandomName" , "~Random Function Name" , "insert-procname", "Sh+F8", "No", "Yes" } ) - aadd( aAct, { "InsertExternalFile", "~External File at Cursor" , "insert-external-file", "", "No", "Yes" } ) - aadd( aAct, { "switchReadOnly" , "Switch Read~Only Mode" , "readonly" , "" , "No", "Yes" } ) - aadd( aAct, { "Properties" , "Properties" , "" , "" , "No", "Yes" } ) - aadd( aAct, { "ProjAddSource" , "Add Source to Project" , "projectadd" , "" , "No", "Yes" } ) - aadd( aAct, { "ProjRemSource" , "Remove Source" , "projectdel" , "" , "No", "Yes" } ) - aadd( aAct, { "ProjMainModule" , "Select Main Module" , "setmain" , "" , "No", "Yes" } ) - aadd( aAct, { "SelectProject" , "Select Current Project" , "" , "" , "No", "Yes" } ) - aadd( aAct, { "CloseProject" , "Close Current Project" , "" , "" , "No", "Yes" } ) - aadd( aAct, { "Build" , "Build Project" , "build" , "^F9" , "No", "Yes" } ) - aadd( aAct, { "BuildLaunch" , "Build and Launch Project" , "buildlaunch" , "F9" , "No", "Yes" } ) - aadd( aAct, { "ReBuild" , "Rebuild Project" , "rebuild" , "" , "No", "Yes" } ) - aadd( aAct, { "ReBuildLaunch" , "Rebuild and Launch Project" , "rebuildlaunch" , "" , "No", "Yes" } ) - aadd( aAct, { "CompileCurrent" , "Compile Current Source" , "compile" , "" , "No", "Yes" } ) - aadd( aAct, { "CompilePPO" , "Compile Current Source to PPO", "ppo" , "" , "No", "Yes" } ) - aadd( aAct, { "LaunchProject" , "Launch Project" , "" , "^F10" , "No", "Yes" } ) - aadd( aAct, { "ConfigureTools" , "Configure Tools...*" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "Exit" , "E~xit" , "exit" , "Sh+^W", "No", "Yes" } ) + aadd( aAct, { "New" , "~Source" , "new" , "^N" , "No", "Yes" } ) + aadd( aAct, { "Open" , "~Open" , "open" , "^O" , "No", "Yes" } ) + aadd( aAct, { "Save" , "~Save" , "save" , "^S" , "No", "Yes" } ) + aadd( aAct, { "Close" , "~Close" , "close" , "^W" , "No", "Yes" } ) + aadd( aAct, { "Print" , "~Print" , "print" , "^P" , "No", "Yes" } ) + aadd( aAct, { "Compile" , "Co~mpile" , "compile" , "" , "No", "Yes" } ) + aadd( aAct, { "CompilePPO" , "Com~pile to PPO" , "ppo" , "" , "No", "Yes" } ) + aadd( aAct, { "Build" , "Build Project" , "build" , "" , "No", "Yes" } ) + aadd( aAct, { "BuildLaunch" , "Build and Launch" , "buildlaunch" , "" , "No", "Yes" } ) + aadd( aAct, { "Rebuild" , "Rebuild Project" , "rebuild" , "" , "No", "Yes" } ) + aadd( aAct, { "RebuildLaunch" , "Rebuild and Launch" , "rebuildlaunch" , "" , "No", "Yes" } ) + aadd( aAct, { "ToggleProjectTree" , "Toggle Project Tree" , "properties" , "" , "No", "Yes" } ) + aadd( aAct, { "ToggleBuildInfo" , "Toggle Build Info" , "builderror" , "" , "No", "Yes" } ) + aadd( aAct, { "ToggleFuncList" , "Toggle Function List" , "modulelist" , "" , "No", "Yes" } ) + aadd( aAct, { "Undo" , "~Undo" , "undo" , "" , "No", "Yes" } ) + aadd( aAct, { "Redo" , "~Redo" , "redo" , "" , "No", "Yes" } ) + aadd( aAct, { "Cut" , "C~ut" , "cut" , "" , "No", "Yes" } ) + aadd( aAct, { "Copy" , "~Copy" , "copy" , "" , "No", "Yes" } ) + aadd( aAct, { "Paste" , "~Paste" , "paste" , "" , "No", "Yes" } ) + aadd( aAct, { "SelectAll" , "Select ~All" , "selectall" , "" , "No", "Yes" } ) + aadd( aAct, { "SelectionMode" , "Toggle Selection Mode" , "stream" , "" , "No", "Yes" } ) + aadd( aAct, { "Find" , "~Find / Replace" , "find" , "^F" , "No", "Yes" } ) + aadd( aAct, { "Search" , "Search" , "search" , "" , "No", "Yes" } ) + aadd( aAct, { "SetMark" , "Set Mark" , "placeremovemark", "" , "No", "Yes" } ) + aadd( aAct, { "GotoMark" , "Goto Mark" , "gotomark" , "" , "No", "Yes" } ) + aadd( aAct, { "Goto" , "~Goto Line" , "gotoline" , "^G" , "No", "Yes" } ) + aadd( aAct, { "ToUpper" , "To Upper" , "toupper" , "" , "No", "Yes" } ) + aadd( aAct, { "ToLower" , "To Lower" , "tolower" , "" , "No", "Yes" } ) + aadd( aAct, { "Invert" , "Invert" , "invertcase" , "" , "No", "Yes" } ) + aadd( aAct, { "MatchPairs" , "Match Pairs" , "matchobj" , "" , "No", "Yes" } ) + aadd( aAct, { "ZoomIn" , "ZoomIn" , "zoomin" , "" , "No", "Yes" } ) + aadd( aAct, { "ZoomOut" , "ZoomOut" , "zoomout" , "" , "No", "Yes" } ) + // + aadd( aAct, { "NewProject" , "~Project" , "project" , "" , "No", "Yes" } ) + aadd( aAct, { "LoadProject" , "Open Projec~t" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "SaveAs" , "Save ~As" , "saveas" , "" , "No", "Yes" } ) + aadd( aAct, { "SaveAll" , "Save A~ll" , "saveall" , "Sh+^s", "No", "Yes" } ) + aadd( aAct, { "CloseAll" , "Clos~e All" , "closeall" , "" , "No", "Yes" } ) + aadd( aAct, { "Revert" , "~Revert to Saved" , "" , "Sh+^R", "No", "Yes" } ) + aadd( aAct, { "ExportHTML" , "~Export to HTML" , "exporthtml" , "" , "No", "Yes" } ) + aadd( aAct, { "InsertDateTime" , "~Date && Time" , "insert-datetime", "Sh+F7", "No", "Yes" } ) + aadd( aAct, { "InsertRandomName" , "~Random Function Name" , "insert-procname", "Sh+F8", "No", "Yes" } ) + aadd( aAct, { "InsertExternalFile" , "~External File at Cursor" , "insert-external-file", "", "No", "Yes" } ) + aadd( aAct, { "switchReadOnly" , "Switch Read~Only Mode" , "readonly" , "" , "No", "Yes" } ) + aadd( aAct, { "Properties" , "Properties" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "ProjAddSource" , "Add Source to Project" , "projectadd" , "" , "No", "Yes" } ) + aadd( aAct, { "ProjRemSource" , "Remove Source" , "projectdel" , "" , "No", "Yes" } ) + aadd( aAct, { "ProjMainModule" , "Select Main Module" , "setmain" , "" , "No", "Yes" } ) + aadd( aAct, { "SelectProject" , "Select Current Project" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "CloseProject" , "Close Current Project" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "Build" , "Build Project" , "build" , "^F9" , "No", "Yes" } ) + aadd( aAct, { "BuildLaunch" , "Build and Launch Project" , "buildlaunch" , "F9" , "No", "Yes" } ) + aadd( aAct, { "ReBuild" , "Rebuild Project" , "rebuild" , "" , "No", "Yes" } ) + aadd( aAct, { "ReBuildLaunch" , "Rebuild and Launch Project" , "rebuildlaunch" , "" , "No", "Yes" } ) + aadd( aAct, { "CompileCurrent" , "Compile Current Source" , "compile" , "" , "No", "Yes" } ) + aadd( aAct, { "CompilePPO" , "Compile Current Source to PPO", "ppo" , "" , "No", "Yes" } ) + aadd( aAct, { "LaunchProject" , "Launch Project" , "" , "^F10" , "No", "Yes" } ) + aadd( aAct, { "ConfigureTools" , "Configure Tools...*" , "" , "" , "No", "Yes" } ) #ifdef __PLATFORM__WINDOWS - aadd( aAct, { "CommandPrompt" , "Command Prompt...*" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "CommandPrompt" , "Command Prompt...*" , "" , "" , "No", "Yes" } ) #else - aadd( aAct, { "Terminal" , "Terminal" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "Terminal" , "Terminal" , "" , "" , "No", "Yes" } ) #endif - aadd( aAct, { "ManageThemes" , "Manage Themes" , "" , "" , "No", "Yes" } ) - aadd( aAct, { "DefaultTheme" , "Set Default Theme" , "" , "" , "No", "Yes" } ) - aadd( aAct, { "AboutIDE" , "About Harbour IDE" , "vr-16x16" , "" , "No", "Yes" } ) - aadd( aAct, { "AboutHarbour" , "About Harbour" , "hb-16x16" , "" , "No", "Yes" } ) - aadd( aAct, { "HarbourUsersList" , "Harbour Users (Mailing Lists)", "list-users" , "" , "No", "Yes" } ) - aadd( aAct, { "HarbourDevList" , "Harbour Developers (Mailing Lists)", "list-developers", "", "No", "Yes" } ) + aadd( aAct, { "ManageThemes" , "Manage Themes" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "DefaultTheme" , "Set Default Theme" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "AboutIDE" , "About Harbour IDE" , "vr-16x16" , "" , "No", "Yes" } ) + aadd( aAct, { "AboutHarbour" , "About Harbour" , "hb-16x16" , "" , "No", "Yes" } ) + aadd( aAct, { "HarbourUsersList" , "Harbour Users (Mailing Lists)", "list-users" , "" , "No", "Yes" } ) + aadd( aAct, { "HarbourDevList" , "Harbour Developers (Mailing Lists)", "list-developers", "", "No", "Yes" } ) - aadd( aAct, { "BuildQt" , "Build Project" , "build" , "" , "No", "Yes" } ) - aadd( aAct, { "BuildLaunchQt" , "Build and Launch" , "buildlaunch" , "" , "No", "Yes" } ) - aadd( aAct, { "RebuildQt" , "Rebuild Project" , "rebuild" , "" , "No", "Yes" } ) - aadd( aAct, { "RebuildLaunchQt" , "Rebuild and Launch" , "rebuildlaunch" , "" , "No", "Yes" } ) + aadd( aAct, { "BuildQt" , "Build Project" , "build" , "" , "No", "Yes" } ) + aadd( aAct, { "BuildLaunchQt" , "Build and Launch" , "buildlaunch" , "" , "No", "Yes" } ) + aadd( aAct, { "RebuildQt" , "Rebuild Project" , "rebuild" , "" , "No", "Yes" } ) + aadd( aAct, { "RebuildLaunchQt" , "Rebuild and Launch" , "rebuildlaunch" , "" , "No", "Yes" } ) RETURN aAct @@ -266,45 +301,45 @@ METHOD IdeActions:buildToolBar() oTBar:buttonClick := {|oButton| ::oIde:execAction( oButton:key ) } - oTBar:addItem( ::getAction( "Exit" ), , , , , , "Exit" ) + oTBar:addItem( ::getAction( "TB_Exit" ), , , , , , "Exit" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "New" ), , , , , , "New" ) - oTBar:addItem( ::getAction( "Open" ), , , , , , "Open" ) - oTBar:addItem( ::getAction( "Save" ), , , , , , "Save" ) - oTBar:addItem( ::getAction( "Close" ), , , , , , "Close" ) - oTBar:addItem( ::getAction( "Print" ), , , , , , "Print" ) + oTBar:addItem( ::getAction( "TB_New" ), , , , , , "New" ) + oTBar:addItem( ::getAction( "TB_Open" ), , , , , , "Open" ) + oTBar:addItem( ::getAction( "TB_Save" ), , , , , , "Save" ) + oTBar:addItem( ::getAction( "TB_Close" ), , , , , , "Close" ) + oTBar:addItem( ::getAction( "TB_Print" ), , , , , , "Print" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "Compile" ), , , , , , "Compile" ) - oTBar:addItem( ::getAction( "CompilePPO" ), , , , , , "CompilePPO" ) - oTBar:addItem( ::getAction( "Build" ), , , , , , "Build" ) - oTBar:addItem( ::getAction( "BuildLaunch" ), , , , , , "BuildLaunch" ) - oTBar:addItem( ::getAction( "Rebuild" ), , , , , , "Rebuild" ) - oTBar:addItem( ::getAction( "RebuildLaunch" ), , , , , , "RebuildLaunch" ) + oTBar:addItem( ::getAction( "TB_Compile" ), , , , , , "Compile" ) + oTBar:addItem( ::getAction( "TB_CompilePPO" ), , , , , , "CompilePPO" ) + oTBar:addItem( ::getAction( "TB_Build" ), , , , , , "Build" ) + oTBar:addItem( ::getAction( "TB_BuildLaunch" ), , , , , , "BuildLaunch" ) + oTBar:addItem( ::getAction( "TB_Rebuild" ), , , , , , "Rebuild" ) + oTBar:addItem( ::getAction( "TB_RebuildLaunch" ), , , , , , "RebuildLaunch" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "ToggleProjectTree" ), , , , , , "ToggleProjectTree" ) - oTBar:addItem( ::getAction( "ToggleBuildInfo" ), , , , , , "ToggleBuildInfo" ) - oTBar:addItem( ::getAction( "ToggleFuncList" ), , , , , , "ToggleFuncList" ) + oTBar:addItem( ::getAction( "TB_ToggleProjectTree" ), , , , , , "ToggleProjectTree" ) + oTBar:addItem( ::getAction( "TB_ToggleBuildInfo" ), , , , , , "ToggleBuildInfo" ) + oTBar:addItem( ::getAction( "TB_ToggleFuncList" ), , , , , , "ToggleFuncList" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "Undo" ), , , , , , "Undo" ) - oTBar:addItem( ::getAction( "Redo" ), , , , , , "Redo" ) + oTBar:addItem( ::getAction( "TB_Undo" ), , , , , , "Undo" ) + oTBar:addItem( ::getAction( "TB_Redo" ), , , , , , "Redo" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "Cut" ), , , , , , "Cut" ) - oTBar:addItem( ::getAction( "Copy" ), , , , , , "Copy" ) - oTBar:addItem( ::getAction( "Paste" ), , , , , , "Paste" ) - oTBar:addItem( ::getAction( "SelectAll" ), , , , , , "SelectAll" ) - oTBar:addItem( ::getAction( "SelectionMode" ), , , , , , "SelectionMode" ) + oTBar:addItem( ::getAction( "TB_Cut" ), , , , , , "Cut" ) + oTBar:addItem( ::getAction( "TB_Copy" ), , , , , , "Copy" ) + oTBar:addItem( ::getAction( "TB_Paste" ), , , , , , "Paste" ) + oTBar:addItem( ::getAction( "TB_SelectAll" ), , , , , , "SelectAll" ) + oTBar:addItem( ::getAction( "TB_SelectionMode" ), , , , , , "SelectionMode" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "Find" ), , , , , , "Find" ) - oTBar:addItem( ::getAction( "Search" ), , , , , , "Search" ) + oTBar:addItem( ::getAction( "TB_Find" ), , , , , , "Find" ) + oTBar:addItem( ::getAction( "TB_Search" ), , , , , , "Search" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "SetMark" ), , , , , , "SetMark" ) - oTBar:addItem( ::getAction( "GotoMark" ), , , , , , "GotoMark" ) - oTBar:addItem( ::getAction( "Goto" ), , , , , , "Goto" ) + oTBar:addItem( ::getAction( "TB_SetMark" ), , , , , , "SetMark" ) + oTBar:addItem( ::getAction( "TB_GotoMark" ), , , , , , "GotoMark" ) + oTBar:addItem( ::getAction( "TB_Goto" ), , , , , , "Goto" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "ToUpper" ), , , , , , "ToUpper" ) - oTBar:addItem( ::getAction( "ToLower" ), , , , , , "ToLower" ) - oTBar:addItem( ::getAction( "Invert" ), , , , , , "Invert" ) - oTBar:addItem( ::getAction( "MatchPairs" ), , , , , , "MatchPairs" ) + oTBar:addItem( ::getAction( "TB_ToUpper" ), , , , , , "ToUpper" ) + oTBar:addItem( ::getAction( "TB_ToLower" ), , , , , , "ToLower" ) + oTBar:addItem( ::getAction( "TB_Invert" ), , , , , , "Invert" ) + oTBar:addItem( ::getAction( "TB_MatchPairs" ), , , , , , "MatchPairs" ) oTBar:addItem( , , , , , nSep ) RETURN Self diff --git a/harbour/contrib/hbqt/hbqt_hbslots.cpp b/harbour/contrib/hbqt/hbqt_hbslots.cpp index d489187a9d..27dee7d860 100644 --- a/harbour/contrib/hbqt/hbqt_hbslots.cpp +++ b/harbour/contrib/hbqt/hbqt_hbslots.cpp @@ -808,7 +808,7 @@ bool signal_already_connected( HBSlots * t_slots, QObject * object, const char * { if( t_slots->listBlock[ i ] != NULL && t_slots->listObj[ i ] == object ) { - if( object->property( signal ).toInt() == i ) + if( object->property( signal ).toInt() == i + 1 ) { return true; } diff --git a/harbour/contrib/hbxbp/xbpfiledialog.prg b/harbour/contrib/hbxbp/xbpfiledialog.prg index 492e4d71b0..fa077ffcfd 100644 --- a/harbour/contrib/hbxbp/xbpfiledialog.prg +++ b/harbour/contrib/hbxbp/xbpfiledialog.prg @@ -278,8 +278,7 @@ METHOD XbpFileDialog:extractFileNames( lAllowMultiple ) DEFAULT lAllowMultiple TO .F. - oFiles := QStringList() - oFiles:pPtr := ::oWidget:selectedFiles() + oFiles := QStringList():configure( ::oWidget:selectedFiles() ) FOR i := 1 TO oFiles:size() aadd( f_, oFiles:at( i-1 ) ) NEXT