2012-09-19 17:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/gtwvg/toolbar.prg
+ Added code to pass <pBitmap> as a pointer to bitmap in memory.
+ contrib/hbxbp/resources
+ contrib/hbxbp/resources/closetab.png
+ contrib/hbxbp/resources/database.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/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
+ Added: various images for HbpDBU() class implementation.
* contrib/hbxbp/hbxbp.hbp
+ Added: dbu.prg, xbpdbstruct.ui, xbpfethdate.ui, xbptables.ui.
* contrib/hbxbp/hbxbp.hbx
* Regenerated.
+ contrib/hbxbp/dbu.prg
* contrib/hbxbp/dialog.prg
* contrib/hbxbp/generic.prg
* contrib/hbxbp/toolbar.prg
+ contrib/hbxbp/xbpdbstruct.ui
+ contrib/hbxbp/xbpfetchdate.ui
+ contrib/hbxbp/xbptables.ui
+ Implemented: HbpDBU() class which was developed for HbIDE initially.
Now this class is self contained object like a COM object which can
be embedded into your HbQt/HbXBP based applications. The syntax to
embed in your applications is like :
oWidget := QWidget()
oLayout := QHBoxLayout( oWidget )
oWidget:setLayout( oLayout )
oDBU := HbpDBU():new()
oDBU:qtObject := oWidget
oDBU:create( , , {0,0}, {100,100}, , .T. )
And you will see the DBU will all its bells and whisles inside oWidget.
oWidget can be any container of your application, but it must have a
layout set on it. Layout can be any. But if it is QGridlayout then
row/column 0,0 is consumed with rowspan/columnsspan 1,1.
It is usable as it was usable in HbIDE, but a lot of improvements/features
are planned lurking on my drawingboard. So just for now, you can play.
* contrib/hbide/actions.prg
- Deprecated: ideDBU opening inside dock widget. Removed this action from
<Main Menu><View> and also from <Dock Widgets Toolbar>.
! Fixed: Selection Mode toggle action not working in Selected-text Toolbar.
- contrib/hbide/browse.prg
- Removed: ideDBU source.
* contrib/hbide/docks.prg
% Adjusted: toggle actions.
* contrib/hbide/hbqtoolbar.prg
% Few refinements.
* contrib/hbide/main.prg
* contrib/hbide/parts.prg
* contrib/hbide/hbide.hbp
- Removed: browse.prg.
TODO: to remove resources consumed by ideDBU.
@@ -16,6 +16,115 @@
|
||||
The license applies to all entries newer than 2009-04-28.
|
||||
*/
|
||||
|
||||
2012-09-19 17:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
|
||||
* contrib/gtwvg/toolbar.prg
|
||||
+ Added code to pass <pBitmap> as a pointer to bitmap in memory.
|
||||
|
||||
+ contrib/hbxbp/resources
|
||||
+ contrib/hbxbp/resources/closetab.png
|
||||
+ contrib/hbxbp/resources/database.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/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
|
||||
+ Added: various images for HbpDBU() class implementation.
|
||||
|
||||
* contrib/hbxbp/hbxbp.hbp
|
||||
+ Added: dbu.prg, xbpdbstruct.ui, xbpfethdate.ui, xbptables.ui.
|
||||
|
||||
* contrib/hbxbp/hbxbp.hbx
|
||||
* Regenerated.
|
||||
|
||||
+ contrib/hbxbp/dbu.prg
|
||||
* contrib/hbxbp/dialog.prg
|
||||
* contrib/hbxbp/generic.prg
|
||||
* contrib/hbxbp/toolbar.prg
|
||||
+ contrib/hbxbp/xbpdbstruct.ui
|
||||
+ contrib/hbxbp/xbpfetchdate.ui
|
||||
+ contrib/hbxbp/xbptables.ui
|
||||
+ Implemented: HbpDBU() class which was developed for HbIDE initially.
|
||||
Now this class is self contained object like a COM object which can
|
||||
be embedded into your HbQt/HbXBP based applications. The syntax to
|
||||
embed in your applications is like :
|
||||
oWidget := QWidget()
|
||||
oLayout := QHBoxLayout( oWidget )
|
||||
oWidget:setLayout( oLayout )
|
||||
|
||||
oDBU := HbpDBU():new()
|
||||
oDBU:qtObject := oWidget
|
||||
oDBU:create( , , {0,0}, {100,100}, , .T. )
|
||||
|
||||
And you will see the DBU will all its bells and whisles inside oWidget.
|
||||
oWidget can be any container of your application, but it must have a
|
||||
layout set on it. Layout can be any. But if it is QGridlayout then
|
||||
row/column 0,0 is consumed with rowspan/columnsspan 1,1.
|
||||
|
||||
It is usable as it was usable in HbIDE, but a lot of improvements/features
|
||||
are planned lurking on my drawingboard. So just for now, you can play.
|
||||
|
||||
* contrib/hbide/actions.prg
|
||||
- Deprecated: ideDBU opening inside dock widget. Removed this action from
|
||||
<Main Menu><View> and also from <Dock Widgets Toolbar>.
|
||||
|
||||
! Fixed: Selection Mode toggle action not working in Selected-text Toolbar.
|
||||
|
||||
- contrib/hbide/browse.prg
|
||||
- Removed: ideDBU source.
|
||||
|
||||
* contrib/hbide/docks.prg
|
||||
% Adjusted: toggle actions.
|
||||
|
||||
* contrib/hbide/hbqtoolbar.prg
|
||||
% Few refinements.
|
||||
|
||||
* contrib/hbide/main.prg
|
||||
* contrib/hbide/parts.prg
|
||||
|
||||
* contrib/hbide/hbide.hbp
|
||||
- Removed: browse.prg.
|
||||
TODO: to remove resources consumed by ideDBU.
|
||||
|
||||
2012-09-19 14:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
|
||||
* harbour/doc/en/compiler.txt
|
||||
* updated to follow recent modifications in compiler code.
|
||||
|
||||
@@ -321,6 +321,9 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS
|
||||
CASE cType == "N"
|
||||
pBitmap := Wvg_PrepareBitmapFromResourceID( xImage, ::imageWidth, ::imageHeight, .t., ::hWnd )
|
||||
|
||||
CASE cType == "P"
|
||||
pBitmap := xImage
|
||||
|
||||
ENDCASE
|
||||
|
||||
IF ! empty( pBitmap )
|
||||
@@ -331,7 +334,9 @@ METHOD WvgToolBar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS
|
||||
ELSE
|
||||
nBtn := WAPI_ImageList_Add( ::hImageList, pBitmap )
|
||||
ENDIF
|
||||
WVG_DeleteObject( pBitmap )
|
||||
IF cType <> "P"
|
||||
WVG_DeleteObject( pBitmap )
|
||||
ENDIF
|
||||
|
||||
WVG_AddToolbarButton( ::pWnd, nBtn, oBtn:caption, oBtn:command, 1, ::showToolTips )
|
||||
|
||||
|
||||
@@ -269,7 +269,7 @@ METHOD IdeActions:loadActions()
|
||||
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, { "SelectionMode" , "Toggle Selection Mode" , "stream" , "" , "Yes","Yes" } )
|
||||
aadd( aAct, { "Find" , "~Find / Replace..." , "find" , "^F" , "No", "Yes" } )
|
||||
aadd( aAct, { "FindEx" , "~Find / Replace Ex" , "find" , "Sh+^F", "No", "Yes" } )
|
||||
aadd( aAct, { "Search" , "F~ind in Files" , "search" , "" , "No", "Yes" } )
|
||||
@@ -558,7 +558,7 @@ METHOD IdeActions:buildMainMenu()
|
||||
oSubMenu2:oWidget:addAction( ::oThemesDock:oWidget:toggleViewAction() )
|
||||
oSubMenu2:oWidget:addAction( ::oFindDock:oWidget:toggleViewAction() )
|
||||
oSubMenu2:oWidget:addAction( ::oSourceThumbnailDock:oWidget:toggleViewAction() )
|
||||
oSubMenu2:oWidget:addAction( ::oQScintillaDock:oWidget:toggleViewAction() )
|
||||
// oSubMenu2:oWidget:addAction( ::oQScintillaDock:oWidget:toggleViewAction() )
|
||||
|
||||
oSubMenu2:oWidget:addAction( ::oReportsManagerDock:toggleViewAction() )
|
||||
oSubMenu2:oWidget:addAction( ::oCuiEdDock:toggleViewAction() )
|
||||
@@ -1113,7 +1113,7 @@ METHOD IdeActions:buildToolBarDocks()
|
||||
aadd( aBtns, { ::oThemesDock , "syntaxhiliter" } )
|
||||
aadd( aBtns, { ::oFindDock , "search" } )
|
||||
aadd( aBtns, { ::oSourceThumbnailDock, "thumbnail" } )
|
||||
aadd( aBtns, { ::oQScintillaDock , "browser" } )
|
||||
// aadd( aBtns, { ::oQScintillaDock , "browser" } )
|
||||
aadd( aBtns, { ::oReportsManagerDock , "designer" } )
|
||||
aadd( aBtns, { ::oCuiEdDock , "cuied" } )
|
||||
aadd( aBtns, { ::oUiSrcDock , "fileprg" } )
|
||||
@@ -1220,7 +1220,7 @@ METHOD IdeActions:buildMdiToolbar()
|
||||
qTBar:addToolButton( "Copy" , "Copy" , hbide_image( "copy" ), {|| ::oEM:copy() }, .f. )
|
||||
qTBar:addToolButton( "Paste" , "Paste" , hbide_image( "paste" ), {|| ::oEM:paste() }, .f. )
|
||||
qTBar:addToolButton( "SelectAll" , "Select all" , hbide_image( "selectall" ), {|| ::oEM:selectAll() }, .f. )
|
||||
qTBar:addToolButton( "SelectionMode", "Selection mode" , hbide_image( "stream" ), {|| ::oEM:toggleSelectionMode(), ::oIDE:manageFocusInEditor() }, .t. )
|
||||
qTBar:addAction( "SelectionMode", ::getAction( "SelectionMode" ), {|| ::oEM:toggleSelectionMode(), ::oIDE:manageFocusInEditor() } )
|
||||
qTBar:addWidget( "Label1", sp1 )
|
||||
qTBar:addToolButton( "Find" , "Find / Replace" , hbide_image( "find" ), {|| ::oEM:find() }, .f. )
|
||||
qTBar:addToolButton( "BookMark" , "Toggle Mark" , hbide_image( "bookmark" ), {|| ::oEM:setMark() }, .f. )
|
||||
@@ -1265,7 +1265,6 @@ METHOD IdeActions:buildToolbarSelectedText()
|
||||
::qSelToolbar:create( "SelectedText_Toolbar" )
|
||||
::qSelToolbar:setObjectName( "ToolbarSelectedText" )
|
||||
::qSelToolbar:setWindowTitle( "Actions on Selected Text" )
|
||||
//::qSelToolbar:setWindowFlags( hb_bitOr( Qt_Tool, Qt_CustomizeWindowHint, Qt_WindowTitleHint, Qt_WindowCloseButtonHint ) )
|
||||
::qSelToolbar:setWindowFlags( hb_bitOr( Qt_Tool, Qt_CustomizeWindowHint ) )
|
||||
::qSelToolbar:setMovable( .T. )
|
||||
::qSelToolbar:setFloatable( .T. )
|
||||
@@ -1278,7 +1277,7 @@ METHOD IdeActions:buildToolbarSelectedText()
|
||||
qTBar:addToolButton( "Cut" , "Cut" , hbide_image( "cut" ), {|| ::oEM:cut() }, .f. )
|
||||
qTBar:addToolButton( "Copy" , "Copy" , hbide_image( "copy" ), {|| ::oEM:copy() }, .f. )
|
||||
qTBar:addToolButton( "Paste" , "Paste" , hbide_image( "paste" ), {|| ::oEM:paste() }, .f. )
|
||||
qTBar:addToolButton( "SelMode" , "Selection Mode" , hbide_image( "stream" ), {|| ::oEM:toggleSelectionMode(), ::oIDE:manageFocusInEditor() }, .t. )
|
||||
qTBar:addAction( "SelectionMode", ::getAction( "SelectionMode" ), {|| ::oEM:toggleSelectionMode(), ::oIDE:manageFocusInEditor() } )
|
||||
qTBar:addToolButton( "ToUpper" , "To Upper" , hbide_image( "toupper" ), {|| ::oEM:convertSelection( "ToUpper" ) }, .f. )
|
||||
qTBar:addToolButton( "ToLower" , "To Lower" , hbide_image( "tolower" ), {|| ::oEM:convertSelection( "ToLower" ) }, .f. )
|
||||
qTBar:addToolButton( "InvertCase", "Invert Case" , hbide_image( "invertcase" ), {|| ::oEM:convertSelection( "Invert" ) }, .f. )
|
||||
|
||||
@@ -418,7 +418,7 @@ METHOD IdeDocks:buildDialog()
|
||||
|
||||
::oDlg:oWidget:setStyleSheet( GetStyleSheet( "QMainWindow", ::nAnimantionMode ) )
|
||||
|
||||
::oDlg:close := {|| hbide_setClose( hbide_getYesNo( "hbIDE is about to be closed!", "Are you sure?" ) ), ;
|
||||
::oDlg:close := {|| hbide_setClose( hbide_getYesNo( "HbIDE is about to be closed!", "Are you sure?" ) ), ;
|
||||
PostAppEvent( xbeP_Close, , , ::oDlg ) }
|
||||
::oDlg:setDockOptions( QMainWindow_AllowTabbedDocks + QMainWindow_AllowNestedDocks + QMainWindow_AnimatedDocks )
|
||||
::oDlg:setTabShape( ::oINI:nDocksTabShape )
|
||||
@@ -625,6 +625,7 @@ METHOD IdeDocks:execEvent( nEvent, p, p1 )
|
||||
ENDIF
|
||||
ENDIF
|
||||
EXIT
|
||||
#if 0 /* Deprecated */
|
||||
CASE __dockQScintilla_visibilityChanged__
|
||||
IF p; ::oBM:show() ; ENDIF
|
||||
IF !empty( p1 )
|
||||
@@ -633,6 +634,7 @@ METHOD IdeDocks:execEvent( nEvent, p, p1 )
|
||||
ENDIF
|
||||
ENDIF
|
||||
EXIT
|
||||
#endif
|
||||
CASE __dockSourceThumbnail_visibilityChanged__
|
||||
IF p; ::oEM:showThumbnail(); ENDIF
|
||||
IF !empty( p1 )
|
||||
@@ -1665,7 +1667,6 @@ METHOD IdeDocks:animateComponents( nMode )
|
||||
::oTM:setStyleSheet( GetStyleSheet( "QToolBarLR5", nMode ) )
|
||||
|
||||
::oEM:setStyleSheet( nMode )
|
||||
::oBM:setStyleSheet( nMode )
|
||||
|
||||
/* Statusbar */
|
||||
::oSBar:oWidget:setStyleSheet( GetStyleSheet( "QStatusBar", nMode ) )
|
||||
|
||||
@@ -52,7 +52,6 @@ shortcuts.prg
|
||||
edit.prg
|
||||
plugins.prg
|
||||
dict.prg
|
||||
browse.prg
|
||||
format.prg
|
||||
changelog.prg
|
||||
console.prg
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
*
|
||||
* Copyright 2010 Pritpal Bedi <pritpal@vouchcac.com>
|
||||
* Copyright 2010-2012 Pritpal Bedi <pritpal@vouchcac.com>
|
||||
* www - http://harbour-project.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@@ -104,8 +104,9 @@ CLASS HbqToolbar
|
||||
METHOD addWidget( cName, qWidget )
|
||||
METHOD addAction( cName, qAction, bBlock )
|
||||
METHOD addSeparator()
|
||||
METHOD contains( cName ) INLINE hb_hHasKey( ::hItems, cName )
|
||||
METHOD getItem( cName ) INLINE iif( hb_hHasKey( ::hItems, cName ), ::hItems[ cName ], NIL )
|
||||
METHOD contains( cName ) INLINE hb_hHasKey( ::hActions, cName )
|
||||
METHOD getItem( cName ) INLINE iif( hb_hHasKey( ::hActions, cName ), ::hActions[ cName ], NIL )
|
||||
METHOD itemToggle( cName )
|
||||
|
||||
ERROR HANDLER onError( ... )
|
||||
ENDCLASS
|
||||
@@ -276,7 +277,7 @@ METHOD HbqToolbar:addSeparator()
|
||||
|
||||
METHOD HbqToolbar:addAction( cName, qAction, bBlock )
|
||||
|
||||
DEFAULT cName TO hbide_getNextIDasString( "IdeToolButtonAction" )
|
||||
DEFAULT cName TO hbide_getNextIdAsString( "IdeToolButtonAction" )
|
||||
|
||||
::oWidget:addAction( qAction )
|
||||
|
||||
@@ -298,7 +299,7 @@ METHOD HbqToolbar:addToolButton( cName, cDesc, cImage, bAction, lCheckable, lDra
|
||||
DEFAULT lCheckable TO .f.
|
||||
DEFAULT lDragEnabled TO .f.
|
||||
|
||||
oButton := QToolButton() // ::oWidget )
|
||||
oButton := QToolButton()
|
||||
oButton:setObjectName( cName )
|
||||
oButton:setTooltip( cDesc )
|
||||
oButton:setIcon( QIcon( cImage ) )
|
||||
@@ -327,11 +328,11 @@ METHOD HbqToolbar:addToolButton( cName, cDesc, cImage, bAction, lCheckable, lDra
|
||||
METHOD HbqToolbar:setItemChecked( cName, lState )
|
||||
LOCAL lOldState
|
||||
|
||||
IF hb_hHasKey( ::hItems, cName )
|
||||
IF ::hItems[ cName ]:isCheckable()
|
||||
lOldState := ::hItems[ cName ]:isChecked()
|
||||
IF hb_hHasKey( ::hActions, cName )
|
||||
IF ::hActions[ cName ]:isCheckable()
|
||||
lOldState := ::hActions[ cName ]:isChecked()
|
||||
IF HB_ISLOGICAL( lState )
|
||||
::hItems[ cName ]:setChecked( lState )
|
||||
::hActions[ cName ]:setChecked( lState )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
@@ -343,13 +344,28 @@ METHOD HbqToolbar:setItemChecked( cName, lState )
|
||||
METHOD HbqToolbar:setItemEnabled( cName, lEnabled )
|
||||
LOCAL lOldEnabled
|
||||
|
||||
IF hb_hHasKey( ::hItems, cName )
|
||||
lOldEnabled := ::hItems[ cName ]:isEnabled()
|
||||
IF hb_hHasKey( ::hActions, cName )
|
||||
lOldEnabled := ::hActions[ cName ]:isEnabled()
|
||||
IF HB_ISLOGICAL( lEnabled )
|
||||
::hItems[ cName ]:setEnabled( lEnabled )
|
||||
::hActions[ cName ]:setEnabled( lEnabled )
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
RETURN lOldEnabled
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD HbqToolbar:itemToggle( cName )
|
||||
LOCAL lOldState
|
||||
|
||||
IF hb_hHasKey( ::hActions, cName )
|
||||
IF ::hActions[ cName ]:isCheckable()
|
||||
lOldState := ::hActions[ cName ]:isChecked()
|
||||
::hActions[ cName ]:setChecked( ! lOldState )
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
RETURN lOldState
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
|
||||
@@ -339,6 +339,8 @@ CLASS HbIde
|
||||
DATA lSortedFuncList INIT .t.
|
||||
DATA lQuitting INIT .f.
|
||||
|
||||
DATA oBMM /* Testing */
|
||||
|
||||
METHOD new( aParams )
|
||||
METHOD create( aParams )
|
||||
METHOD destroy()
|
||||
@@ -670,7 +672,10 @@ METHOD HbIde:create( aParams )
|
||||
::oHM := IdeHome():new():create( Self )
|
||||
|
||||
/* Browser Manager */
|
||||
::oBM := IdeBrowseManager():new():create( Self )
|
||||
::oBMM := HbpDBU():new()
|
||||
::oBMM:qtObject := ::oParts:oStackDbu
|
||||
::oBMM:create()
|
||||
::oBM := ::oBMM:oIdeMgr
|
||||
|
||||
/* Reports Manager */
|
||||
::oRM := HbqReportsManager():new():create( ::oReportsManagerDock:oWidget )
|
||||
|
||||
@@ -185,7 +185,6 @@ METHOD IdeParts:execStackIndexChanged( nIndex )
|
||||
CASE IDE_PART_DBU
|
||||
::oIde:oSBar:hide()
|
||||
::oDK:hideAllDocks()
|
||||
::oBM:showInIdeDBU()
|
||||
EXIT
|
||||
|
||||
ENDSWITCH
|
||||
|
||||
@@ -135,7 +135,7 @@ METHOD XbpDialog:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
|
||||
::resizeMode := 0
|
||||
::mouseMode := 0
|
||||
|
||||
::drawingArea := XbpDrawingArea():new( self, , {0,0}, ::aSize, , .t. )
|
||||
::drawingArea := XbpDrawingArea():new( self, , {0,0}, ::aSize, , .F. )
|
||||
|
||||
RETURN Self
|
||||
|
||||
|
||||
@@ -612,3 +612,22 @@ FUNCTION ConfirmBox( oOwner, cMessage, cTitle, nButtons, nStyle, nStartBtn )
|
||||
RETURN nRet
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
FUNCTION Xbp_getNextIdAsString( cString )
|
||||
|
||||
STATIC hIDs := {=>}
|
||||
|
||||
IF ! hb_hHasKey( hIDs, cString )
|
||||
hIDs[ cString ] := 0
|
||||
ENDIF
|
||||
|
||||
RETURN cString + "_" + hb_ntos( ++hIDs[ cString ] )
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
FUNCTION Xbp_Image( cName )
|
||||
|
||||
RETURN ":/xbp/resources" + "/" + cName + ".png"
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
|
||||
@@ -55,3 +55,10 @@ tabpage.prg
|
||||
toolbar.prg
|
||||
treeview.prg
|
||||
window.prg
|
||||
dbu.prg
|
||||
|
||||
xbp.qrc
|
||||
|
||||
xbptables.ui
|
||||
xbpdbstruct.ui
|
||||
xbpfetchdate.ui
|
||||
|
||||
@@ -70,7 +70,15 @@ DYNAMIC GRASPLINE
|
||||
DYNAMIC GRASTRINGAT
|
||||
DYNAMIC GRATRANSLATE
|
||||
DYNAMIC HBPAPPDESKTOP
|
||||
DYNAMIC HBPBROWSE
|
||||
DYNAMIC HBPBROWSEMANAGER
|
||||
DYNAMIC HBPBROWSEPANEL
|
||||
DYNAMIC HBPDBU
|
||||
DYNAMIC HBPPROCESS
|
||||
DYNAMIC HBQTRES_XBP
|
||||
DYNAMIC HBQTUI_XBPDBSTRUCT
|
||||
DYNAMIC HBQTUI_XBPFETCHDATE
|
||||
DYNAMIC HBQTUI_XBPTABLES
|
||||
DYNAMIC HBXBP_APPEVENTMODIFIER
|
||||
DYNAMIC HBXBP_APPEVENTTOQKEYEVENT
|
||||
DYNAMIC HBXBP_CLEAREVENTBUFFER
|
||||
@@ -88,6 +96,9 @@ DYNAMIC POSTAPPEVENT
|
||||
DYNAMIC SETAPPEVENT
|
||||
DYNAMIC SETAPPFOCUS
|
||||
DYNAMIC SETAPPWINDOW
|
||||
DYNAMIC UI_XBPDBSTRUCT
|
||||
DYNAMIC UI_XBPFETCHDATE
|
||||
DYNAMIC UI_XBPTABLES
|
||||
DYNAMIC XBP3STATE
|
||||
DYNAMIC XBPBITMAP
|
||||
DYNAMIC XBPBROWSE
|
||||
@@ -129,6 +140,8 @@ DYNAMIC XBPTOOLBARBUTTON
|
||||
DYNAMIC XBPTREEVIEW
|
||||
DYNAMIC XBPTREEVIEWITEM
|
||||
DYNAMIC XBPWINDOW
|
||||
DYNAMIC XBP_GETNEXTIDASSTRING
|
||||
DYNAMIC XBP_IMAGE
|
||||
DYNAMIC XBP_XBPTOQTNAME
|
||||
|
||||
#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBXBP__REQUEST )
|
||||
|
||||
BIN
harbour/contrib/hbxbp/resources/closetab.png
Normal file
|
After Width: | Height: | Size: 375 B |
BIN
harbour/contrib/hbxbp/resources/database.png
Normal file
|
After Width: | Height: | Size: 787 B |
BIN
harbour/contrib/hbxbp/resources/database_accept.png
Normal file
|
After Width: | Height: | Size: 960 B |
BIN
harbour/contrib/hbxbp/resources/database_add.png
Normal file
|
After Width: | Height: | Size: 962 B |
BIN
harbour/contrib/hbxbp/resources/database_down.png
Normal file
|
After Width: | Height: | Size: 960 B |
BIN
harbour/contrib/hbxbp/resources/database_lock.png
Normal file
|
After Width: | Height: | Size: 919 B |
BIN
harbour/contrib/hbxbp/resources/database_next.png
Normal file
|
After Width: | Height: | Size: 959 B |
BIN
harbour/contrib/hbxbp/resources/database_previous.png
Normal file
|
After Width: | Height: | Size: 960 B |
BIN
harbour/contrib/hbxbp/resources/database_process.png
Normal file
|
After Width: | Height: | Size: 952 B |
BIN
harbour/contrib/hbxbp/resources/database_remove.png
Normal file
|
After Width: | Height: | Size: 958 B |
BIN
harbour/contrib/hbxbp/resources/database_search.png
Normal file
|
After Width: | Height: | Size: 907 B |
BIN
harbour/contrib/hbxbp/resources/database_up.png
Normal file
|
After Width: | Height: | Size: 955 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p1.png
Normal file
|
After Width: | Height: | Size: 121 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p10.png
Normal file
|
After Width: | Height: | Size: 119 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p2.png
Normal file
|
After Width: | Height: | Size: 110 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p3.png
Normal file
|
After Width: | Height: | Size: 114 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p4.png
Normal file
|
After Width: | Height: | Size: 114 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p5.png
Normal file
|
After Width: | Height: | Size: 112 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p6.png
Normal file
|
After Width: | Height: | Size: 117 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p7.png
Normal file
|
After Width: | Height: | Size: 123 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p8.png
Normal file
|
After Width: | Height: | Size: 116 B |
BIN
harbour/contrib/hbxbp/resources/dbf_p9.png
Normal file
|
After Width: | Height: | Size: 123 B |
BIN
harbour/contrib/hbxbp/resources/dbstruct.png
Normal file
|
After Width: | Height: | Size: 262 B |
BIN
harbour/contrib/hbxbp/resources/dc_delete.png
Normal file
|
After Width: | Height: | Size: 489 B |
BIN
harbour/contrib/hbxbp/resources/find.png
Normal file
|
After Width: | Height: | Size: 342 B |
BIN
harbour/contrib/hbxbp/resources/form.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
harbour/contrib/hbxbp/resources/formview.png
Normal file
|
After Width: | Height: | Size: 475 B |
BIN
harbour/contrib/hbxbp/resources/fullscreen.png
Normal file
|
After Width: | Height: | Size: 349 B |
BIN
harbour/contrib/hbxbp/resources/gotoline3.png
Normal file
|
After Width: | Height: | Size: 329 B |
BIN
harbour/contrib/hbxbp/resources/open3.png
Normal file
|
After Width: | Height: | Size: 639 B |
BIN
harbour/contrib/hbxbp/resources/panel_7.png
Normal file
|
After Width: | Height: | Size: 243 B |
BIN
harbour/contrib/hbxbp/resources/panel_8.png
Normal file
|
After Width: | Height: | Size: 398 B |
BIN
harbour/contrib/hbxbp/resources/save3.png
Normal file
|
After Width: | Height: | Size: 564 B |
BIN
harbour/contrib/hbxbp/resources/sort.png
Normal file
|
After Width: | Height: | Size: 162 B |
BIN
harbour/contrib/hbxbp/resources/table.png
Normal file
|
After Width: | Height: | Size: 920 B |
BIN
harbour/contrib/hbxbp/resources/view_cascaded.png
Normal file
|
After Width: | Height: | Size: 576 B |
BIN
harbour/contrib/hbxbp/resources/view_docks.png
Normal file
|
After Width: | Height: | Size: 564 B |
BIN
harbour/contrib/hbxbp/resources/view_horzstacked.png
Normal file
|
After Width: | Height: | Size: 279 B |
BIN
harbour/contrib/hbxbp/resources/view_organized.png
Normal file
|
After Width: | Height: | Size: 302 B |
BIN
harbour/contrib/hbxbp/resources/view_refresh.png
Normal file
|
After Width: | Height: | Size: 753 B |
BIN
harbour/contrib/hbxbp/resources/view_tabbed.png
Normal file
|
After Width: | Height: | Size: 293 B |
BIN
harbour/contrib/hbxbp/resources/view_tiled.png
Normal file
|
After Width: | Height: | Size: 330 B |
BIN
harbour/contrib/hbxbp/resources/view_vertstacked.png
Normal file
|
After Width: | Height: | Size: 327 B |
BIN
harbour/contrib/hbxbp/resources/view_zoomin.png
Normal file
|
After Width: | Height: | Size: 769 B |
BIN
harbour/contrib/hbxbp/resources/view_zoomout.png
Normal file
|
After Width: | Height: | Size: 772 B |
@@ -99,17 +99,20 @@ CLASS XbpToolBar INHERIT XbpWindow
|
||||
DATA sl_buttonMenuClick
|
||||
DATA sl_buttonDropDown
|
||||
|
||||
DATA qByte, qMime, qDrag, qPix, qdropAction, qPos
|
||||
DATA orientation INIT Qt_Horizontal
|
||||
|
||||
METHOD numItems() INLINE Len( ::aItems )
|
||||
|
||||
METHOD init( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
|
||||
METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
|
||||
METHOD configure( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
|
||||
METHOD destroy()
|
||||
METHOD execSlot( cSlot, p )
|
||||
METHOD execSlot( cSlot, p, p1 )
|
||||
|
||||
METHOD addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nStyle, cKey, nMapRGB )
|
||||
METHOD delItem()
|
||||
METHOD getItem()
|
||||
METHOD addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nStyle, xKey )
|
||||
METHOD delItem( nItem_cKey )
|
||||
METHOD getItem( nItem_cKey )
|
||||
METHOD clear()
|
||||
METHOD customize()
|
||||
METHOD loadImageSet()
|
||||
@@ -126,6 +129,10 @@ CLASS XbpToolBar INHERIT XbpWindow
|
||||
METHOD sendToolbarMessage()
|
||||
METHOD setStyle()
|
||||
|
||||
METHOD setItemChecked( nItem_cKey, lChecked )
|
||||
METHOD setItemEnabled( nItem_cKey, lEnabled )
|
||||
METHOD itemToggle( nItem_cKey )
|
||||
|
||||
ENDCLASS
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
@@ -147,28 +154,31 @@ METHOD XbpToolbar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
|
||||
ELSEIF upper( ::oParent:className ) == "XBPDRAWINGAREA"
|
||||
oPar := ::oParent:oParent
|
||||
ELSE
|
||||
RETURN Self
|
||||
oPar := ::oParent
|
||||
ENDIF
|
||||
::oParent := oPar
|
||||
|
||||
::oWidget := QToolBar( ::oParent:oWidget )
|
||||
::oWidget:setObjectName( "XBPTOOLBARMAIN" )
|
||||
::oWidget:setWindowTitle( "Main" )
|
||||
::oParent:oWidget:addToolBar( ::oWidget )
|
||||
::oWidget := QToolBar( iif( Empty( ::oParent ), NIL, ::oParent:oWidget ) )
|
||||
IF ! Empty( ::oParent )
|
||||
::oWidget:setObjectName( iif( Empty( ::oParent ), "XBPTOOLBAR", "XBPTOOLBARMAIN" ) )
|
||||
::oWidget:setWindowTitle( "Main" )
|
||||
::oParent:oWidget:addToolBar( ::oWidget )
|
||||
ENDIF
|
||||
|
||||
IF ::imageWidth > 0 .and. ::imageHeight > 0
|
||||
::oWidget:setIconSize( QSize( ::imageWidth, ::imageHeight ) )
|
||||
ENDIF
|
||||
|
||||
#if 0
|
||||
::oWidget:setFocusPolicy( Qt_NoFocus )
|
||||
|
||||
/* Assign attributes */
|
||||
IF ::style == XBPTOOLBAR_STYLE_FLAT
|
||||
//::style := TBSTYLE_FLAT
|
||||
ELSEIF ::style == XBPTOOLBAR_STYLE_VERTICAL
|
||||
//::style := CCS_VERT
|
||||
ELSE
|
||||
::style := 0
|
||||
ENDIF
|
||||
IF ::orientation == Qt_Vertical
|
||||
::oWidget:setOrientation( Qt_Vertical )
|
||||
ENDIF
|
||||
//
|
||||
IF ::wrappable
|
||||
//::style += TBSTYLE_WRAPABLE
|
||||
ENDIF
|
||||
@@ -178,17 +188,17 @@ METHOD XbpToolbar:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
|
||||
IF ::borderStyle == XBPFRAME_RECT
|
||||
//::style += WS_BORDER
|
||||
ENDIF
|
||||
|
||||
//
|
||||
IF ::appearance == XBP_APPEARANCE_3D
|
||||
ENDIF
|
||||
#endif
|
||||
|
||||
IF ::visible
|
||||
::show()
|
||||
ENDIF
|
||||
::oParent:AddChild( SELF )
|
||||
::postCreate()
|
||||
|
||||
IF ! Empty( ::oParent )
|
||||
::oParent:AddChild( SELF )
|
||||
::postCreate()
|
||||
ENDIF
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
@@ -229,18 +239,32 @@ METHOD XbpToolbar:sendToolbarMessage()
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nStyle, cKey, nMapRGB )
|
||||
METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nStyle, xKey )
|
||||
LOCAL oBtn
|
||||
LOCAL isAction := HB_ISOBJECT( cCaption ) .AND. __ObjGetClsName( cCaption ) == "QACTION"
|
||||
LOCAL isAction := HB_ISOBJECT( cCaption ) .AND. __ObjGetClsName( cCaption ) == "QACTION"
|
||||
LOCAL isToolButton := HB_ISARRAY( cCaption )
|
||||
LOCAL isObject := HB_ISOBJECT( cCaption )
|
||||
|
||||
HB_SYMBOL_UNUSED( xDisabledImage )
|
||||
HB_SYMBOL_UNUSED( xHotImage )
|
||||
HB_SYMBOL_UNUSED( cDLL )
|
||||
HB_SYMBOL_UNUSED( nMapRGB )
|
||||
HB_SYMBOL_UNUSED( isToolButton )
|
||||
|
||||
DEFAULT nStyle TO XBPTOOLBAR_BUTTON_DEFAULT
|
||||
|
||||
oBtn := XbpToolbarButton():new( iif( isAction, cCaption:text(), cCaption ), nStyle, cKey )
|
||||
IF isToolButton
|
||||
//addToolButton( cName, cDesc, cImage, bAction, lCheckable, lDragEnabled )
|
||||
ASize( cCaption, 6 )
|
||||
|
||||
DEFAULT cCaption[ 1 ] TO Xbp_getNextIdAsString( "XbpToolButton" )
|
||||
DEFAULT cCaption[ 2 ] TO ""
|
||||
DEFAULT cCaption[ 5 ] TO .F.
|
||||
DEFAULT cCaption[ 6 ] TO .F.
|
||||
|
||||
oBtn := XbpToolbarButton():new( cCaption[ 1 ], nStyle, iif( HB_ISBLOCK( cCaption[ 4 ] ), cCaption[ 4 ], xKey ) )
|
||||
ELSE
|
||||
oBtn := XbpToolbarButton():new( iif( isAction, cCaption:text(), cCaption ), nStyle, xKey )
|
||||
ENDIF
|
||||
|
||||
oBtn:index := ::numItems + 1
|
||||
oBtn:command := 100 + oBtn:index
|
||||
@@ -252,6 +276,24 @@ METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS
|
||||
IF isAction
|
||||
oBtn:oAction := cCaption
|
||||
|
||||
ELSEIF isToolButton
|
||||
oBtn:oAction := QAction( ::oWidget )
|
||||
|
||||
oBtn:oAction:setObjectName( cCaption[ 1 ] )
|
||||
oBtn:oAction:setTooltip( cCaption[ 2 ] )
|
||||
oBtn:oAction:setIcon( cCaption[ 3 ] )
|
||||
oBtn:oAction:setCheckable( cCaption[ 5 ] )
|
||||
IF cCaption[ 6 ]
|
||||
oBtn:oAction:connect( QEvent_MouseButtonPress , {|p| ::execSlot( "QEvent_MousePress" , p, cCaption[ 1 ] ) } )
|
||||
oBtn:oAction:connect( QEvent_MouseButtonRelease, {|p| ::execSlot( "QEvent_MouseRelease", p, cCaption[ 1 ] ) } )
|
||||
oBtn:oAction:connect( QEvent_MouseMove , {|p| ::execSlot( "QEvent_MouseMove" , p, cCaption[ 1 ] ) } )
|
||||
oBtn:oAction:connect( QEvent_Enter , {|p| ::execSlot( "QEvent_MouseEnter" , p, cCaption[ 1 ] ) } )
|
||||
ENDIF
|
||||
|
||||
ELSEIF isObject
|
||||
oBtn:oAction := QWidgetAction( ::oWidget )
|
||||
oBtn:oAction:setDefaultWidget( cCaption )
|
||||
|
||||
ELSE
|
||||
/* Create an action */
|
||||
oBtn:oAction := QAction( ::oWidget )
|
||||
@@ -279,30 +321,157 @@ METHOD XbpToolbar:addItem( cCaption, xImage, xDisabledImage, xHotImage, cDLL, nS
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:execSlot( cSlot, p )
|
||||
METHOD XbpToolbar:execSlot( cSlot, p, p1 )
|
||||
LOCAL qEvent, qRC
|
||||
|
||||
IF cSlot == "triggered(bool)"
|
||||
qEvent := p
|
||||
|
||||
SWITCH cSlot
|
||||
|
||||
CASE "triggered(bool)"
|
||||
::buttonClick( p )
|
||||
EXIT
|
||||
|
||||
CASE "QEvent_MouseLeave"
|
||||
EXIT
|
||||
|
||||
CASE "QEvent_MouseMove"
|
||||
qRC := QRect( ::qPos:x() - 5, ::qPos:y() - 5, 10, 10 ):normalized()
|
||||
IF qRC:contains( qEvent:pos() )
|
||||
::qByte := QByteArray( ::hItems[ p1 ]:objectName() )
|
||||
|
||||
::qMime := QMimeData()
|
||||
::qMime:setData( "application/x-toolbaricon", ::qByte )
|
||||
::qMime:setHtml( ::hItems[ p1 ]:objectName() )
|
||||
|
||||
::qPix := QIcon( ::hItems[ p1 ]:icon ):pixmap( 16,16 )
|
||||
|
||||
::qDrag := QDrag( SetAppWindow():oWidget )
|
||||
::qDrag:setMimeData( ::qMime )
|
||||
::qDrag:setPixmap( ::qPix )
|
||||
::qDrag:setHotSpot( QPoint( 15,15 ) )
|
||||
::qDrag:setDragCursor( ::qPix, Qt_CopyAction + Qt_IgnoreAction )
|
||||
::qDropAction := ::qDrag:exec( Qt_CopyAction + Qt_IgnoreAction ) /* Why this is not terminated GPF's */
|
||||
|
||||
::qDrag := NIL
|
||||
::qPos := NIL
|
||||
::hItems[ p1 ]:setChecked( .f. )
|
||||
::hItems[ p1 ]:setWindowState( 0 )
|
||||
ENDIF
|
||||
EXIT
|
||||
|
||||
CASE "QEvent_MouseRelease"
|
||||
::qDrag := NIL
|
||||
EXIT
|
||||
|
||||
CASE "QEvent_MousePress"
|
||||
::qPos := qEvent:pos()
|
||||
EXIT
|
||||
|
||||
ENDSWITCH
|
||||
|
||||
RETURN NIL
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:setItemChecked( nItem_cKey, lChecked )
|
||||
LOCAL oBtn, lOldState
|
||||
|
||||
IF ! Empty( oBtn := ::getItem( nItem_cKey ) )
|
||||
IF oBtn:oAction:isCheckable()
|
||||
lOldState := oBtn:oAction:isChecked()
|
||||
IF HB_ISLOGICAL( lChecked )
|
||||
oBtn:oAction:setChecked( lChecked )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
RETURN lOldState
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:setItemEnabled( nItem_cKey, lEnabled )
|
||||
LOCAL oBtn, lOldState
|
||||
|
||||
IF ! Empty( oBtn := ::getItem( nItem_cKey ) )
|
||||
lOldState := oBtn:oAction:isEnabled()
|
||||
IF HB_ISLOGICAL( lEnabled )
|
||||
oBtn:oAction:setEnabled( lEnabled )
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
RETURN lOldState
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:itemToggle( nItem_cKey )
|
||||
LOCAL oBtn, lOldState
|
||||
|
||||
IF ! Empty( oBtn := ::getItem( nItem_cKey ) )
|
||||
IF oBtn:oAction:isCheckable()
|
||||
lOldState := oBtn:oAction:isChecked()
|
||||
oBtn:oAction:setChecked( ! lOldState )
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
RETURN lOldState
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:delItem( nItem_cKey )
|
||||
LOCAL a_
|
||||
|
||||
IF HB_ISNUMERIC( nItem_cKey )
|
||||
IF Len( ::aItems ) <= nItem_cKey
|
||||
::oWidget:removeAction( ::aItems[ nItem_cKey, 2 ]:oAction )
|
||||
hb_ADel( ::aItems, nItem_cKey, .T. )
|
||||
ENDIF
|
||||
|
||||
ELSEIF HB_ISCHAR( nItem_cKey )
|
||||
FOR EACH a_ IN ::aItems
|
||||
IF HB_ISCHAR( a_[ 2 ]:key )
|
||||
IF a_[ 2 ]:key == nItem_cKey
|
||||
::oWidget:removeAction( a_[ 2 ]:oAction )
|
||||
hb_ADel( ::aItems, a_:__enumIndex(), .T. )
|
||||
EXIT
|
||||
ENDIF
|
||||
ENDIF
|
||||
NEXT
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:getItem( nItem_cKey )
|
||||
LOCAL a_
|
||||
|
||||
IF HB_ISNUMERIC( nItem_cKey )
|
||||
IF Len( ::aItems ) <= nItem_cKey
|
||||
RETURN ::aItems[ nItem_cKey, 2 ]
|
||||
ENDIF
|
||||
|
||||
ELSEIF HB_ISCHAR( nItem_cKey )
|
||||
FOR EACH a_ IN ::aItems
|
||||
IF HB_ISCHAR( a_[ 2 ]:key )
|
||||
IF a_[ 2 ]:key == nItem_cKey
|
||||
RETURN a_[ 2 ]
|
||||
ENDIF
|
||||
ENDIF
|
||||
NEXT
|
||||
|
||||
ENDIF
|
||||
|
||||
RETURN NIL
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:delItem()
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:getItem()
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbar:clear()
|
||||
|
||||
::oWidget:clear()
|
||||
::aItems := {}
|
||||
|
||||
RETURN Self
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
@@ -438,22 +607,23 @@ CLASS XbpToolbarButton
|
||||
DATA tooltipText INIT ""
|
||||
DATA command INIT 0
|
||||
DATA oAction
|
||||
DATA cargo
|
||||
|
||||
METHOD init( cCaption, nStyle, cKey )
|
||||
METHOD init( cCaption, nStyle, xKey )
|
||||
|
||||
ENDCLASS
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
METHOD XbpToolbarButton:init( cCaption, nStyle, cKey )
|
||||
METHOD XbpToolbarButton:init( cCaption, nStyle, xKey )
|
||||
|
||||
DEFAULT cCaption TO ::caption
|
||||
DEFAULT nStyle TO ::style
|
||||
DEFAULT cKey TO ::key
|
||||
DEFAULT xKey TO ::key
|
||||
|
||||
::caption := cCaption
|
||||
::style := nStyle
|
||||
::key := cKey
|
||||
::key := xKey
|
||||
|
||||
RETURN Self
|
||||
|
||||
|
||||
48
harbour/contrib/hbxbp/xbp.qrc
Normal file
@@ -0,0 +1,48 @@
|
||||
<RCC>
|
||||
<qresource prefix="xbp">
|
||||
<file>resources/view_cascaded.png</file>
|
||||
<file>resources/view_organized.png</file>
|
||||
<file>resources/view_tabbed.png</file>
|
||||
<file>resources/view_tiled.png</file>
|
||||
<file>resources/view_vertstacked.png</file>
|
||||
<file>resources/view_horzstacked.png</file>
|
||||
<file>resources/view_zoomin.png</file>
|
||||
<file>resources/view_zoomout.png</file>
|
||||
<file>resources/view_refresh.png</file>
|
||||
<file>resources/database.png</file>
|
||||
<file>resources/database_accept.png</file>
|
||||
<file>resources/database_add.png</file>
|
||||
<file>resources/database_remove.png</file>
|
||||
<file>resources/database_lock.png</file>
|
||||
<file>resources/database_process.png</file>
|
||||
<file>resources/database_up.png</file>
|
||||
<file>resources/database_down.png</file>
|
||||
<file>resources/database_previous.png</file>
|
||||
<file>resources/database_next.png</file>
|
||||
<file>resources/database_search.png</file>
|
||||
<file>resources/open3.png</file>
|
||||
<file>resources/save3.png</file>
|
||||
<file>resources/fullscreen.png</file>
|
||||
<file>resources/formview.png</file>
|
||||
<file>resources/dbstruct.png</file>
|
||||
<file>resources/find.png</file>
|
||||
<file>resources/gotoline3.png</file>
|
||||
<file>resources/dc_delete.png</file>
|
||||
<file>resources/panel_7.png</file>
|
||||
<file>resources/panel_8.png</file>
|
||||
<file>resources/sort.png</file>
|
||||
<file>resources/closetab.png</file>
|
||||
<file>resources/dbf_p1.png</file>
|
||||
<file>resources/dbf_p2.png</file>
|
||||
<file>resources/dbf_p3.png</file>
|
||||
<file>resources/dbf_p4.png</file>
|
||||
<file>resources/dbf_p5.png</file>
|
||||
<file>resources/dbf_p6.png</file>
|
||||
<file>resources/dbf_p7.png</file>
|
||||
<file>resources/dbf_p8.png</file>
|
||||
<file>resources/dbf_p9.png</file>
|
||||
<file>resources/dbf_p10.png</file>
|
||||
<file>resources/form.png</file>
|
||||
<file>resources/table.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
332
harbour/contrib/hbxbp/xbpdbstruct.ui
Normal file
@@ -0,0 +1,332 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>FormStruct</class>
|
||||
<widget class="QWidget" name="FormStruct">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>481</width>
|
||||
<height>389</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Structure</string>
|
||||
</property>
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>8</x>
|
||||
<y>8</y>
|
||||
<width>463</width>
|
||||
<height>53</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string/>
|
||||
</property>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>12</x>
|
||||
<y>6</y>
|
||||
<width>63</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Field Name:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="editName">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>22</y>
|
||||
<width>175</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>198</x>
|
||||
<y>4</y>
|
||||
<width>73</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QComboBox" name="comboType">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>198</x>
|
||||
<y>20</y>
|
||||
<width>101</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="editSize">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>310</x>
|
||||
<y>22</y>
|
||||
<width>69</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>312</x>
|
||||
<y>6</y>
|
||||
<width>46</width>
|
||||
<height>14</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Size:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>396</x>
|
||||
<y>6</y>
|
||||
<width>46</width>
|
||||
<height>14</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Decimals:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="editDec">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>394</x>
|
||||
<y>22</y>
|
||||
<width>57</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QTableWidget" name="tableFields">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>8</x>
|
||||
<y>96</y>
|
||||
<width>463</width>
|
||||
<height>255</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonAdd">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>18</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonModify">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>58</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonDel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>100</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonPrint">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>186</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonClose">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>436</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonExec">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonDelAll">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>142</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonDown">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>322</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QToolButton" name="buttonUp">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>364</x>
|
||||
<y>70</y>
|
||||
<width>25</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>362</y>
|
||||
<width>91</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Memo Block Size:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QFrame" name="frame">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>298</x>
|
||||
<y>358</y>
|
||||
<width>173</width>
|
||||
<height>25</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>8</x>
|
||||
<y>4</y>
|
||||
<width>65</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Record Size:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="labelRecSize">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>98</x>
|
||||
<y>6</y>
|
||||
<width>61</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>1</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QSpinBox" name="spinMemoSize">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>102</x>
|
||||
<y>360</y>
|
||||
<width>77</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="buttonCopyStruct">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>204</x>
|
||||
<y>360</y>
|
||||
<width>75</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Copy Struct</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
71
harbour/contrib/hbxbp/xbpfetchdate.ui
Normal file
@@ -0,0 +1,71 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>DialogDate</class>
|
||||
<widget class="QDialog" name="DialogDate">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>194</width>
|
||||
<height>104</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Fetch a date</string>
|
||||
</property>
|
||||
<widget class="QDateEdit" name="editDate">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>14</x>
|
||||
<y>30</y>
|
||||
<width>161</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="calendarPopup">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="buttonOk">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>14</x>
|
||||
<y>68</y>
|
||||
<width>75</width>
|
||||
<height>24</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>OK</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="buttonCancel">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>102</x>
|
||||
<y>68</y>
|
||||
<width>75</width>
|
||||
<height>24</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Cancel</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="labelPrompt">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>14</x>
|
||||
<y>8</y>
|
||||
<width>159</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Select a date</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
52
harbour/contrib/hbxbp/xbptables.ui
Normal file
@@ -0,0 +1,52 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>DialogTables</class>
|
||||
<widget class="QDialog" name="DialogTables">
|
||||
<property name="windowModality">
|
||||
<enum>Qt::ApplicationModal</enum>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>302</width>
|
||||
<height>485</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Opened Tables</string>
|
||||
</property>
|
||||
<property name="sizeGripEnabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="modal">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QTreeWidget" name="treeTables">
|
||||
<property name="headerHidden">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="columnCount">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<column>
|
||||
<property name="text">
|
||||
<string notr="true">1</string>
|
||||
</property>
|
||||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="buttonOk">
|
||||
<property name="text">
|
||||
<string>OK</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||