cui/source/inc/labdlg.hxx | 18 ++--
cui/source/tabpages/labdlg.cxx | 184 ++++++++++++++++++++---------------------
2 files changed, 101 insertions(+), 101 deletions(-)
New commits:
commit 48806ad275b0c4c8fa3eb1637684092266ec6a0d
Author: Johnny_M <kla...@partyheld.de>
AuthorDate: Sat Aug 4 11:46:29 2018 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Aug 7 10:29:21 2018 +0200
Translate German variable names
This is not a literal translation. Rather, it follows the notions used in
the UI,
as introduced in commit 79283929ac9b8e56516b70c8381e0c31f1c68645 - see
https://gerrit.libreoffice.org/gitweb?p=core.git;a=blob;f=cui/source/tabpages/labdlg.cxx;h=41bc3d72ea50e94d31aab369ea5dcdedbb00ddac;hb=79283929ac9b8e56516b70c8381e0c31f1c68645#l86
.
This seem to be the legacy callouts described in
https://help.libreoffice.org/Common/Callout .
Further similar translations in the same files will be done separately
later.
Change-Id: Iac5f1e34f28f12cd24001c488d35ae3ba3996aea
Reviewed-on: https://gerrit.libreoffice.org/58584
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 42fbc5faaa3e..646d03d217dc 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -40,15 +40,15 @@ class SvxCaptionTabPage : public SfxTabPage
private:
static const sal_uInt16 pCaptionRanges[];
VclPtr<ValueSet> m_pCT_CAPTTYPE;
- VclPtr<MetricField> m_pMF_ABSTAND;
- VclPtr<ListBox> m_pLB_ANSATZ;
- VclPtr<FixedText> m_pFT_UM;
- VclPtr<MetricField> m_pMF_ANSATZ;
- VclPtr<FixedText> m_pFT_ANSATZ_REL;
- VclPtr<ListBox> m_pLB_ANSATZ_REL;
- VclPtr<FixedText> m_pFT_LAENGE;
- VclPtr<MetricField> m_pMF_LAENGE;
- VclPtr<CheckBox> m_pCB_LAENGE;
+ VclPtr<MetricField> m_pMF_SPACING;
+ VclPtr<ListBox> m_pLB_EXTENSION;
+ VclPtr<FixedText> m_pFT_BYFT;
+ VclPtr<MetricField> m_pMF_BY;
+ VclPtr<FixedText> m_pFT_POSITIONFT;
+ VclPtr<ListBox> m_pLB_POSITION;
+ VclPtr<FixedText> m_pFT_LENGTHFT;
+ VclPtr<MetricField> m_pMF_LENGTH;
+ VclPtr<CheckBox> m_pCB_OPTIMAL;
Image m_aBmpCapTypes[CAPTYPE_BITMAPS_COUNT];
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 946528e44ae5..15f20be2fc0e 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -88,19 +88,19 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent,
const SfxItemSet& rIn
m_pCT_CAPTTYPE->set_width_request(aSize.Width());
m_pCT_CAPTTYPE->set_height_request(aSize.Height());
- get(m_pMF_ABSTAND, "spacing");
- get(m_pLB_ANSATZ, "extension");
- get(m_pFT_UM, "byft");
- get(m_pMF_ANSATZ, "by");
- get(m_pFT_ANSATZ_REL, "positionft");
- get(m_pLB_ANSATZ_REL, "position");
-
- assert(m_pLB_ANSATZ_REL->GetEntryCount() == 6);
+ get(m_pMF_SPACING, "spacing");
+ get(m_pLB_EXTENSION, "extension");
+ get(m_pFT_BYFT, "byft");
+ get(m_pMF_BY, "by");
+ get(m_pFT_POSITIONFT, "positionft");
+ get(m_pLB_POSITION, "position");
+
+ assert(m_pLB_POSITION->GetEntryCount() == 6);
for (int i = 0; i < 3; ++i)
- m_aStrHorzList.push_back(m_pLB_ANSATZ_REL->GetEntry(i));
+ m_aStrHorzList.push_back(m_pLB_POSITION->GetEntry(i));
for (int i = 3; i < 6; ++i)
- m_aStrVertList.push_back(m_pLB_ANSATZ_REL->GetEntry(i));
- m_pLB_ANSATZ_REL->Clear();
+ m_aStrVertList.push_back(m_pLB_POSITION->GetEntry(i));
+ m_pLB_POSITION->Clear();
ListBox *pLineTypes = get<ListBox>("linetypes");
assert(pLineTypes->GetEntryCount() == 3);
@@ -108,9 +108,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent,
const SfxItemSet& rIn
for (int i = 0; i < 3; ++i)
aLineTypes.push_back(pLineTypes->GetEntry(i));
- get(m_pFT_LAENGE, "lengthft");
- get(m_pMF_LAENGE, "length");
- get(m_pCB_LAENGE, "optimal");
+ get(m_pFT_LENGTHFT, "lengthft");
+ get(m_pMF_LENGTH, "length");
+ get(m_pCB_OPTIMAL, "optimal");
for(sal_uInt16 nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; ++nBitmap)
{
@@ -131,9 +131,9 @@ SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent,
const SfxItemSet& rIn
FillValueSet();
-
m_pLB_ANSATZ->SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzSelectHdl_Impl));
-
m_pLB_ANSATZ_REL->SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzRelSelectHdl_Impl));
- m_pCB_LAENGE->SetClickHdl(LINK(this,SvxCaptionTabPage,LineOptHdl_Impl));
+
m_pLB_EXTENSION->SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzSelectHdl_Impl));
+
m_pLB_POSITION->SetSelectHdl(LINK(this,SvxCaptionTabPage,AnsatzRelSelectHdl_Impl));
+ m_pCB_OPTIMAL->SetClickHdl(LINK(this,SvxCaptionTabPage,LineOptHdl_Impl));
}
SvxCaptionTabPage::~SvxCaptionTabPage()
@@ -144,15 +144,15 @@ SvxCaptionTabPage::~SvxCaptionTabPage()
void SvxCaptionTabPage::dispose()
{
m_pCT_CAPTTYPE.clear();
- m_pMF_ABSTAND.clear();
- m_pLB_ANSATZ.clear();
- m_pFT_UM.clear();
- m_pMF_ANSATZ.clear();
- m_pFT_ANSATZ_REL.clear();
- m_pLB_ANSATZ_REL.clear();
- m_pFT_LAENGE.clear();
- m_pMF_LAENGE.clear();
- m_pCB_LAENGE.clear();
+ m_pMF_SPACING.clear();
+ m_pLB_EXTENSION.clear();
+ m_pFT_BYFT.clear();
+ m_pMF_BY.clear();
+ m_pFT_POSITIONFT.clear();
+ m_pLB_POSITION.clear();
+ m_pFT_LENGTHFT.clear();
+ m_pMF_LENGTH.clear();
+ m_pCB_OPTIMAL.clear();
SfxTabPage::dispose();
}
@@ -174,10 +174,10 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet*
_rOutAttrs)
_rOutAttrs->Put( SdrCaptionTypeItem( nCaptionType ) );
- if( m_pMF_ABSTAND->IsValueModified() )
+ if( m_pMF_SPACING->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONGAP ) );
- _rOutAttrs->Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit
) ) );
+ _rOutAttrs->Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_SPACING, eUnit
) ) );
}
// special treatment!!! XXX
@@ -193,14 +193,14 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet*
_rOutAttrs)
_rOutAttrs->Put( SdrCaptionEscDirItem( nEscDir ) );
- bEscRel = m_pLB_ANSATZ_REL->IsVisible();
+ bEscRel = m_pLB_POSITION->IsVisible();
_rOutAttrs->Put( SdrCaptionEscIsRelItem( bEscRel ) );
if( bEscRel )
{
long nVal = 0;
- switch( m_pLB_ANSATZ_REL->GetSelectedEntryPos() )
+ switch( m_pLB_POSITION->GetSelectedEntryPos() )
{
case AT_OBEN: nVal=0;break;
case AT_MITTE: nVal=5000;break;
@@ -210,22 +210,22 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet*
_rOutAttrs)
}
else
{
- if( m_pMF_ANSATZ->IsValueModified() )
+ if( m_pMF_BY->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONESCABS ) );
- _rOutAttrs->Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ,
eUnit ) ) );
+ _rOutAttrs->Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_BY,
eUnit ) ) );
}
}
- bFitLineLen = m_pCB_LAENGE->IsChecked();
+ bFitLineLen = m_pCB_OPTIMAL->IsChecked();
_rOutAttrs->Put( SdrCaptionFitLineLenItem( bFitLineLen ) );
if( ! bFitLineLen )
{
- if( m_pMF_LAENGE->IsValueModified() )
+ if( m_pMF_LENGTH->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONLINELEN ) );
- _rOutAttrs->Put( SdrCaptionLineLenItem(
GetCoreValue(*m_pMF_LAENGE, eUnit ) ) );
+ _rOutAttrs->Put( SdrCaptionLineLenItem(
GetCoreValue(*m_pMF_LENGTH, eUnit ) ) );
}
}
@@ -251,9 +251,9 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
break;
default: ;//prevent warning
}
- SetFieldUnit( *m_pMF_ABSTAND, eFUnit );
- SetFieldUnit( *m_pMF_ANSATZ, eFUnit );
- SetFieldUnit( *m_pMF_LAENGE, eFUnit );
+ SetFieldUnit( *m_pMF_SPACING, eFUnit );
+ SetFieldUnit( *m_pMF_BY, eFUnit );
+ SetFieldUnit( *m_pMF_LENGTH, eFUnit );
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "Where is the pool?" );
@@ -264,8 +264,8 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
nWhich = GetWhich( SDRATTR_CAPTIONESCABS );
eUnit = pPool->GetMetric( nWhich );
nEscAbs = static_cast<const SdrCaptionEscAbsItem&>( rOutAttrs.Get( nWhich
) ).GetValue();
- SetMetricValue( *m_pMF_ANSATZ, nEscAbs, eUnit );
- nEscAbs = static_cast<long>(m_pMF_ANSATZ->GetValue());
+ SetMetricValue( *m_pMF_BY, nEscAbs, eUnit );
+ nEscAbs = static_cast<long>(m_pMF_BY->GetValue());
nWhich = GetWhich( SDRATTR_CAPTIONESCREL );
nEscRel = static_cast<long>(static_cast<const SdrCaptionEscRelItem&>(
rOutAttrs.Get( nWhich ) ).GetValue());
@@ -274,15 +274,15 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
nWhich = GetWhich( SDRATTR_CAPTIONLINELEN );
eUnit = pPool->GetMetric( nWhich );
nLineLen = static_cast<const SdrCaptionLineLenItem&>( rOutAttrs.Get(
nWhich ) ).GetValue();
- SetMetricValue( *m_pMF_LAENGE, nLineLen, eUnit );
- nLineLen = static_cast<long>(m_pMF_LAENGE->GetValue());
+ SetMetricValue( *m_pMF_LENGTH, nLineLen, eUnit );
+ nLineLen = static_cast<long>(m_pMF_LENGTH->GetValue());
//------- distance to box ----------
nWhich = GetWhich( SDRATTR_CAPTIONGAP );
eUnit = pPool->GetMetric( nWhich );
nGap = static_cast<const SdrCaptionGapItem&>( rOutAttrs.Get( nWhich )
).GetValue();
- SetMetricValue( *m_pMF_ABSTAND, nGap, eUnit );
- nGap = static_cast<long>(m_pMF_ABSTAND->GetValue());
+ SetMetricValue( *m_pMF_SPACING, nGap, eUnit );
+ nGap = static_cast<long>(m_pMF_SPACING->GetValue());
nCaptionType = static_cast<const SdrCaptionTypeItem&>( rOutAttrs.Get(
GetWhich( SDRATTR_CAPTIONTYPE ) ) ).GetValue();
bFitLineLen = static_cast<const SfxBoolItem&>( rOutAttrs.Get( GetWhich(
SDRATTR_CAPTIONFITLINELEN ) ) ).GetValue();
@@ -303,7 +303,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
nAnsatzRelPos=AT_MITTE;
nAnsatzTypePos=AZ_OPTIMAL;
- m_pMF_ABSTAND->SetValue( nGap );
+ m_pMF_SPACING->SetValue( nGap );
if( nEscDir == SdrCaptionEscDir::Horizontal )
{
@@ -318,7 +318,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
else
{
nAnsatzTypePos = AZ_VON_OBEN;
- m_pMF_ANSATZ->SetValue( nEscAbs );
+ m_pMF_BY->SetValue( nEscAbs );
}
}
else if( nEscDir == SdrCaptionEscDir::Vertical )
@@ -334,7 +334,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
else
{
nAnsatzTypePos = AZ_VON_LINKS;
- m_pMF_ANSATZ->SetValue( nEscAbs );
+ m_pMF_BY->SetValue( nEscAbs );
}
}
else if( nEscDir == SdrCaptionEscDir::BestFit )
@@ -342,10 +342,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
nAnsatzTypePos = AZ_OPTIMAL;
}
- m_pCB_LAENGE->Check( bFitLineLen );
- m_pMF_LAENGE->SetValue( nLineLen );
+ m_pCB_OPTIMAL->Check( bFitLineLen );
+ m_pMF_LENGTH->SetValue( nLineLen );
- m_pLB_ANSATZ->SelectEntryPos( nAnsatzTypePos );
+ m_pLB_EXTENSION->SelectEntryPos( nAnsatzTypePos );
SetupAnsatz_Impl( nAnsatzTypePos );
m_pCT_CAPTTYPE->SelectItem( static_cast<int>(nCaptionType)+1 ); // Enum
starts at 0!
@@ -365,52 +365,52 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16
nType )
switch( nType )
{
case AZ_OPTIMAL:
- m_pMF_ANSATZ->Show();
- m_pFT_UM->Show();
- m_pFT_ANSATZ_REL->Hide();
- m_pLB_ANSATZ_REL->Hide();
+ m_pMF_BY->Show();
+ m_pFT_BYFT->Show();
+ m_pFT_POSITIONFT->Hide();
+ m_pLB_POSITION->Hide();
nEscDir = SdrCaptionEscDir::BestFit;
break;
case AZ_VON_OBEN:
- m_pMF_ANSATZ->Show();
- m_pFT_UM->Show();
- m_pFT_ANSATZ_REL->Hide();
- m_pLB_ANSATZ_REL->Hide();
+ m_pMF_BY->Show();
+ m_pFT_BYFT->Show();
+ m_pFT_POSITIONFT->Hide();
+ m_pLB_POSITION->Hide();
nEscDir = SdrCaptionEscDir::Horizontal;
break;
case AZ_VON_LINKS:
- m_pMF_ANSATZ->Show();
- m_pFT_UM->Show();
- m_pFT_ANSATZ_REL->Hide();
- m_pLB_ANSATZ_REL->Hide();
+ m_pMF_BY->Show();
+ m_pFT_BYFT->Show();
+ m_pFT_POSITIONFT->Hide();
+ m_pLB_POSITION->Hide();
nEscDir = SdrCaptionEscDir::Vertical;
break;
case AZ_HORIZONTAL:
- m_pLB_ANSATZ_REL->Clear();
+ m_pLB_POSITION->Clear();
for (OUString & i : m_aStrHorzList)
- m_pLB_ANSATZ_REL->InsertEntry(i);
- m_pLB_ANSATZ_REL->SelectEntryPos(nAnsatzRelPos);
+ m_pLB_POSITION->InsertEntry(i);
+ m_pLB_POSITION->SelectEntryPos(nAnsatzRelPos);
- m_pMF_ANSATZ->Hide();
- m_pFT_UM->Hide();
- m_pFT_ANSATZ_REL->Show();
- m_pLB_ANSATZ_REL->Show();
+ m_pMF_BY->Hide();
+ m_pFT_BYFT->Hide();
+ m_pFT_POSITIONFT->Show();
+ m_pLB_POSITION->Show();
nEscDir = SdrCaptionEscDir::Horizontal;
break;
case AZ_VERTIKAL:
- m_pLB_ANSATZ_REL->Clear();
+ m_pLB_POSITION->Clear();
for (OUString & i : m_aStrVertList)
- m_pLB_ANSATZ_REL->InsertEntry(i);
- m_pLB_ANSATZ_REL->SelectEntryPos(nAnsatzRelPos);
+ m_pLB_POSITION->InsertEntry(i);
+ m_pLB_POSITION->SelectEntryPos(nAnsatzRelPos);
- m_pMF_ANSATZ->Hide();
- m_pFT_UM->Hide();
- m_pFT_ANSATZ_REL->Show();
- m_pLB_ANSATZ_REL->Show();
+ m_pMF_BY->Hide();
+ m_pFT_BYFT->Hide();
+ m_pFT_POSITIONFT->Show();
+ m_pLB_POSITION->Show();
nEscDir = SdrCaptionEscDir::Vertical;
break;
}
@@ -419,33 +419,33 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16
nType )
IMPL_LINK( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void )
{
- if (&rListBox == m_pLB_ANSATZ)
+ if (&rListBox == m_pLB_EXTENSION)
{
- SetupAnsatz_Impl( m_pLB_ANSATZ->GetSelectedEntryPos() );
+ SetupAnsatz_Impl( m_pLB_EXTENSION->GetSelectedEntryPos() );
}
}
IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox,
void )
{
- if (&rListBox == m_pLB_ANSATZ_REL)
+ if (&rListBox == m_pLB_POSITION)
{
- nAnsatzRelPos = m_pLB_ANSATZ_REL->GetSelectedEntryPos();
+ nAnsatzRelPos = m_pLB_POSITION->GetSelectedEntryPos();
}
}
IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void )
{
- if (pButton == m_pCB_LAENGE)
+ if (pButton == m_pCB_OPTIMAL)
{
- if( m_pCB_LAENGE->IsChecked() || ! m_pCB_LAENGE->IsEnabled() )
+ if( m_pCB_OPTIMAL->IsChecked() || ! m_pCB_OPTIMAL->IsEnabled() )
{
- m_pFT_LAENGE->Disable();
- m_pMF_LAENGE->Disable();
+ m_pFT_LENGTHFT->Disable();
+ m_pMF_LENGTH->Disable();
}
else
{
- m_pFT_LAENGE->Enable();
- m_pMF_LAENGE->Enable();
+ m_pFT_LENGTHFT->Enable();
+ m_pMF_LENGTH->Enable();
}
}
}
@@ -462,16 +462,16 @@ void SvxCaptionTabPage::SetupType_Impl( SdrCaptionType
nType )
{
case SdrCaptionType::Type1:
case SdrCaptionType::Type2:
- m_pFT_LAENGE->Disable();
- m_pCB_LAENGE->Disable();
- LineOptHdl_Impl( m_pCB_LAENGE );
+ m_pFT_LENGTHFT->Disable();
+ m_pCB_OPTIMAL->Disable();
+ LineOptHdl_Impl( m_pCB_OPTIMAL );
break;
case SdrCaptionType::Type3:
case SdrCaptionType::Type4:
- m_pFT_LAENGE->Enable();
- m_pCB_LAENGE->Enable();
- LineOptHdl_Impl( m_pCB_LAENGE );
+ m_pFT_LENGTHFT->Enable();
+ m_pCB_OPTIMAL->Enable();
+ LineOptHdl_Impl( m_pCB_OPTIMAL );
break;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
