Skip to content

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

Resolves: fdo#30862 move user options page to cui and adapt code 

and make initials area and zip code areas wider to address
fdo#30862

This "first/last name" thing is a disaster of course:
http://www.kalzumeus.com/2010/06/17/falsehoods-programmers-believe-about-names/
http://www.w3.org/International/questions/qa-personal-names

Change-Id: Iedb347a533f208056176b5a79b8a56050672a8d1
üst 722c84c1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 273 deletions
cui/AllLangResTarget_cui.mk
Dosyayı görüntüle @ 4c2ff9d0
......@@ -86,7 +86,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optdict.src \
cui/source/options/optfltr.src \
cui/source/options/optgdlg.src \
cui/source/options/optgenrl.src \
cui/source/options/opthtml.src \
cui/source/options/optinet2.src \
cui/source/options/optjava.src \
......
cui/UI_cui.mk
Dosyayı görüntüle @ 4c2ff9d0
......@@ -40,6 +40,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/optmemorypage \
cui/uiconfig/ui/optpathspage \
cui/uiconfig/ui/optsecuritypage \
cui/uiconfig/ui/optuserpage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
......
cui/source/inc/cuioptgenrl.hxx
Dosyayı görüntüle @ 4c2ff9d0
......@@ -40,10 +40,8 @@ class SvxGeneralTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
private:
// the horizontal line "Address"
FixedLine aAddrFrm;
// the "Use data for document properties" checkbox (but where is it?)
CheckBox aUseDataCB;
// the "Use data for document properties" checkbox
CheckBox* m_pUseDataCB;
// rows
struct Row;
std::vector<boost::shared_ptr<Row> > vRows;
......@@ -59,8 +57,7 @@ private:
sal_Bool GetAddress_Impl();
void SetAddress_Impl();
void CreateControls ();
void PositionControls ();
void InitControls ();
void SetLinks ();
void SetAccessibleNames ();
......
cui/source/options/optgenrl.cxx
Dosyayı görüntüle @ 4c2ff9d0
This diff is collapsed.
cui/source/options/optgenrl.hrc deleted 100644 → 0
Dosyayı görüntüle @ 722c84c1
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* 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
// defines ------------------------------------------------------------------
#define FT_COMPANY 10
#define ED_COMPANY 11
#define FT_NAME 12
#define FT_NAME_RUSS 13
#define ED_FATHERNAME 14
#define ED_FIRSTNAME 15
#define ED_NAME 16
#define ED_SHORTNAME 17
#define FT_STREET 18
#define FT_STREET_RUSS 19
#define ED_STREET 20
#define ED_APARTMENTNR 21
#define FT_CITY 22
#define ED_PLZ 23
#define ED_CITY 24
#define ED_US_CITY 25
#define ED_US_STATE 26
#define ED_US_ZIPCODE 27
#define FT_COUNTRY 28
#define ED_COUNTRY 29
#define FT_TITLEPOS 30
#define ED_TITLE 31
#define ED_POSITION 32
#define FT_PHONE 33
#define ED_TELPRIVAT 34
#define ED_TELCOMPANY 35
#define FT_FAXMAIL 36
#define ED_FAX 37
#define ED_EMAIL 38
#define GB_ADDRESS 39
#define CB_USEDATA 40
#define FT_NAME_EASTERN 41
#define FT_CITY_US 42
#endif // #ifndef SVX_OPTGENRL_HRC
// ******************************************************************* EOF
cui/source/options/optgenrl.src deleted 100644 → 0
Dosyayı görüntüle @ 722c84c1
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sfx2/sfx.hrc>
#include "helpid.hrc"
#include <cuires.hrc>
#include "optgenrl.hrc"
// RID_SFXPAGE_GENERAL ------------------------------------------------------
TabPage RID_SFXPAGE_GENERAL
{
HelpId = HID_OPTIONS_GENERAL ;
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "User Data" ;
FixedText FT_COMPANY
{
LeftLabel = TRUE ;
Text [ en-US ] = "~Company" ;
};
Edit ED_COMPANY
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY";
Border = TRUE ;
};
FixedText FT_NAME
{
LeftLabel = TRUE ;
Text [ en-US ] = "First/Last ~name/Initials" ;
};
FixedText FT_NAME_RUSS
{
LeftLabel = TRUE ;
Text [ en-US ] = "Last Name/First name/Father's name/Initials";
};
FixedText FT_NAME_EASTERN
{
LeftLabel = TRUE ;
Text [ en-US ] = "Last/First ~name/Initials" ;
};
Edit ED_FATHERNAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME";
Border = TRUE ;
};
Edit ED_FIRSTNAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME";
Border = TRUE ;
};
Edit ED_NAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME";
Border = TRUE ;
};
Edit ED_SHORTNAME
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME";
Border = TRUE ;
};
FixedText FT_STREET
{
LeftLabel = TRUE ;
Text [ en-US ] = "~Street" ;
};
FixedText FT_STREET_RUSS
{
LeftLabel = TRUE ;
Text [ en-US ] = "Street/Apartment number";
};
Edit ED_STREET
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET";
Border = TRUE ;
};
Edit ED_APARTMENTNR
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR";
Border = TRUE ;
};
FixedText FT_CITY
{
LeftLabel = TRUE ;
Text [ en-US ] = "Zip/City";
};
Edit ED_PLZ
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ";
Border = TRUE ;
};
Edit ED_CITY
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY";
Border = TRUE ;
};
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 ;
};
Edit ED_US_STATE
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE";
Border = TRUE ;
};
Edit ED_US_ZIPCODE
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE";
Border = TRUE ;
};
FixedText FT_COUNTRY
{
LeftLabel = TRUE ;
Text [ en-US ] = "Country/Region";
};
Edit ED_COUNTRY
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY";
Border = TRUE ;
};
FixedText FT_TITLEPOS
{
LeftLabel = TRUE ;
Text [ en-US ] = "~Title/Position" ;
};
Edit ED_TITLE
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE";
Border = TRUE ;
};
Edit ED_POSITION
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION";
Border = TRUE ;
};
FixedText FT_PHONE
{
Text [ en-US ] = "Tel. (Home/Work)" ;
LeftLabel = TRUE ;
};
Edit ED_TELPRIVAT
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT";
Border = TRUE ;
};
Edit ED_TELCOMPANY
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY";
Border = TRUE ;
};
FixedText FT_FAXMAIL
{
LeftLabel = TRUE ;
Text [ en-US ] = "Fa~x / E-mail" ;
};
Edit ED_FAX
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX";
Border = TRUE ;
};
Edit ED_EMAIL
{
HelpID = "cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL";
Border = TRUE ;
};
FixedLine GB_ADDRESS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Address " ;
};
CheckBox CB_USEDATA
{
HelpID = "cui:CheckBox:RID_SFXPAGE_GENERAL:CB_USEDATA";
Pos = MAP_APPFONT ( 6 , 122 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Hide = TRUE;
Text [ en-US ] = "Use data for document properties";
};
};
// ********************************************************************** EOF
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