diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f0273a96f7..7b86c72f9b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-20 07:53 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/hbide.hbp + + Added idewizard.prg + + * contrib/hbide/hbide.prg + ! Postponed destruction of QSplashScreen(), + always producing GPF on OS2, to take care of by Qt itself. + + * contrib/hbide/idedocks.prg + ! Fix to *nixs warning + QWidget::setLayout: Attempting to set QLayout "" on QDockWidget + "dockHelp", which already has a layout + and family. + + + contrib/hbide/idewizard.prg + + Preparations for globalization of hbIDE for Xbase world. + + 2010-03-20 14:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/win_shell.c ! Inevitable tweaking for Windows API header / compiler diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp index 529c2be9e2..6ce2b548cb 100644 --- a/harbour/contrib/hbide/hbide.hbp +++ b/harbour/contrib/hbide/hbide.hbp @@ -31,6 +31,7 @@ idehome.prg idefunctions.prg idedocwriter.prg ideskeletons.prg +idewizard.prg diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 5b0d97077f..20af267ee5 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -501,7 +501,7 @@ hbide_dbg( "HbIde:create( cProjIni )", "#Params=" ) ::showApplicationCursor() qSplash:close() - qSplash := NIL + //qSplash := NIL DO WHILE .t. ::nEvent := AppEvent( @::mp1, @::mp2, @::oXbp ) @@ -831,7 +831,7 @@ METHOD HbIde:execEditorAction( cKey ) EXIT CASE "MatchPairs" // - ::oSkeltn:show() + hbide_startOpenWizard() EXIT CASE "InsertSeparator" ::oEM:insertSeparator() diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index e320d80fca..8c2126eebe 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -304,9 +304,6 @@ METHOD IdeDocks:getADockWidget( nArea, cObjectName, cWindowTitle, nFlags ) oDock:oWidget:setStyleSheet( getStyleSheet( "QDockWidget" ) ) oDock:hide() - oDock:hbLayout := HBPLAYOUT_TYPE_VERTBOX - oDock:qLayout:setContentsMargins( 2, 2, 2, 2 ) - RETURN oDock /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idewizard.prg b/harbour/contrib/hbide/idewizard.prg new file mode 100644 index 0000000000..d0d1e8a3bd --- /dev/null +++ b/harbour/contrib/hbide/idewizard.prg @@ -0,0 +1,182 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * + * Copyright 2010 Pritpal Bedi + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* + * EkOnkar + * ( The LORD is ONE ) + * + * Harbour-Qt IDE + * + * Pritpal Bedi + * 18Mar2010 + */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ + +#include "hbide.ch" +#include "common.ch" +#include "hbclass.ch" +#include "hbqt.ch" + +/*----------------------------------------------------------------------*/ + +#define PAGE_INTRO 1 +#define PAGE_X 2 + +/*----------------------------------------------------------------------*/ + +FUNCTION hbide_startOpenWizard() + + STATIC oWz + oWz := IdeWizard():new():create() + + RETURN NIL + +/*----------------------------------------------------------------------*/ + +CLASS IdeWizard INHERIT IdeObject + + DATA aPages INIT {} + + METHOD new( oIde ) + METHOD create( oIde ) + METHOD destroy() + METHOD execEvent( nMode, p ) + METHOD addIntroPage() + METHOD addDescPage() + + ENDCLASS + +/*----------------------------------------------------------------------*/ + +METHOD IdeWizard:new( oIde ) + + ::oIde := oIde + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeWizard:create( oIde ) + + DEFAULT oIde TO ::oIde + ::oIde := oIde + + ::oUI := QWizard():new() + ::oUI:setWindowTitle( "Open" ) + ::oUI:setWindowIcon( hbide_image( "hbide" ) ) + + ::addIntroPage() + ::addDescPage() + + ::oUI:show() + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeWizard:destroy() + LOCAL a_, obj + + IF !empty( ::oUI ) + FOR EACH a_ IN ::aPages + FOR EACH obj IN a_ DESCEND + obj := NIL + NEXT + NEXT + ::oUI := NIL + ENDIF + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeWizard:execEvent( nMode, p ) + + HB_SYMBOL_UNUSED( nMode ) + HB_SYMBOL_UNUSED( p ) + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeWizard:addIntroPage() + LOCAL page, label, layout + + page := QWizardPage():new() + page:setTitle( "Introduction" ) + + label := QLabel():new( "This wizard will help you register your copy " + ; + "of Super Product Two." ) + label:setWordWrap( .t. ) + + layout := QVBoxLayout():new() + layout:addWidget( label ) + page:setLayout( layout ) + page:setTitle( "This is waizard" ) + page:setSubTitle( "So the ?" ) + + aadd( ::aPages, { PAGE_INTRO, page, layout, label } ) + + ::oUI:setPage( len( ::aPages ), page ) + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeWizard:addDescPage() + + RETURN Self + +/*----------------------------------------------------------------------*/