Kaydet (Commit) 87629f39 authored tarafından Miklos Vajna's avatar Miklos Vajna

cui: show classification path in SvxPathTabPage

It's not really able to modify it yet, as it wants to select a
directory, and we need a file instead.

Change-Id: I05b0e5a42ef64e56caeae35054fb331e3f1a712c
üst bf172191
...@@ -163,6 +163,7 @@ ...@@ -163,6 +163,7 @@
#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)//? #define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)//?
#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)//? #define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)//?
#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//? #define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//?
#define RID_SVXSTR_KEY_CLASSIFICATION_PATH (RID_SVX_START + 1118)
// dialogs // dialogs
#define STR_MODIFY (RID_SVX_START + 336)//from optdict.src #define STR_MODIFY (RID_SVX_START + 336)//from optdict.src
......
...@@ -115,6 +115,7 @@ static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] = ...@@ -115,6 +115,7 @@ static Handle2CfgNameMapping_Impl const Hdl2CfgMap_Impl[] =
{ SvtPathOptions::PATH_TEMPLATE, "Template" }, { SvtPathOptions::PATH_TEMPLATE, "Template" },
{ SvtPathOptions::PATH_WORK, "Work" }, { SvtPathOptions::PATH_WORK, "Work" },
{ SvtPathOptions::PATH_DICTIONARY, "Dictionary" }, { SvtPathOptions::PATH_DICTIONARY, "Dictionary" },
{ SvtPathOptions::PATH_CLASSIFICATION, "Classification" },
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
{ SvtPathOptions::PATH_LINGUISTIC, "Linguistic" }, { SvtPathOptions::PATH_LINGUISTIC, "Linguistic" },
#endif #endif
...@@ -282,7 +283,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) ...@@ -282,7 +283,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(1)); long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(1));
long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(2)); long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(2));
for( sal_uInt16 i = 0; i <= (sal_uInt16)SvtPathOptions::PATH_WORK; ++i ) for( sal_uInt16 i = 0; i <= (sal_uInt16)SvtPathOptions::PATH_CLASSIFICATION; ++i )
{ {
// only writer uses autotext // only writer uses autotext
if ( i == SvtPathOptions::PATH_AUTOTEXT if ( i == SvtPathOptions::PATH_AUTOTEXT
...@@ -299,12 +300,18 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) ...@@ -299,12 +300,18 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
case SvtPathOptions::PATH_TEMP: case SvtPathOptions::PATH_TEMP:
case SvtPathOptions::PATH_TEMPLATE: case SvtPathOptions::PATH_TEMPLATE:
case SvtPathOptions::PATH_DICTIONARY: case SvtPathOptions::PATH_DICTIONARY:
case SvtPathOptions::PATH_CLASSIFICATION:
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
case SvtPathOptions::PATH_LINGUISTIC: case SvtPathOptions::PATH_LINGUISTIC:
#endif #endif
case SvtPathOptions::PATH_WORK: case SvtPathOptions::PATH_WORK:
{ {
OUString aStr( CUI_RES( RID_SVXSTR_PATH_NAME_START + i ) ); sal_uInt32 nId = RID_SVXSTR_PATH_NAME_START + i;
if (i == SvtPathOptions::PATH_CLASSIFICATION)
// RID_SVXSTR_KEY_USERDICTIONARY_DIR already took our slot, so name the key explicitly.
nId = RID_SVXSTR_KEY_CLASSIFICATION_PATH;
OUString aStr(CUI_RES(nId));
nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr));
aStr += "\t"; aStr += "\t";
OUString sInternal, sUser, sWritable; OUString sInternal, sUser, sWritable;
......
...@@ -104,6 +104,10 @@ String RID_SVXSTR_KEY_USERDICTIONARY_DIR ...@@ -104,6 +104,10 @@ String RID_SVXSTR_KEY_USERDICTIONARY_DIR
{ {
Text [ en-US ] = "User-defined dictionaries"; Text [ en-US ] = "User-defined dictionaries";
}; };
String RID_SVXSTR_KEY_CLASSIFICATION_PATH
{
Text [ en-US ] = "Classification" ;
};
String RID_SVXSTR_KEY_AUTOCORRECT_DIR String RID_SVXSTR_KEY_AUTOCORRECT_DIR
{ {
Text [ en-US ] = "AutoCorrect"; Text [ en-US ] = "AutoCorrect";
......
...@@ -58,9 +58,9 @@ public: ...@@ -58,9 +58,9 @@ public:
PATH_TEMPLATE, PATH_TEMPLATE,
PATH_USERCONFIG, PATH_USERCONFIG,
PATH_WORK, PATH_WORK,
PATH_CLASSIFICATION,
PATH_UICONFIG, PATH_UICONFIG,
PATH_FINGERPRINT, PATH_FINGERPRINT,
PATH_CLASSIFICATION,
PATH_COUNT // should always be the last element PATH_COUNT // should always be the last element
}; };
......
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