From c17445d9987d7098fb451e62664a3d6569a59e78 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Wed, 20 Jun 2012 14:34:56 +0000 Subject: [PATCH] 2012-06-20 07:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idebrowse.prg * contrib/hbide/idedocks.prg * contrib/hbide/ideeditor.prg * contrib/hbide/ideharbourhelp.prg * contrib/hbide/idehome.prg * contrib/hbide/ideshortcuts.prg * contrib/hbide/idesources.prg * contrib/hbide/idetools.prg * contrib/hbide/idewizard.prg ! Fixed: remaining QIcon() specific regression. --- harbour/ChangeLog | 12 ++++ harbour/contrib/hbide/idebrowse.prg | 74 ++++++++++++------------ harbour/contrib/hbide/idedocks.prg | 30 +--------- harbour/contrib/hbide/ideeditor.prg | 18 +++--- harbour/contrib/hbide/ideharbourhelp.prg | 10 ++-- harbour/contrib/hbide/idehome.prg | 6 +- harbour/contrib/hbide/ideshortcuts.prg | 8 +-- harbour/contrib/hbide/idesources.prg | 2 +- harbour/contrib/hbide/idetools.prg | 16 ++--- harbour/contrib/hbide/idewizard.prg | 2 +- 10 files changed, 82 insertions(+), 96 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b74f7e2cb9..5c90b3a45a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-20 07:32 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idebrowse.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/ideeditor.prg + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/idehome.prg + * contrib/hbide/ideshortcuts.prg + * contrib/hbide/idesources.prg + * contrib/hbide/idetools.prg + * contrib/hbide/idewizard.prg + ! Fixed: remaining QIcon() specific regression. + 2012-06-20 15:17 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/include/hbclass.ch + added support for diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index 98503d97c9..c36b5e36e6 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -142,7 +142,7 @@ CLASS IdeBrowseManager INHERIT IdeObject DATA lDeletedOn INIT .t. DATA qComboAction DATA sp0,sp1,sp2,sp3 - + METHOD new( oIde ) METHOD create( oIde ) METHOD show() @@ -404,7 +404,7 @@ METHOD IdeBrowseManager:setStyleSheet( nMode ) ::qToolbar:setStyleSheet( GetStyleSheet( "QToolBar", nMode ) ) ::qToolbarL:setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) ) ::qStatus:setStyleSheet( GetStyleSheet( "QStatusBar", nMode ) ) -#if 0 +#if 0 ::qPanelsMenu:setStyleSheet( GetStyleSheet( "QMenuPop", nMode ) ) ::qIndexMenu:setStyleSheet( GetStyleSheet( "QMenuPop", nMode ) ) ::qTablesMenu:setStyleSheet( GetStyleSheet( "QMenuPop", nMode ) ) @@ -530,7 +530,7 @@ IF HB_ISOBJECT( ::qPanelsMenu ) qAct:setIcon( QIcon( hbide_image( "panel_7" ) ) ) qAct:connect( "triggered(bool)", {|| ::setPanel( cPanel ) } ) aadd( ::aPanelsAct, qAct ) -ENDIF +ENDIF RETURN Self /*----------------------------------------------------------------------*/ @@ -561,8 +561,8 @@ METHOD IdeBrowseManager:execEvent( cEvent, p, p1 ) HB_SYMBOL_UNUSED( p1 ) IF ::lQuitting - RETURN Self - ENDIF + RETURN Self + ENDIF SWITCH cEvent CASE "dockDbu_dragEnterEvent" @@ -981,7 +981,7 @@ METHOD IdeBrowseManager:addArray( aData, aAttr ) METHOD IdeBrowseManager:buildToolbar() LOCAL nW := 25 LOCAL qTBar - + ::sp0 := QLabel(); ::sp0:setMinimumWidth( nW ) ::sp1 := QLabel(); ::sp1:setMinimumWidth( nW ) ::sp2 := QLabel(); ::sp2:setMinimumWidth( nW ) @@ -993,7 +993,7 @@ METHOD IdeBrowseManager:buildToolbar() qTBar:create() ::qToolbar := qTBar - + ::buildPanelsButton() qTBar:addWidget( , ::sp0 ) ::buildRddsCombo() @@ -1011,7 +1011,7 @@ METHOD IdeBrowseManager:buildToolbar() qTBar:addToolButton( "Close" , "Close current table", app_image( "dc_delete" ), {|| ::execEvent( "buttonClose_clicked" ) }, .f. ) qTBar:addWidget( , ::sp2 ) ::buildTablesButton() - + RETURN Self /*----------------------------------------------------------------------*/ @@ -1023,40 +1023,40 @@ METHOD IdeBrowseManager:buildLeftToolbar() qTBar:size := QSize( 16,16 ) qTBar:orientation := Qt_Vertical qTBar:create() - + ::qToolbarL := qTBar - + qTBar:setMaximumWidth( 24 ) qTBar:setStyleSheet( GetStyleSheet( "QToolBar", ::nAnimantionMode ) ) - qTBar:addToolButton( "view_tabbed" , "Toggle tabbed view" , app_image( "view_tabbed" ), {|| ::execEvent( "buttonViewTabbed_clicked" ) }, .f. ) - qTBar:addSeparator() - qTBar:addToolButton( "view_organized" , "View as arranged" , app_image( "view_organized" ), {|| ::execEvent( "buttonViewOrganized_clicked" ) }, .f. ) - qTBar:addToolButton( "save3" , "Save layout" , app_image( "save3" ), {|| ::execEvent( "buttonSaveLayout_clicked" ) }, .f. ) - qTBar:addSeparator() - qTBar:addToolButton( "view_cascaded" , "View as cascaded" , app_image( "view_cascaded" ), {|| ::execEvent( "buttonViewCascaded_clicked" ) }, .f. ) - qTBar:addToolButton( "view_tiled" , "View as tiled" , app_image( "view_tiled" ), {|| ::execEvent( "buttonViewTiled_clicked" ) }, .f. ) - qTBar:addToolButton( "fullscreen" , "View Maximized" , app_image( "fullscreen" ), {|| ::execEvent( "buttonViewMaximized_clicked" ) }, .f. ) - qTBar:addToolButton( "view_vertstacked", "View Vertically Tiled" , app_image( "view_vertstacked" ), {|| ::execEvent( "buttonViewStackedVert_clicked" ) }, .f. ) - qTBar:addToolButton( "view_horzstacked", "View Horizontally Tiled" , app_image( "view_horzstacked" ), {|| ::execEvent( "buttonViewStackedHorz_clicked" ) }, .f. ) - qTBar:addToolButton( "view_zoomin" , "View Zoom In" , app_image( "view_zoomin" ), {|| ::execEvent( "buttonViewZoomedIn_clicked" ) }, .f. ) - qTBar:addToolButton( "view_zoomout" , "View Zoom Out" , app_image( "view_zoomout" ), {|| ::execEvent( "buttonViewZoomedOut_clicked" ) }, .f. ) + qTBar:addToolButton( "view_tabbed" , "Toggle tabbed view" , app_image( "view_tabbed" ), {|| ::execEvent( "buttonViewTabbed_clicked" ) }, .f. ) + qTBar:addSeparator() + qTBar:addToolButton( "view_organized" , "View as arranged" , app_image( "view_organized" ), {|| ::execEvent( "buttonViewOrganized_clicked" ) }, .f. ) + qTBar:addToolButton( "save3" , "Save layout" , app_image( "save3" ), {|| ::execEvent( "buttonSaveLayout_clicked" ) }, .f. ) + qTBar:addSeparator() + qTBar:addToolButton( "view_cascaded" , "View as cascaded" , app_image( "view_cascaded" ), {|| ::execEvent( "buttonViewCascaded_clicked" ) }, .f. ) + qTBar:addToolButton( "view_tiled" , "View as tiled" , app_image( "view_tiled" ), {|| ::execEvent( "buttonViewTiled_clicked" ) }, .f. ) + qTBar:addToolButton( "fullscreen" , "View Maximized" , app_image( "fullscreen" ), {|| ::execEvent( "buttonViewMaximized_clicked" ) }, .f. ) + qTBar:addToolButton( "view_vertstacked", "View Vertically Tiled" , app_image( "view_vertstacked" ), {|| ::execEvent( "buttonViewStackedVert_clicked" ) }, .f. ) + qTBar:addToolButton( "view_horzstacked", "View Horizontally Tiled" , app_image( "view_horzstacked" ), {|| ::execEvent( "buttonViewStackedHorz_clicked" ) }, .f. ) + qTBar:addToolButton( "view_zoomin" , "View Zoom In" , app_image( "view_zoomin" ), {|| ::execEvent( "buttonViewZoomedIn_clicked" ) }, .f. ) + qTBar:addToolButton( "view_zoomout" , "View Zoom Out" , app_image( "view_zoomout" ), {|| ::execEvent( "buttonViewZoomedOut_clicked" ) }, .f. ) qTBar:addSeparator() - qTBar:addToolButton( "database_add" , "Append a record" , app_image( "database_add" ), {|| ::execEvent( "buttonAppendRecord_clicked" ) }, .f. ) - qTBar:addToolButton( "database_remove" , "Delete a record" , app_image( "database_remove" ), {|| ::execEvent( "buttonDelRecord_clicked" ) }, .f. ) - qTBar:addToolButton( "database_lock" , "Lock/Unlock Record" , app_image( "database_lock" ), {|| ::execEvent( "buttonLockRecord_clicked" ) }, .f. ) - qTBar:addSeparator() - qTBar:addToolButton( "database_up" , "Goto Top" , app_image( "database_up" ), {|| ::execEvent( "buttonGoTop_clicked" ) }, .f. ) - qTBar:addToolButton( "database_down" , "Goto Bottom" , app_image( "database_down" ), {|| ::execEvent( "buttonGoBottom_clicked" ) }, .f. ) - qTBar:addToolButton( "database_previous", "Scroll to First Column" , app_image( "database_previous" ), {|| ::execEvent( "buttonScrollToFirst_clicked" ) }, .f. ) - qTBar:addToolButton( "database_next" , "Scroll to Last Column" , app_image( "database_next" ), {|| ::execEvent( "buttonScrollToLast_clicked" ) }, .f. ) - qTBar:addSeparator() - qTBar:addToolButton( "database_search" , "Search in Table" , app_image( "database_search" ), {|| ::execEvent( "buttonSearchInTable_clicked" ) }, .f. ) - qTBar:addSeparator() - qTBar:addToolButton( "database_process" , "Zap Table" , app_image( "database_process" ), {|| ::execEvent( "buttonZaptable_clicked" ) }, .f. ) - - RETURN NIL + qTBar:addToolButton( "database_add" , "Append a record" , app_image( "database_add" ), {|| ::execEvent( "buttonAppendRecord_clicked" ) }, .f. ) + qTBar:addToolButton( "database_remove" , "Delete a record" , app_image( "database_remove" ), {|| ::execEvent( "buttonDelRecord_clicked" ) }, .f. ) + qTBar:addToolButton( "database_lock" , "Lock/Unlock Record" , app_image( "database_lock" ), {|| ::execEvent( "buttonLockRecord_clicked" ) }, .f. ) + qTBar:addSeparator() + qTBar:addToolButton( "database_up" , "Goto Top" , app_image( "database_up" ), {|| ::execEvent( "buttonGoTop_clicked" ) }, .f. ) + qTBar:addToolButton( "database_down" , "Goto Bottom" , app_image( "database_down" ), {|| ::execEvent( "buttonGoBottom_clicked" ) }, .f. ) + qTBar:addToolButton( "database_previous", "Scroll to First Column" , app_image( "database_previous" ), {|| ::execEvent( "buttonScrollToFirst_clicked" ) }, .f. ) + qTBar:addToolButton( "database_next" , "Scroll to Last Column" , app_image( "database_next" ), {|| ::execEvent( "buttonScrollToLast_clicked" ) }, .f. ) + qTBar:addSeparator() + qTBar:addToolButton( "database_search" , "Search in Table" , app_image( "database_search" ), {|| ::execEvent( "buttonSearchInTable_clicked" ) }, .f. ) + qTBar:addSeparator() + qTBar:addToolButton( "database_process" , "Zap Table" , app_image( "database_process" ), {|| ::execEvent( "buttonZaptable_clicked" ) }, .f. ) + + RETURN NIL /*------------------------------------------------------------------------*/ @@ -1852,7 +1852,7 @@ METHOD IdeBrowse:buildBrowser() ::qVerSpl:addWidget( ::qForm ) ::qClose := QToolButton() - ::qClose:setIcon( hbide_image( "closetab" ) ) + ::qClose:setIcon( QIcon( hbide_image( "closetab" ) ) ) ::qClose:hide() ::qVerSpl:addWidget( ::qClose ) diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 218d2ed64e..be341e2d61 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -541,7 +541,7 @@ METHOD IdeDocks:buildSystemTray() IF empty( ::oSys ) ::oIde:oSys := QSystemTrayIcon( ::oDlg:oWidget ) IF ( ::lSystemTrayAvailable := ::oSys:isSystemTrayAvailable() ) .AND. ::lMinimizeInSystemTray - ::oSys:setIcon( hbide_image( "hbide" ) ) + ::oSys:setIcon( QIcon( hbide_image( "hbide" ) ) ) ::oSys:connect( "activated(QSystemTrayIcon::ActivationReason)", {|p| ::execEvent( "qSystemTrayIcon_activated", p ) } ) ::oIde:oSysMenu := QMenu() @@ -558,7 +558,7 @@ METHOD IdeDocks:buildSystemTray() ENDIF ENDIF - RETURN nil + RETURN NIL /*----------------------------------------------------------------------*/ @@ -1434,32 +1434,6 @@ METHOD IdeDocks:getPanelIcon( cView ) RETURN "" /*----------------------------------------------------------------------*/ -/* -METHOD IdeDocks:addPanelButton( cPanel ) - LOCAL qTBtn - - STATIC nIndex := 0 - nIndex++ - - qTBtn := QToolButton() - qTBtn:setMaximumHeight( 20 ) - qTBtn:setMaximumWidth( 20 ) - qTBtn:setText( cPanel ) - qTBtn:setTooltip( "Panel: " + cPanel ) - qTBtn:setIcon( hbide_image( "panel_" + hb_ntos( nIndex ) ) ) - aadd( ::aPanels, qTBtn ) - ::qTBarPanels:addWidget( qTBtn ) - qTBtn:connect( "clicked()", {|| ::setView( cPanel ) } ) - - nIndex := iif( nIndex >= 7, 0, nIndex ) - - IF !empty( ::qViewsCombo ) - ::qViewsCombo:setCurrentIndex( len( ::aPanels ) + 1 ) - endif - - RETURN Self -*/ -/*----------------------------------------------------------------------*/ METHOD IdeDocks:buildProjectTree() LOCAL i, oItem, qDrop diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg index c0981201de..92413c2186 100644 --- a/harbour/contrib/hbide/ideeditor.prg +++ b/harbour/contrib/hbide/ideeditor.prg @@ -422,9 +422,9 @@ METHOD IdeEditsManager:execEvent( cEvent, p ) LOCAL oEdit IF ::lQuitting - RETURN Self - ENDIF - + RETURN Self + ENDIF + DO CASE CASE cEvent == "qFldsCompleter_activated" IF !empty( oEdit := ::getEditObjectCurrent() ) @@ -1359,7 +1359,7 @@ METHOD IdeEditor:create( oIde, cSourceFile, nPos, nHPos, nVPos, cTheme, cView, a ::qLayout:setContentsMargins( 0,0,0,0 ) // ::oTab:oWidget:setLayout( ::qLayout ) - + ::oEdit := IdeEdit():new( ::oIde, Self, 0 ) ::oEdit:aBookMarks := aBookMarks ::oEdit:create() @@ -1430,7 +1430,7 @@ METHOD IdeEditor:destroy() ::qHiliter := NIL ENDIF - ::qSplitter := NIL + ::qSplitter := NIL ::oEdit := NIL ::qLayout := NIL @@ -1608,7 +1608,7 @@ METHOD IdeEditor:reload() ::oEdit:setReadOnly( ::lReadOnly ) ::qTabWidget:setTabIcon( ::qTabWidget:indexOf( ::oTab:oWidget ), ; - hbide_image( iif( ::lReadOnly, "tabreadonly", "tabunmodified" ) ) ) + QIcon( hbide_image( iif( ::lReadOnly, "tabreadonly", "tabunmodified" ) ) ) ) ::qEdit:clear() ::qEdit:setPlainText( ::prepareBufferToLoad( hb_memoread( ::sourceFile ) ) ) @@ -1683,9 +1683,9 @@ METHOD IdeEditor:execEvent( cEvent, p ) p := p IF ::lQuitting - RETURN Self - ENDIF - + RETURN Self + ENDIF + SWITCH cEvent CASE "qTimeSave_timeout" diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index 4e5ef66359..b698e9d060 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -410,10 +410,10 @@ METHOD IdeHarbourHelp:setImages() oUI:q_buttonInstall :setIcon( QIcon( hbide_image( "dc_folder" ) ) ) - //oUI:q_buttonArgPlus:setIcon( hbide_image( "dc_plus" ) ) - //oUI:q_buttonArgMinus:setIcon( hbide_image( "dc_delete" ) ) - //oUI:q_buttonArgUp:setIcon( hbide_image( "dc_up" ) ) - //oUI:q_buttonArgDown:setIcon( hbide_image( "dc_down" ) ) + //oUI:q_buttonArgPlus:setIcon( QIcon( hbide_image( "dc_plus" ) ) ) + //oUI:q_buttonArgMinus:setIcon( QIcon( QIcon( hbide_image( "dc_delete" ) ) ) + //oUI:q_buttonArgUp:setIcon( QIcon( hbide_image( "dc_up" ) ) ) + //oUI:q_buttonArgDown:setIcon( QIcon( hbide_image( "dc_down" ) ) ) RETURN Self @@ -1423,7 +1423,7 @@ METHOD IdeHarbourHelp:exportAsPdf() METHOD IdeHarbourHelp:exportAsPdfAll() LOCAL cPdf, qPrinter, cExt, cPath, cFile, aItems LOCAL qApp := QApplication() - + IF empty( ::aNodes ) RETURN Self ENDIF diff --git a/harbour/contrib/hbide/idehome.prg b/harbour/contrib/hbide/idehome.prg index e63cc9bd8b..4a5d1871e5 100644 --- a/harbour/contrib/hbide/idehome.prg +++ b/harbour/contrib/hbide/idehome.prg @@ -221,8 +221,8 @@ METHOD IdeHome:execEvent( nMode, p ) LOCAL cAct, cText, cExt IF ::lQuitting - RETURN Self - ENDIF + RETURN Self + ENDIF DO CASE CASE nMode == "tabWidget_currentChanged" @@ -289,7 +289,7 @@ METHOD IdeHome:print() IF empty( ::qPrnDlg ) ::qPrnDlg := QPrintPreviewDialog() ::qPrnDlg:setWindowTitle( "Welcome::Projects" ) - ::qPrnDlg:setWindowIcon( hbide_image( "hbide" ) ) + ::qPrnDlg:setWindowIcon( QIcon( hbide_image( "hbide" ) ) ) ::qPrnDlg:connect( "paintRequested(QPrinter*)", {|p| ::paintRequested( p ) } ) ENDIF diff --git a/harbour/contrib/hbide/ideshortcuts.prg b/harbour/contrib/hbide/ideshortcuts.prg index 35bb6e1202..05beaacf5f 100644 --- a/harbour/contrib/hbide/ideshortcuts.prg +++ b/harbour/contrib/hbide/ideshortcuts.prg @@ -466,12 +466,12 @@ METHOD IdeShortcuts:vrbls2array( nRow ) METHOD IdeShortcuts:vrbls2controls( nRow ) - ::aDftSCutsItms[ nRow, 1 ]:setIcon( hbide_image( ::cIcon ) ) + ::aDftSCutsItms[ nRow, 1 ]:setIcon( QIcon( hbide_image( ::cIcon ) ) ) ::aDftSCutsItms[ nRow, 2 ]:setText( ::cName ) ::aDftSCutsItms[ nRow, 3 ]:setText( ::cKey ) - ::aDftSCutsItms[ nRow, 4 ]:setIcon( hbide_image( iif( ::cAlt == "YES", "check", "" ) ) ) - ::aDftSCutsItms[ nRow, 5 ]:setIcon( hbide_image( iif( ::cCtrl == "YES", "check", "" ) ) ) - ::aDftSCutsItms[ nRow, 6 ]:setIcon( hbide_image( iif( ::cShift == "YES", "check", "" ) ) ) + ::aDftSCutsItms[ nRow, 4 ]:setIcon( QIcon( hbide_image( iif( ::cAlt == "YES", "check", "" ) ) ) ) + ::aDftSCutsItms[ nRow, 5 ]:setIcon( QIcon( hbide_image( iif( ::cCtrl == "YES", "check", "" ) ) ) ) + ::aDftSCutsItms[ nRow, 6 ]:setIcon( QIcon( hbide_image( iif( ::cShift == "YES", "check", "" ) ) ) ) RETURN Self diff --git a/harbour/contrib/hbide/idesources.prg b/harbour/contrib/hbide/idesources.prg index 7552933d11..2bb26b4bc9 100644 --- a/harbour/contrib/hbide/idesources.prg +++ b/harbour/contrib/hbide/idesources.prg @@ -281,7 +281,7 @@ METHOD IdeSourcesManager:saveSource( nTab, lCancel, lAs ) ::oIde:aSources := { oEdit:sourceFile } ::createTags() ::updateFuncList() - ::qTabWidget:setTabIcon( nIndex, ::resPath + "tabunmodified.png" ) + ::qTabWidget:setTabIcon( nIndex, QIcon( ::resPath + "tabunmodified.png" ) ) ::oDK:setStatusText( SB_PNL_MODIFIED, " " ) cFileTemp := hbide_pathToOSPath( oEdit:cPath + oEdit:cFile + oEdit:cExt + ".tmp" ) diff --git a/harbour/contrib/hbide/idetools.prg b/harbour/contrib/hbide/idetools.prg index b5f859f17c..b6ce69ce22 100644 --- a/harbour/contrib/hbide/idetools.prg +++ b/harbour/contrib/hbide/idetools.prg @@ -323,8 +323,8 @@ METHOD IdeToolsManager:execEvent( cMode, p ) HB_SYMBOL_UNUSED( p ) IF ::lQuitting - RETURN Self - ENDIF + RETURN Self + ENDIF SWITCH cMode CASE "checkToolActive_stateChanged" @@ -342,7 +342,7 @@ METHOD IdeToolsManager:execEvent( cMode, p ) cFileName := hbide_fetchAFile( ::oDlg, "Select an PNG image", { { "Image Files", "*.png" } },/* cFolder */ , /*cDftSuffix*/ ) IF !empty( cFileName ) ::oUI:q_editImage:setText( hbide_pathNormalized( cFileName, .f. ) ) - ::oUI:q_buttonSetImage:setIcon( hbide_pathToOsPath( cFileName ) ) + ::oUI:q_buttonSetImage:setIcon( QIcon( hbide_pathToOsPath( cFileName ) ) ) ENDIF EXIT CASE "buttonUserToolbarUpd_clicked" @@ -464,7 +464,7 @@ METHOD IdeToolsManager:buildUserToolbars() qTBtn := QToolButton() qTBtn:setText( b_[ 1 ] ) qTBtn:setTooltip( b_[ 10 ] ) - qTBtn:setIcon( hbide_pathToOSPath( b_[ 9 ] ) ) + qTBtn:setIcon( QIcon( hbide_pathToOSPath( b_[ 9 ] ) ) ) qTBtn:setMaximumWidth( 20 ) qTBtn:setMaximumHeight( 20 ) qTBtn:connect( "clicked()", hbide_toolBlock( Self, b_ ) ) @@ -508,7 +508,7 @@ METHOD IdeToolsManager:populateButtonsTable( nIndex ) nRow := b_:__enumIndex()-1 q0 := QTableWidgetItem() - q0:setIcon( hbide_pathToOSPath( b_[ 9 ] ) ) + q0:setIcon( QIcon( hbide_pathToOSPath( b_[ 9 ] ) ) ) q0:setTooltip( b_[ 10 ] ) oTbl:setItem( nRow, 0, q0 ) @@ -567,8 +567,8 @@ METHOD IdeToolsManager:ini2controls( nIndex ) ::oUI:q_comboToolbarAsgnd:setCurrentIndex( iif( empty( ::aTools[ nIndex, 7 ] ), -1, val( ::aTools[ nIndex, 7 ] ) ) ) ::oUI:q_checkToolActive :setChecked( ::aTools[ nIndex, 8 ] == "YES" ) ::oUI:q_editImage :setText( hbide_pathNormalized( ::aTools[ nIndex, 9 ], .f. ) ) - ::oUI:q_buttonSetImage :setIcon( iif( empty( ::aTools[ nIndex, 9 ] ), hbide_image( "open" ), ; - hbide_pathToOsPath( ::aTools[ nIndex, 9 ] ) ) ) + ::oUI:q_buttonSetImage :setIcon( QIcon( iif( empty( ::aTools[ nIndex, 9 ] ), hbide_image( "open" ), ; + hbide_pathToOsPath( ::aTools[ nIndex, 9 ] ) ) ) ) ::oUI:q_editTooltip :setText( ::aTools[ nIndex, 10 ] ) ::oUI:q_comboPlugin :setCurrentIndex( ascan( ::aPlugins, {|e| ::aTools[ nIndex, 11 ] == e } ) - 1 ) ::oUI:q_checkPlugInit :setChecked( ::aTools[ nIndex, 12 ] == "YES" ) @@ -584,7 +584,7 @@ METHOD IdeToolsManager:ini2controls( nIndex ) ::oUI:q_comboToolbarAsgnd:setCurrentIndex( -1 ) ::oUI:q_checkToolActive :setChecked( .t. ) ::oUI:q_editImage :setText( "" ) - ::oUI:q_buttonSetImage :setIcon( hbide_image( "open" ) ) + ::oUI:q_buttonSetImage :setIcon( QIcon( hbide_image( "open" ) ) ) ::oUI:q_editTooltip :setText( "" ) ::oUI:q_comboPlugin :setCurrentIndex( -1 ) ::oUI:q_checkPlugInit :setChecked( .f. ) diff --git a/harbour/contrib/hbide/idewizard.prg b/harbour/contrib/hbide/idewizard.prg index 021574465c..5ecb49a40b 100644 --- a/harbour/contrib/hbide/idewizard.prg +++ b/harbour/contrib/hbide/idewizard.prg @@ -115,7 +115,7 @@ METHOD IdeWizard:create( oIde ) ::oUI := QWizard() ::oUI:setWindowTitle( "Open" ) - ::oUI:setWindowIcon( hbide_image( "hbide" ) ) + ::oUI:setWindowIcon( QIcon( hbide_image( "hbide" ) ) ) ::addIntroPage() ::addDescPage()