diff --git a/harbour/ChangeLog b/harbour/ChangeLog index acdf98945f..cab3eeff43 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,11 +16,91 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-21 10:41 UTC+0200 Viktor Szakats (harbour syenar.net) + + contrib/hbide/idedbu + + contrib/hbide/idedbu/idedbu.hbc + + contrib/hbide/idedbu/idedbu.hbp + + contrib/hbide/idedbu/dbstruct.ui + + contrib/hbide/idedbu/dbu.prg + + contrib/hbide/idedbu/dbu.qrc + + contrib/hbide/idedbu/fetchdate.ui + + contrib/hbide/idedbu/resources + + contrib/hbide/idedbu/tables.ui + - contrib/hbxbp/dbu.prg + - contrib/hbxbp/resources + - contrib/hbxbp/resources/closetab.png + - contrib/hbxbp/resources/database_accept.png + - contrib/hbxbp/resources/database_add.png + - contrib/hbxbp/resources/database_down.png + - contrib/hbxbp/resources/database_lock.png + - contrib/hbxbp/resources/database_next.png + - contrib/hbxbp/resources/database_previous.png + - contrib/hbxbp/resources/database_process.png + - contrib/hbxbp/resources/database_remove.png + - contrib/hbxbp/resources/database_search.png + - contrib/hbxbp/resources/database_up.png + - contrib/hbxbp/resources/database.png + - contrib/hbxbp/resources/dbf_p1.png + - contrib/hbxbp/resources/dbf_p10.png + - contrib/hbxbp/resources/dbf_p2.png + - contrib/hbxbp/resources/dbf_p3.png + - contrib/hbxbp/resources/dbf_p4.png + - contrib/hbxbp/resources/dbf_p5.png + - contrib/hbxbp/resources/dbf_p6.png + - contrib/hbxbp/resources/dbf_p7.png + - contrib/hbxbp/resources/dbf_p8.png + - contrib/hbxbp/resources/dbf_p9.png + - contrib/hbxbp/resources/dbstruct.png + - contrib/hbxbp/resources/dc_delete.png + - contrib/hbxbp/resources/find.png + - contrib/hbxbp/resources/form.png + - contrib/hbxbp/resources/formview.png + - contrib/hbxbp/resources/fullscreen.png + - contrib/hbxbp/resources/gotoline3.png + - contrib/hbxbp/resources/open3.png + - contrib/hbxbp/resources/panel_7.png + - contrib/hbxbp/resources/panel_8.png + - contrib/hbxbp/resources/save3.png + - contrib/hbxbp/resources/sort.png + - contrib/hbxbp/resources/table.png + - contrib/hbxbp/resources/view_cascaded.png + - contrib/hbxbp/resources/view_docks.png + - contrib/hbxbp/resources/view_horzstacked.png + - contrib/hbxbp/resources/view_organized.png + - contrib/hbxbp/resources/view_refresh.png + - contrib/hbxbp/resources/view_tabbed.png + - contrib/hbxbp/resources/view_tiled.png + - contrib/hbxbp/resources/view_vertstacked.png + - contrib/hbxbp/resources/view_zoomin.png + - contrib/hbxbp/resources/view_zoomout.png + - contrib/hbxbp/xbp.qrc + - contrib/hbxbp/xbpdbstruct.ui + - contrib/hbxbp/xbpfetchdate.ui + - contrib/hbxbp/xbptables.ui + * contrib/hbide/hbide.hbp + * contrib/hbxbp/generic.prg + * contrib/hbxbp/hbxbp.hbp + * HBIDE submodule DBU moved under HBIDE. + Such module (complete with its own UI theme, GUI resources + hard-wired texts) has nothing to do in a generic library. + I can hardly imagine what the goal was with this move. + It's also good idea to consult/ask questions before + making such code rearrangement. + Untested. + ; TOFIX: Some more stuff (code) has been added to hbxbp, + I didn't deal with those. + ; TOFIX: Someone please remove the duplicate resources + from hbide/resources. + Also, please make use of 'svn move' when moving + around objects inside the repository tree, otherwise + such thing will happen and history is also lost + along the way. + 2012-09-20 22:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hb * contrib/hbqt/qtgui/qth/QWidget.qth - + Enabled: "WId" casted calls. - WARNING: These are portable to the extent that Qt does not + + Enabled: "WId" casted calls. + WARNING: These are portable to the extent that Qt does not throw error. But what you do with the WId is non portable. So be careful. diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp index c680e85cbc..5c53adfee3 100644 --- a/harbour/contrib/hbide/hbide.hbp +++ b/harbour/contrib/hbide/hbide.hbp @@ -23,6 +23,9 @@ hbxbp.hbc hbqt.hbc hbformat.hbc +idedbu/idedbu.hbp +idedbu/idedbu.hbc + -env:HB_DYNLOAD_RDDADS=yes rddads.hbc diff --git a/harbour/contrib/hbxbp/xbpdbstruct.ui b/harbour/contrib/hbide/idedbu/dbstruct.ui similarity index 100% rename from harbour/contrib/hbxbp/xbpdbstruct.ui rename to harbour/contrib/hbide/idedbu/dbstruct.ui diff --git a/harbour/contrib/hbxbp/dbu.prg b/harbour/contrib/hbide/idedbu/dbu.prg similarity index 96% rename from harbour/contrib/hbxbp/dbu.prg rename to harbour/contrib/hbide/idedbu/dbu.prg index e9903348df..f8d9873787 100644 --- a/harbour/contrib/hbxbp/dbu.prg +++ b/harbour/contrib/hbide/idedbu/dbu.prg @@ -1,10 +1,10 @@ - /* +/* * $Id$ */ /* * Harbour Project source code: - * Source file for the Xbp*Classes + * Source file for the HBIDE/DBU * * Copyright 2012 Pritpal Bedi * http://harbour-project.org @@ -241,7 +241,7 @@ METHOD HbpDBU:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) IF ! ::lRegistered ::lRegistered := .T. - QResource():registerResource_1( hbqtres_xbp() ) + QResource():registerResource_1( hbqtres_dbu() ) ENDIF ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) @@ -543,7 +543,7 @@ METHOD HbpDBU:addPanelsMenu( cPanel ) LOCAL qAct IF HB_ISOBJECT( ::qPanelsMenu ) qAct := ::qPanelsMenu:addAction( cPanel ) - qAct:setIcon( QIcon( xbp_image( "panel_7" ) ) ) + qAct:setIcon( QIcon( dbu_Image( "panel_7" ) ) ) qAct:connect( "triggered(bool)", {|| ::setPanel( cPanel ) } ) aadd( ::aPanelsAct, qAct ) ENDIF @@ -780,7 +780,7 @@ METHOD HbpDBU:showTablesTree() LOCAL oUI, qTree, qParent, oPanel, qItm, aBrowser, q, aFld, qFont, nMax, nSz, oBrw LOCAL a_:={} - oUI := hbqtui_xbpTables( ::oCurPanel:qWidget ) + oUI := hbqtui_Tables( ::oCurPanel:qWidget ) qFont := QFont( "Courier New", 8 ) qTree := oUI:treeTables @@ -912,7 +912,7 @@ METHOD HbpDBU:buildUiStruct() LOCAL oTbl, n, qItm LOCAL hdr_:= { { "", 50 }, { "Field Name",200 }, { "Type", 100 }, { "Len", 50 }, { "Dec", 70 } } - ::qStruct := hbqtui_xbpDbStruct( ::oWidget ) + ::qStruct := hbqtui_DbStruct( ::oWidget ) ::qStruct:setWindowFlags( Qt_Dialog ) ::qStruct:setMaximumHeight( ::qStruct:height() ) @@ -1021,17 +1021,17 @@ METHOD HbpDBU:buildToolbar() qTBar:addItem( ::sp0 ) ::buildRddsCombo() ::buildConxnCombo() - qTBar:addItem( { "Open" , "Open a Table" , QIcon( xbp_image( "open3" ) ), {|| ::execEvent( __buttonOpen_clicked__ ) }, .F. } ) + qTBar:addItem( { "Open" , "Open a Table" , QIcon( dbu_Image( "open3" ) ), {|| ::execEvent( __buttonOpen_clicked__ ) }, .F. } ) qTBar:addItem( ::sp1 ) - qTBar:addItem( { "Toggle" , "Show/Hide Form View", QIcon( xbp_image( "form" ) ), {|| ::execEvent( __buttonShowForm_clicked__ ) }, .T. } ) + qTBar:addItem( { "Toggle" , "Show/Hide Form View", QIcon( dbu_Image( "form" ) ), {|| ::execEvent( __buttonShowForm_clicked__ ) }, .T. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "Structure", "Table Structure" , QIcon( xbp_image( "dbstruct" ) ), {|| ::execEvent( __buttonDbStruct_clicked__ ) }, .F. } ) + qTBar:addItem( { "Structure", "Table Structure" , QIcon( dbu_Image( "dbstruct" ) ), {|| ::execEvent( __buttonDbStruct_clicked__ ) }, .F. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) ::buildIndexButton() - qTBar:addItem( { "Search" , "Search in Table" , QIcon( xbp_image( "find" ) ), {|| ::execEvent( __buttonFind_clicked__ ) }, .F. } ) - qTBar:addItem( { "Goto" , "Goto Record" , QIcon( xbp_image( "gotoline3" ) ), {|| ::execEvent( __buttonGoto_clicked__ ) }, .F. } ) + qTBar:addItem( { "Search" , "Search in Table" , QIcon( dbu_Image( "find" ) ), {|| ::execEvent( __buttonFind_clicked__ ) }, .F. } ) + qTBar:addItem( { "Goto" , "Goto Record" , QIcon( dbu_Image( "gotoline3" ) ), {|| ::execEvent( __buttonGoto_clicked__ ) }, .F. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "Close" , "Close Current Table", QIcon( xbp_image( "dc_delete" ) ), {|| ::execEvent( __buttonClose_clicked__ ) }, .F. } ) + qTBar:addItem( { "Close" , "Close Current Table", QIcon( dbu_Image( "dc_delete" ) ), {|| ::execEvent( __buttonClose_clicked__ ) }, .F. } ) qTBar:addItem( ::sp2 ) ::buildTablesButton() @@ -1051,31 +1051,31 @@ METHOD HbpDBU:buildLeftToolbar() ::qToolbarL := qTBar - qTBar:addItem( { "view_tabbed" , "Toggle Tabbed View" , QIcon( xbp_image( "view_tabbed" ) ), {|| ::execEvent( __buttonViewTabbed_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_tabbed" , "Toggle Tabbed View" , QIcon( dbu_Image( "view_tabbed" ) ), {|| ::execEvent( __buttonViewTabbed_clicked__ ) }, .f. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "view_organized" , "View as Arranged" , QIcon( xbp_image( "view_organized" ) ), {|| ::execEvent( __buttonViewOrganized_clicked__ ) }, .f. } ) - qTBar:addItem( { "save3" , "Save Layout" , QIcon( xbp_image( "save3" ) ), {|| ::execEvent( __buttonSaveLayout_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_organized" , "View as Arranged" , QIcon( dbu_Image( "view_organized" ) ), {|| ::execEvent( __buttonViewOrganized_clicked__ ) }, .f. } ) + qTBar:addItem( { "save3" , "Save Layout" , QIcon( dbu_Image( "save3" ) ), {|| ::execEvent( __buttonSaveLayout_clicked__ ) }, .f. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "view_cascaded" , "View as Cascaded" , QIcon( xbp_image( "view_cascaded" ) ), {|| ::execEvent( __buttonViewCascaded_clicked__ ) }, .f. } ) - qTBar:addItem( { "view_tiled" , "View as Tiled" , QIcon( xbp_image( "view_tiled" ) ), {|| ::execEvent( __buttonViewTiled_clicked__ ) }, .f. } ) - qTBar:addItem( { "fullscreen" , "View Maximized" , QIcon( xbp_image( "fullscreen" ) ), {|| ::execEvent( __buttonViewMaximized_clicked__ ) }, .f. } ) - qTBar:addItem( { "view_vertstacked" , "View Vertically Tiled" , QIcon( xbp_image( "view_vertstacked" ) ), {|| ::execEvent( __buttonViewStackedVert_clicked__ ) }, .f. } ) - qTBar:addItem( { "view_horzstacked" , "View Horizontally Tiled" , QIcon( xbp_image( "view_horzstacked" ) ), {|| ::execEvent( __buttonViewStackedHorz_clicked__ ) }, .f. } ) - qTBar:addItem( { "view_zoomin" , "View Zoom In" , QIcon( xbp_image( "view_zoomin" ) ), {|| ::execEvent( __buttonViewZoomedIn_clicked__ ) }, .f. } ) - qTBar:addItem( { "view_zoomout" , "View Zoom Out" , QIcon( xbp_image( "view_zoomout" ) ), {|| ::execEvent( __buttonViewZoomedOut_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_cascaded" , "View as Cascaded" , QIcon( dbu_Image( "view_cascaded" ) ), {|| ::execEvent( __buttonViewCascaded_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_tiled" , "View as Tiled" , QIcon( dbu_Image( "view_tiled" ) ), {|| ::execEvent( __buttonViewTiled_clicked__ ) }, .f. } ) + qTBar:addItem( { "fullscreen" , "View Maximized" , QIcon( dbu_Image( "fullscreen" ) ), {|| ::execEvent( __buttonViewMaximized_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_vertstacked" , "View Vertically Tiled" , QIcon( dbu_Image( "view_vertstacked" ) ), {|| ::execEvent( __buttonViewStackedVert_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_horzstacked" , "View Horizontally Tiled" , QIcon( dbu_Image( "view_horzstacked" ) ), {|| ::execEvent( __buttonViewStackedHorz_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_zoomin" , "View Zoom In" , QIcon( dbu_Image( "view_zoomin" ) ), {|| ::execEvent( __buttonViewZoomedIn_clicked__ ) }, .f. } ) + qTBar:addItem( { "view_zoomout" , "View Zoom Out" , QIcon( dbu_Image( "view_zoomout" ) ), {|| ::execEvent( __buttonViewZoomedOut_clicked__ ) }, .f. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "database_add" , "Append Record" , QIcon( xbp_image( "database_add" ) ), {|| ::execEvent( __buttonAppendRecord_clicked__ ) }, .f. } ) - qTBar:addItem( { "database_remove" , "Delete Record" , QIcon( xbp_image( "database_remove" ) ), {|| ::execEvent( __buttonDelRecord_clicked__ ) }, .f. } ) - qTBar:addItem( { "database_lock" , "Lock/Unlock Record" , QIcon( xbp_image( "database_lock" ) ), {|| ::execEvent( __buttonLockRecord_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_add" , "Append Record" , QIcon( dbu_Image( "database_add" ) ), {|| ::execEvent( __buttonAppendRecord_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_remove" , "Delete Record" , QIcon( dbu_Image( "database_remove" ) ), {|| ::execEvent( __buttonDelRecord_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_lock" , "Lock/Unlock Record" , QIcon( dbu_Image( "database_lock" ) ), {|| ::execEvent( __buttonLockRecord_clicked__ ) }, .f. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "database_up" , "Goto Top" , QIcon( xbp_image( "database_up" ) ), {|| ::execEvent( __buttonGoTop_clicked__ ) }, .f. } ) - qTBar:addItem( { "database_down" , "Goto Bottom" , QIcon( xbp_image( "database_down" ) ), {|| ::execEvent( __buttonGoBottom_clicked__ ) }, .f. } ) - qTBar:addItem( { "database_previous", "Scroll to First Column" , QIcon( xbp_image( "database_previous" ) ), {|| ::execEvent( __buttonScrollToFirst_clicked__ ) }, .f. } ) - qTBar:addItem( { "database_next" , "Scroll to Last Column" , QIcon( xbp_image( "database_next" ) ), {|| ::execEvent( __buttonScrollToLast_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_up" , "Goto Top" , QIcon( dbu_Image( "database_up" ) ), {|| ::execEvent( __buttonGoTop_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_down" , "Goto Bottom" , QIcon( dbu_Image( "database_down" ) ), {|| ::execEvent( __buttonGoBottom_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_previous", "Scroll to First Column" , QIcon( dbu_Image( "database_previous" ) ), {|| ::execEvent( __buttonScrollToFirst_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_next" , "Scroll to Last Column" , QIcon( dbu_Image( "database_next" ) ), {|| ::execEvent( __buttonScrollToLast_clicked__ ) }, .f. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "database_search" , "Search in Table" , QIcon( xbp_image( "database_search" ) ), {|| ::execEvent( __buttonSearchInTable_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_search" , "Search in Table" , QIcon( dbu_Image( "database_search" ) ), {|| ::execEvent( __buttonSearchInTable_clicked__ ) }, .f. } ) qTBar:addItem( , , , , , XBPTOOLBAR_BUTTON_SEPARATOR ) - qTBar:addItem( { "database_process" , "Zap Table" , QIcon( xbp_image( "database_process" ) ), {|| ::execEvent( __buttonZaptable_clicked__ ) }, .f. } ) + qTBar:addItem( { "database_process" , "Zap Table" , QIcon( dbu_Image( "database_process" ) ), {|| ::execEvent( __buttonZaptable_clicked__ ) }, .f. } ) RETURN NIL @@ -1087,7 +1087,7 @@ METHOD HbpDBU:buildPanelsButton() ::qPanelsButton := QToolButton() ::qPanelsButton:setTooltip( "HbpDBU Panels" ) - ::qPanelsButton:setIcon( QIcon( xbp_image( "panel_8" ) ) ) + ::qPanelsButton:setIcon( QIcon( dbu_Image( "panel_8" ) ) ) ::qPanelsButton:setPopupMode( QToolButton_MenuButtonPopup ) ::qPanelsButton:setMenu( ::qPanelsMenu ) @@ -1135,7 +1135,7 @@ METHOD HbpDBU:buildTablesButton() ::qTablesButton := QToolButton() ::qTablesButton:setTooltip( "Tables" ) - ::qTablesButton:setIcon( QIcon( xbp_image( "table" ) ) ) + ::qTablesButton:setIcon( QIcon( dbu_Image( "table" ) ) ) ::qTablesButton:setPopupMode( QToolButton_MenuButtonPopup ) ::qTablesButton:setMenu( ::qTablesMenu ) @@ -1153,7 +1153,7 @@ METHOD HbpDBU:buildIndexButton() ::qIndexButton := QToolButton() ::qIndexButton:setTooltip( "Indexes" ) - ::qIndexButton:setIcon( QIcon( xbp_image( "sort" ) ) ) + ::qIndexButton:setIcon( QIcon( dbu_Image( "sort" ) ) ) ::qIndexButton:setPopupMode( QToolButton_MenuButtonPopup ) ::qIndexButton:setMenu( ::qIndexMenu ) @@ -1916,7 +1916,7 @@ METHOD HbpBrowse:buildMdiWindow() ::qMdi:setWindowTitle( ::cTable ) ::qMdi:setObjectName( hb_ntos( nID ) ) - ::qMdi:setWindowIcon( QIcon( xbp_image( "dbf_p" + hb_ntos( ::nID ) ) ) ) + ::qMdi:setWindowIcon( QIcon( dbu_Image( "dbf_p" + hb_ntos( ::nID ) ) ) ) IF ! empty( ::aInfo[ TBL_GEOMETRY ] ) qRect := hb_aTokens( ::aInfo[ TBL_GEOMETRY ], " " ) @@ -2823,7 +2823,7 @@ STATIC FUNCTION hbide_fetchADate( qParent, cTitle, cPrompt, dDefault ) DEFAULT cTitle TO "A Date Value" DEFAULT cPrompt TO "What" - oUI := hbqtui_xbpFetchDate( qParent ) + oUI := hbqtui_FetchDate( qParent ) oUI:setWindowTitle( cTitle ) oUI:labelPrompt:setText( cPrompt ) @@ -2896,3 +2896,8 @@ STATIC FUNCTION hbide_fldType2Desc( cType ) /*----------------------------------------------------------------------*/ +FUNCTION dbu_Image( cName ) + + RETURN ":/dbu/resources" + "/" + cName + ".png" + +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbxbp/xbp.qrc b/harbour/contrib/hbide/idedbu/dbu.qrc similarity index 98% rename from harbour/contrib/hbxbp/xbp.qrc rename to harbour/contrib/hbide/idedbu/dbu.qrc index 023aaa3796..92c850671b 100644 --- a/harbour/contrib/hbxbp/xbp.qrc +++ b/harbour/contrib/hbide/idedbu/dbu.qrc @@ -1,5 +1,5 @@ - + resources/view_cascaded.png resources/view_organized.png resources/view_tabbed.png diff --git a/harbour/contrib/hbxbp/xbpfetchdate.ui b/harbour/contrib/hbide/idedbu/fetchdate.ui similarity index 100% rename from harbour/contrib/hbxbp/xbpfetchdate.ui rename to harbour/contrib/hbide/idedbu/fetchdate.ui diff --git a/harbour/contrib/hbide/idedbu/idedbu.hbc b/harbour/contrib/hbide/idedbu/idedbu.hbc new file mode 100644 index 0000000000..cea6d90845 --- /dev/null +++ b/harbour/contrib/hbide/idedbu/idedbu.hbc @@ -0,0 +1,9 @@ +# +# $Id$ +# + +incpaths=. + +libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} + +libs=hbxbp.hbc diff --git a/harbour/contrib/hbide/idedbu/idedbu.hbp b/harbour/contrib/hbide/idedbu/idedbu.hbp new file mode 100644 index 0000000000..a80ab83ef7 --- /dev/null +++ b/harbour/contrib/hbide/idedbu/idedbu.hbp @@ -0,0 +1,18 @@ +# +# $Id$ +# + +-hblib +-inc + +-o${hb_name} + +-w3 -es2 + +hbxbp.hbc + +dbu.prg +dbu.qrc +dbstruct.ui +fetchdate.ui +tables.ui diff --git a/harbour/contrib/hbxbp/resources/closetab.png b/harbour/contrib/hbide/idedbu/resources/closetab.png similarity index 100% rename from harbour/contrib/hbxbp/resources/closetab.png rename to harbour/contrib/hbide/idedbu/resources/closetab.png diff --git a/harbour/contrib/hbxbp/resources/database.png b/harbour/contrib/hbide/idedbu/resources/database.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database.png rename to harbour/contrib/hbide/idedbu/resources/database.png diff --git a/harbour/contrib/hbxbp/resources/database_accept.png b/harbour/contrib/hbide/idedbu/resources/database_accept.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_accept.png rename to harbour/contrib/hbide/idedbu/resources/database_accept.png diff --git a/harbour/contrib/hbxbp/resources/database_add.png b/harbour/contrib/hbide/idedbu/resources/database_add.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_add.png rename to harbour/contrib/hbide/idedbu/resources/database_add.png diff --git a/harbour/contrib/hbxbp/resources/database_down.png b/harbour/contrib/hbide/idedbu/resources/database_down.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_down.png rename to harbour/contrib/hbide/idedbu/resources/database_down.png diff --git a/harbour/contrib/hbxbp/resources/database_lock.png b/harbour/contrib/hbide/idedbu/resources/database_lock.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_lock.png rename to harbour/contrib/hbide/idedbu/resources/database_lock.png diff --git a/harbour/contrib/hbxbp/resources/database_next.png b/harbour/contrib/hbide/idedbu/resources/database_next.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_next.png rename to harbour/contrib/hbide/idedbu/resources/database_next.png diff --git a/harbour/contrib/hbxbp/resources/database_previous.png b/harbour/contrib/hbide/idedbu/resources/database_previous.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_previous.png rename to harbour/contrib/hbide/idedbu/resources/database_previous.png diff --git a/harbour/contrib/hbxbp/resources/database_process.png b/harbour/contrib/hbide/idedbu/resources/database_process.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_process.png rename to harbour/contrib/hbide/idedbu/resources/database_process.png diff --git a/harbour/contrib/hbxbp/resources/database_remove.png b/harbour/contrib/hbide/idedbu/resources/database_remove.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_remove.png rename to harbour/contrib/hbide/idedbu/resources/database_remove.png diff --git a/harbour/contrib/hbxbp/resources/database_search.png b/harbour/contrib/hbide/idedbu/resources/database_search.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_search.png rename to harbour/contrib/hbide/idedbu/resources/database_search.png diff --git a/harbour/contrib/hbxbp/resources/database_up.png b/harbour/contrib/hbide/idedbu/resources/database_up.png similarity index 100% rename from harbour/contrib/hbxbp/resources/database_up.png rename to harbour/contrib/hbide/idedbu/resources/database_up.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p1.png b/harbour/contrib/hbide/idedbu/resources/dbf_p1.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p1.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p1.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p10.png b/harbour/contrib/hbide/idedbu/resources/dbf_p10.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p10.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p10.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p2.png b/harbour/contrib/hbide/idedbu/resources/dbf_p2.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p2.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p2.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p3.png b/harbour/contrib/hbide/idedbu/resources/dbf_p3.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p3.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p3.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p4.png b/harbour/contrib/hbide/idedbu/resources/dbf_p4.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p4.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p4.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p5.png b/harbour/contrib/hbide/idedbu/resources/dbf_p5.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p5.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p5.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p6.png b/harbour/contrib/hbide/idedbu/resources/dbf_p6.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p6.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p6.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p7.png b/harbour/contrib/hbide/idedbu/resources/dbf_p7.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p7.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p7.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p8.png b/harbour/contrib/hbide/idedbu/resources/dbf_p8.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p8.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p8.png diff --git a/harbour/contrib/hbxbp/resources/dbf_p9.png b/harbour/contrib/hbide/idedbu/resources/dbf_p9.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbf_p9.png rename to harbour/contrib/hbide/idedbu/resources/dbf_p9.png diff --git a/harbour/contrib/hbxbp/resources/dbstruct.png b/harbour/contrib/hbide/idedbu/resources/dbstruct.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dbstruct.png rename to harbour/contrib/hbide/idedbu/resources/dbstruct.png diff --git a/harbour/contrib/hbxbp/resources/dc_delete.png b/harbour/contrib/hbide/idedbu/resources/dc_delete.png similarity index 100% rename from harbour/contrib/hbxbp/resources/dc_delete.png rename to harbour/contrib/hbide/idedbu/resources/dc_delete.png diff --git a/harbour/contrib/hbxbp/resources/find.png b/harbour/contrib/hbide/idedbu/resources/find.png similarity index 100% rename from harbour/contrib/hbxbp/resources/find.png rename to harbour/contrib/hbide/idedbu/resources/find.png diff --git a/harbour/contrib/hbxbp/resources/form.png b/harbour/contrib/hbide/idedbu/resources/form.png similarity index 100% rename from harbour/contrib/hbxbp/resources/form.png rename to harbour/contrib/hbide/idedbu/resources/form.png diff --git a/harbour/contrib/hbxbp/resources/formview.png b/harbour/contrib/hbide/idedbu/resources/formview.png similarity index 100% rename from harbour/contrib/hbxbp/resources/formview.png rename to harbour/contrib/hbide/idedbu/resources/formview.png diff --git a/harbour/contrib/hbxbp/resources/fullscreen.png b/harbour/contrib/hbide/idedbu/resources/fullscreen.png similarity index 100% rename from harbour/contrib/hbxbp/resources/fullscreen.png rename to harbour/contrib/hbide/idedbu/resources/fullscreen.png diff --git a/harbour/contrib/hbxbp/resources/gotoline3.png b/harbour/contrib/hbide/idedbu/resources/gotoline3.png similarity index 100% rename from harbour/contrib/hbxbp/resources/gotoline3.png rename to harbour/contrib/hbide/idedbu/resources/gotoline3.png diff --git a/harbour/contrib/hbxbp/resources/open3.png b/harbour/contrib/hbide/idedbu/resources/open3.png similarity index 100% rename from harbour/contrib/hbxbp/resources/open3.png rename to harbour/contrib/hbide/idedbu/resources/open3.png diff --git a/harbour/contrib/hbxbp/resources/panel_7.png b/harbour/contrib/hbide/idedbu/resources/panel_7.png similarity index 100% rename from harbour/contrib/hbxbp/resources/panel_7.png rename to harbour/contrib/hbide/idedbu/resources/panel_7.png diff --git a/harbour/contrib/hbxbp/resources/panel_8.png b/harbour/contrib/hbide/idedbu/resources/panel_8.png similarity index 100% rename from harbour/contrib/hbxbp/resources/panel_8.png rename to harbour/contrib/hbide/idedbu/resources/panel_8.png diff --git a/harbour/contrib/hbxbp/resources/save3.png b/harbour/contrib/hbide/idedbu/resources/save3.png similarity index 100% rename from harbour/contrib/hbxbp/resources/save3.png rename to harbour/contrib/hbide/idedbu/resources/save3.png diff --git a/harbour/contrib/hbxbp/resources/sort.png b/harbour/contrib/hbide/idedbu/resources/sort.png similarity index 100% rename from harbour/contrib/hbxbp/resources/sort.png rename to harbour/contrib/hbide/idedbu/resources/sort.png diff --git a/harbour/contrib/hbxbp/resources/table.png b/harbour/contrib/hbide/idedbu/resources/table.png similarity index 100% rename from harbour/contrib/hbxbp/resources/table.png rename to harbour/contrib/hbide/idedbu/resources/table.png diff --git a/harbour/contrib/hbxbp/resources/view_cascaded.png b/harbour/contrib/hbide/idedbu/resources/view_cascaded.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_cascaded.png rename to harbour/contrib/hbide/idedbu/resources/view_cascaded.png diff --git a/harbour/contrib/hbxbp/resources/view_docks.png b/harbour/contrib/hbide/idedbu/resources/view_docks.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_docks.png rename to harbour/contrib/hbide/idedbu/resources/view_docks.png diff --git a/harbour/contrib/hbxbp/resources/view_horzstacked.png b/harbour/contrib/hbide/idedbu/resources/view_horzstacked.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_horzstacked.png rename to harbour/contrib/hbide/idedbu/resources/view_horzstacked.png diff --git a/harbour/contrib/hbxbp/resources/view_organized.png b/harbour/contrib/hbide/idedbu/resources/view_organized.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_organized.png rename to harbour/contrib/hbide/idedbu/resources/view_organized.png diff --git a/harbour/contrib/hbxbp/resources/view_refresh.png b/harbour/contrib/hbide/idedbu/resources/view_refresh.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_refresh.png rename to harbour/contrib/hbide/idedbu/resources/view_refresh.png diff --git a/harbour/contrib/hbxbp/resources/view_tabbed.png b/harbour/contrib/hbide/idedbu/resources/view_tabbed.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_tabbed.png rename to harbour/contrib/hbide/idedbu/resources/view_tabbed.png diff --git a/harbour/contrib/hbxbp/resources/view_tiled.png b/harbour/contrib/hbide/idedbu/resources/view_tiled.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_tiled.png rename to harbour/contrib/hbide/idedbu/resources/view_tiled.png diff --git a/harbour/contrib/hbxbp/resources/view_vertstacked.png b/harbour/contrib/hbide/idedbu/resources/view_vertstacked.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_vertstacked.png rename to harbour/contrib/hbide/idedbu/resources/view_vertstacked.png diff --git a/harbour/contrib/hbxbp/resources/view_zoomin.png b/harbour/contrib/hbide/idedbu/resources/view_zoomin.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_zoomin.png rename to harbour/contrib/hbide/idedbu/resources/view_zoomin.png diff --git a/harbour/contrib/hbxbp/resources/view_zoomout.png b/harbour/contrib/hbide/idedbu/resources/view_zoomout.png similarity index 100% rename from harbour/contrib/hbxbp/resources/view_zoomout.png rename to harbour/contrib/hbide/idedbu/resources/view_zoomout.png diff --git a/harbour/contrib/hbxbp/xbptables.ui b/harbour/contrib/hbide/idedbu/tables.ui similarity index 100% rename from harbour/contrib/hbxbp/xbptables.ui rename to harbour/contrib/hbide/idedbu/tables.ui diff --git a/harbour/contrib/hbxbp/generic.prg b/harbour/contrib/hbxbp/generic.prg index 3b9677667a..79e4a9f4e2 100644 --- a/harbour/contrib/hbxbp/generic.prg +++ b/harbour/contrib/hbxbp/generic.prg @@ -624,10 +624,3 @@ FUNCTION Xbp_getNextIdAsString( cString ) RETURN cString + "_" + hb_ntos( ++hIDs[ cString ] ) /*----------------------------------------------------------------------*/ - -FUNCTION Xbp_Image( cName ) - - RETURN ":/xbp/resources" + "/" + cName + ".png" - -/*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp index 6a70b33e56..280047ee9d 100644 --- a/harbour/contrib/hbxbp/hbxbp.hbp +++ b/harbour/contrib/hbxbp/hbxbp.hbp @@ -55,7 +55,6 @@ tabpage.prg toolbar.prg treeview.prg window.prg -dbu.prg xbp.qrc