From 9e6101cc0a93b0add55ce741919484353f79b48d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 27 Sep 2012 16:29:36 +0000 Subject: [PATCH] 2012-09-27 18:27 UTC+0200 Viktor Szakats (vszakats syenar.net) + contrib/gtwvg/tests/activex.prg + contrib/gtwvg/tests/cuigdlgs.prg + contrib/gtwvg/tests/dyndlgs.prg + contrib/gtwvg/tests/modal.prg + contrib/gtwvg/tests/tbrowser.prg + contrib/gtwvg/tests/utils.prg + contrib/gtwvg/tests/wvtcls.prg + contrib/gtwvg/tests/xbp.prg - contrib/gtwvg/tests/wvgactivex.prg - contrib/gtwvg/tests/wvgcuigdialog.prg - contrib/gtwvg/tests/wvgdyndialogs.prg - contrib/gtwvg/tests/wvgmodal.prg - contrib/gtwvg/tests/wvgqt.prg - contrib/gtwvg/tests/wvgtbrowser.prg - contrib/gtwvg/tests/wvgutilities.prg - contrib/gtwvg/tests/wvgwvtclasses.prg - contrib/gtwvg/tests/wvgxbp.prg * contrib/gtwvg/tests/demowvg.hbp * contrib/gtwvg/tests/demowvg.prg * use short filenames, avoid same prefix for all files - deleted QT dependent parts (possibly to be moved to hbqt repo tests dir) * extras/hbxlsxml/hbxlsxml.hbp * synced with rest of extras .hbp files (allowing f.e. multiple target builds in parallel) --- harbour/ChangeLog | 28 +++++++++ .../tests/{wvgactivex.prg => activex.prg} | 0 .../tests/{wvgcuigdialog.prg => cuigdlgs.prg} | 0 harbour/contrib/gtwvg/tests/demowvg.hbp | 26 ++++----- harbour/contrib/gtwvg/tests/demowvg.prg | 6 -- .../tests/{wvgdyndialogs.prg => dyndlgs.prg} | 0 .../gtwvg/tests/{wvgmodal.prg => modal.prg} | 0 .../tests/{wvgtbrowser.prg => tbrowser.prg} | 0 .../tests/{wvgutilities.prg => utils.prg} | 0 harbour/contrib/gtwvg/tests/wvgqt.prg | 57 ------------------- .../tests/{wvgwvtclasses.prg => wvtcls.prg} | 0 .../gtwvg/tests/{wvgxbp.prg => xbp.prg} | 0 harbour/extras/hbxlsxml/hbxlsxml.hbp | 20 ++----- 13 files changed, 44 insertions(+), 93 deletions(-) rename harbour/contrib/gtwvg/tests/{wvgactivex.prg => activex.prg} (100%) rename harbour/contrib/gtwvg/tests/{wvgcuigdialog.prg => cuigdlgs.prg} (100%) rename harbour/contrib/gtwvg/tests/{wvgdyndialogs.prg => dyndlgs.prg} (100%) rename harbour/contrib/gtwvg/tests/{wvgmodal.prg => modal.prg} (100%) rename harbour/contrib/gtwvg/tests/{wvgtbrowser.prg => tbrowser.prg} (100%) rename harbour/contrib/gtwvg/tests/{wvgutilities.prg => utils.prg} (100%) delete mode 100644 harbour/contrib/gtwvg/tests/wvgqt.prg rename harbour/contrib/gtwvg/tests/{wvgwvtclasses.prg => wvtcls.prg} (100%) rename harbour/contrib/gtwvg/tests/{wvgxbp.prg => xbp.prg} (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 38a7457a99..e8e967a921 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,34 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-27 18:27 UTC+0200 Viktor Szakats (vszakats syenar.net) + + contrib/gtwvg/tests/activex.prg + + contrib/gtwvg/tests/cuigdlgs.prg + + contrib/gtwvg/tests/dyndlgs.prg + + contrib/gtwvg/tests/modal.prg + + contrib/gtwvg/tests/tbrowser.prg + + contrib/gtwvg/tests/utils.prg + + contrib/gtwvg/tests/wvtcls.prg + + contrib/gtwvg/tests/xbp.prg + - contrib/gtwvg/tests/wvgactivex.prg + - contrib/gtwvg/tests/wvgcuigdialog.prg + - contrib/gtwvg/tests/wvgdyndialogs.prg + - contrib/gtwvg/tests/wvgmodal.prg + - contrib/gtwvg/tests/wvgqt.prg + - contrib/gtwvg/tests/wvgtbrowser.prg + - contrib/gtwvg/tests/wvgutilities.prg + - contrib/gtwvg/tests/wvgwvtclasses.prg + - contrib/gtwvg/tests/wvgxbp.prg + * contrib/gtwvg/tests/demowvg.hbp + * contrib/gtwvg/tests/demowvg.prg + * use short filenames, avoid same prefix for all files + - deleted QT dependent parts (possibly to be moved to hbqt + repo tests dir) + + * extras/hbxlsxml/hbxlsxml.hbp + * synced with rest of extras .hbp files + (allowing f.e. multiple target builds in parallel) + 2012-09-27 18:13 UTC+0200 Viktor Szakats (vszakats syenar.net) * contrib/gtwvg/* % reduced code size by 10%+ by replacing long function diff --git a/harbour/contrib/gtwvg/tests/wvgactivex.prg b/harbour/contrib/gtwvg/tests/activex.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgactivex.prg rename to harbour/contrib/gtwvg/tests/activex.prg diff --git a/harbour/contrib/gtwvg/tests/wvgcuigdialog.prg b/harbour/contrib/gtwvg/tests/cuigdlgs.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgcuigdialog.prg rename to harbour/contrib/gtwvg/tests/cuigdlgs.prg diff --git a/harbour/contrib/gtwvg/tests/demowvg.hbp b/harbour/contrib/gtwvg/tests/demowvg.hbp index 8b3c5f5dba..b805064b52 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.hbp +++ b/harbour/contrib/gtwvg/tests/demowvg.hbp @@ -2,23 +2,19 @@ # $Id$ # --3rd=hbide_version=1.0 --3rd=hbide_title=Demo>WVG --3rd=hbide_output=demowvg - -inc + +-w3 -es2 + -mt --w3 --es2 -gtwvg demowvg.prg -wvgwvtclasses.prg -wvgtbrowser.prg -wvgutilities.prg -wvgdyndialogs.prg -wvgmodal.prg -wvgcuigdialog.prg -wvgxbp.prg -wvgactivex.prg -wvgqt.prg +wvtcls.prg +tbrowser.prg +utils.prg +dyndlgs.prg +modal.prg +cuigdlgs.prg +xbp.prg +activex.prg diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index ca76749e1b..8beac5bfe0 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -531,12 +531,6 @@ FUNCTION BuildMainMenu() oMenu:AddItem( "ActiveX - Image Viewer" , {|| Hb_ThreadStart( {|| ExecuteActiveX( 5 ) } ) } ) g_oMenuBar:addItem( { oMenu, "~XbpDialog()s" } ) - #ifdef __QT__ - oMenu := WvgMenu():new( g_oMenuBar, , .t. ):create() - oMenu:Caption:= "~QT" - oMenu:AddItem( "All Widgets" , {|| Hb_ThreadStart( {|| ExeQTWidgets() } ) } ) - #endif - RETURN oMenu /* The last submenu item */ //-------------------------------------------------------------------// diff --git a/harbour/contrib/gtwvg/tests/wvgdyndialogs.prg b/harbour/contrib/gtwvg/tests/dyndlgs.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgdyndialogs.prg rename to harbour/contrib/gtwvg/tests/dyndlgs.prg diff --git a/harbour/contrib/gtwvg/tests/wvgmodal.prg b/harbour/contrib/gtwvg/tests/modal.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgmodal.prg rename to harbour/contrib/gtwvg/tests/modal.prg diff --git a/harbour/contrib/gtwvg/tests/wvgtbrowser.prg b/harbour/contrib/gtwvg/tests/tbrowser.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgtbrowser.prg rename to harbour/contrib/gtwvg/tests/tbrowser.prg diff --git a/harbour/contrib/gtwvg/tests/wvgutilities.prg b/harbour/contrib/gtwvg/tests/utils.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgutilities.prg rename to harbour/contrib/gtwvg/tests/utils.prg diff --git a/harbour/contrib/gtwvg/tests/wvgqt.prg b/harbour/contrib/gtwvg/tests/wvgqt.prg deleted file mode 100644 index 2244ca0c5f..0000000000 --- a/harbour/contrib/gtwvg/tests/wvgqt.prg +++ /dev/null @@ -1,57 +0,0 @@ -/* - * $Id$ - */ - -/* - * Pritpal Bedi - */ -/*----------------------------------------------------------------------*/ - -#include "inkey.ch" -#include "common.ch" -#include "wvtwin.ch" -#include "hbgtinfo.ch" -#include "hbgtwvg.ch" -#include "wvgparts.ch" - -/*----------------------------------------------------------------------*/ - -#ifdef __QT__ -INIT PROCEDURE Qt_Start() - qt_qapplication() - RETURN - -EXIT PROCEDURE Qt_End() - qt_qapplication_exec() - RETURN -#endif - -//-------------------------------------------------------------------// - -#ifdef __QT__ -FUNCTION ExeQTWidgets() - LOCAL oPS, oPPrv, oWZ, oCD, oWP - - oPS := QPageSetupDialog():new() - oPS:setWindowTitle( 'Harbour-QT PageSetup Dialog' ) - oPS:show() - - oPPrv := QPrintPreviewDialog():new() - oPPrv:setWindowTitle( 'Harbour-QT Preview Preview Dialog' ) - oPPrv:show() - - oWZ := QWizard():new() - oWZ:setWindowTitle( 'Harbour-QT Wizard to Show Slides etc.' ) - oWZ:show() - - oCD := QColorDialog():new() - oCD:setWindowTitle( 'Harbour-QT Color Selection Dialog' ) - oCD:show() - - oWP := QWebView():new() - oWP:setWindowTitle( 'Harbour-QT Web Page Navigator' ) - oWP:show() - - RETURN NIL -#endif -/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/gtwvg/tests/wvgwvtclasses.prg b/harbour/contrib/gtwvg/tests/wvtcls.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgwvtclasses.prg rename to harbour/contrib/gtwvg/tests/wvtcls.prg diff --git a/harbour/contrib/gtwvg/tests/wvgxbp.prg b/harbour/contrib/gtwvg/tests/xbp.prg similarity index 100% rename from harbour/contrib/gtwvg/tests/wvgxbp.prg rename to harbour/contrib/gtwvg/tests/xbp.prg diff --git a/harbour/extras/hbxlsxml/hbxlsxml.hbp b/harbour/extras/hbxlsxml/hbxlsxml.hbp index 1a3519da3d..b55e0f7880 100644 --- a/harbour/extras/hbxlsxml/hbxlsxml.hbp +++ b/harbour/extras/hbxlsxml/hbxlsxml.hbp @@ -2,23 +2,13 @@ # $Id$ # --3rd=hbide_version=1.0 --3rd=hbide_type=Lib --3rd=hbide_title=XmlExcel --3rd=hbide_output=xlsxml - --inc -hblib --es2 --w3 +-inc + +-olib/${hb_plat}/${hb_comp}/${hb_name} + +-w3 -es2 xlsxml.prg xlsxml_s.prg xlsxml_y.prg - --ohbxlsxml - - - - -