fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-10-27 17:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/tests/demoqt.prg
  * contrib/hbqt/tests/dialogqt.prg
    % Deleted unnecessary manifest constants for 
      signal names (used inconsistently).

  * contrib/hbxbp/tests/demoxbp.prg
  * contrib/hbxbp/tests/dialogqt.prg
    % Deleted unnecessary synonym for HB_SYMBOL_UNUSED().
This commit is contained in:
Viktor Szakats
2010-10-27 15:46:20 +00:00
parent 872abe845b
commit 0f4730b0dd
5 changed files with 96 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -16,6 +16,16 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-27 17:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/tests/demoqt.prg
* contrib/hbqt/tests/dialogqt.prg
% Deleted unnecessary manifest constants for
signal names (used inconsistently).
* contrib/hbxbp/tests/demoxbp.prg
* contrib/hbxbp/tests/dialogqt.prg
% Deleted unnecessary synonym for HB_SYMBOL_UNUSED().
2010-10-27 05:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/gete.c
% Optimization to GETENV()/HB_GETENV(). Patch by Tamas Tevesz.

60
harbour/contrib/hbqt/tests/demoqt.prg
View File

@@ -56,20 +56,6 @@
#include "hbtrace.ch"
#define QT_EVE_TRIGGERED "triggered()"
#define QT_EVE_TRIGGERED_B "triggered(bool)"
#define QT_EVE_HOVERED "hovered()"
#define QT_EVE_CLICKED "clicked()"
#define QT_EVE_STATECHANGED_I "stateChanged(int)"
#define QT_EVE_PRESSED "pressed()"
#define QT_EVE_RELEASED "released()"
#define QT_EVE_ACTIVATED_I "activated(int)"
#define QT_EVE_CURRENTINDEXCHANGED_I "currentIndexChanged(int)"
#define QT_EVE_HIGHLIGHTED_I "highlighted(int)"
#define QT_EVE_RETURNPRESSED "returnPressed()"
#define QT_EVE_CLICKED_M "clicked(QModelIndex)"
#define QT_EVE_VIEWPORTENTERED "viewportEntered()"
/*----------------------------------------------------------------------*/
/*
* A NOTE
@@ -241,17 +227,17 @@ STATIC FUNCTION Build_MenuBar( oWnd )
oMenu1:addAction( oActNew )
oActOpen := oMenu1:addAction( hb_dirBase() + "open.png", "&Open" )
oActOpen:connect( QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open" , w, l ) } )
oActOpen:connect( "triggered(bool)", {|w,l| FileDialog( "Open" , w, l ) } )
oMenu1:addSeparator()
oActSave := oMenu1:addAction( hb_dirBase() + "save.png", "&Save" )
oActSave:connect( QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save" , w, l ) } )
oActSave:connect( "triggered(bool)", {|w,l| FileDialog( "Save" , w, l ) } )
oMenu1:addSeparator()
oActExit := oMenu1:addAction( "E&xit" )
oActExit:connect( QT_EVE_TRIGGERED_B, {|| s_qApp:quit() } )
oActExit:connect( "triggered(bool)", {|| s_qApp:quit() } )
oMenuBar:addMenu( oMenu1 )
@@ -259,31 +245,31 @@ STATIC FUNCTION Build_MenuBar( oWnd )
oMenu2:setTitle( "&Dialogs" )
oActColors := oMenu2:addAction( "&Colors" )
oActColors:connect( QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Colors", w, l ) } )
oActColors:connect( "triggered(bool)", {|w,l| Dialogs( "Colors", w, l ) } )
oActFonts := oMenu2:addAction( "&Fonts" )
oActFonts:connect( QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Fonts", w, l ) } )
oActFonts:connect( "triggered(bool)", {|w,l| Dialogs( "Fonts", w, l ) } )
oMenu2:addSeparator()
oActPgSetup := oMenu2:addAction( "&PageSetup" )
oActPgSetup:connect( QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "PageSetup", w, l ) } )
oActPgSetup:connect( "triggered(bool)", {|w,l| Dialogs( "PageSetup", w, l ) } )
oActPreview := oMenu2:addAction( "P&review" )
oActPreview:connect( QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Preview", w, l ) } )
oActPreview:connect( "triggered(bool)", {|w,l| Dialogs( "Preview", w, l ) } )
oMenu2:addSeparator()
oActWiz := oMenu2:addAction( "&Wizard" )
oActWiz:connect( QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Wizard", w, l ) } )
oActWiz:connect( "triggered(bool)", {|w,l| Dialogs( "Wizard", w, l ) } )
oActWeb := oMenu2:addAction( "W&ebPage" )
oActWeb:connect( QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "WebPage", w, l ) } )
oActWeb:connect( "triggered(bool)", {|w,l| Dialogs( "WebPage", w, l ) } )
oMenu2:addSeparator()
oActOther := oMenu2:addAction( "&Another Dialog" )
oActOther:connect( QT_EVE_TRIGGERED_B, {|| ExecOneMore() } )
oActOther:connect( "triggered(bool)", {|| ExecOneMore() } )
oMenuBar:addMenu( oMenu2 )
@@ -305,7 +291,7 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oActNew:setText( "&New" )
oActNew:setIcon( hb_dirBase() + "new.png" )
oActNew:setToolTip( "A New File" )
oActNew:connect( QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } )
oActNew:connect( "triggered(bool)", {|w,l| FileDialog( "New" , w, l ) } )
/* Attach Action with Toolbar */
oTB:addAction( oActNew )
@@ -315,7 +301,7 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oActOpen:setText( "&Open" )
oActOpen:setIcon( hb_dirBase() + "open.png" )
oActOpen:setToolTip( "Select a file to be opened!" )
oActOpen:connect( QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open" , w, l ) } )
oActOpen:connect( "triggered(bool)", {|w,l| FileDialog( "Open" , w, l ) } )
/* Attach Action with Toolbar */
oTB:addAction( oActOpen )
@@ -326,7 +312,7 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oActSave:setText( "&Save" )
oActSave:setIcon( hb_dirBase() + "save.png" )
oActSave:setToolTip( "Save this file!" )
oActSave:connect( oActSave, QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save" , w, l ) } )
oActSave:connect( oActSave, "triggered(bool)", {|w,l| FileDialog( "Save" , w, l ) } )
/* Attach Action with Toolbar */
oTB:addAction( oActSave )
@@ -349,9 +335,9 @@ STATIC FUNCTION Build_PushButton( oWnd, aPos, aSize, cLabel, cMsg, lExit )
oBtn:resize( aSize[ 1 ],aSize[ 2 ] )
oBtn:show()
IF hb_isLogical( lExit )
oBtn:connect( QT_EVE_CLICKED, {|| lExit := .t. } )
oBtn:connect( "clicked()", {|| lExit := .t. } )
ELSE
oBtn:connect( QT_EVE_CLICKED, {|| MsgInfo( cMsg ), lExit := .t. } )
oBtn:connect( "clicked()", {|| MsgInfo( cMsg ), lExit := .t. } )
ENDIF
RETURN oBtn
@@ -421,7 +407,7 @@ STATIC FUNCTION Build_TreeView( oWnd )
oTV := QTreeView( oWnd )
oTV:setMouseTracking( .t. )
* oTV:connect( QT_EVE_HOVERED, {|i| HB_TRACE( HB_TR_ALWAYS, ( "oTV:hovered" ) } )
* oTV:connect( "hovered()", {|i| HB_TRACE( HB_TR_ALWAYS, ( "oTV:hovered" ) } )
oDirModel := QDirModel()
oTV:setModel( oDirModel )
oTV:move( 5, 7 )
@@ -437,7 +423,7 @@ STATIC FUNCTION Build_ListBox( oWnd, aPos, aSize )
oListBox := QListView( oWnd )
oListBox:setMouseTracking( .t. )
* oListBox:connect( QT_EVE_HOVERED, {|i| HB_TRACE( HB_TR_ALWAYS, ( "oListBox:hovered" ) } )
* oListBox:connect( "hovered()", {|i| HB_TRACE( HB_TR_ALWAYS, ( "oListBox:hovered" ) } )
oStrList := QStringList()
@@ -480,7 +466,7 @@ STATIC FUNCTION Build_Controls( oWnd )
LOCAL oEdit, oCheckBox, oComboBox, oSpinBox, oRadioButton
oEdit := QLineEdit( oWnd )
oEdit:connect( QT_EVE_RETURNPRESSED, {|i| i := i, MsgInfo( oEdit:text() ) } )
oEdit:connect( "returnPressed()", {|i| i := i, MsgInfo( oEdit:text() ) } )
oEdit:move( 5, 10 )
oEdit:resize( 345, 30 )
oEdit:setMaxLength( 40 )
@@ -492,13 +478,13 @@ STATIC FUNCTION Build_Controls( oWnd )
oComboBox:addItem( "First" )
oComboBox:addItem( "Second" )
oComboBox:addItem( "Third" )
oComboBox:connect( QT_EVE_CURRENTINDEXCHANGED_I, {|i| i := i, MsgInfo( oComboBox:itemText( i ) ) } )
oComboBox:connect( "currentIndexChanged(int)", {|i| i := i, MsgInfo( oComboBox:itemText( i ) ) } )
oComboBox:move( 5, 60 )
oComboBox:resize( 345, 30 )
oComboBox:show()
oCheckBox := QCheckBox( oWnd )
oCheckBox:connect( QT_EVE_STATECHANGED_I, {|i| i := i, MsgInfo( IF( i == 0,"Uncheckd","Checked" ) ) } )
oCheckBox:connect( "stateChanged(int)", {|i| i := i, MsgInfo( IF( i == 0,"Uncheckd","Checked" ) ) } )
oCheckBox:setText( "Testing CheckBox HbQt" )
oCheckBox:move( 5, 110 )
oCheckBox:resize( 345, 30 )
@@ -510,7 +496,7 @@ STATIC FUNCTION Build_Controls( oWnd )
oSpinBox:Show()
oRadioButton := QRadioButton( oWnd )
oRadioButton:connect( QT_EVE_CLICKED, {|i| i := i, MsgInfo( "Checked" ) } )
oRadioButton:connect( "clicked()", {|i| i := i, MsgInfo( "Checked" ) } )
oRadioButton:Move( 5, 210 )
oRadioButton:ReSize( 345, 30 )
oRadioButton:Show()
@@ -631,12 +617,12 @@ FUNCTION ShowInSystemTray( oWnd )
oMenuSys:setTitle( "&File" )
oActShow := oMenuSys:addAction( hb_dirBase() + "new.png" , "&Show" )
oActShow:connect( QT_EVE_TRIGGERED_B, {|| oWnd:show() } )
oActShow:connect( "triggered(bool)", {|| oWnd:show() } )
oMenuSys:addSeparator()
oActHide := oMenuSys:addAction( hb_dirBase() + "new.png" , "&Show" )
oActHide:connect( QT_EVE_TRIGGERED_B, {|| oWnd:hide() } )
oActHide:connect( "triggered(bool)", {|| oWnd:hide() } )
oSys := QSystemTrayIcon( oWnd )
oSys:setIcon( hb_dirBase() + "new.png" )

76
harbour/contrib/hbqt/tests/dialogqt.prg
View File

@@ -54,20 +54,6 @@
#include "hbtrace.ch"
#define QT_EVE_TRIGGERED "triggered()"
#define QT_EVE_TRIGGERED_B "triggered(bool)"
#define QT_EVE_HOVERED "hovered()"
#define QT_EVE_CLICKED "clicked()"
#define QT_EVE_STATECHANGED_I "stateChanged(int)"
#define QT_EVE_PRESSED "pressed()"
#define QT_EVE_RELEASED "released()"
#define QT_EVE_ACTIVATED_I "activated(int)"
#define QT_EVE_CURRENTINDEXCHANGED_I "currentIndexChanged(int)"
#define QT_EVE_HIGHLIGHTED_I "highlighted(int)"
#define QT_EVE_RETURNPRESSED "returnPressed()"
#define QT_EVE_CLICKED_M "clicked(QModelIndex)"
#define QT_EVE_VIEWPORTENTERED "viewportEntered()"
/*----------------------------------------------------------------------*/
#include "common.ch"
@@ -149,26 +135,26 @@ STATIC FUNCTION Build_MenuBar( oWnd )
oMenu1 := QMenu()
oMenu1:setTitle( "&File" )
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction_1( hb_dirBase() + "new.png" , "&New" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction_1( hb_dirBase() + "open.png", "&Open" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction_1( hb_dirBase() + "new.png" , "&New" ), "triggered(bool)", {|w,l| FileDialog( "New" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction_1( hb_dirBase() + "open.png", "&Open" ), "triggered(bool)", {|w,l| FileDialog( "Open", w, l ) } )
oMenu1:addSeparator()
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction_1( hb_dirBase() + "save.png", "&Save" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction_1( hb_dirBase() + "save.png", "&Save" ), "triggered(bool)", {|w,l| FileDialog( "Save", w, l ) } )
oMenu1:addSeparator()
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction( "E&xit" ), QT_EVE_TRIGGERED_B, {|w,l| w := w, l := l, MsgInfo( "Exit ?" ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu1:addAction( "E&xit" ), "triggered(bool)", {|w,l| w := w, l := l, MsgInfo( "Exit ?" ) } )
oMenuBar:addMenu( oMenu1 )
oMenu2 := QMenu()
oMenu2:setTitle( "&Dialogs" )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Colors" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Colors" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Fonts" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Fonts" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Colors" ), "triggered(bool)", {|w,l| Dialogs( "Colors" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Fonts" ), "triggered(bool)", {|w,l| Dialogs( "Fonts" , w, l ) } )
oMenu2:addSeparator()
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&PageSetup" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "PageSetup", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "P&review" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Preview" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&PageSetup" ), "triggered(bool)", {|w,l| Dialogs( "PageSetup", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "P&review" ), "triggered(bool)", {|w,l| Dialogs( "Preview" , w, l ) } )
oMenu2:addSeparator()
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Wizard" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Wizard" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "W&ebPage" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "WebPage" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Wizard" ), "triggered(bool)", {|w,l| Dialogs( "Wizard" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "W&ebPage" ), "triggered(bool)", {|w,l| Dialogs( "WebPage" , w, l ) } )
oMenu2:addSeparator()
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Another Dialog" ), QT_EVE_TRIGGERED_B, {|w,l| w := w, l := l, hb_threadStart( {|| ExecOneMore() } ) } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu2:addAction( "&Another Dialog" ), "triggered(bool)", {|w,l| w := w, l := l, hb_threadStart( {|| ExecOneMore() } ) } )
oMenuBar:addMenu( oMenu2 )
oWnd:setMenuBar( oMenuBar )
@@ -189,7 +175,7 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oActNew:setIcon( hb_dirBase() + "new.png" )
oActNew:setToolTip( "A New File" )
/* Attach codeblock to be triggered */
__HBQT_SLOTS_CONNECT( s_slots, oActNew, QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oActNew, "triggered(bool)", {|w,l| FileDialog( "New" , w, l ) } )
/* Attach Action with Toolbar */
oTB:addAction( oActNew )
@@ -199,7 +185,7 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oActOpen:setIcon( hb_dirBase() + "open.png" )
oActOpen:setToolTip( "Select a file to be opened!" )
/* Attach codeblock to be triggered */
__HBQT_SLOTS_CONNECT( s_slots, oActOpen, QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oActOpen, "triggered(bool)", {|w,l| FileDialog( "Open" , w, l ) } )
/* Attach Action with Toolbar */
oTB:addAction( oActOpen )
@@ -211,7 +197,7 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oActSave:setIcon( hb_dirBase() + "save.png" )
oActSave:setToolTip( "Save this file!" )
/* Attach codeblock to be triggered */
__HBQT_SLOTS_CONNECT( s_slots, oActSave, QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save" , w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oActSave, "triggered(bool)", {|w,l| FileDialog( "Save" , w, l ) } )
/* Attach Action with Toolbar */
oTB:addAction( oActSave )
@@ -226,13 +212,13 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oAct := QAction( oWnd )
oAct:setText( "&Colors" )
oAct:setToolTip( "Colors Dialog" )
__HBQT_SLOTS_CONNECT( s_slots, oAct, QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Colors", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oAct, "triggered(bool)", {|w,l| Dialogs( "Colors", w, l ) } )
oTB:addAction( oAct )
oAct := QAction( oWnd )
oAct:setText( "&Fonts" )
oAct:setToolTip( "Fonts Dialog" )
__HBQT_SLOTS_CONNECT( s_slots, oAct, QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Fonts", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oAct, "triggered(bool)", {|w,l| Dialogs( "Fonts", w, l ) } )
oTB:addAction( oAct )
oTB:addSeparator()
@@ -240,13 +226,13 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oAct := QAction( oWnd )
oAct:setText( "&PgSetup" )
oAct:setToolTip( "Page Setup Dialog" )
__HBQT_SLOTS_CONNECT( s_slots, oAct, QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "PageSetup", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oAct, "triggered(bool)", {|w,l| Dialogs( "PageSetup", w, l ) } )
oTB:addAction( oAct )
oAct := QAction( oWnd )
oAct:setText( "&Preview" )
oAct:setToolTip( "Page Preview Dialog" )
__HBQT_SLOTS_CONNECT( s_slots, oAct, QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Preview", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oAct, "triggered(bool)", {|w,l| Dialogs( "Preview", w, l ) } )
oTB:addAction( oAct )
oTB:addSeparator()
@@ -254,19 +240,19 @@ STATIC FUNCTION Build_ToolBar( oWnd )
oAct := QAction( oWnd )
oAct:setText( "&Webpage" )
oAct:setToolTip( "Web Browser Dialog" )
__HBQT_SLOTS_CONNECT( s_slots, oAct, QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "WebPage", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oAct, "triggered(bool)", {|w,l| Dialogs( "WebPage", w, l ) } )
oTB:addAction( oAct )
oAct := QAction( oWnd )
oAct:setText( "&Wizard" )
oAct:setToolTip( "Generic Wizard Dialog" )
__HBQT_SLOTS_CONNECT( s_slots, oAct, QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Wizard", w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oAct, "triggered(bool)", {|w,l| Dialogs( "Wizard", w, l ) } )
oTB:addAction( oAct )
oAct := QAction( oWnd )
oAct:setText( "&SystemTray" )
oAct:setToolTip( "Show in System Tray!" )
__HBQT_SLOTS_CONNECT( s_slots, oAct, QT_EVE_TRIGGERED_B, {|w,l| ShowInSystemTray( oWnd, w, l ) } )
__HBQT_SLOTS_CONNECT( s_slots, oAct, "triggered(bool)", {|w,l| ShowInSystemTray( oWnd, w, l ) } )
oTB:addAction( oAct )
/* Add this toolbar with main window */
@@ -288,9 +274,9 @@ STATIC FUNCTION Build_PushButton( oWnd, aPos, aSize, cLabel, cMsg, lExit )
oBtn:resize( aSize[ 1 ],aSize[ 2 ] )
oBtn:show()
IF hb_isLogical( lExit )
__HBQT_SLOTS_CONNECT( s_slots, oBtn, QT_EVE_CLICKED, {|| lExit := .t. } )
__HBQT_SLOTS_CONNECT( s_slots, oBtn, "clicked()", {|| lExit := .t. } )
ELSE
__HBQT_SLOTS_CONNECT( s_slots, oBtn, QT_EVE_CLICKED, {|| MsgInfo( cMsg ), lExit := .t. } )
__HBQT_SLOTS_CONNECT( s_slots, oBtn, "clicked()", {|| MsgInfo( cMsg ), lExit := .t. } )
ENDIF
RETURN oBtn
@@ -360,7 +346,7 @@ STATIC FUNCTION Build_TreeView( oWnd )
oTV := QTreeView( oWnd )
oTV:setMouseTracking( .t. )
* __HBQT_SLOTS_CONNECT( s_slots, oTV, QT_EVE_HOVERED, {|i| HB_TRACE( HB_TR_ALWAYS, ( "oTV:hovered" ) } )
* __HBQT_SLOTS_CONNECT( s_slots, oTV, "hovered()", {|i| HB_TRACE( HB_TR_ALWAYS, ( "oTV:hovered" ) } )
oDirModel := QDirModel()
oTV:setModel( oDirModel )
oTV:move( 5, 7 )
@@ -376,7 +362,7 @@ STATIC FUNCTION Build_ListBox( oWnd, aPos, aSize )
oListBox := QListView( oWnd )
oListBox:setMouseTracking( .t. )
* __HBQT_SLOTS_CONNECT( s_slots, oListBox, QT_EVE_HOVERED, {|i| HB_TRACE( HB_TR_ALWAYS, ( "oListBox:hovered" ) } )
* __HBQT_SLOTS_CONNECT( s_slots, oListBox, "hovered()", {|i| HB_TRACE( HB_TR_ALWAYS, ( "oListBox:hovered" ) } )
oStrList := QStringList()
@@ -419,7 +405,7 @@ STATIC FUNCTION Build_Controls( oWnd )
LOCAL oEdit, oCheckBox, oComboBox, oSpinBox, oRadioButton
oEdit := QLineEdit( oWnd )
__HBQT_SLOTS_CONNECT( s_slots, oEdit, QT_EVE_RETURNPRESSED, {|i| i := i, MsgInfo( oEdit:text() ) } )
__HBQT_SLOTS_CONNECT( s_slots, oEdit, "returnPressed()", {|i| i := i, MsgInfo( oEdit:text() ) } )
oEdit:move( 5, 10 )
oEdit:resize( 345, 30 )
oEdit:setMaxLength( 40 )
@@ -431,13 +417,13 @@ STATIC FUNCTION Build_Controls( oWnd )
oComboBox:addItem( "First" )
oComboBox:addItem( "Second" )
oComboBox:addItem( "Third" )
__HBQT_SLOTS_CONNECT( s_slots, oComboBox, QT_EVE_CURRENTINDEXCHANGED_I, {|i| i := i, MsgInfo( oComboBox:itemText( i ) ) } )
__HBQT_SLOTS_CONNECT( s_slots, oComboBox, "currentIndexChanged(int)", {|i| i := i, MsgInfo( oComboBox:itemText( i ) ) } )
oComboBox:move( 5, 60 )
oComboBox:resize( 345, 30 )
oComboBox:show()
oCheckBox := QCheckBox( oWnd )
__HBQT_SLOTS_CONNECT( s_slots, oCheckBox, QT_EVE_STATECHANGED_I, {|i| i := i, MsgInfo( IF( i == 0,"Uncheckd","Checked" ) ) } )
__HBQT_SLOTS_CONNECT( s_slots, oCheckBox, "stateChanged(int)", {|i| i := i, MsgInfo( IF( i == 0,"Uncheckd","Checked" ) ) } )
oCheckBox:setText( "Testing CheckBox HbQt" )
oCheckBox:move( 5, 110 )
oCheckBox:resize( 345, 30 )
@@ -449,7 +435,7 @@ STATIC FUNCTION Build_Controls( oWnd )
oSpinBox:Show()
oRadioButton := QRadioButton( oWnd )
__HBQT_SLOTS_CONNECT( s_slots, oRadioButton, QT_EVE_CLICKED, {|i| i := i, MsgInfo( "Checked" ) } )
__HBQT_SLOTS_CONNECT( s_slots, oRadioButton, "clicked()", {|i| i := i, MsgInfo( "Checked" ) } )
oRadioButton:Move( 5, 210 )
oRadioButton:ReSize( 345, 30 )
oRadioButton:Show()
@@ -573,9 +559,9 @@ FUNCTION ShowInSystemTray( oWnd )
oMenu := QMenu( oWnd )
oMenu:setTitle( "&File" )
__HBQT_SLOTS_CONNECT( s_slots, oMenu:addAction_1( hb_dirBase() + "new.png" , "&Show" ), QT_EVE_TRIGGERED_B, {|| oWnd:show() } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu:addAction_1( hb_dirBase() + "new.png" , "&Show" ), "triggered(bool)", {|| oWnd:show() } )
oMenu:addSeparator()
__HBQT_SLOTS_CONNECT( s_slots, oMenu:addAction_1( hb_dirBase() + "save.png", "&Hide" ), QT_EVE_TRIGGERED_B, {|| oWnd:hide() } )
__HBQT_SLOTS_CONNECT( s_slots, oMenu:addAction_1( hb_dirBase() + "save.png", "&Hide" ), "triggered(bool)", {|| oWnd:hide() } )
oSys := QSystemTrayIcon( oWnd )
oSys:setIcon( hb_dirBase() + "new.png" )

36
harbour/contrib/hbxbp/tests/demoxbp.prg
View File

@@ -61,10 +61,8 @@
#pragma library("XppUi2")
#endif
#ifdef __HARBOUR__
#define UNU( x ) HB_SYMBOL_UNUSED( x )
#else
#define UNU( x ) ( x := x )
#ifndef __HARBOUR__
#define HB_SYMBOL_UNUSED( x ) ( x := x )
#endif
/*----------------------------------------------------------------------*/
@@ -614,7 +612,7 @@ FUNCTION Build_CheckBox( oWnd )
// Determine state using mp1
oXbp:selected := ;
{| mp1, mp2, oChk| UNU( mp2 ), UNU( oChk ), ;
{| mp1, mp2, oChk| HB_SYMBOL_UNUSED( mp2 ), HB_SYMBOL_UNUSED( oChk ), ;
MsgBox( "Checkbox A", IIf( mp1, "selected", "not selected" ) ) }
// Create second checkbox, specify position using :new()
@@ -624,7 +622,7 @@ FUNCTION Build_CheckBox( oWnd )
// Determine state using :getData()
oXbp:selected := ;
{| mp1, mp2, oChk| UNU( mp1 ), UNU( mp2 ), ;
{| mp1, mp2, oChk| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), ;
MsgBox( "Checkbox B", ;
IIf( oChk:getData(), "selected", ;
"not selected" ) ) }
@@ -642,7 +640,7 @@ FUNCTION Build_3State( oWnd )
oXbp:caption := "3State A"
oXbp:create( oWnd, , {130,30}, {100,30} )
// Determine current state using mp1
oXbp:selected := {| mp1, mp2, oBtn| UNU( mp2 ), UNU( oBtn ), MsgBox( "3State A", aState[ mp1+1 ] ) }
oXbp:selected := {| mp1, mp2, oBtn| HB_SYMBOL_UNUSED( mp2 ), HB_SYMBOL_UNUSED( oBtn ), MsgBox( "3State A", aState[ mp1+1 ] ) }
// Create second 3State Button, passing the position to :new()
//
@@ -650,7 +648,7 @@ FUNCTION Build_3State( oWnd )
oXbp:caption := "3State B"
oXbp:create()
// Determine current state using :getData()
oXbp:selected := {| mp1, mp2, oBtn| UNU( mp1 ), UNU( mp2 ), MsgBox( "3State B", aState[ oBtn:getData()+1 ] ) }
oXbp:selected := {| mp1, mp2, oBtn| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), MsgBox( "3State B", aState[ oBtn:getData()+1 ] ) }
RETURN nil
@@ -660,7 +658,7 @@ FUNCTION Build_RadioButton( oStatic )
LOCAL bSelected, oRadio
// Display which radiobutton is selected
bSelected := {|mp1,mp2,obj| UNU( mp1 ), UNU( mp2 ), MsgBox( obj:caption ) }
bSelected := {|mp1,mp2,obj| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), MsgBox( obj:caption ) }
// Create four radiobuttons
oRadio := XbpRadioButton():new( oStatic,, {30,110}, {80,30} )
@@ -708,7 +706,7 @@ FUNCTION Build_ListBox( oWnd )
aeval( aItems, {|e| oListBox:addItem( e ) } )
// Code block for list box selection:
oListBox:ItemSelected := {|mp1, mp2, obj| UNU( obj ), mp1 := oListBox:getData(), ;
oListBox:ItemSelected := {|mp1, mp2, obj| HB_SYMBOL_UNUSED( obj ), mp1 := oListBox:getData(), ;
iif( !empty( mp1 ), mp2 := oListBox:getItem( mp1[ 1 ] ), mp2 := "Nothing" ), ;
MsgBox( "itemSelected: " + mp2 ) }
oListBox:setColorFG( GraMakeRGBColor( {227,12,110} ) )
@@ -740,13 +738,13 @@ STATIC FUNCTION Build_ComboBox( oWnd )
// Code block for selection:
// - assign to LOCAL variable using :getData()
// - display LOCAL variable using DispoutAt()
bAction := {|mp1, mp2, obj| UNU( mp1 ), UNU( mp2 ), obj:XbpSLE:getData() }
bAction := {|mp1, mp2, obj| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), obj:XbpSLE:getData() }
// Assign code block for selection with Up and Down keys
oCombo:ItemMarked := bAction
// Assign code block for selection by left mouse click in list box
oCombo:ItemSelected := {|mp1, mp2, obj| UNU( mp1 ), UNU( mp2 ), obj:XbpSLE:getData() }
oCombo:ItemSelected := {|mp1, mp2, obj| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), obj:XbpSLE:getData() }
// Copy data from array to combo box, then discard array
FOR i := 1 TO 7
@@ -809,7 +807,7 @@ FUNCTION Build_SLEs( oWnd )
oXbp:setData()
// Assign the value of the edit buffer to a LOCAL variable
// when the input focus is lost
oXbp:killInputFocus := { |mp1,mp2,oSLE| UNU( mp1 ), UNU( mp2 ), oSLE:getData() }
oXbp:killInputFocus := { |mp1,mp2,oSLE| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), oSLE:getData() }
oXbp:setColorBG( GraMakeRGBColor( { 190,190,190 } ) )
@@ -868,7 +866,7 @@ FUNCTION Build_SpinButtons( oWnd )
LOCAL nX := 230, nY := 190
// Callback code block
bCallback := {|mp1, mp2, oXbp| UNU( mp1 ), UNU( mp2 ), nRed := oXbp:getData(), ;
bCallback := {|mp1, mp2, oXbp| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), nRed := oXbp:getData(), ;
RGB( nRed, nGreen, nBlue ) }
// Create spinbutton for red (without using :dataLink)
@@ -884,7 +882,7 @@ FUNCTION Build_SpinButtons( oWnd )
oSpinRed:setData( 121 )
// Callback code block
bCallback := {|mp1, mp2, oXbp| UNU( mp1 ), UNU( mp2 ), oXbp:getData(), ;
bCallback := {|mp1, mp2, oXbp| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), oXbp:getData(), ;
RGB( nRed, nGreen, nBlue ) }
// Create spinbutton for green (using :dataLink)
@@ -926,7 +924,7 @@ FUNCTION Build_TreeView( oWnd )
oTree:hasLines := .T.
oTree:hasButtons := .T.
oTree:create()
oTree:itemCollapsed := {|oItem,aRect,oSelf| UNU( aRect ), UNU( oSelf ), MsgBox( oItem:caption ) }
oTree:itemCollapsed := {|oItem,aRect,oSelf| HB_SYMBOL_UNUSED( aRect ), HB_SYMBOL_UNUSED( oSelf ), MsgBox( oItem:caption ) }
#ifdef __HARBOUR__
oTree:setStyleSheet( GetTreeStyleSheet() )
#endif
@@ -994,7 +992,7 @@ PROCEDURE WAStruct( oItem, iIndex )
aadd( aStr, { "Salary", 'N', 10, 2 } )
AEval( aStr, ;
{|a,i,oSub| UNU( i ), oSub := oItem:addItem( "FIELD_NAME = " + a[1] ), FieldStruct( oSub, a ) } )
{|a,i,oSub| HB_SYMBOL_UNUSED( i ), oSub := oItem:addItem( "FIELD_NAME = " + a[1] ), FieldStruct( oSub, a ) } )
RETURN
@@ -1288,7 +1286,7 @@ FUNCTION Build_HTMLViewer( oWnd )
oHtm := XbpHTMLViewer():new( oFrm, , {10,10}, {sz_[1]-10-10,sz_[2]-10-10} )
oHtm:create()
oHtm:navigate( "http://harbour-project.org" )
oHtm:titleChange := {|e| UNU( e ) }
oHtm:titleChange := {|e| HB_SYMBOL_UNUSED( e ) }
RETURN oHtm
@@ -1305,7 +1303,7 @@ FUNCTION Build_FileDialog( oWnd, cMode )
//oDlg:setColorBG( GraMakeRGBColor( { 170,170,170 } ) )
aFiles := oDlg:open( "c:\temp", , .t. )
IF !empty( aFiles )
aeval( aFiles, {|e| UNU( e ) } )
aeval( aFiles, {|e| HB_SYMBOL_UNUSED( e ) } )
ENDIF
ELSE
oDlg:title := "Save this Database"

32
harbour/contrib/hbxbp/tests/dialogqt.prg
View File

@@ -57,8 +57,6 @@
#include "gra.ch"
#include "set.ch"
#define UNU( x ) HB_SYMBOL_UNUSED( x )
/*----------------------------------------------------------------------*/
REQUEST HB_QTGUI
@@ -556,7 +554,7 @@ FUNCTION Build_CheckBox( oWnd )
// Determine state using mp1
oXbp:selected := ;
{| mp1, mp2, oChk| UNU( mp2 ), UNU( oChk ), ;
{| mp1, mp2, oChk| HB_SYMBOL_UNUSED( mp2 ), HB_SYMBOL_UNUSED( oChk ), ;
MsgBox( "Checkbox A", IIf( mp1, "selected", "not selected" ) ) }
// Create second checkbox, specify position using :new()
@@ -566,7 +564,7 @@ FUNCTION Build_CheckBox( oWnd )
// Determine state using :getData()
oXbp:selected := ;
{| mp1, mp2, oChk| UNU( mp1 ), UNU( mp2 ), ;
{| mp1, mp2, oChk| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), ;
MsgBox( "Checkbox B", ;
IIf( oChk:getData(), "selected", ;
"not selected" ) ) }
@@ -584,7 +582,7 @@ FUNCTION Build_3State( oWnd )
oXbp:caption := "3State A"
oXbp:create( oWnd, , {130,30}, {100,30} )
// Determine current state using mp1
oXbp:selected := {| mp1, mp2, oBtn| UNU( mp2 ), UNU( oBtn ), MsgBox( "3State A", aState[ mp1+1 ] ) }
oXbp:selected := {| mp1, mp2, oBtn| HB_SYMBOL_UNUSED( mp2 ), HB_SYMBOL_UNUSED( oBtn ), MsgBox( "3State A", aState[ mp1+1 ] ) }
// Create second 3State Button, passing the position to :new()
//
@@ -592,7 +590,7 @@ FUNCTION Build_3State( oWnd )
oXbp:caption := "3State B"
oXbp:create()
// Determine current state using :getData()
oXbp:selected := {| mp1, mp2, oBtn| UNU( mp1 ), UNU( mp2 ), MsgBox( "3State B", aState[ oBtn:getData()+1 ] ) }
oXbp:selected := {| mp1, mp2, oBtn| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), MsgBox( "3State B", aState[ oBtn:getData()+1 ] ) }
RETURN nil
@@ -602,7 +600,7 @@ FUNCTION Build_RadioButton( oStatic )
LOCAL bSelected, oRadio
// Display which radiobutton is selected
bSelected := {|mp1,mp2,obj| UNU( mp1 ), UNU( mp2 ), MsgBox( obj:caption ) }
bSelected := {|mp1,mp2,obj| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), MsgBox( obj:caption ) }
// Create four radiobuttons
oRadio := XbpRadioButton():new( oStatic,, {30,110}, {80,30} )
@@ -650,7 +648,7 @@ STATIC FUNCTION Build_ListBox( oWnd )
aeval( aItems, {|e| oListBox:addItem( e ) } )
// Code block for list box selection:
oListBox:ItemSelected := {|mp1, mp2, obj| UNU( obj ), mp1 := oListBox:getData(), ;
oListBox:ItemSelected := {|mp1, mp2, obj| HB_SYMBOL_UNUSED( obj ), mp1 := oListBox:getData(), ;
iif( !empty( mp1 ), mp2 := oListBox:getItem( mp1[ 1 ] ), mp2 := "Nothing" ), ;
MsgBox( "itemSelected: " + mp2 ) }
oListBox:setColorFG( GraMakeRGBColor( {227,12,110} ) )
@@ -682,13 +680,13 @@ STATIC FUNCTION Build_ComboBox( oWnd )
// Code block for selection:
// - assign to LOCAL variable using :getData()
// - display LOCAL variable using DispoutAt()
bAction := {|mp1, mp2, obj| UNU( mp1 ), UNU( mp2 ), obj:XbpSLE:getData() }
bAction := {|mp1, mp2, obj| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), obj:XbpSLE:getData() }
// Assign code block for selection with Up and Down keys
oCombo:ItemMarked := bAction
// Assign code block for selection by left mouse click in list box
oCombo:ItemSelected := {|mp1, mp2, obj| UNU( mp1 ), UNU( mp2 ), obj:XbpSLE:getData() }
oCombo:ItemSelected := {|mp1, mp2, obj| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), obj:XbpSLE:getData() }
// Copy data from array to combo box, then discard array
FOR i := 1 TO 7
@@ -751,7 +749,7 @@ STATIC FUNCTION Build_SLEs( oWnd )
oXbp:setData()
// Assign the value of the edit buffer to a LOCAL variable
// when the input focus is lost
oXbp:killInputFocus := { |mp1,mp2,oSLE| UNU( mp1 ), UNU( mp2 ), oSLE:getData() }
oXbp:killInputFocus := { |mp1,mp2,oSLE| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), oSLE:getData() }
oXbp:setColorBG( GraMakeRGBColor( { 190,190,190 } ) )
@@ -810,7 +808,7 @@ STATIC FUNCTION Build_SpinButtons( oWnd )
LOCAL nX := 230, nY := 190
// Callback code block
bCallback := {|mp1, mp2, oXbp| UNU( mp1 ), UNU( mp2 ), nRed := oXbp:getData(), ;
bCallback := {|mp1, mp2, oXbp| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), nRed := oXbp:getData(), ;
RGB( nRed, nGreen, nBlue ) }
// Create spinbutton for red (without using :dataLink)
@@ -826,7 +824,7 @@ STATIC FUNCTION Build_SpinButtons( oWnd )
oSpinRed:setData( 121 )
// Callback code block
bCallback := {|mp1, mp2, oXbp| UNU( mp1 ), UNU( mp2 ), oXbp:getData(), ;
bCallback := {|mp1, mp2, oXbp| HB_SYMBOL_UNUSED( mp1 ), HB_SYMBOL_UNUSED( mp2 ), oXbp:getData(), ;
RGB( nRed, nGreen, nBlue ) }
// Create spinbutton for green (using :dataLink)
@@ -868,7 +866,7 @@ STATIC FUNCTION Build_TreeView( oWnd )
oTree:hasLines := .T.
oTree:hasButtons := .T.
oTree:create()
oTree:itemCollapsed := {|oItem,aRect,oSelf| UNU( aRect ), UNU( oSelf ), MsgBox( oItem:caption ) }
oTree:itemCollapsed := {|oItem,aRect,oSelf| HB_SYMBOL_UNUSED( aRect ), HB_SYMBOL_UNUSED( oSelf ), MsgBox( oItem:caption ) }
#ifdef __HARBOUR__
oTree:setStyleSheet( GetTreeStyleSheet() )
#endif
@@ -936,7 +934,7 @@ STATIC PROCEDURE WAStruct( oItem, iIndex )
aadd( aStr, { "Salary", 'N', 10, 2 } )
AEval( aStr, ;
{|a,i,oSub| UNU( i ), oSub := oItem:addItem( "FIELD_NAME = " + a[1] ), FieldStruct( oSub, a ) } )
{|a,i,oSub| HB_SYMBOL_UNUSED( i ), oSub := oItem:addItem( "FIELD_NAME = " + a[1] ), FieldStruct( oSub, a ) } )
RETURN
@@ -1232,7 +1230,7 @@ STATIC FUNCTION Build_HTMLViewer( oWnd )
oHtm := XbpHTMLViewer():new( oFrm, , {10,10}, {sz_[1]-10-10,sz_[2]-10-10} )
oHtm:create()
oHtm:navigate( "http://harbour-project.org" )
oHtm:titleChange := {|e| UNU( e ) }
oHtm:titleChange := {|e| HB_SYMBOL_UNUSED( e ) }
RETURN oHtm
@@ -1249,7 +1247,7 @@ STATIC FUNCTION Build_FileDialog( oWnd, cMode )
//oDlg:setColorBG( GraMakeRGBColor( { 170,170,170 } ) )
aFiles := oDlg:open( "c:\temp", , .t. )
IF !empty( aFiles )
aeval( aFiles, {|e| UNU( e ) } )
aeval( aFiles, {|e| HB_SYMBOL_UNUSED( e ) } )
ENDIF
ELSE
oDlg:title := "Save this Database"