diff options
author | Manal Alhassoun <malhassoun@kacst.edu.sa> | 2013-09-29 10:52:53 +0300 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-01 10:54:07 +0000 |
commit | e8c8f02ffd6988ea72141992b1f26f9c5d918af5 (patch) | |
tree | d2886db32f933733bceeede7a8eca0accee9f6a9 | |
parent | Fix error: assigning to 'rtl::OUString *' from incompatible type 'const int' (diff) | |
download | core-e8c8f02ffd6988ea72141992b1f26f9c5d918af5.tar.gz core-e8c8f02ffd6988ea72141992b1f26f9c5d918af5.zip |
Convert edit field dialog to widget UI
Conflicts:
sd/AllLangResTarget_sd.mk
Change-Id: I7f60b1ac8a59e5e4a460fd26754dd83a7835ed45
Reviewed-on: https://gerrit.libreoffice.org/6073
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sd/UIConfig_simpress.mk | 1 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgfield.cxx | 128 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgfield.src | 104 | ||||
-rw-r--r-- | sd/source/ui/inc/dlgfield.hrc | 31 | ||||
-rw-r--r-- | sd/source/ui/inc/dlgfield.hxx | 14 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/dlgfield.ui | 244 |
6 files changed, 309 insertions, 213 deletions
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index d67bf3ac0230..e13f035de9f2 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -79,6 +79,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/customanimationtexttab \ sd/uiconfig/simpress/ui/customslideshows \ sd/uiconfig/simpress/ui/definecustomslideshow \ + sd/uiconfig/simpress/ui/dlgfield \ sd/uiconfig/simpress/ui/headerfooterdialog \ sd/uiconfig/simpress/ui/headerfootertab \ sd/uiconfig/simpress/ui/masterlayoutdlg \ diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 3281d364c35f..3eb2cd1690c9 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -28,7 +28,6 @@ #include <unotools/useroptions.hxx> #include "strings.hrc" -#include "dlgfield.hrc" #include "sdattr.hxx" #include "sdresid.hxx" #include "sdmod.hxx" @@ -40,24 +39,17 @@ * dialog to edit field commands */ SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : - ModalDialog ( pWindow, SdResId( DLG_FIELD_MODIFY ) ), - aGrpType ( this, SdResId( GRP_TYPE ) ), - aRbtFix ( this, SdResId( RBT_FIX ) ), - aRbtVar ( this, SdResId( RBT_VAR ) ), - maFtLanguage( this, SdResId( FT_LANGUAGE ) ), - maLbLanguage( this, SdResId( LB_LANGUAGE ) ), - aFtFormat ( this, SdResId( FT_FORMAT ) ), - aLbFormat ( this, SdResId( LB_FORMAT ) ), - aBtnOK ( this, SdResId( BTN_OK ) ), - aBtnCancel ( this, SdResId( BTN_CANCEL ) ), - aBtnHelp ( this, SdResId( BTN_HELP ) ), + ModalDialog ( pWindow, "EditFieldsDialog", "modules/simpress/ui/dlgfield.ui" ), maInputSet ( rSet ), pField ( pInField ) { - FreeResource(); + get(m_pRbtFix, "fixedRB"); + get(m_pRbtVar, "varRB"); + get(m_pLbLanguage, "languageLB"); + get(m_pLbFormat, "formatLB"); - maLbLanguage.SetLanguageList( LANG_LIST_ALL|LANG_LIST_ONLY_KNOWN, false ); - maLbLanguage.SetSelectHdl( LINK( this, SdModifyFieldDlg, LanguageChangeHdl ) ); + m_pLbLanguage->SetLanguageList( LANG_LIST_ALL|LANG_LIST_ONLY_KNOWN, false ); + m_pLbLanguage->SetSelectHdl( LINK( this, SdModifyFieldDlg, LanguageChangeHdl ) ); FillControls(); } @@ -69,9 +61,9 @@ SvxFieldData* SdModifyFieldDlg::GetField() { SvxFieldData* pNewField = NULL; - if( aRbtFix.IsChecked() != aRbtFix.GetSavedValue() || - aRbtVar.IsChecked() != aRbtVar.GetSavedValue() || - aLbFormat.GetSelectEntryPos() != aLbFormat.GetSavedValue() ) + if( m_pRbtFix->IsChecked() != m_pRbtFix->GetSavedValue() || + m_pRbtVar->IsChecked() != m_pRbtVar->GetSavedValue() || + m_pLbFormat->GetSelectEntryPos() != m_pLbFormat->GetSavedValue() ) { if( pField->ISA( SvxDateField ) ) { @@ -79,12 +71,12 @@ SvxFieldData* SdModifyFieldDlg::GetField() SvxDateType eType; SvxDateFormat eFormat; - if( aRbtFix.IsChecked() ) + if( m_pRbtFix->IsChecked() ) eType = SVXDATETYPE_FIX; else eType = SVXDATETYPE_VAR; - eFormat = (SvxDateFormat) ( aLbFormat.GetSelectEntryPos() + 2 ); + eFormat = (SvxDateFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 ); pNewField = new SvxDateField( *pDateField ); ( (SvxDateField*) pNewField )->SetType( eType ); @@ -96,12 +88,12 @@ SvxFieldData* SdModifyFieldDlg::GetField() SvxTimeType eType; SvxTimeFormat eFormat; - if( aRbtFix.IsChecked() ) + if( m_pRbtFix->IsChecked() ) eType = SVXTIMETYPE_FIX; else eType = SVXTIMETYPE_VAR; - eFormat = (SvxTimeFormat) ( aLbFormat.GetSelectEntryPos() + 2 ); + eFormat = (SvxTimeFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 ); pNewField = new SvxExtTimeField( *pTimeField ); ( (SvxExtTimeField*) pNewField )->SetType( eType ); @@ -113,12 +105,12 @@ SvxFieldData* SdModifyFieldDlg::GetField() SvxFileType eType; SvxFileFormat eFormat; - if( aRbtFix.IsChecked() ) + if( m_pRbtFix->IsChecked() ) eType = SVXFILETYPE_FIX; else eType = SVXFILETYPE_VAR; - eFormat = (SvxFileFormat) ( aLbFormat.GetSelectEntryPos() ); + eFormat = (SvxFileFormat) ( m_pLbFormat->GetSelectEntryPos() ); ::sd::DrawDocShell* pDocSh = PTR_CAST( ::sd::DrawDocShell, SfxObjectShell::Current() ); @@ -142,12 +134,12 @@ SvxFieldData* SdModifyFieldDlg::GetField() SvxAuthorType eType; SvxAuthorFormat eFormat; - if( aRbtFix.IsChecked() ) + if( m_pRbtFix->IsChecked() ) eType = SVXAUTHORTYPE_FIX; else eType = SVXAUTHORTYPE_VAR; - eFormat = (SvxAuthorFormat) ( aLbFormat.GetSelectEntryPos() ); + eFormat = (SvxAuthorFormat) ( m_pLbFormat->GetSelectEntryPos() ); // Get current state of address, not the old one SvtUserOptions aUserOptions; @@ -162,9 +154,9 @@ SvxFieldData* SdModifyFieldDlg::GetField() void SdModifyFieldDlg::FillFormatList() { - LanguageType eLangType = maLbLanguage.GetSelectLanguage(); + LanguageType eLangType = m_pLbLanguage->GetSelectLanguage(); - aLbFormat.Clear(); + m_pLbFormat->Clear(); if( pField->ISA( SvxDateField ) ) { @@ -173,24 +165,24 @@ void SdModifyFieldDlg::FillFormatList() //SVXDATEFORMAT_APPDEFAULT, // not used //SVXDATEFORMAT_SYSTEM, // not used - aLbFormat.InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) ); - aLbFormat.InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) ); + m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) ); + m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 - aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); aDateField.SetFormat( SVXDATEFORMAT_B ); // 13.02.1996 - aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); aDateField.SetFormat( SVXDATEFORMAT_C ); // 13.Feb 1996 - aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); aDateField.SetFormat( SVXDATEFORMAT_D ); // 13.Februar 1996 - aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); aDateField.SetFormat( SVXDATEFORMAT_E ); // Die, 13.Februar 1996 - aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); aDateField.SetFormat( SVXDATEFORMAT_F ); // Dienstag, 13.Februar 1996 - aLbFormat.InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aDateField.GetFormatted( *pNumberFormatter, eLangType ) ); - aLbFormat.SelectEntryPos( (sal_uInt16) ( pDateField->GetFormat() - 2 ) ); + m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pDateField->GetFormat() - 2 ) ); } else if( pField->ISA( SvxExtTimeField ) ) { @@ -199,38 +191,38 @@ void SdModifyFieldDlg::FillFormatList() //SVXTIMEFORMAT_APPDEFAULT, // not used //SVXTIMEFORMAT_SYSTEM, // not used - aLbFormat.InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) ); + m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 - aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); aTimeField.SetFormat( SVXTIMEFORMAT_24_HMS ); // 13:49:38 - aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); aTimeField.SetFormat( SVXTIMEFORMAT_24_HMSH ); // 13:49:38.78 - aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); aTimeField.SetFormat( SVXTIMEFORMAT_12_HM ); // 01:49 - aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); aTimeField.SetFormat( SVXTIMEFORMAT_12_HMS ); // 01:49:38 - aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); aTimeField.SetFormat( SVXTIMEFORMAT_12_HMSH ); // 01:49:38.78 - aLbFormat.InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); + m_pLbFormat->InsertEntry( aTimeField.GetFormatted( *pNumberFormatter, eLangType ) ); //SVXTIMEFORMAT_AM_HM, // 01:49 PM //SVXTIMEFORMAT_AM_HMS, // 01:49:38 PM //SVXTIMEFORMAT_AM_HMSH // 01:49:38.78 PM - aLbFormat.SelectEntryPos( (sal_uInt16) ( pTimeField->GetFormat() - 2 ) ); + m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pTimeField->GetFormat() - 2 ) ); } else if( pField->ISA( SvxExtFileField ) ) { const SvxExtFileField* pFileField = (const SvxExtFileField*) pField; SvxExtFileField aFileField( *pFileField ); - aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) ); - aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) ); - aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) ); - aLbFormat.InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) ); + m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) ); + m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) ); + m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) ); + m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) ); - aLbFormat.SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) ); + m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) ); } else if( pField->ISA( SvxAuthorField ) ) { @@ -240,10 +232,10 @@ void SdModifyFieldDlg::FillFormatList() for( sal_uInt16 i = 0; i < 4; i++ ) { aAuthorField.SetFormat( (SvxAuthorFormat) i ); - aLbFormat.InsertEntry( aAuthorField.GetFormatted() ); + m_pLbFormat->InsertEntry( aAuthorField.GetFormatted() ); } - aLbFormat.SelectEntryPos( (sal_uInt16) ( pAuthorField->GetFormat() ) ); + m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pAuthorField->GetFormat() ) ); } @@ -252,7 +244,7 @@ void SdModifyFieldDlg::FillFormatList() void SdModifyFieldDlg::FillControls() { - aLbFormat.Clear(); + m_pLbFormat->Clear(); if( pField->ISA( SvxDateField ) ) { @@ -260,9 +252,9 @@ void SdModifyFieldDlg::FillControls() SvxDateField aDateField( *pDateField ); if( pDateField->GetType() == SVXDATETYPE_FIX ) - aRbtFix.Check(); + m_pRbtFix->Check(); else - aRbtVar.Check(); + m_pRbtVar->Check(); } else if( pField->ISA( SvxExtTimeField ) ) { @@ -270,9 +262,9 @@ void SdModifyFieldDlg::FillControls() SvxExtTimeField aTimeField( *pTimeField ); if( pTimeField->GetType() == SVXTIMETYPE_FIX ) - aRbtFix.Check(); + m_pRbtFix->Check(); else - aRbtVar.Check(); + m_pRbtVar->Check(); } else if( pField->ISA( SvxExtFileField ) ) { @@ -280,9 +272,9 @@ void SdModifyFieldDlg::FillControls() SvxExtFileField aFileField( *pFileField ); if( pFileField->GetType() == SVXFILETYPE_FIX ) - aRbtFix.Check(); + m_pRbtFix->Check(); else - aRbtVar.Check(); + m_pRbtVar->Check(); } else if( pField->ISA( SvxAuthorField ) ) { @@ -290,21 +282,21 @@ void SdModifyFieldDlg::FillControls() SvxAuthorField aAuthorField( *pAuthorField ); if( pAuthorField->GetType() == SVXAUTHORTYPE_FIX ) - aRbtFix.Check(); + m_pRbtFix->Check(); else - aRbtVar.Check(); + m_pRbtVar->Check(); } - aRbtFix.SaveValue(); - aRbtVar.SaveValue(); + m_pRbtFix->SaveValue(); + m_pRbtVar->SaveValue(); const SfxPoolItem* pItem; if( SFX_ITEM_SET == maInputSet.GetItemState(EE_CHAR_LANGUAGE, sal_True, &pItem ) ) - maLbLanguage.SelectLanguage( static_cast<const SvxLanguageItem*>(pItem)->GetLanguage() ); + m_pLbLanguage->SelectLanguage( static_cast<const SvxLanguageItem*>(pItem)->GetLanguage() ); - maLbLanguage.SaveValue(); + m_pLbLanguage->SaveValue(); FillFormatList(); - aLbFormat.SaveValue(); + m_pLbFormat->SaveValue(); } @@ -319,9 +311,9 @@ SfxItemSet SdModifyFieldDlg::GetItemSet() { SfxItemSet aOutput( *maInputSet.GetPool(), EE_CHAR_LANGUAGE, EE_CHAR_LANGUAGE_CTL ); - if( maLbLanguage.GetSelectEntryPos() != maLbLanguage.GetSavedValue() ) + if( m_pLbLanguage->GetSelectEntryPos() != m_pLbLanguage->GetSavedValue() ) { - LanguageType eLangType = maLbLanguage.GetSelectLanguage(); + LanguageType eLangType = m_pLbLanguage->GetSelectLanguage(); SvxLanguageItem aItem( eLangType, EE_CHAR_LANGUAGE ); aOutput.Put( aItem ); diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src index bca8ff7bc550..e69de29bb2d1 100644 --- a/sd/source/ui/dlg/dlgfield.src +++ b/sd/source/ui/dlg/dlgfield.src @@ -1,104 +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 . - */ - -#include "dlgfield.hrc" -ModalDialog DLG_FIELD_MODIFY -{ - HelpID = "sd:ModalDialog:DLG_FIELD_MODIFY"; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 138 , 154 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - FixedLine GRP_TYPE - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 70 , 8 ) ; - Text [ en-US ] = "Field type" ; - }; - RadioButton RBT_FIX - { - HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX"; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 64 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Fixed" ; - }; - RadioButton RBT_VAR - { - HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR"; - Pos = MAP_APPFONT ( 12 , 25 ) ; - Size = MAP_APPFONT ( 64 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Variable" ; - }; - FixedText FT_LANGUAGE - { - Pos = MAP_APPFONT ( 6 , 67 ) ; - Size = MAP_APPFONT ( 40 , 10 ) ; - Text [ en-US ] = "~Language" ; - }; - - ListBox LB_LANGUAGE - { - HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_LANGUAGE"; - Border = TRUE ; - Pos = MAP_APPFONT ( 52 , 65 ) ; - Size = MAP_APPFONT ( 80 , 70 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - - ListBox LB_FORMAT - { - HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_FORMAT"; - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 94 ) ; - Size = MAP_APPFONT ( 126 , 54 ) ; - TabStop = TRUE ; - }; - FixedText FT_FORMAT - { - Pos = MAP_APPFONT ( 6 , 83 ) ; - Size = MAP_APPFONT ( 70 , 10 ) ; - Text [ en-US ] = "F~ormat" ; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 82 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 82 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 82 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - Text [ en-US ] = "Edit Field" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/dlgfield.hrc b/sd/source/ui/inc/dlgfield.hrc index be4dd9b2b99e..e69de29bb2d1 100644 --- a/sd/source/ui/inc/dlgfield.hrc +++ b/sd/source/ui/inc/dlgfield.hrc @@ -1,31 +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 . - */ -#define GRP_TYPE 1 -#define RBT_FIX 1 -#define RBT_VAR 2 -#define LB_FORMAT 1 -#define FT_FORMAT 1 -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 -#define FT_LANGUAGE 2 -#define LB_LANGUAGE 3 -#define DLG_FIELD_MODIFY 448 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index 6b2394f29ad6..a60f1f749996 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -36,16 +36,10 @@ class SvxFieldData; class SdModifyFieldDlg : public ModalDialog { private: - FixedLine aGrpType; - RadioButton aRbtFix; - RadioButton aRbtVar; - FixedText maFtLanguage; - SvxLanguageBox maLbLanguage; - FixedText aFtFormat; - ListBox aLbFormat; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + RadioButton* m_pRbtFix; + RadioButton* m_pRbtVar; + SvxLanguageBox* m_pLbLanguage; + ListBox* m_pLbFormat; SfxItemSet maInputSet; const SvxFieldData* pField; diff --git a/sd/uiconfig/simpress/ui/dlgfield.ui b/sd/uiconfig/simpress/ui/dlgfield.ui new file mode 100644 index 000000000000..3ffef6c75837 --- /dev/null +++ b/sd/uiconfig/simpress/ui/dlgfield.ui @@ -0,0 +1,244 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkDialog" id="EditFieldsDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Edit Field</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkRadioButton" id="fixedRB"> + <property name="label" translatable="yes">_Fixed</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">varRB</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="varRB"> + <property name="label" translatable="yes">_Variable</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">fixedRB</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Field type</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Language</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">languageLB</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svxcorelo-SvxLanguageBox" id="languageLB"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkComboBoxText" id="formatLB"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">F_ormat</property> + <property name="use_underline">True</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">ok</action-widget> + <action-widget response="0">cancel</action-widget> + <action-widget response="0">help</action-widget> + </action-widgets> + </object> +</interface> |