Skip to content

C
core
Kaydet (Commit) 030df631 authored tarafından Uray M. János's avatar Uray M. János Kaydeden (comit) Andras Timar
Dosyalara gözat
Seçenekler

Cleanup in Tools > Options > User Data 

Change-Id: I4f0a0304d7dd23ed8ce011e6f8f90e170bfbe5df

Cleanup in Tools > Options > User Data

Change-Id: If89f19e22b6efeb0fdd811ff8afe2cb6c0b0bf4e
Reviewed-on: https://gerrit.libreoffice.org/500Reviewed-by: 's avatarAndras Timar <atimar@suse.com>
Tested-by: 's avatarAndras Timar <atimar@suse.com>
üst c20f15c1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 198 deletions
cui/source/inc/cuioptgenrl.hxx
Dosyayı görüntüle @ 030df631
......@@ -16,40 +16,23 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _SVX_CUIOPTGENRL_HXX
#define _SVX_CUIOPTGENRL_HXX
#ifndef SVX_CUIOPTGENRL_HXX
#define SVX_CUIOPTGENRL_HXX
// include ---------------------------------------------------------------
#include <svx/optgenrl.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
#include <vcl/group.hxx>
#include <vector>
#include <boost/shared_ptr.hpp>
// forward ---------------------------------------------------------------
struct GeneralTabPage_Impl;
class Edit;
#define SfxGeneralTabPage SvxGeneralTabPage
#define INDEX_NOTSET ((sal_Int16)-1)
// class SvxUserEdit -----------------------------------------------------
class SvxUserEdit : public Edit
{
private:
sal_Int16 m_nIndex;
FixedText* m_pLabel;
public:
SvxUserEdit( Window* pParent, const ResId& rResId,
sal_Int16 nIndex = INDEX_NOTSET, FixedText* pLabel = NULL ) :
Edit( pParent, rResId, true ), m_nIndex( nIndex ), m_pLabel( pLabel ) {}
inline void SetIndex( sal_Int16 nIndex ) { m_nIndex = nIndex; }
inline sal_Int16 GetIndex() const { return m_nIndex; }
inline void SetLabel( FixedText* pLabel ) { m_pLabel = pLabel; }
inline FixedText* GetLabel() const { return m_pLabel; }
};
// class SvxGeneralTabPage -----------------------------------------------
......@@ -57,62 +40,44 @@ class SvxGeneralTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
private:
// the horizontal line "Address"
FixedLine aAddrFrm;
FixedText aCompanyLbl;
SvxUserEdit aCompanyEdit;
FixedText aNameLbl;
FixedText aNameLblRuss;
FixedText aNameLblEastern;
SvxUserEdit aFirstName;
SvxUserEdit aFatherName;
SvxUserEdit aName;
SvxUserEdit aShortName;
FixedText aStreetLbl;
FixedText aStreetLblRuss;
SvxUserEdit aStreetEdit;
SvxUserEdit aApartmentNrEdit;
FixedText aCityLbl;
SvxUserEdit aPLZEdit;
SvxUserEdit aCityEdit;
SvxUserEdit aUsCityEdit;
SvxUserEdit aUsStateEdit;
SvxUserEdit aUsZipEdit;
FixedText aCountryLbl;
SvxUserEdit aCountryEdit;
FixedText aTitlePosLbl;
SvxUserEdit aTitleEdit;
SvxUserEdit aPositionEdit;
FixedText aPhoneLbl;
SvxUserEdit aTelPrivEdit;
SvxUserEdit aTelCompanyEdit;
FixedText aFaxMailLbl;
SvxUserEdit aFaxEdit;
SvxUserEdit aEmailEdit;
// the "Use data for document properties" checkbox (but where is it?)
CheckBox aUseDataCB;
// rows
class Row;
std::vector<boost::shared_ptr<Row> > vRows;
// fields
class Field;
std::vector<boost::shared_ptr<Field> > vFields;
// "name" fields
unsigned nNameRow;
unsigned nShortNameField;
GeneralTabPage_Impl* pImpl;
#ifdef _SVX_OPTGENRL_CXX
DECL_LINK( ModifyHdl_Impl, Edit * );
sal_Bool GetAddress_Impl();
void SetAddress_Impl();
#endif
void CreateControls ();
void PositionControls ();
void SetLinks ();
void SetAccessibleNames ();
protected:
virtual int DeactivatePage( SfxItemSet* pSet );
public:
SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet );
~SvxGeneralTabPage();
~SvxGeneralTabPage ();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
#endif // #ifndef _SVX_CUIOPTGENRL_HXX
#endif // #ifndef SVX_CUIOPTGENRL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/options/optgenrl.cxx
Dosyayı görüntüle @ 030df631
This diff is collapsed.
cui/source/options/optgenrl.hrc
Dosyayı görüntüle @ 030df631
......@@ -15,8 +15,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _SVX_OPTGENRL_HRC
#define _SVX_OPTGENRL_HRC
#ifndef SVX_OPTGENRL_HRC
#define SVX_OPTGENRL_HRC
// defines ------------------------------------------------------------------
......@@ -51,26 +51,13 @@
#define ED_EMAIL 38
#define GB_ADDRESS 39
#define CB_USEDATA 40
#define FT_NAME_EASTERN 41
#define FT_NAME_EASTERN 41
#define FT_CITY_US 42
#define STR_US_STATE 10
#define STR_QUERY_REG 11
// positioning help for the dialog
#define HSPACE 2
#define VSPACE 3
#define LINEH 12
#define FLINEH 8
#define LEFT 12
#define MID 100
#define RIGHT 248
#define TOP 10
#define LINE(y) (14+y*15)
#define FLINE(y) (16+y*15)
#define NAMELEN 74
#endif // #ifndef _SVX_OPTGENRL_HRC
#endif // #ifndef SVX_OPTGENRL_HRC
// ******************************************************************* EOF
cui/source/options/optgenrl.src
Dosyayı görüntüle @ 030df631
......@@ -43,8 +43,6 @@ TabPage RID_SFXPAGE_GENERAL
Text [ en-US ] = "User Data" ;
FixedText FT_COMPANY
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 0 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "~Company" ;
};
......@@ -52,95 +50,64 @@ TabPage RID_SFXPAGE_GENERAL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 0 ) ) ;
Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
};
FixedText FT_NAME
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 1 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "First/Last ~name/Initials" ;
};
FixedText FT_NAME_RUSS
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 1 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Hide = TRUE;
Text [ en-US ] = "Last Name/First name/Father's name/Initials";
};
FixedText FT_NAME_EASTERN
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 1 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Hide = TRUE;
Text [ en-US ] = "Last/First ~name/Initials" ;
};
Edit ED_FATHERNAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME";
Border = TRUE ;
Hide = TRUE;
Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
};
Edit ED_FIRSTNAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 1 ) ) ;
Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
};
Edit ED_NAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-8+HSPACE , LINE ( 1 ) ) ;
Size = MAP_APPFONT ( NAMELEN-8 , LINEH ) ;
};
Edit ED_SHORTNAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+2* ( NAMELEN-8+HSPACE ) , LINE ( 1 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+2* ( NAMELEN-8+HSPACE ) ) , LINEH ) ;
};
FixedText FT_STREET
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 2 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "~Street" ;
};
FixedText FT_STREET_RUSS
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 2 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Hide = TRUE;
Text [ en-US ] = "Street/Apartment number";
};
Edit ED_STREET
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
};
Edit ED_APARTMENTNR
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR";
Border = TRUE ;
Hide = TRUE;
Pos = MAP_APPFONT ( MID , LINE ( 2 ) ) ;
Size = MAP_APPFONT ( RIGHT-MID , LINEH ) ;
};
FixedText FT_CITY
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 3 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "Zip/City";
};
......@@ -148,41 +115,34 @@ TabPage RID_SFXPAGE_GENERAL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
Size = MAP_APPFONT ( 24 , LINEH ) ;
};
Edit ED_CITY
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID + 24 + HSPACE , LINE ( 3 ) ) ;
Size = MAP_APPFONT ( RIGHT - ( MID + 24 + HSPACE ) , LINEH ) ;
};
FixedText FT_CITY_US
{
LeftLabel = TRUE ;
Text [ en-US ] = "City/State/Zip";
};
Edit ED_US_CITY
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 3 ) ) ;
Size = MAP_APPFONT ( 90 , LINEH ) ;
};
Edit ED_US_STATE
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE";
Border = TRUE ;
Pos = MAP_APPFONT ( MID + 90 + HSPACE, LINE ( 3 ) ) ;
Size = MAP_APPFONT ( 30 , LINEH ) ;
};
Edit ED_US_ZIPCODE
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE";
Border = TRUE ;
Pos = MAP_APPFONT ( MID + 90 + HSPACE + 30 + HSPACE, LINE ( 3 ) ) ;
Size = MAP_APPFONT ( RIGHT - ( MID + 90 + HSPACE + 30 + HSPACE ) , LINEH ) ;
};
FixedText FT_COUNTRY
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 4 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "Country/Region";
};
......@@ -190,13 +150,9 @@ TabPage RID_SFXPAGE_GENERAL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 4 ) ) ;
Size = MAP_APPFONT ( RIGHT - MID , LINEH ) ;
};
FixedText FT_TITLEPOS
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 5 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "~Title/Position" ;
};
......@@ -204,20 +160,14 @@ TabPage RID_SFXPAGE_GENERAL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 5 ) ) ;
Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
};
Edit ED_POSITION
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 5 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
};
FixedText FT_PHONE
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 6 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
Text [ en-US ] = "Tel. (Home/Work)" ;
LeftLabel = TRUE ;
};
......@@ -225,20 +175,14 @@ TabPage RID_SFXPAGE_GENERAL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 6 ) ) ;
Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
};
Edit ED_TELCOMPANY
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 6 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
};
FixedText FT_FAXMAIL
{
Pos = MAP_APPFONT ( LEFT , FLINE ( 7 ) ) ;
Size = MAP_APPFONT ( MID-LEFT-2 , FLINEH ) ;
LeftLabel = TRUE ;
Text [ en-US ] = "Fa~x / E-mail" ;
};
......@@ -246,15 +190,11 @@ TabPage RID_SFXPAGE_GENERAL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX";
Border = TRUE ;
Pos = MAP_APPFONT ( MID , LINE ( 7 ) ) ;
Size = MAP_APPFONT ( NAMELEN-1 , LINEH ) ;
};
Edit ED_EMAIL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL";
Border = TRUE ;
Pos = MAP_APPFONT ( MID+NAMELEN-1+HSPACE , LINE ( 7 ) ) ;
Size = MAP_APPFONT ( RIGHT- ( MID+NAMELEN-1+HSPACE ) , LINEH ) ;
};
FixedLine GB_ADDRESS
{
......@@ -271,11 +211,7 @@ TabPage RID_SFXPAGE_GENERAL
Text [ en-US ] = "Use data for document properties";
};
// extra Resourcen f"ur die amerikanische Postadresse
String STR_US_STATE
{
Text [ en-US ] = "City/State/Zip";
};
// extra resource for US addresses
String STR_QUERY_REG
{
Text [ en-US ] = "Note that street, Zip code and city are used to generate the registration key. You will not be able to change the user data again until the registration has been carried out. Do you want to modify the user data now?";
......
unotools/inc/unotools/useroptions.hxx
Dosyayı görüntüle @ 030df631
......@@ -23,6 +23,8 @@
#include <unotools/configitem.hxx>
#include <osl/mutex.hxx>
#include <unotools/options.hxx>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
// define ----------------------------------------------------------------
......@@ -43,66 +45,70 @@
#define USER_OPT_ZIP ((sal_uInt16)14)
#define USER_OPT_FATHERSNAME ((sal_uInt16)15)
#define USER_OPT_APARTMENT ((sal_uInt16)16)
#define USER_OPT_CUSTOMERNUMBER ((sal_uInt16)17)
// class SvtUserOptions --------------------------------------------------
class SvtUserOptions_Impl;
class UNOTOOLS_DLLPUBLIC SvtUserOptions: public utl::detail::Options
class UNOTOOLS_DLLPUBLIC SvtUserOptions : public utl::detail::Options
{
private:
SvtUserOptions_Impl* pImp;
public:
SvtUserOptions();
virtual ~SvtUserOptions();
SvtUserOptions ();
virtual ~SvtUserOptions ();
static ::osl::Mutex& GetInitMutex();
static osl::Mutex& GetInitMutex ();
// get the address token
::rtl::OUString GetCompany() const;
::rtl::OUString GetFirstName() const;
::rtl::OUString GetLastName() const;
::rtl::OUString GetID() const;
::rtl::OUString GetStreet() const;
::rtl::OUString GetCity() const;
::rtl::OUString GetState() const;
::rtl::OUString GetZip() const;
::rtl::OUString GetCountry() const;
::rtl::OUString GetPosition() const;
::rtl::OUString GetTitle() const;
::rtl::OUString GetTelephoneHome() const;
::rtl::OUString GetTelephoneWork() const;
::rtl::OUString GetFax() const;
::rtl::OUString GetEmail() const;
::rtl::OUString GetCustomerNumber() const;
::rtl::OUString GetFathersName() const;
::rtl::OUString GetApartment() const;
rtl::OUString GetCompany () const;
rtl::OUString GetFirstName () const;
rtl::OUString GetLastName () const;
rtl::OUString GetID () const;
rtl::OUString GetStreet () const;
rtl::OUString GetCity () const;
rtl::OUString GetState () const;
rtl::OUString GetZip () const;
rtl::OUString GetCountry () const;
rtl::OUString GetPosition () const;
rtl::OUString GetTitle () const;
rtl::OUString GetTelephoneHome () const;
rtl::OUString GetTelephoneWork () const;
rtl::OUString GetFax () const;
rtl::OUString GetEmail () const;
rtl::OUString GetCustomerNumber () const;
rtl::OUString GetFathersName () const;
rtl::OUString GetApartment () const;
::rtl::OUString GetFullName() const;
rtl::OUString GetFullName () const;
// set the address token
void SetCompany( const ::rtl::OUString& rNewToken );
void SetFirstName( const ::rtl::OUString& rNewToken );
void SetLastName( const ::rtl::OUString& rNewToken );
void SetID( const ::rtl::OUString& rNewToken );
void SetStreet( const ::rtl::OUString& rNewToken );
void SetCity( const ::rtl::OUString& rNewToken );
void SetState( const ::rtl::OUString& rNewToken );
void SetZip( const ::rtl::OUString& rNewToken );
void SetCountry( const ::rtl::OUString& rNewToken );
void SetPosition( const ::rtl::OUString& rNewToken );
void SetTitle( const ::rtl::OUString& rNewToken );
void SetTelephoneHome( const ::rtl::OUString& rNewToken );
void SetTelephoneWork( const ::rtl::OUString& rNewToken );
void SetFax( const ::rtl::OUString& rNewToken );
void SetEmail( const ::rtl::OUString& rNewToken );
void SetCustomerNumber( const ::rtl::OUString& rNewToken );
void SetFathersName( const ::rtl::OUString& rNewToken );
void SetApartment( const ::rtl::OUString& rNewToken );
void SetCompany (rtl::OUString const&);
void SetFirstName (rtl::OUString const&);
void SetLastName (rtl::OUString const&);
void SetID (rtl::OUString const&);
void SetStreet (rtl::OUString const&);
void SetCity (rtl::OUString const&);
void SetState (rtl::OUString const&);
void SetZip (rtl::OUString const&);
void SetCountry (rtl::OUString const&);
void SetPosition (rtl::OUString const&);
void SetTitle (rtl::OUString const&);
void SetTelephoneHome (rtl::OUString const&);
void SetTelephoneWork (rtl::OUString const&);
void SetFax (rtl::OUString const&);
void SetEmail (rtl::OUString const&);
void SetCustomerNumber (rtl::OUString const&);
void SetFathersName (rtl::OUString const&);
void SetApartment (rtl::OUString const&);
sal_Bool IsTokenReadonly( sal_uInt16 nToken ) const;
::rtl::OUString GetToken(sal_uInt16 nToken) const;
sal_Bool IsTokenReadonly (sal_uInt16 nToken) const;
rtl::OUString GetToken (sal_uInt16 nToken) const;
void SetToken (sal_uInt16 nToken, rtl::OUString const& rNewToken);
private:
class Impl;
boost::shared_ptr<Impl> pImpl;
static boost::weak_ptr<Impl> pSharedImpl;
private:
class ChangeListener;
};
#endif // #ifndef INCLUDED_unotools_USEROPTIONS_HXX
......
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