diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-02-11 10:31:42 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-11 12:11:44 +0000 |
commit | 281bdaaa0b2860ef2f2b08b1acb3f930f81cf020 (patch) | |
tree | 8b78b33280a5b0b92c5b52fb1f14dbf3cdeaf2dd /basctl/source | |
parent | 91d714c5ddbc80e770628d0631100783574ed3ee (diff) |
convert manage languages dialog to .ui
Change-Id: I1a50f8715040e64758cf18bee8ca6ac1d04652c8
Diffstat (limited to 'basctl/source')
-rw-r--r-- | basctl/source/dlged/dlgresid.src | 15 | ||||
-rw-r--r-- | basctl/source/dlged/managelang.cxx | 109 | ||||
-rw-r--r-- | basctl/source/dlged/managelang.hrc | 96 | ||||
-rw-r--r-- | basctl/source/dlged/managelang.src | 88 | ||||
-rw-r--r-- | basctl/source/inc/dlgresid.hrc | 6 | ||||
-rw-r--r-- | basctl/source/inc/managelang.hxx | 15 |
6 files changed, 60 insertions, 269 deletions
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src index 9e394e6678fd..d1c3db25dc91 100644 --- a/basctl/source/dlged/dlgresid.src +++ b/basctl/source/dlged/dlgresid.src @@ -132,4 +132,19 @@ String RID_STR_BRWTITLE_MULTISELECT // ----------------------------------------------------------------------- +String RID_STR_DEF_LANG +{ + Text [ en-US ] = "[Default Language]" ; +}; + +String RID_STR_DELETE +{ + Text [ en-US ] = "~Delete" ; +}; + +String RID_STR_CREATE_LANG +{ + Text [ en-US ] = "<Press 'Add' to create language resources>" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 21632c4db9d7..3150bc9c5dc5 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -26,7 +26,6 @@ #include "dlgresid.hrc" #include "helpid.hrc" -#include "managelang.hrc" #include <com/sun/star/i18n/Boundary.hpp> #include <com/sun/star/i18n/WordType.hpp> @@ -80,23 +79,19 @@ namespace { } } -ManageLanguageDialog::ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr ) : - ModalDialog( pParent, IDEResId( RID_DLG_MANAGE_LANGUAGE ) ), - m_aLanguageFT ( this, IDEResId( FT_LANGUAGE ) ), - m_aLanguageLB ( this, IDEResId( LB_LANGUAGE ) ), - m_aAddPB ( this, IDEResId( PB_ADD_LANG ) ), - m_aDeletePB ( this, IDEResId( PB_DEL_LANG ) ), - m_aMakeDefPB ( this, IDEResId( PB_MAKE_DEFAULT ) ), - m_aInfoFT ( this, IDEResId( FT_INFO ) ), - m_aBtnLine ( this, IDEResId( FL_BUTTONS ) ), - m_aHelpBtn ( this, IDEResId( PB_HELP ) ), - m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ), - m_xLocalizationMgr ( xLMgr ), - m_sDefLangStr (IDE_RESSTR(STR_DEF_LANG)), - m_sDeleteStr (IDE_RESSTR(STR_DELETE)), - m_sCreateLangStr (IDE_RESSTR(STR_CREATE_LANG)) +ManageLanguageDialog::ManageLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) + : ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui") + , m_xLocalizationMgr(xLMgr) + , m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG)) + , m_sDeleteStr(IDE_RESSTR(RID_STR_DELETE)) + , m_sCreateLangStr(IDE_RESSTR(RID_STR_CREATE_LANG)) { - FreeResource(); + get(m_pLanguageLB, "treeview"); + m_pLanguageLB->set_height_request(m_pLanguageLB->GetTextHeight() * 10); + m_pLanguageLB->set_width_request(m_pLanguageLB->approximate_char_width() * 50); + get(m_pAddPB, "add"); + get(m_pDeletePB, "delete"); + get(m_pMakeDefPB, "default"); Init(); FillLanguageBox(); @@ -118,42 +113,12 @@ void ManageLanguageDialog::Init() sText = sText.replaceAll("$1", sLibName); SetText( sText ); // set handler - m_aAddPB.SetClickHdl( LINK( this, ManageLanguageDialog, AddHdl ) ); - m_aDeletePB.SetClickHdl( LINK( this, ManageLanguageDialog, DeleteHdl ) ); - m_aMakeDefPB.SetClickHdl( LINK( this, ManageLanguageDialog, MakeDefHdl ) ); - m_aLanguageLB.SetSelectHdl( LINK( this, ManageLanguageDialog, SelectHdl ) ); - - m_aLanguageLB.EnableMultiSelection( true ); - CalcInfoSize(); -} + m_pAddPB->SetClickHdl( LINK( this, ManageLanguageDialog, AddHdl ) ); + m_pDeletePB->SetClickHdl( LINK( this, ManageLanguageDialog, DeleteHdl ) ); + m_pMakeDefPB->SetClickHdl( LINK( this, ManageLanguageDialog, MakeDefHdl ) ); + m_pLanguageLB->SetSelectHdl( LINK( this, ManageLanguageDialog, SelectHdl ) ); -void ManageLanguageDialog::CalcInfoSize() -{ - OUString sInfoStr = m_aInfoFT.GetText(); - long nInfoWidth = m_aInfoFT.GetSizePixel().Width(); - long nLongWord = getLongestWordWidth( sInfoStr, m_aInfoFT ); - long nTxtWidth = m_aInfoFT.GetCtrlTextWidth( sInfoStr ) + nLongWord; - long nLines = ( nTxtWidth / nInfoWidth ) + 1; - if ( nLines > INFO_LINES_COUNT ) - { - Size aFTSize = m_aLanguageFT.GetSizePixel(); - Size aSize = m_aInfoFT.GetSizePixel(); - long nNewHeight = aFTSize.Height() * nLines; - long nDelta = nNewHeight - aSize.Height(); - aSize.Height() = nNewHeight; - m_aInfoFT.SetSizePixel( aSize ); - - aSize = m_aLanguageLB.GetSizePixel(); - aSize.Height() -= nDelta; - m_aLanguageLB.SetSizePixel( aSize ); - - Point aNewPos = m_aInfoFT.GetPosPixel(); - aNewPos.Y() -= nDelta; - m_aInfoFT.SetPosPixel( aNewPos ); - aNewPos = m_aMakeDefPB.GetPosPixel(); - aNewPos.Y() -= nDelta; - m_aMakeDefPB.SetPosPixel( aNewPos ); - } + m_pLanguageLB->EnableMultiSelection( true ); } void ManageLanguageDialog::FillLanguageBox() @@ -176,23 +141,23 @@ void ManageLanguageDialog::FillLanguageBox() { sLanguage += " " + m_sDefLangStr; } - sal_uInt16 nPos = m_aLanguageLB.InsertEntry( sLanguage ); - m_aLanguageLB.SetEntryData( nPos, new LanguageEntry( sLanguage, pLocale[i], bIsDefault ) ); + sal_uInt16 nPos = m_pLanguageLB->InsertEntry( sLanguage ); + m_pLanguageLB->SetEntryData( nPos, new LanguageEntry( sLanguage, pLocale[i], bIsDefault ) ); } } else - m_aLanguageLB.InsertEntry( m_sCreateLangStr ); + m_pLanguageLB->InsertEntry( m_sCreateLangStr ); } void ManageLanguageDialog::ClearLanguageBox() { - sal_uInt16 i, nCount = m_aLanguageLB.GetEntryCount(); + sal_uInt16 i, nCount = m_pLanguageLB->GetEntryCount(); for ( i = 0; i < nCount; ++i ) { - LanguageEntry* pEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData(i) ); + LanguageEntry* pEntry = (LanguageEntry*)( m_pLanguageLB->GetEntryData(i) ); delete pEntry; } - m_aLanguageLB.Clear(); + m_pLanguageLB->Clear(); } IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl) @@ -219,14 +184,14 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) aQBox.SetButtonText( RET_OK, m_sDeleteStr ); if ( aQBox.Execute() == RET_OK ) { - sal_uInt16 i, nCount = m_aLanguageLB.GetSelectEntryCount(); - sal_uInt16 nPos = m_aLanguageLB.GetSelectEntryPos(); + sal_uInt16 i, nCount = m_pLanguageLB->GetSelectEntryCount(); + sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); // remove locales Sequence< Locale > aLocaleSeq( nCount ); for ( i = 0; i < nCount; ++i ) { - sal_uInt16 nSelPos = m_aLanguageLB.GetSelectEntryPos(i); - LanguageEntry* pEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData( nSelPos ) ); + sal_uInt16 nSelPos = m_pLanguageLB->GetSelectEntryPos(i); + LanguageEntry* pEntry = (LanguageEntry*)( m_pLanguageLB->GetEntryData( nSelPos ) ); if ( pEntry ) aLocaleSeq[i] = pEntry->m_aLocale; } @@ -235,10 +200,10 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) ClearLanguageBox(); FillLanguageBox(); // reset selection - nCount = m_aLanguageLB.GetEntryCount(); + nCount = m_pLanguageLB->GetEntryCount(); if ( nCount <= nPos ) nPos = nCount - 1; - m_aLanguageLB.SelectEntryPos( nPos ); + m_pLanguageLB->SelectEntryPos( nPos ); SelectHdl( NULL ); } return 1; @@ -246,8 +211,8 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl) { - sal_uInt16 nPos = m_aLanguageLB.GetSelectEntryPos(); - LanguageEntry* pSelectEntry = (LanguageEntry*)( m_aLanguageLB.GetEntryData( nPos ) ); + sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); + LanguageEntry* pSelectEntry = (LanguageEntry*)( m_pLanguageLB->GetEntryData( nPos ) ); if ( pSelectEntry && !pSelectEntry->m_bIsDefault ) { // set new default entry @@ -256,7 +221,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl) ClearLanguageBox(); FillLanguageBox(); // reset selection - m_aLanguageLB.SelectEntryPos( nPos ); + m_pLanguageLB->SelectEntryPos( nPos ); SelectHdl( NULL ); } @@ -265,14 +230,14 @@ IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl) IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) { - sal_uInt16 nCount = m_aLanguageLB.GetEntryCount(); + sal_uInt16 nCount = m_pLanguageLB->GetEntryCount(); bool bEmpty = ( !nCount || - m_aLanguageLB.GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND ); - bool bSelect = ( m_aLanguageLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); + m_pLanguageLB->GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND ); + bool bSelect = ( m_pLanguageLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); bool bEnable = ( !bEmpty && bSelect != false ); - m_aDeletePB.Enable( bEnable != false ); - m_aMakeDefPB.Enable( bEnable != false && nCount > 1 && m_aLanguageLB.GetSelectEntryCount() == 1 ); + m_pDeletePB->Enable( bEnable != false ); + m_pMakeDefPB->Enable( bEnable != false && nCount > 1 && m_pLanguageLB->GetSelectEntryCount() == 1 ); return 1; } diff --git a/basctl/source/dlged/managelang.hrc b/basctl/source/dlged/managelang.hrc deleted file mode 100644 index 929aee86e5e9..000000000000 --- a/basctl/source/dlged/managelang.hrc +++ /dev/null @@ -1,96 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 BASCTL_MANAGELANG_HRC -#define BASCTL_MANAGELANG_HRC - -// Include ----------------------------------------------------------------------- - -#include <svtools/controldims.hrc> - -// Dialog Control Id's ----------------------------------------------------------- - -#define FT_LANGUAGE 1 -#define LB_LANGUAGE 2 -#define PB_ADD_LANG 3 -#define PB_DEL_LANG 4 -#define PB_MAKE_DEFAULT 5 -#define FT_INFO 6 -#define FL_BUTTONS 7 -#define PB_HELP 8 -#define PB_CLOSE 9 -#define STR_DEF_LANG 10 -#define STR_DELETE 11 -#define STR_CREATE_LANG 12 - -#define FT_DEF_LANGUAGE 1 -#define LB_DEF_LANGUAGE 2 -#define LB_ADD_LANGUAGE 3 -#define FT_DEF_INFO 4 -#define FL_DEF_BUTTONS 5 -#define PB_DEF_OK 6 -#define PB_DEF_CANCEL 7 -#define PB_DEF_HELP 8 - -// Metrics ----------------------------------------------------------------------- - -#define MANAGE_DLG_WIDTH 240 -#define MANAGE_DLG_HEIGHT 180 -#define INFO_LINES_COUNT 3 - -#define MANAGE_COL1 RSC_SP_DLG_INNERBORDER_LEFT -#define MANAGE_COL2 (MANAGE_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 2*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_X) -#define MANAGE_COL3 (MANAGE_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) - -#define MANAGE_ROW1 RSC_SP_DLG_INNERBORDER_TOP -#define MANAGE_ROW2 (MANAGE_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) -#define MANAGE_ROW3 (MANAGE_ROW2 + RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) - -#define MANAGE_ROW7 (MANAGE_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_ROW6 (MANAGE_ROW7 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) -#define MANAGE_ROW5 (MANAGE_ROW6 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) -#define MANAGE_ROW4 (MANAGE_ROW5 - RSC_SP_CTRL_GROUP_Y - RSC_CD_PUSHBUTTON_HEIGHT) -#define MANAGE_ROW4A (MANAGE_ROW4 + RSC_CD_PUSHBUTTON_HEIGHT) - -#define MANAGE_LB_WIDTH (MANAGE_COL3 - RSC_SP_CTRL_X - RSC_SP_DLG_INNERBORDER_LEFT) -#define MANAGE_LB_HEIGHT (MANAGE_ROW4A - MANAGE_ROW2) - -#define SETDEF_DLG_WIDTH 180 -#define SETDEF_DLG_HEIGHT 165 - -#define SETDEF_COL1 RSC_SP_DLG_INNERBORDER_LEFT -#define SETDEF_COL2 (SETDEF_DLG_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_SP_CTRL_X) -#define SETDEF_COL3 (SETDEF_COL2 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_GROUP_X) -#define SETDEF_COL4 (SETDEF_COL3 + RSC_CD_PUSHBUTTON_WIDTH + RSC_SP_CTRL_X) -#define SETDEF_COL4A (SETDEF_COL4 + RSC_CD_PUSHBUTTON_WIDTH) - -#define SETDEF_ROW1 RSC_SP_DLG_INNERBORDER_TOP -#define SETDEF_ROW2 (SETDEF_ROW1 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) - -#define SETDEF_ROW5 (SETDEF_DLG_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) -#define SETDEF_ROW4 (SETDEF_ROW5 - RSC_SP_FLGR_SPACE_Y - RSC_CD_FIXEDLINE_HEIGHT) -#define SETDEF_ROW3 (SETDEF_ROW4 - RSC_SP_FLGR_SPACE_Y - INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT) -#define SETDEF_ROW3A (SETDEF_ROW3 - RSC_SP_CTRL_GROUP_Y) - -#define SETDEF_LB_WIDTH (SETDEF_COL4A - SETDEF_COL1) -#define SETDEF_LB_HEIGHT (SETDEF_ROW3A - SETDEF_ROW2) - -#endif // BASCTL_MANAGELANG_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src index d38a43d66e69..7a6a6ceef19c 100644 --- a/basctl/source/dlged/managelang.src +++ b/basctl/source/dlged/managelang.src @@ -18,94 +18,6 @@ */ #include "dlgresid.hrc" -#include "managelang.hrc" -#include "helpid.hrc" - -ModalDialog RID_DLG_MANAGE_LANGUAGE -{ - HelpId = HID_BASICIDE_MANAGE_LANGUAGE ; - OutputSize = TRUE ; - Size = MAP_APPFONT ( MANAGE_DLG_WIDTH , MANAGE_DLG_HEIGHT ) ; - Moveable = TRUE ; - Closeable = TRUE ; - Text [ en-US ] = "Manage User Interface Languages [$1]" ; - FixedText FT_LANGUAGE - { - Pos = MAP_APPFONT ( MANAGE_COL1 , MANAGE_ROW1 ) ; - Size = MAP_APPFONT ( MANAGE_LB_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Present Languages" ; - }; - ListBox LB_LANGUAGE - { - HelpID = "basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE"; - Pos = MAP_APPFONT ( MANAGE_COL1 , MANAGE_ROW2 ) ; - Size = MAP_APPFONT ( MANAGE_LB_WIDTH , MANAGE_LB_HEIGHT ) ; - Border = TRUE; - AutoHScroll = TRUE ; - }; - PushButton PB_ADD_LANG - { - HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG"; - Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW2 ) ; - Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - TabStop = TRUE ; - Text [ en-US ] = "Add..." ; - }; - PushButton PB_DEL_LANG - { - HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG"; - Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW3 ) ; - Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - TabStop = TRUE ; - Text [ en-US ] = "Delete" ; - }; - PushButton PB_MAKE_DEFAULT - { - HelpID = "basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_MAKE_DEFAULT"; - Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW4 ) ; - Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - TabStop = TRUE ; - Text [ en-US ] = "Default" ; - }; - FixedText FT_INFO - { - Pos = MAP_APPFONT ( MANAGE_COL1 , MANAGE_ROW5 ) ; - Size = MAP_APPFONT ( MANAGE_DLG_WIDTH - 2*RSC_SP_FLGR_INNERBORDER_LEFT, INFO_LINES_COUNT*RSC_CD_FIXEDTEXT_HEIGHT ) ; - WordBreak = TRUE ; - Text [ en-US ] = "The default language is used if no localization for a user interface locale is present. Furthermore all strings from the default language are copied to resources of newly added languages." ; - }; - FixedLine FL_BUTTONS - { - Pos = MAP_APPFONT ( 0 , MANAGE_ROW6 ) ; - Size = MAP_APPFONT ( MANAGE_DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; - }; - HelpButton PB_HELP - { - Pos = MAP_APPFONT ( MANAGE_COL2 , MANAGE_ROW7 ) ; - Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - TabStop = TRUE ; - }; - OKButton PB_CLOSE - { - Pos = MAP_APPFONT ( MANAGE_COL3 , MANAGE_ROW7 ) ; - Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - TabStop = TRUE ; - DefButton = TRUE ; - Text [ en-US ] = "~Close" ; - }; - String STR_DEF_LANG - { - Text [ en-US ] = "[Default Language]" ; - }; - String STR_DELETE - { - Text [ en-US ] = "~Delete" ; - }; - String STR_CREATE_LANG - { - Text [ en-US ] = "<Press 'Add' to create language resources>" ; - }; -}; QueryBox RID_QRYBOX_LANGUAGE { diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc index 04163e4e7463..77e4480c20de 100644 --- a/basctl/source/inc/dlgresid.hrc +++ b/basctl/source/inc/dlgresid.hrc @@ -49,6 +49,9 @@ #define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 ) #define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 ) #define RID_STR_CLASS_SPINCONTROL ( RID_DLG_START + 24 ) +#define RID_STR_DEF_LANG ( RID_DLG_START + 25 ) +#define RID_STR_DELETE ( RID_DLG_START + 26 ) +#define RID_STR_CREATE_LANG ( RID_DLG_START + 27 ) // Property Browser Headline Id's ----------------------------------------------------------- @@ -58,8 +61,7 @@ // Manage Language Dialogs -#define RID_DLG_MANAGE_LANGUAGE ( RID_DLG_START + 70 ) -#define RID_QRYBOX_LANGUAGE ( RID_DLG_START + 71 ) +#define RID_QRYBOX_LANGUAGE ( RID_DLG_START + 70 ) // ----------------------------------------------------------------------- diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 86f5a7cb0fab..6fa0c62e9229 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -52,16 +52,10 @@ extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft, class ManageLanguageDialog : public ModalDialog { private: - FixedText m_aLanguageFT; - ListBox m_aLanguageLB; - PushButton m_aAddPB; - PushButton m_aDeletePB; - PushButton m_aMakeDefPB; - FixedText m_aInfoFT; - - FixedLine m_aBtnLine; - HelpButton m_aHelpBtn; - OKButton m_aCloseBtn; + ListBox* m_pLanguageLB; + PushButton* m_pAddPB; + PushButton* m_pDeletePB; + PushButton* m_pMakeDefPB; boost::shared_ptr<LocalizationMgr> m_xLocalizationMgr; @@ -70,7 +64,6 @@ private: OUString m_sCreateLangStr; void Init(); - void CalcInfoSize(); void FillLanguageBox(); void ClearLanguageBox(); |