Skip to content

C
core
Kaydet (Commit) b2d7ede9 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

ditch product registration implementation

üst 64d9d21d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 904 deletions
Repository.mk
Dosyayı görüntüle @ b2d7ede9
...@@ -214,7 +214,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ ...@@ -214,7 +214,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
nullcanvas \ nullcanvas \
OGLTrans \ OGLTrans \
passwordcontainer \ passwordcontainer \
productregistration \
simplecanvas \ simplecanvas \
slideshow \ slideshow \
vbaobj \ vbaobj \
......
desktop/prj/build.lst
Dosyayı görüntüle @ b2d7ede9
...@@ -40,7 +40,6 @@ dt desktop\source\deployment\registry\executable nmake - all dt_dp_registry_exe ...@@ -40,7 +40,6 @@ dt desktop\source\deployment\registry\executable nmake - all dt_dp_registry_exe
dt desktop\scripts nmake - u dt_scripts dt_inc NULL dt desktop\scripts nmake - u dt_scripts dt_inc NULL
dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_win32_quickstart_so.w dt_zipintro NULL dt desktop\util nmake - all dt_util dt_app dt_pagein.u dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_win32_quickstart_so.w dt_zipintro NULL
dt desktop\zipintro nmake - all dt_zipintro NULL dt desktop\zipintro nmake - all dt_zipintro NULL
dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig NULL
dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL dt desktop\qa\deployment_misc nmake - all sn_qa_deployment_misc dt_dp_misc dt_inc NULL
dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL dt desktop\test\deployment\active nmake - all dt_test_deployment_active NULL
dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL dt desktop\test\deployment\boxt nmake - all dt_test_deployment_boxt NULL
......
desktop/registry/data/org/openoffice/Office/Jobs.xcu deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************ -->
<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="Jobs">
<node oor:name="ProductRegistration" oor:op="replace">
<prop oor:name="Service">
<value>com.sun.star.comp.framework.DoRegistrationJob</value>
</prop>
<node oor:name="Arguments">
<prop oor:name="ProductName" oor:op="replace" oor:type="xs:string">
<value>${SERVICETAG_PRODUCTNAME}</value>
</prop>
<prop oor:name="ProductVersion" oor:op="replace" oor:type="xs:string">
<value>${SERVICETAG_PRODUCTVERSION}</value>
</prop>
<prop oor:name="ProductURN" oor:op="replace" oor:type="xs:string">
<value>${SERVICETAG_URN}</value>
</prop>
<prop oor:name="ProductSource" oor:op="replace" oor:type="xs:string">
<value>${SERVICETAG_SOURCE}</value>
</prop>
<prop oor:name="ProductParent" oor:op="replace" oor:type="xs:string">
<value>${SERVICETAG_PARENTNAME}</value>
</prop>
<prop oor:name="Vendor" oor:op="replace" oor:type="xs:string">
<value>Sun Microsystems, Inc.</value>
</prop>
<prop oor:name="RegistrationData" oor:op="replace" oor:type="xs:string">
<value>$(user)/registration.xml</value>
</prop>
<prop oor:name="RegistrationURL" oor:op="replace" oor:type="xs:string">
<value>${REGISTRATION_HOST}/register/${registry_urn}?product=${REGISTRATION_PRODUCT}&amp;locale=${locale}&amp;cid=${REGISTRATION_CID}</value>
</prop>
</node>
</node>
</node>
<node oor:name="Events">
<node oor:name="onRegisterNow" oor:op="fuse">
<node oor:name="JobList">
<node oor:name="ProductRegistration" oor:op="replace"/>
</node>
</node>
<node oor:name="onRegisterLater" oor:op="fuse">
<node oor:name="JobList">
<node oor:name="ProductRegistration" oor:op="replace"/>
</node>
</node>
</node>
</oor:component-data>
desktop/registry/data/org/openoffice/Office/makefile.mk deleted 100755 → 0
Dosyayı görüntüle @ 64d9d21d
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org 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 Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
PRJ=..$/..$/..$/..$/..
PRJNAME=setup_native
TARGET=data_registration
PACKAGE=org.openoffice.Office
ABSXCSROOT=$(SOLARXMLDIR)
XCSROOT=..
DTDDIR=$(ABSXCSROOT)
XSLDIR=$(ABSXCSROOT)$/processing
PROCESSOUT=$(MISC)$/$(TARGET)
PROCESSORDIR=$(SOLARBINDIR)
.INCLUDE : settings.mk
.IF "$(L10N_framework)"==""
# --- Files -------------------------------------------------------
.IF "$(BUILD_SPECIAL)"!=""
XCUFILES= \
Jobs.xcu
MODULEFILES=
LOCALIZEDFILES=
PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
SPOOLDIR=$(MISC)$/registry$/spool
MYXCUFILES= \
$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu
.ELSE # "$(BUILD_SPECIAL)"!=""
dummy:
@echo "Nothing to build"
.ENDIF # "$(BUILD_SPECIAL)"!=""
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
.ENDIF # L10N_framework
ALLTAR : $(MYXCUFILES)
$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu : $(PROCESSOUT)$/registry$/data$/$/$(PACKAGEDIR)$/Jobs.xcu
@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@
postprocess/packcomponents/makefile.mk
Dosyayı görüntüle @ b2d7ede9
...@@ -100,7 +100,6 @@ my_components = \ ...@@ -100,7 +100,6 @@ my_components = \
component/svl/source/passwordcontainer/passwordcontainer \ component/svl/source/passwordcontainer/passwordcontainer \
component/svl/util/svl \ component/svl/util/svl \
component/svtools/source/hatchwindow/hatchwindowfactory \ component/svtools/source/hatchwindow/hatchwindowfactory \
component/svtools/source/productregistration/productregistration.uno \
component/svtools/util/svt \ component/svtools/util/svt \
component/svx/util/svx \ component/svx/util/svx \
component/svx/util/svxcore \ component/svx/util/svxcore \
......
postprocess/rebase/coffbase.txt
Dosyayı görüntüle @ b2d7ede9
...@@ -207,7 +207,6 @@ pdfimport.uno.dll 0x0000000060bf0000 0x000a0000 ...@@ -207,7 +207,6 @@ pdfimport.uno.dll 0x0000000060bf0000 0x000a0000
placewaremi.dll 0x0000000060bd0000 0x00010000 placewaremi.dll 0x0000000060bd0000 0x00010000
plmi.dll 0x0000000060b90000 0x00030000 plmi.dll 0x0000000060b90000 0x00030000
pptimportermi.dll 0x0000000060b70000 0x00010000 pptimportermi.dll 0x0000000060b70000 0x00010000
productregistration.uno.dll 0x0000000060b20000 0x00010000
protocolhandlermi.dll 0x0000000060b00000 0x00010000 protocolhandlermi.dll 0x0000000060b00000 0x00010000
proxyfac.uno.dll 0x0000000060ae0000 0x00010000 proxyfac.uno.dll 0x0000000060ae0000 0x00010000
purpenvhelper3msc.dll 0x0000000060ac0000 0x00010000 purpenvhelper3msc.dll 0x0000000060ac0000 0x00010000
......
scp2/source/ooo/file_library_ooo.scp
Dosyayı görüntüle @ b2d7ede9
...@@ -1016,8 +1016,6 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc) ...@@ -1016,8 +1016,6 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
STD_LIB_FILE( gid_File_Lib_Pl , pl) STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif #endif
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
#if defined(UNX) && ! defined(QUARTZ) #if defined(UNX) && ! defined(QUARTZ)
File gid_File_Lib_Desktop_Detector File gid_File_Lib_Desktop_Detector
Name = LIBNAME(desktop_detector); Name = LIBNAME(desktop_detector);
......
scp2/source/ooo/file_resource_ooo.scp
Dosyayı görüntüle @ b2d7ede9
...@@ -66,8 +66,6 @@ STD_RES_FILE( gid_File_Res_Pcr, pcr) ...@@ -66,8 +66,6 @@ STD_RES_FILE( gid_File_Res_Pcr, pcr)
STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter) STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
STD_RES_FILE( gid_File_Res_Productregistration, productregistration)
#ifdef UNX #ifdef UNX
STD_RES_FILE( gid_File_Res_San, san ) STD_RES_FILE( gid_File_Res_San, san )
......
scp2/source/ooo/module_hidden_ooo.scp
Dosyayı görüntüle @ b2d7ede9
...@@ -480,7 +480,6 @@ Module gid_Module_Root_Files_5 ...@@ -480,7 +480,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Fsstorage, gid_File_Lib_Fsstorage,
gid_File_Lib_Hatchwindowfactory, gid_File_Lib_Hatchwindowfactory,
gid_File_Lib_Passwordcontainer, gid_File_Lib_Passwordcontainer,
gid_File_Lib_Productregistration,
gid_File_Lib_Svtmisc, gid_File_Lib_Svtmisc,
gid_File_Lib_Updchkui, gid_File_Lib_Updchkui,
gid_File_Lib_Updatefeed, gid_File_Lib_Updatefeed,
......
scp2/source/ooo/module_lang_template.scp
Dosyayı görüntüle @ b2d7ede9
...@@ -75,7 +75,6 @@ Module gid_Module_Langpack_Resource_Template ...@@ -75,7 +75,6 @@ Module gid_Module_Langpack_Resource_Template
gid_File_Res_Pcr, gid_File_Res_Pcr,
gid_File_Res_Pdffilter, gid_File_Res_Pdffilter,
gid_File_Res_San, gid_File_Res_San,
gid_File_Res_Productregistration,
gid_File_Res_Sb, gid_File_Res_Sb,
gid_File_Res_Sd, gid_File_Res_Sd,
gid_File_Res_Sfx, gid_File_Res_Sfx,
......
svtools/AllLangResTarget_productregistration.mk deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org 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 Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration))
$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools))
$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\
svt/productregistration \
))
$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration))
$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\
$$(INCLUDE) \
-I$(WORKDIR)/inc \
))
$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\
svtools/source/productregistration/registrationdlg.src \
))
# vim: set noet sw=4 ts=4:
svtools/Library_productregistration.mk deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License version 3
# only, as published by the Free Software Foundation.
#
# OpenOffice.org 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 Lesser General Public License version 3 for more details
# (a copy is included in the LICENSE file that accompanied this code).
#
# You should have received a copy of the GNU Lesser General Public License
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
$(eval $(call gb_Library_Library,productregistration))
$(eval $(call gb_Library_set_componentfile,productregistration,svtools/source/productregistration/productregistration.uno))
$(eval $(call gb_Library_set_include,productregistration,\
$$(SOLARINC) \
-I$(WORKDIR)/inc/svtools \
-I$(WORKDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc/pch) \
-I$(OUTDIR)/inc/ \
-I$(realpath $(SRCDIR)/svtools/inc) \
-I$(OUTDIR)/inc \
))
$(eval $(call gb_Library_add_api,productregistration,\
udkapi \
offapi \
))
$(eval $(call gb_Library_add_linked_libs,productregistration,\
cppu \
cppuhelper \
sal \
svl \
tk \
tl \
utl \
vcl \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,productregistration,\
svtools/source/productregistration/productregistration \
svtools/source/productregistration/registrationdlg \
))
# vim: set noet sw=4 ts=4:
svtools/Module_svtools.mk
Dosyayı görüntüle @ b2d7ede9
...@@ -29,10 +29,8 @@ ...@@ -29,10 +29,8 @@
$(eval $(call gb_Module_Module,svtools)) $(eval $(call gb_Module_Module,svtools))
$(eval $(call gb_Module_add_targets,svtools,\ $(eval $(call gb_Module_add_targets,svtools,\
AllLangResTarget_productregistration \
AllLangResTarget_svt \ AllLangResTarget_svt \
Library_hatchwindowfactory \ Library_hatchwindowfactory \
Library_productregistration \
Library_svt \ Library_svt \
Package_inc \ Package_inc \
)) ))
......
svtools/source/productregistration/productregistration.hxx deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef SVTOOLS_PRODUCTREGISTRATION_HXX
#define SVTOOLS_PRODUCTREGISTRATION_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/task/XJobExecutor.hpp>
#include <com/sun/star/task/XJob.hpp>
#include <cppuhelper/implbase3.hxx>
//........................................................................
namespace svt
{
//........................................................................
//====================================================================
//= OProductRegistration
//====================================================================
typedef ::cppu::WeakImplHelper3 < ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::task::XJobExecutor
, ::com::sun::star::task::XJob
> OProductRegistration_Base;
class OProductRegistration : public OProductRegistration_Base
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
m_xORB;
protected:
OProductRegistration( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
// XServiceInfo - static version
static ::rtl::OUString SAL_CALL getImplementationName_Static( );
static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException);
protected:
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
// XJobExecutor
virtual void SAL_CALL trigger( const ::rtl::OUString& sEvent ) throw (::com::sun::star::uno::RuntimeException);
// XJob
virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
private:
// types of events which can be handled by this component
enum EventType
{
etRegistrationRequired,
etUnknown
};
// classifies a event
EventType classify( const ::rtl::OUString& _rEventDesc );
// do the online registration
void doOnlineRegistration( );
};
//........................................................................
} // namespace svt
//........................................................................
#endif // SVTOOLS_PRODUCTREGISTRATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/source/productregistration/productregistration.uno.component deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
**********************************************************************-->
<component loader="com.sun.star.loader.SharedLibrary" prefix="productregistration"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.setup.ProductRegistration">
<service name="com.sun.star.setup.ProductRegistration"/>
</implementation>
</component>
svtools/source/productregistration/registrationdlg.cxx deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#include "registrationdlg.hxx"
#include "registrationdlg.hrc"
#include <vcl/msgbox.hxx>
#include <tools/debug.hxx>
//........................................................................
namespace svt
{
//........................................................................
static void lcl_moveControls( Control** _ppControls, sal_Int32 _nAmount )
{
if ( _ppControls )
while ( *_ppControls )
{
Point aPos = (*_ppControls)->GetPosPixel();
aPos.Y() += _nAmount;
(*_ppControls)->SetPosPixel( aPos );
++_ppControls;
}
}
//====================================================================
//= RegistrationDialog
//====================================================================
//--------------------------------------------------------------------
RegistrationDialog::RegistrationDialog( Window* _pWindow, const ResId& _rResId, bool _bEvalVersion )
:ModalDialog( _pWindow, _rResId )
,m_eResponse ( urRegisterLater )
,m_aLogo ( this, ResId( FI_LOGO, *_rResId.GetResMgr() ) )
,m_aIntro ( this, ResId( FT_INTRO, *_rResId.GetResMgr() ) )
,m_aNow ( this, ResId( RB_NOW, *_rResId.GetResMgr() ) )
,m_aLater ( this, ResId( RB_LATER, *_rResId.GetResMgr() ) )
,m_aNever ( this, ResId( RB_NEVER, *_rResId.GetResMgr() ) )
,m_aAlreadyDone ( this, ResId( RB_DONE, *_rResId.GetResMgr() ) )
,m_aSeparator ( this, ResId( FL_SEPARATOR, *_rResId.GetResMgr() ) )
,m_aOK ( this, ResId( BTN_OK, *_rResId.GetResMgr() ) )
,m_aHelp ( this, ResId( BTN_HELP, *_rResId.GetResMgr() ) )
{
if ( _bEvalVersion )
{ // if we're an eval version, we need to hide two of the options
m_aNever.Hide( );
m_aAlreadyDone.Hide( );
// make the explanatory text somewhat smaller
Size aIntroSize = m_aIntro.GetSizePixel();
aIntroSize.Height() = LogicToPixel( Size( 0, 18 ), MAP_APPFONT ).Height();
sal_Int32 nHeightDifference = m_aIntro.GetSizePixel().Height() - aIntroSize.Height();
m_aIntro.SetSizePixel( aIntroSize );
// resize the dialog, and move the controls below the ones we just hided
sal_Int32 nAlreadyDoneLower = m_aAlreadyDone.GetPosPixel().Y() + m_aAlreadyDone.GetSizePixel().Height();
sal_Int32 nLaterLower = m_aLater.GetPosPixel().Y() + m_aLater.GetSizePixel().Height();
sal_Int32 nDifference = nAlreadyDoneLower - nLaterLower;
sal_Int32 nOverallDifference = nDifference + nHeightDifference;
// move
Control* pVisibleRadios[] = { &m_aNow, &m_aLater, NULL };
lcl_moveControls( pVisibleRadios, -nHeightDifference );
Control* pControlsToMove[] = { &m_aSeparator, &m_aOK, &m_aHelp, NULL };
lcl_moveControls( pControlsToMove, -nOverallDifference );
// resize the dialog
Size aSize = GetSizePixel();
aSize.Height() -= nOverallDifference;
SetSizePixel( aSize );
}
else
{
// the explanatory text needs to be completed
String sCompleteIntro = m_aIntro.GetText( );
sCompleteIntro += String( ResId( STR_COMPLETE_INTRO, *_rResId.GetResMgr() ) );
m_aIntro.SetText( sCompleteIntro );
}
FreeResource();
m_aNow.Check( sal_True );
}
//--------------------------------------------------------------------
short RegistrationDialog::Execute()
{
short nResult = ModalDialog::Execute();
// as a default, assume that the user wants to be reminded
m_eResponse = urRegisterLater;
if ( RET_OK == nResult )
{
if ( m_aNow.IsChecked() )
m_eResponse = urRegisterNow;
else if ( m_aLater.IsChecked() )
m_eResponse = urRegisterLater;
else if ( m_aNever.IsChecked() )
m_eResponse = urRegisterNever;
else if ( m_aAlreadyDone.IsChecked() )
m_eResponse = urAlreadyRegistered;
#ifdef DBG_UTIL
else
{
OSL_FAIL( "RegistrationDialog::Execute: invalid dialog state!" );
}
#endif
}
return nResult;
}
//--------------------------------------------------------------------
long RegistrationDialog::PreNotify( NotifyEvent& rNEvt )
{
long nHandled;
if( rNEvt.GetType() == EVENT_KEYINPUT &&
rNEvt.GetKeyEvent()->GetCharCode() &&
rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_ESCAPE)
{
EndDialog(RET_CANCEL);
nHandled = 1;
}
else
nHandled = ModalDialog::PreNotify( rNEvt );
return nHandled;
}
//........................................................................
} // namespace svt
//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/source/productregistration/registrationdlg.hrc deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef SVTOOLS_REGISTRATIONDLG_HRC
#define SVTOOLS_REGISTRATIONDLG_HRC
#define FI_LOGO 1
#define FT_INTRO 2
#define RB_NOW 3
#define RB_LATER 4
#define RB_NEVER 5
#define RB_DONE 6
#define FL_SEPARATOR 7
#define BTN_OK 8
#define BTN_HELP 9
#define STR_COMPLETE_INTRO 10
#endif // SVTOOLS_REGISTRATIONDLG_HRC
svtools/source/productregistration/registrationdlg.hxx deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef SVTOOLS_REGISTRATIONDLG_HXX
#define SVTOOLS_REGISTRATIONDLG_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
//........................................................................
namespace svt
{
//........................................................................
//====================================================================
//= RegistrationDialog
//====================================================================
class RegistrationDialog : public ModalDialog
{
public:
enum UserResponse
{
urRegisterNow,
urRegisterLater,
urRegisterNever,
urAlreadyRegistered
};
private:
UserResponse m_eResponse;
FixedImage m_aLogo;
FixedText m_aIntro;
RadioButton m_aNow;
RadioButton m_aLater;
RadioButton m_aNever;
RadioButton m_aAlreadyDone;
FixedLine m_aSeparator;
OKButton m_aOK;
HelpButton m_aHelp;
public:
RegistrationDialog( Window* _pWindow, const ResId& _rResId, bool _bEvalVersion );
virtual short Execute();
virtual long PreNotify( NotifyEvent& rNEvt );
inline UserResponse getResponse() const { return m_eResponse; }
};
//........................................................................
}// namespace svt
//........................................................................
#endif // SVTOOLS_REGISTRATIONDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/source/productregistration/registrationdlg.src deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include "registrationdlg.hrc"
#include <svtools/svtools.hrc>
#include <svtools/helpid.hrc>
ModalDialog DLG_REGISTRATION_REQUEST
{
HelpID = HID_REGISTRATION_DIALOG;
Moveable = TRUE ;
Closeable = TRUE;
OutputSize = TRUE ;
Size = MAP_APPFONT ( 192 , 134 ) ;
Text [ en-US ] = "%PRODUCTNAME Registration";
FixedImage FI_LOGO
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 24 , 24 ) ;
Fixed = Image
{
ImageBitmap = Bitmap
{
File = "regkey.png" ;
};
MaskColor = Color { Red = 0x0000 ; Green = 0x0000 ; Blue = 0xFFFF ; };
};
};
FixedText FT_INTRO
{
Pos = MAP_APPFONT ( 33, 6 ) ;
Size = MAP_APPFONT ( 153 , 32 ) ;
WordBreak = TRUE;
Text [ en-US ] = "You now have the opportunity to register as a %PRODUCTNAME user." ;
};
String STR_COMPLETE_INTRO
{
Text [ en-US ] = " Registration is voluntary and is without obligation." ;
};
RadioButton RB_NOW
{
HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW";
Pos = MAP_APPFONT ( 33 , 41 ) ;
Size = MAP_APPFONT ( 153 , 10 ) ;
Text [ en-US ] = "Register now" ;
};
RadioButton RB_LATER
{
HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER";
Pos = MAP_APPFONT ( 33 , 54 ) ;
Size = MAP_APPFONT ( 153 , 10 ) ;
Text [ en-US ] = "Remind me to register later" ;
};
RadioButton RB_NEVER
{
HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER";
Pos = MAP_APPFONT ( 33 , 67 ) ;
Size = MAP_APPFONT ( 153 , 10 ) ;
Text [ en-US ] = "Never register" ;
};
RadioButton RB_DONE
{
HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE";
Pos = MAP_APPFONT ( 33 , 80 ) ;
Size = MAP_APPFONT ( 153 , 20 ) ;
WordBreak = TRUE;
Text [ en-US ] = "Already registered as %PRODUCTNAME %PRODUCTVERSION user." ;
};
FixedLine FL_SEPARATOR
{
Pos = MAP_APPFONT ( 6, 107 ) ;
Size = MAP_APPFONT ( 180 , 1 ) ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 80, 114 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 136, 114 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
};
ErrorBox ERRBOX_REG_NOSYSBROWSER
{
BUTTONS = WB_OK ;
DEFBUTTON = WB_DEF_OK ;
Message [ en-US ] = "An error occurred in starting the web browser.\nPlease check the %PRODUCTNAME and web browser settings.";
};
toolkit/src2xml/src.lst
Dosyayı görüntüle @ b2d7ede9
...@@ -598,7 +598,6 @@ ...@@ -598,7 +598,6 @@
../../svtools/source/filter.vcl/filter/dlgejpg.src ../../svtools/source/filter.vcl/filter/dlgejpg.src
../../svtools/source/filter.vcl/filter/strings.src ../../svtools/source/filter.vcl/filter/strings.src
../../svtools/source/Accessibility/accessiblelistboxentry.src ../../svtools/source/Accessibility/accessiblelistboxentry.src
../../svtools/source/productregistration/registrationdlg.src
../../svtools/source/plugapp/commtest.src ../../svtools/source/plugapp/commtest.src
../../svtools/source/plugapp/testtool.src ../../svtools/source/plugapp/testtool.src
../../fpicker/source/office/OfficeFilePicker.src ../../fpicker/source/office/OfficeFilePicker.src
......
vcl/inc/vcl/wpropset.hxx deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org 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 Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef VCL_WPROPSET_HXX
#define VCL_WPROPSET_HXX
#include "vcl/dllapi.h"
#include "tools/link.hxx"
#include "vcl/arrange.hxx"
#include "com/sun/star/beans/XPropertySet.hpp"
class VclWindowEvent;
namespace vcl
{
class WindowPropertySetData;
class WindowPropertySetListener;
class VCL_DLLPUBLIC WindowPropertySet
{
WindowPropertySetData* mpImpl;
void addWindowToSet( Window* );
void addLayoutToSet( const boost::shared_ptr<WindowArranger>& );
void setupProperties();
DECL_LINK( ChildEventListener, VclWindowEvent* );
void propertyChange( const com::sun::star::beans::PropertyChangeEvent& );
friend class vcl::WindowPropertySetListener;
public:
WindowPropertySet( Window* i_pTopWindow, bool i_bTakeOwnership );
~WindowPropertySet();
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getPropertySet() const;
};
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/source/window/wpropset.cxx deleted 100644 → 0
Dosyayı görüntüle @ 64d9d21d
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment