mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convertion section page to .ui format

Browse Source 
Change-Id: I26990ba16ba70683960685d8c26bbfd2d66d6132
This commit is contained in:
Caolán McNamara
2013-08-04 23:12:45 +02:00
parent 7dff8a91f9
commit a4c385f1aa
8 changed files with 637 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extras/source/glade/libreoffice-catalog.xml.in
View File

@@ -415,6 +415,10 @@
generic-name="Cursor Reference Edit" parent="foruilo-RefEdit"
icon-name="widget-gtk-textentry"/>
<glade-widget-class title="Condition Edit" name="swlo-ConditionEdit"
generic-name="Condition Edit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
<glade-widget-class title="Text View" name="sclo-ScEditWindow"
generic-name="Text View" parent="GtkTextView"
icon-name="widget-gtk-textentry"/>

1
sw/UIConfig_swriter.mk
View File

@@ -128,6 +128,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/rowheight \
sw/uiconfig/swriter/ui/saveashtmldialog \
sw/uiconfig/swriter/ui/savelabeldialog \
sw/uiconfig/swriter/ui/sectionpage \
sw/uiconfig/swriter/ui/sidebarpage \
sw/uiconfig/swriter/ui/sidebarwrap \
sw/uiconfig/swriter/ui/sortdialog \

1
sw/inc/helpid.h
View File

@@ -167,7 +167,6 @@
#define HID_EDIT_FLD_REF "SW_HID_EDIT_FLD_REF"
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
#define HID_INSERT_SECTION_PAGE "SW_HID_INSERT_SECTION_PAGE"
#define HID_INSERT_SECTION_DLG "SW_HID_INSERT_SECTION_DLG"
#define HID_SECTION_PROPERTIES_DLG "SW_HID_SECTION_PROPERTIES_DLG"
#define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT"

31
sw/source/ui/dialog/regionsw.hrc
View File

@@ -21,38 +21,7 @@
#include "dialog.hrc"
#define CB_DDE 1
#define CB_DISMISS 2
#define CB_FILE 5
#define CB_HIDE 8
#define CB_PASSWD 9
#define CB_PROTECT 10
#define ED_CONDITION 13
#define ED_FILE 16
#define ED_RANAME 19
#define ED_RNAME 20
#define FT_CONDITION 21
#define FT_DDE 25
#define FT_FILE 29
#define FT_SUBREG 34
#define LB_SUBREG 38
#define PB_CANCEL 39
#define PB_FILE 40
#define PB_HELP 41
#define PB_OK 42
#define PB_OPTIONS 43
#define ST_INSERT 45
#define TLB_SECTION 46
#define FL_NAME 47
#define FL_LINK 48
#define FL_PROTECT 49
#define FL_HIDE 50
#define PB_PASSWD 51
#define IL_BITMAPS 54
// #114856# edit in readonly sections
#define FL_PROPERTIES 56
#define CB_EDIT_IN_READONLY 57
/* global resources */
#define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6)

174
sw/source/ui/dialog/regionsw.src
View File

@@ -166,180 +166,6 @@ TabDialog DLG_INSERT_SECTION
};
};
TabPage TP_INSERT_SECTION
{
HelpID = HID_INSERT_SECTION_PAGE;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_NAME
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 78 , 8 ) ;
Text [ en-US ] = "New section" ;
};
ComboBox ED_RNAME
{
HelpID = "sw:ComboBox:TP_INSERT_SECTION:ED_RNAME";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 69 , 140 ) ;
TabStop = TRUE ;
AutoHScroll = TRUE ;
SORT = TRUE ;
};
FixedLine FL_LINK
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 90 , 3 ) ;
Size = MAP_APPFONT ( 164 , 8 ) ;
FL_FILE_TEXT
};
CheckBox CB_FILE
{
HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_FILE";
Pos = MAP_APPFONT ( 96 , 14 ) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
TabStop = TRUE ;
CB_FILE_TEXT
};
CheckBox CB_DDE
{
HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_DDE";
Pos = MAP_APPFONT ( 96 , 28) ;
Size = MAP_APPFONT ( 60 , 10 ) ;
Disable = TRUE ;
CB_DDE_TEXT
};
FixedText FT_DDE
{
Pos = MAP_APPFONT ( 96 , 44 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Hide = TRUE ;
FT_DDE_TEXT
};
FixedText FT_FILE
{
Pos = MAP_APPFONT ( 96 , 44 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Disable = TRUE ;
FT_FILE_TEXT
};
Edit ED_FILE
{
HelpID = "sw:Edit:TP_INSERT_SECTION:ED_FILE";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 42 ) ;
Size = MAP_APPFONT ( 76 , 12 ) ;
Disable = TRUE ;
TabStop = TRUE ;
};
PushButton PB_FILE
{
HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_FILE";
Pos = MAP_APPFONT ( 239 , 42 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Disable = TRUE ;
TabStop = TRUE ;
Text = "...";
};
FixedText FT_SUBREG
{
Pos = MAP_APPFONT ( 96 , 60 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Disable = TRUE ;
FT_SUBREG_TEXT
};
ComboBox LB_SUBREG
{
HelpID = "sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG";
Pos = MAP_APPFONT ( 160 , 58 ) ;
Size = MAP_APPFONT ( 76 , 50 ) ;
DropDown = TRUE ;
Disable = TRUE ;
TabStop = TRUE ;
Sort = TRUE ;
};
FixedLine FL_PROTECT
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 90 , 76 ) ;
Size = MAP_APPFONT ( 164 , 8 ) ;
FL_PROTECT_TEXT
};
CheckBox CB_PROTECT
{
HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT";
Pos = MAP_APPFONT ( 96 , 87 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Protect";
};
CheckBox CB_PASSWD
{
HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD";
Pos = MAP_APPFONT ( 105 , 101 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
CB_PASSWD_TEXT
};
PushButton PB_PASSWD
{
HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_PASSWD";
Pos = MAP_APPFONT ( 239 , 99 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
Text = "..." ;
};
FixedLine FL_HIDE
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 90 , 117 ) ;
Size = MAP_APPFONT ( 164 , 8 ) ;
FL_HIDE_TEXT
};
CheckBox CB_HIDE
{
HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_HIDE";
Pos = MAP_APPFONT ( 96 , 128 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
CB_HIDE_TEXT
};
FixedText FT_CONDITION
{
Pos = MAP_APPFONT ( 96 , 144 ) ;
Size = MAP_APPFONT ( 60 , 8 ) ;
Disable = TRUE ;
CB_CONDITION_TEXT
};
Edit ED_CONDITION
{
HelpID = "sw:Edit:TP_INSERT_SECTION:ED_CONDITION";
Border = TRUE ;
Pos = MAP_APPFONT ( 160 , 142 ) ;
Size = MAP_APPFONT ( 91 , 12 ) ;
Disable = TRUE ;
TabStop = TRUE ;
};
FixedLine FL_PROPERTIES
{
OutputSize = TRUE ;
Pos = MAP_APPFONT ( 90 , 159 ) ;
Size = MAP_APPFONT ( 164 , 8 ) ;
FL_PROPERTIES_TEXT
};
CheckBox CB_EDIT_IN_READONLY
{
HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_EDIT_IN_READONLY";
Pos = MAP_APPFONT ( 96 , 170 ) ;
Size = MAP_APPFONT ( 158 , 10 ) ;
CB_EDIT_IN_READONLY_TEXT
};
};
TabDialog DLG_SECTION_PROPERTIES
{
HelpId = HID_SECTION_PROPERTIES_DLG;

202
sw/source/ui/dialog/uiregionsw.cxx
View File

@@ -1535,52 +1535,48 @@ short SwInsertSectionTabDialog::Ok()
}
SwInsertSectionTabPage::SwInsertSectionTabPage(
Window *pParent, const SfxItemSet &rAttrSet) :
SfxTabPage( pParent, SW_RES(TP_INSERT_SECTION), rAttrSet ),
aNameFL ( this, SW_RES( FL_NAME ) ),
aCurName ( this, SW_RES( ED_RNAME ) ),
aLinkFL ( this, SW_RES( FL_LINK ) ),
aFileCB ( this, SW_RES( CB_FILE ) ),
aDDECB ( this, SW_RES( CB_DDE ) ) ,
aDDECommandFT ( this, SW_RES( FT_DDE ) ) ,
aFileNameFT ( this, SW_RES( FT_FILE ) ) ,
aFileNameED ( this, SW_RES( ED_FILE ) ),
aFilePB ( this, SW_RES( PB_FILE ) ),
aSubRegionFT ( this, SW_RES( FT_SUBREG ) ) ,
aSubRegionED ( this, SW_RES( LB_SUBREG ) ) ,
aProtectFL ( this, SW_RES( FL_PROTECT ) ),
aProtectCB ( this, SW_RES( CB_PROTECT ) ),
aPasswdCB ( this, SW_RES( CB_PASSWD ) ),
aPasswdPB ( this, SW_RES( PB_PASSWD ) ),
aHideFL ( this, SW_RES( FL_HIDE ) ),
aHideCB ( this, SW_RES( CB_HIDE ) ),
aConditionFT ( this, SW_RES( FT_CONDITION ) ),
aConditionED ( this, SW_RES( ED_CONDITION ) ),
// edit in readonly sections
aPropertiesFL ( this, SW_RES( FL_PROPERTIES ) ),
aEditInReadonlyCB ( this, SW_RES( CB_EDIT_IN_READONLY ) ),
m_pWrtSh(0),
m_pDocInserter(NULL),
m_pOldDefDlgParent(NULL)
Window *pParent, const SfxItemSet &rAttrSet)
: SfxTabPage(pParent, "SectionPage",
"modules/swriter/ui/sectionpage.ui", rAttrSet)
, m_pWrtSh(0)
, m_pDocInserter(NULL)
, m_pOldDefDlgParent(NULL)
{
FreeResource();
aProtectCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeProtectHdl));
aPasswdCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl));
aPasswdPB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl));
aHideCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeHideHdl));
get(m_pCurName, "sectionnames");
m_pCurName->SetStyle(m_pCurName->GetStyle() | WB_SORT);
m_pCurName->set_height_request(m_pCurName->GetTextHeight() * 12);
get(m_pFileCB, "link");
get(m_pDDECB, "dde");
get(m_pDDECommandFT, "ddelabel");
get(m_pFileNameFT, "filelabel");
get(m_pFileNameED, "filename");
get(m_pFilePB, "selectfile");
get(m_pSubRegionFT, "sectionlabel");
get(m_pSubRegionED, "sectionname");
m_pSubRegionED->SetStyle(m_pSubRegionED->GetStyle() | WB_SORT);
get(m_pProtectCB, "protect");
get(m_pPasswdCB, "withpassword");
get(m_pPasswdPB, "selectpassword");
get(m_pHideCB, "hide");
get(m_pConditionFT, "condlabel");
get(m_pConditionED, "withcond");
// edit in readonly sections
aEditInReadonlyCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeEditInReadonlyHdl));
aFileCB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, UseFileHdl ));
aFilePB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, FileSearchHdl ));
aCurName.SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl));
aDDECB.SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl ));
ChangeProtectHdl(&aProtectCB);
aPasswdPB.SetAccessibleRelationMemberOf(&aProtectFL);
aSubRegionED.EnableAutocomplete( sal_True, sal_True );
get(m_pEditInReadonlyCB, "editable");
m_pProtectCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeProtectHdl));
m_pPasswdCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl));
m_pPasswdPB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangePasswdHdl));
m_pHideCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeHideHdl));
// edit in readonly sections
m_pEditInReadonlyCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, ChangeEditInReadonlyHdl));
m_pFileCB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, UseFileHdl ));
m_pFilePB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, FileSearchHdl ));
m_pCurName->SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl));
m_pDDECB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl ));
ChangeProtectHdl(m_pProtectCB);
m_pSubRegionED->EnableAutocomplete( sal_True, sal_True );
}
SwInsertSectionTabPage::~SwInsertSectionTabPage()
@@ -1595,53 +1591,53 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
bool bWeb = 0 != PTR_CAST(SwWebDocShell, m_pWrtSh->GetView().GetDocShell());
if(bWeb)
{
aHideCB .Hide();
aConditionED .Hide();
aConditionFT .Hide();
aDDECB .Hide();
aDDECommandFT .Hide();
m_pHideCB->Hide();
m_pConditionED->Hide();
m_pConditionFT->Hide();
m_pDDECB->Hide();
m_pDDECommandFT->Hide();
}
lcl_FillSubRegionList( *m_pWrtSh, aSubRegionED, &aCurName );
lcl_FillSubRegionList(*m_pWrtSh, *m_pSubRegionED, m_pCurName);
SwSectionData *const pSectionData =
static_cast<SwInsertSectionTabDialog*>(GetTabDialog())
->GetSectionData();
if (pSectionData) // something set?
{
aCurName.SetText(
m_pCurName->SetText(
rSh.GetUniqueSectionName(& pSectionData->GetSectionName()));
aProtectCB.Check( 0 != pSectionData->IsProtectFlag() );
m_pProtectCB->Check( 0 != pSectionData->IsProtectFlag() );
m_sFileName = pSectionData->GetLinkFileName();
m_sFilePasswd = pSectionData->GetLinkFilePassword();
aFileCB.Check( 0 != m_sFileName.Len() );
aFileNameED.SetText( m_sFileName );
UseFileHdl( &aFileCB );
m_pFileCB->Check( 0 != m_sFileName.Len() );
m_pFileNameED->SetText( m_sFileName );
UseFileHdl(m_pFileCB);
}
else
{
aCurName.SetText( rSh.GetUniqueSectionName() );
m_pCurName->SetText( rSh.GetUniqueSectionName() );
}
}
sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
{
SwSectionData aSection(CONTENT_SECTION, aCurName.GetText());
aSection.SetCondition(aConditionED.GetText());
sal_Bool bProtected = aProtectCB.IsChecked();
SwSectionData aSection(CONTENT_SECTION, m_pCurName->GetText());
aSection.SetCondition(m_pConditionED->GetText());
sal_Bool bProtected = m_pProtectCB->IsChecked();
aSection.SetProtectFlag(bProtected);
aSection.SetHidden(aHideCB.IsChecked());
aSection.SetHidden(m_pHideCB->IsChecked());
// edit in readonly sections
aSection.SetEditInReadonlyFlag(aEditInReadonlyCB.IsChecked());
aSection.SetEditInReadonlyFlag(m_pEditInReadonlyCB->IsChecked());
if(bProtected)
{
aSection.SetPassword(m_aNewPasswd);
}
String sFileName = aFileNameED.GetText();
String sSubRegion = aSubRegionED.GetText();
sal_Bool bDDe = aDDECB.IsChecked();
if(aFileCB.IsChecked() && (sFileName.Len() || sSubRegion.Len() || bDDe))
String sFileName = m_pFileNameED->GetText();
String sSubRegion = m_pSubRegionED->GetText();
sal_Bool bDDe = m_pDDECB->IsChecked();
if(m_pFileCB->IsChecked() && (sFileName.Len() || sSubRegion.Len() || bDDe))
{
String aLinkFile;
if( bDDe )
@@ -1677,7 +1673,7 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& )
aSection.SetLinkFileName(aLinkFile);
if(aLinkFile.Len())
{
aSection.SetType( aDDECB.IsChecked() ?
aSection.SetType( m_pDDECB->IsChecked() ?
DDE_LINK_SECTION :
FILE_LINK_SECTION);
}
@@ -1699,8 +1695,8 @@ SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent,
IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox )
{
sal_Bool bHide = pBox->IsChecked();
aConditionED.Enable(bHide);
aConditionFT.Enable(bHide);
m_pConditionED->Enable(bHide);
m_pConditionFT->Enable(bHide);
return 0;
}
@@ -1712,15 +1708,15 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, ChangeEditInReadonlyHdl)
IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, CheckBox *, pBox )
{
sal_Bool bCheck = pBox->IsChecked();
aPasswdCB.Enable(bCheck);
aPasswdPB.Enable(bCheck);
m_pPasswdCB->Enable(bCheck);
m_pPasswdPB->Enable(bCheck);
return 0;
}
IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
{
sal_Bool bChange = pButton == &aPasswdPB;
sal_Bool bSet = bChange ? bChange : aPasswdCB.IsChecked();
sal_Bool bChange = pButton == m_pPasswdPB;
sal_Bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked();
if(bSet)
{
if(!m_aNewPasswd.getLength() || bChange)
@@ -1740,7 +1736,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
}
}
else if(!bChange)
aPasswdCB.Check(sal_False);
m_pPasswdCB->Check(sal_False);
}
}
else
@@ -1750,8 +1746,8 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
IMPL_LINK_NOARG_INLINE_START(SwInsertSectionTabPage, NameEditHdl)
{
String aName=aCurName.GetText();
GetTabDialog()->GetOKButton().Enable(aName.Len() && aCurName.GetEntryPos( aName ) == USHRT_MAX);
String aName=m_pCurName->GetText();
GetTabDialog()->GetOKButton().Enable(aName.Len() && m_pCurName->GetEntryPos( aName ) == USHRT_MAX);
return 0;
}
IMPL_LINK_NOARG_INLINE_END(SwInsertSectionTabPage, NameEditHdl)
@@ -1766,22 +1762,22 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox )
}
sal_Bool bFile = pBox->IsChecked();
aFileNameFT.Enable(bFile);
aFileNameED.Enable(bFile);
aFilePB.Enable(bFile);
aSubRegionFT.Enable(bFile);
aSubRegionED.Enable(bFile);
aDDECommandFT.Enable(bFile);
aDDECB.Enable(bFile);
m_pFileNameFT->Enable(bFile);
m_pFileNameED->Enable(bFile);
m_pFilePB->Enable(bFile);
m_pSubRegionFT->Enable(bFile);
m_pSubRegionED->Enable(bFile);
m_pDDECommandFT->Enable(bFile);
m_pDDECB->Enable(bFile);
if( bFile )
{
aFileNameED.GrabFocus();
aProtectCB.Check( sal_True );
m_pFileNameED->GrabFocus();
m_pProtectCB->Check( sal_True );
}
else
{
aDDECB.Check(sal_False);
DDEHdl(&aDDECB);
m_pDDECB->Check(sal_False);
DDEHdl(m_pDDECB);
}
return 0;
}
@@ -1800,26 +1796,26 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl)
IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox )
{
sal_Bool bDDE = pBox->IsChecked();
sal_Bool bFile = aFileCB.IsChecked();
aFilePB.Enable(!bDDE && bFile);
sal_Bool bFile = m_pFileCB->IsChecked();
m_pFilePB->Enable(!bDDE && bFile);
if(bDDE)
{
aFileNameFT.Hide();
aDDECommandFT.Enable(bDDE);
aDDECommandFT.Show();
aSubRegionFT.Hide();
aSubRegionED.Hide();
aFileNameED.SetAccessibleName(aDDECommandFT.GetText());
m_pFileNameFT->Hide();
m_pDDECommandFT->Enable(bDDE);
m_pDDECommandFT->Show();
m_pSubRegionFT->Hide();
m_pSubRegionED->Hide();
m_pFileNameED->SetAccessibleName(m_pDDECommandFT->GetText());
}
else
{
aDDECommandFT.Hide();
aFileNameFT.Enable(bFile);
aFileNameFT.Show();
aSubRegionFT.Show();
aSubRegionED.Show();
aSubRegionED.Enable(bFile);
aFileNameED.SetAccessibleName(aFileNameFT.GetText());
m_pDDECommandFT->Hide();
m_pFileNameFT->Enable(bFile);
m_pFileNameFT->Show();
m_pSubRegionFT->Show();
m_pSubRegionED->Show();
m_pSubRegionED->Enable(bFile);
m_pFileNameED->SetAccessibleName(m_pFileNameFT->GetText());
}
return 0;
}
@@ -1836,9 +1832,9 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
const SfxPoolItem* pItem;
if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, sal_False, &pItem ) )
m_sFilePasswd = ( (SfxStringItem*)pItem )->GetValue();
aFileNameED.SetText( INetURLObject::decode(
m_pFileNameED->SetText( INetURLObject::decode(
m_sFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS, RTL_TEXTENCODING_UTF8 ) );
::lcl_ReadSections( *pMedium, aSubRegionED );
::lcl_ReadSections(*pMedium, *m_pSubRegionED);
delete pMedium;
}
}

38
sw/source/ui/inc/regionsw.hxx
View File

@@ -144,38 +144,32 @@ public:
*************************************************************************/
class SwInsertSectionTabPage : public SfxTabPage
{
FixedLine aNameFL;
ComboBox aCurName;
ComboBox* m_pCurName;
FixedLine aLinkFL;
CheckBox aFileCB;
CheckBox aDDECB;
FixedText aDDECommandFT;
FixedText aFileNameFT;
Edit aFileNameED;
PushButton aFilePB;
FixedText aSubRegionFT;
ComboBox aSubRegionED;
CheckBox* m_pFileCB;
CheckBox* m_pDDECB;
FixedText* m_pDDECommandFT;
FixedText* m_pFileNameFT;
Edit* m_pFileNameED;
PushButton* m_pFilePB;
FixedText* m_pSubRegionFT;
ComboBox* m_pSubRegionED;
FixedLine aProtectFL;
CheckBox aProtectCB;
CheckBox aPasswdCB;
PushButton aPasswdPB;
CheckBox* m_pProtectCB;
CheckBox* m_pPasswdCB;
PushButton* m_pPasswdPB;
FixedLine aHideFL;
CheckBox aHideCB;
FixedText aConditionFT;
ConditionEdit aConditionED;
CheckBox* m_pHideCB;
FixedText* m_pConditionFT;
ConditionEdit* m_pConditionED;
// #114856# edit in readonly sections
FixedLine aPropertiesFL;
CheckBox aEditInReadonlyCB;
CheckBox* m_pEditInReadonlyCB;
String m_sFileName;
String m_sFilterName;
String m_sFilePasswd;
// SwFmtCol* pCols;
::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd;
SwWrtShell* m_pWrtSh;
sfx2::DocumentInserter* m_pDocInserter;

517
sw/uiconfig/swriter/ui/sectionpage.ui Normal file
View File

@@ -0,0 +1,517 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="SectionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkFrame" id="section">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="VclComboBoxText" id="sectionnames">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<property name="dropdown">False</property>
<property name="max_width_chars">18</property>
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry">
<property name="can_focus">False</property>
</object>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">New section</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkFrame" id="section1">
<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="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="link">
<property name="label" translatable="yes">_Link</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="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="dde">
<property name="label" translatable="yes">DD_E</property>
<property name="visible">True</property>
<property name="sensitive">False</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="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="sectionlabel">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Section</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sectionname</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="filename">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">●</property>
<property name="width_chars">18</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="VclComboBoxText" id="sectionname">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<property name="max_width_chars">18</property>
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry1">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="filelabel">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_File name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ddelabel">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">DDE _command</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="selectfile">
<property name="label" translatable="yes">...</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</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">Link</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="section2">
<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="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="protect">
<property name="label" translatable="yes">_Protect</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="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="selectpassword">
<property name="label" translatable="yes">...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="withpassword">
<property name="label" translatable="yes">Wit_h password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">12</property>
<property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Write protection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="section3">
<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="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="swlo-ConditionEdit" id="withcond">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="width_chars">18</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="hide">
<property name="label" translatable="yes">H_ide</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="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="condlabel">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_With Condition</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">withcond</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</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">Hide</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="section4">
<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="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="editable">
<property name="label" translatable="yes">E_ditable in read-only document</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="draw_indicator">True</property>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="sectionlabel"/>
<widget name="filelabel"/>
<widget name="ddelabel"/>
<widget name="condlabel"/>
</widgets>
</object>
</interface>