diff options
-rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 4 | ||||
-rw-r--r-- | sw/UIConfig_swriter.mk | 1 | ||||
-rw-r--r-- | sw/inc/globals.hrc | 1 | ||||
-rw-r--r-- | sw/inc/helpid.h | 1 | ||||
-rw-r--r-- | sw/inc/swabstdlg.hxx | 3 | ||||
-rw-r--r-- | sw/source/ui/dialog/regionsw.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/dialog/regionsw.hrc | 1 | ||||
-rw-r--r-- | sw/source/ui/dialog/regionsw.src | 242 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 17 | ||||
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 3 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 577 | ||||
-rw-r--r-- | sw/source/ui/inc/condedit.hxx | 17 | ||||
-rw-r--r-- | sw/source/ui/inc/regionsw.hxx | 57 | ||||
-rw-r--r-- | sw/source/ui/utlui/condedit.cxx | 24 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/editsectiondialog.ui | 746 |
15 files changed, 1090 insertions, 607 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index aa26a10743c5..2cebd981fe0f 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -178,6 +178,10 @@ generic-name="Reference Edit" parent="GtkEntry" icon-name="widget-gtk-textentry"/> + <glade-widget-class title="Condition Edit" name="swuilo-ConditionEdit" + generic-name="Condition Edit" parent="GtkEntry" + icon-name="widget-gtk-textentry"/> + <glade-widget-class title="Cursor Reference Edit" name="sclo-ScCursorRefEdit" generic-name="Cursor Reference Edit" parent="foruilo-RefEdit" icon-name="widget-gtk-textentry"/> diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 6af0654eed87..1e58060782cb 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -74,6 +74,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/converttexttable \ sw/uiconfig/swriter/ui/endnotepage \ sw/uiconfig/swriter/ui/editcategories \ + sw/uiconfig/swriter/ui/editsectiondialog \ sw/uiconfig/swriter/ui/exchangedatabases \ sw/uiconfig/swriter/ui/formattablepage \ sw/uiconfig/swriter/ui/footnotepage \ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 01b429bdb188..f12de51376e8 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -78,6 +78,7 @@ #define SW_STR_READONLY (RC_GLOBALS_BEGIN + 46) #define STR_READONLY_PATH (RC_GLOBALS_BEGIN + 47) +#define IL_SECTION_BITMAPS (RC_GLOBALS_BEGIN + 48) // DIALOGS ----------------------------------------------------------- diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 85b6d8190b2d..a0b69b996ddf 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -298,7 +298,6 @@ #define HID_LINGU_SPELLING_DLG "SW_HID_LINGU_SPELLING_DLG" #define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR" #define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE" -#define HID_REGION_TREE "SW_HID_REGION_TREE" #define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE" #define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE" #define HID_MD_GLOS_DEFINE_TEXT "SW_HID_MD_GLOS_DEFINE_TEXT" diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index acc2af9c9d39..17ed47c08139 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -443,8 +443,7 @@ public: SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, sal_Bool bGlobal = sal_False) = 0; //add for SwMultiTOXTabDialog - virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId, - Window* pParent, SwWrtShell& rWrtSh ) = 0; //add for SwEditRegionDlg + virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0; //add for SwEditRegionDlg virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh ) = 0; //add for SwInsertSectionTabDialog virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 38727ad5d13a..790b5f512f36 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -223,8 +223,7 @@ void SwBaseShell::EditRegionDialog(SfxRequest& rReq) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractEditRegionDlg* pEditRegionDlg = pFact->CreateEditRegionDlg( MD_EDIT_REGION, - pParentWin, rWrtShell); + AbstractEditRegionDlg* pEditRegionDlg = pFact->CreateEditRegionDlg(pParentWin, rWrtShell); OSL_ENSURE(pEditRegionDlg, "Dialogdiet fail!"); if(pItem && pItem->ISA(SfxStringItem)) { diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc index ed27cca99fa1..4f131cbe6545 100644 --- a/sw/source/ui/dialog/regionsw.hrc +++ b/sw/source/ui/dialog/regionsw.hrc @@ -80,7 +80,6 @@ #define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6) #define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) -#define MD_EDIT_REGION (RC_REGIONSW_BEGIN+9) #define QB_CONNECT (RC_REGIONSW_BEGIN+10) #define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) #define REG_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index 4ac3eb146dac..111a3da3a3a5 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.src @@ -72,236 +72,6 @@ #define CB_PASSWD_TEXT\ Text [ en-US ] = "Wit~h password";\ -/************************************************************************* - - Dialog "edit region" - -*************************************************************************/ -ModalDialog MD_EDIT_REGION -{ - HelpID = CMD_FN_EDIT_REGION ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 316 , 185 ) ; - Text [ en-US ] = "Edit Sections" ; - Moveable = TRUE ; - FixedLine FL_NAME - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 80 , 8 ) ; - Text [ en-US ] = "Section" ; - }; - Edit ED_RANAME - { - HelpID = "sw:Edit:MD_EDIT_REGION:ED_RANAME"; - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 71 , 12 ) ; - TabStop = TRUE ; - Disable = TRUE ; - }; - Control TLB_SECTION - { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 29 ) ; - Size = MAP_APPFONT ( 71 , 150 ) ; - TabStop = TRUE ; - }; - FixedLine FL_LINK - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 92 , 3 ) ; - Size = MAP_APPFONT ( 162 , 8 ) ; - FL_FILE_TEXT - }; - TriStateBox CB_FILE - { - HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_FILE"; - Pos = MAP_APPFONT ( 98 , 14 ) ; - Size = MAP_APPFONT ( 59 , 10 ) ; - TabStop = TRUE ; - CB_FILE_TEXT - }; - CheckBox CB_DDE - { - HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_DDE"; - Pos = MAP_APPFONT ( 98 , 28 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; - Disable = TRUE ; - CB_DDE_TEXT - }; - FixedText FT_DDE - { - Pos = MAP_APPFONT ( 104 , 44) ; - Size = MAP_APPFONT ( 60 , 8 ) ; - Hide = TRUE ; - FT_DDE_TEXT - }; - FixedText FT_FILE - { - Pos = MAP_APPFONT ( 104 , 44 ) ; - Size = MAP_APPFONT ( 60 , 8 ) ; - Disable = TRUE ; - FT_FILE_TEXT - }; - Edit ED_FILE - { - HelpID = "sw:Edit:MD_EDIT_REGION:ED_FILE"; - Border = TRUE ; - Pos = MAP_APPFONT ( 165 , 42 ) ; - Size = MAP_APPFONT ( 68 , 12 ) ; - Disable = TRUE ; - TabStop = TRUE ; - }; - PushButton PB_FILE - { - HelpID = "sw:PushButton:MD_EDIT_REGION:PB_FILE"; - Pos = MAP_APPFONT ( 239 , 42 ) ; - Size = MAP_APPFONT ( 12 , 12 ) ; - TabStop = TRUE ; - Disable = TRUE ; - Text = "..."; - }; - FixedText FT_SUBREG - { - Pos = MAP_APPFONT ( 104 , 59 ) ; - Size = MAP_APPFONT ( 38 , 8 ) ; - Disable = TRUE ; - FT_SUBREG_TEXT - }; - ComboBox LB_SUBREG - { - HelpID = "sw:ComboBox:MD_EDIT_REGION:LB_SUBREG"; - Pos = MAP_APPFONT ( 165 , 57 ) ; - Size = MAP_APPFONT ( 68 , 50 ) ; - Disable = TRUE ; - TabStop = TRUE ; - Sort = TRUE ; - DropDown = TRUE ; - }; - FixedLine FL_PROTECT - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 92 , 75 ) ; - Size = MAP_APPFONT ( 162 , 8 ) ; - FL_PROTECT_TEXT - }; - TriStateBox CB_PROTECT - { - HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT"; - Pos = MAP_APPFONT ( 98 , 86 ) ; - Size = MAP_APPFONT ( 70 , 10 ) ; - TabStop = TRUE ; - Disable = TRUE ; - TriStateDisable = FALSE ; - Text [ en-US ] = "~Protected" ; - }; - CheckBox CB_PASSWD - { - HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_PASSWD"; - Pos = MAP_APPFONT ( 107 , 100 ) ; - Size = MAP_APPFONT ( 100 , 10 ) ; - TabStop = TRUE ; - CB_PASSWD_TEXT - }; - PushButton PB_PASSWD - { - HelpID = "sw:PushButton:MD_EDIT_REGION:PB_PASSWD"; - Pos = MAP_APPFONT ( 239 , 98 ) ; - Size = MAP_APPFONT ( 12 , 12 ) ; - TabStop = TRUE ; - Text = "..." ; - }; - FixedLine FL_HIDE - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 92 , 116 ) ; - Size = MAP_APPFONT ( 162 , 8 ) ; - FL_HIDE_TEXT - }; - TriStateBox CB_HIDE - { - HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_HIDE"; - Pos = MAP_APPFONT ( 98 , 127 ) ; - Size = MAP_APPFONT ( 70 , 10 ) ; - TabStop = TRUE ; - TriStateDisable = FALSE ; - CB_HIDE_TEXT - }; - FixedText FT_CONDITION - { - Pos = MAP_APPFONT ( 104 , 143) ; - Size = MAP_APPFONT ( 55 , 8 ) ; - Disable = TRUE ; - CB_CONDITION_TEXT - }; - Edit ED_CONDITION - { - HelpID = "sw:Edit:MD_EDIT_REGION:ED_CONDITION"; - Border = TRUE ; - Pos = MAP_APPFONT ( 165 , 141) ; - Size = MAP_APPFONT ( 86 , 12 ) ; - TabStop = TRUE ; - Disable = TRUE ; - }; - - FixedLine FL_PROPERTIES - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 92 , 159 ) ; - Size = MAP_APPFONT ( 162 , 8 ) ; - FL_PROPERTIES_TEXT - }; - TriStateBox CB_EDIT_IN_READONLY - { - HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_EDIT_IN_READONLY"; - Pos = MAP_APPFONT ( 98 , 170 ) ; - Size = MAP_APPFONT ( 156 , 10 ) ; - TabStop = TRUE ; - TriStateDisable = FALSE ; - CB_EDIT_IN_READONLY_TEXT - }; - - OKButton PB_OK - { - Pos = MAP_APPFONT ( 263 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Disable = TRUE ; - DefButton = TRUE ; - }; - CancelButton PB_CANCEL - { - Pos = MAP_APPFONT ( 263 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - PushButton PB_OPTIONS - { - HelpID = "sw:PushButton:MD_EDIT_REGION:PB_OPTIONS"; - Pos = MAP_APPFONT ( 263 , 40 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Hide = TRUE ; - Text [ en-US ] = "~Options..."; - }; - PushButton CB_DISMISS - { - HelpID = "sw:PushButton:MD_EDIT_REGION:CB_DISMISS"; - Pos = MAP_APPFONT ( 263 , 57 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Disable = TRUE ; - TabStop = TRUE ; - Text [ en-US ] = "Remove" ; - }; - HelpButton PB_HELP - { - Pos = MAP_APPFONT ( 263 , 77 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - #define DLG_IMAGE_IDLIST \ IdList = \ { \ @@ -312,13 +82,13 @@ ModalDialog MD_EDIT_REGION }; \ IdCount = { 4 ; }; - ImageList IL_BITMAPS - { - Prefix = "re"; - MaskColor = IMAGE_MASK_COLOR ; - DLG_IMAGE_IDLIST - }; +ImageList IL_SECTION_BITMAPS +{ + Prefix = "re"; + MaskColor = IMAGE_MASK_COLOR ; + DLG_IMAGE_IDLIST }; + String STR_REG_DUPLICATE { Text [ en-US ] = "Section name changed:" ; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 851cbb170db0..3a4e0c8cc5b1 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1259,21 +1259,10 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo return 0; } -AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg( int nResId, - Window* pParent, SwWrtShell& rWrtSh ) //add for SwEditRegionDlg +AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) //add for SwEditRegionDlg { - SwEditRegionDlg* pDlg=NULL; - switch ( nResId ) - { - case MD_EDIT_REGION : - pDlg = new SwEditRegionDlg( pParent, rWrtSh ); - break; - default: - break; - } - if ( pDlg ) - return new AbstractEditRegionDlg_Impl( pDlg ); - return 0; + SwEditRegionDlg* pDlg = new SwEditRegionDlg( pParent, rWrtSh ); + return new AbstractEditRegionDlg_Impl( pDlg ); } AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( int nResId, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 2547151579ec..115e926a540c 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -542,8 +542,7 @@ public: SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, sal_Bool bGlobal = sal_False); //add for SwMultiTOXTabDialog - virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId, - Window* pParent, SwWrtShell& rWrtSh ); //add for SwEditRegionDlg + virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh); //add for SwEditRegionDlg virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); //add for SwInsertSectionTabDialog virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b3659214ae3d..f04ef1e35d71 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -318,104 +318,88 @@ String SectRepr::GetSubRegion() const Description: dialog edit regions ----------------------------------------------------------------------------*/ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) - : SfxModalDialog( pParent, SW_RES(MD_EDIT_REGION) ), - aNameFL ( this, SW_RES( FL_NAME ) ), - aCurName ( this, SW_RES( ED_RANAME ) ), - aTree ( this, SW_RES( TLB_SECTION )), - aLinkFL ( this, SW_RES( FL_LINK ) ), - aFileCB ( this, SW_RES( CB_FILE ) ), - aDDECB ( this, SW_RES( CB_DDE ) ) , - aFileNameFT ( this, SW_RES( FT_FILE ) ) , - aDDECommandFT ( this, SW_RES( FT_DDE ) ) , - aFileNameED ( this, SW_RES( ED_FILE ) ), - aFilePB ( this, SW_RES( PB_FILE ) ), - aSubRegionFT ( this, SW_RES( FT_SUBREG ) ) , - aSubRegionED ( this, SW_RES( LB_SUBREG ) ) , - bSubRegionsFilled( false ), - - 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 ) ), - + : SfxModalDialog(pParent, "EditSectionDialog", + "modules/swriter/ui/editsectiondialog.ui") + , m_bSubRegionsFilled(false) + , aImageIL(SW_RES(IL_SECTION_BITMAPS)) + , rSh(rWrtSh) + , m_pDocInserter(NULL) + , m_pOldDefDlgParent(NULL) + , bDontCheckPasswd(true) +{ + get(m_pCurName, "curname"); + get(m_pTree, "tree"); + m_pTree->set_height_request(m_pTree->GetTextHeight() * 16); + get(m_pFileCB, "link"); + m_pFileCB->SetState(STATE_NOCHECK); + get(m_pDDECB, "dde"); + get(m_pDDEFrame, "ddedepend"); + get(m_pFileNameFT, "filenameft"); + get(m_pDDECommandFT, "ddeft"); + get(m_pFileNameED, "filename"); + get(m_pFilePB, "file"); + get(m_pSubRegionFT, "sectionft"); + get(m_pSubRegionED, "section"); + m_pSubRegionED->SetStyle(m_pSubRegionED->GetStyle() | WB_SORT); + get(m_pProtectCB, "protect"); + m_pProtectCB->SetState(STATE_NOCHECK); + get(m_pPasswdCB, "withpassword"); + get(m_pPasswdPB, "password"); + get(m_pHideCB, "hide"); + m_pHideCB->SetState(STATE_NOCHECK); + get(m_pConditionFT, "conditionft"); + get(m_pConditionED, "condition"); // edit in readonly sections - aPropertiesFL ( this, SW_RES( FL_PROPERTIES ) ), - aEditInReadonlyCB ( this, SW_RES( CB_EDIT_IN_READONLY ) ), - - aOK ( this, SW_RES( PB_OK ) ), - aCancel ( this, SW_RES( PB_CANCEL ) ), - aOptionsPB ( this, SW_RES( PB_OPTIONS ) ), - aDismiss ( this, SW_RES( CB_DISMISS ) ), - aHelp ( this, SW_RES( PB_HELP ) ), - - aImageIL ( SW_RES(IL_BITMAPS)), - - rSh( rWrtSh ), - m_pDocInserter ( NULL ), - m_pOldDefDlgParent ( NULL ), - bDontCheckPasswd ( sal_True) -{ - FreeResource(); + get(m_pEditInReadonlyCB, "editinro"); + m_pEditInReadonlyCB->SetState(STATE_NOCHECK); + get(m_pOptionsPB, "options"); + get(m_pDismiss, "remove"); + get(m_pOK, "ok"); bWeb = 0 != PTR_CAST( SwWebDocShell, rSh.GetView().GetDocShell() ); - aTree.SetSelectHdl ( LINK( this, SwEditRegionDlg, GetFirstEntryHdl)); - aTree.SetDeselectHdl ( LINK( this, SwEditRegionDlg, DeselectHdl)); - aCurName.SetModifyHdl ( LINK( this, SwEditRegionDlg, NameEditHdl)); - aConditionED.SetModifyHdl( LINK( this, SwEditRegionDlg, ConditionEditHdl)); - aOK.SetClickHdl ( LINK( this, SwEditRegionDlg, OkHdl)); - aPasswdCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl)); - aPasswdPB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangePasswdHdl)); - aHideCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeHideHdl)); + m_pTree->SetSelectHdl(LINK(this, SwEditRegionDlg, GetFirstEntryHdl)); + m_pTree->SetDeselectHdl(LINK(this, SwEditRegionDlg, DeselectHdl)); + m_pCurName->SetModifyHdl(LINK(this, SwEditRegionDlg, NameEditHdl)); + m_pConditionED->SetModifyHdl( LINK( this, SwEditRegionDlg, ConditionEditHdl)); + m_pOK->SetClickHdl ( LINK( this, SwEditRegionDlg, OkHdl)); + m_pPasswdCB->SetClickHdl(LINK(this, SwEditRegionDlg, ChangePasswdHdl)); + m_pPasswdPB->SetClickHdl(LINK(this, SwEditRegionDlg, ChangePasswdHdl)); + m_pHideCB->SetClickHdl(LINK(this, SwEditRegionDlg, ChangeHideHdl)); // edit in readonly sections - aEditInReadonlyCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeEditInReadonlyHdl)); - - aOptionsPB.Show(); - aOptionsPB.SetClickHdl ( LINK( this, SwEditRegionDlg, OptionsHdl)); - aProtectCB.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeProtectHdl)); - aDismiss.SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeDismissHdl)); - aFileCB.SetClickHdl ( LINK( this, SwEditRegionDlg, UseFileHdl )); - aFilePB.SetClickHdl ( LINK( this, SwEditRegionDlg, FileSearchHdl )); - aFileNameED.SetModifyHdl( LINK( this, SwEditRegionDlg, FileNameHdl )); - aSubRegionED.SetModifyHdl( LINK( this, SwEditRegionDlg, FileNameHdl )); - aSubRegionED.AddEventListener( LINK( this, SwEditRegionDlg, SubRegionEventHdl )); - aSubRegionED.EnableAutocomplete( sal_True, sal_True ); - - aTree.SetHelpId(HID_REGION_TREE); - aTree.SetSelectionMode( MULTIPLE_SELECTION ); - aTree.SetStyle(aTree.GetStyle()|WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL); - aTree.SetSpaceBetweenEntries(0); + m_pEditInReadonlyCB->SetClickHdl(LINK(this, SwEditRegionDlg, ChangeEditInReadonlyHdl)); + + m_pOptionsPB->SetClickHdl(LINK(this, SwEditRegionDlg, OptionsHdl)); + m_pProtectCB->SetClickHdl(LINK(this, SwEditRegionDlg, ChangeProtectHdl)); + m_pDismiss->SetClickHdl ( LINK( this, SwEditRegionDlg, ChangeDismissHdl)); + m_pFileCB->SetClickHdl(LINK(this, SwEditRegionDlg, UseFileHdl)); + m_pFilePB->SetClickHdl(LINK(this, SwEditRegionDlg, FileSearchHdl)); + m_pFileNameED->SetModifyHdl(LINK(this, SwEditRegionDlg, FileNameHdl)); + m_pSubRegionED->SetModifyHdl(LINK(this, SwEditRegionDlg, FileNameHdl)); + m_pSubRegionED->AddEventListener(LINK(this, SwEditRegionDlg, SubRegionEventHdl)); + m_pSubRegionED->EnableAutocomplete(true, true); + + m_pTree->SetSelectionMode( MULTIPLE_SELECTION ); + m_pTree->SetStyle(m_pTree->GetStyle()|WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL); + m_pTree->SetSpaceBetweenEntries(0); if(bWeb) { - aConditionFT .Hide(); - aConditionED .Hide(); - aPasswdCB .Hide(); - aHideCB .Hide(); - - aDDECB .Hide(); - aDDECommandFT .Hide(); + m_pDDECB->Hide(); + get<VclContainer>("hideframe")->Hide(); + m_pPasswdCB->Hide(); } - aDDECB.SetClickHdl ( LINK( this, SwEditRegionDlg, DDEHdl )); + m_pDDECB->SetClickHdl(LINK(this, SwEditRegionDlg, DDEHdl)); pCurrSect = rSh.GetCurrSection(); RecurseList( 0, 0 ); // if the cursor is not in a region // the first one will always be selected - if( !aTree.FirstSelected() && aTree.First() ) - aTree.Select( aTree.First() ); - aTree.Show(); + if( !m_pTree->FirstSelected() && m_pTree->First() ) + m_pTree->Select( m_pTree->First() ); + m_pTree->Show(); bDontCheckPasswd = sal_False; - - aPasswdPB.SetAccessibleRelationMemberOf(&aProtectFL); - aPasswdPB.SetAccessibleRelationLabeledBy(&aPasswdCB); - aSubRegionED.SetAccessibleName(aSubRegionFT.GetText()); } sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) @@ -423,7 +407,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) if(bDontCheckPasswd) return sal_True; sal_Bool bRet = sal_True; - SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); while( pEntry ) { SectReprPtr pRepr = (SectReprPtr)pEntry->GetUserData(); @@ -449,7 +433,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) } } } - pEntry = aTree.NextSelected(pEntry); + pEntry = m_pTree->NextSelected(pEntry); } if(!bRet && pBox) { @@ -485,13 +469,13 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pE SectRepr* pSectRepr = new SectRepr( n, *(pSect=pFmt->GetSection()) ); Image aImg = BuildBitmap( pSect->IsProtect(),pSect->IsHidden()); - pEntry = aTree.InsertEntry(pSect->GetSectionName(), aImg, aImg); + pEntry = m_pTree->InsertEntry(pSect->GetSectionName(), aImg, aImg); pEntry->SetUserData(pSectRepr); RecurseList( pFmt, pEntry ); if (pEntry->HasChildren()) - aTree.Expand(pEntry); + m_pTree->Expand(pEntry); if (pCurrSect==pSect) - aTree.Select(pEntry); + m_pTree->Select(pEntry); } } } @@ -515,12 +499,12 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pE FindArrPos( pSect->GetFmt() ), *pSect ); Image aImage = BuildBitmap( pSect->IsProtect(), pSect->IsHidden()); - pNEntry = aTree.InsertEntry( + pNEntry = m_pTree->InsertEntry( pSect->GetSectionName(), aImage, aImage, pEntry); pNEntry->SetUserData(pSectRepr); RecurseList( aTmpArr[n]->GetFmt(), pNEntry ); if( pNEntry->HasChildren()) - aTree.Expand(pNEntry); + m_pTree->Expand(pNEntry); if (pCurrSect==pSect) pSelEntry = pNEntry; } @@ -529,8 +513,8 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pE } if(0 != pSelEntry) { - aTree.MakeVisible(pSelEntry); - aTree.Select(pSelEntry); + m_pTree->MakeVisible(pSelEntry); + m_pTree->Select(pSelEntry); } } @@ -547,11 +531,11 @@ sal_uInt16 SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt ) SwEditRegionDlg::~SwEditRegionDlg( ) { - SvTreeListEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = m_pTree->First(); while( pEntry ) { delete (SectRepr*)pEntry->GetUserData(); - pEntry = aTree.Next( pEntry ); + pEntry = m_pTree->Next( pEntry ); } delete m_pDocInserter; @@ -559,19 +543,19 @@ SwEditRegionDlg::~SwEditRegionDlg( ) void SwEditRegionDlg::SelectSection(const String& rSectionName) { - SvTreeListEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = m_pTree->First(); while(pEntry) { SectReprPtr pRepr = (SectReprPtr)pEntry->GetUserData(); if (pRepr->GetSectionData().GetSectionName() == rSectionName) break; - pEntry = aTree.Next(pEntry); + pEntry = m_pTree->Next(pEntry); } if(pEntry) { - aTree.SelectAll( sal_False); - aTree.Select(pEntry); - aTree.MakeVisible(pEntry); + m_pTree->SelectAll(false); + m_pTree->Select(pEntry); + m_pTree->MakeVisible(pEntry); } } @@ -582,23 +566,23 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName) ---------------------------------------------------------------------*/ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) { - bDontCheckPasswd = sal_True; + bDontCheckPasswd = true; SvTreeListEntry* pEntry=pBox->FirstSelected(); - aHideCB .Enable(sal_True); + m_pHideCB->Enable(true); // edit in readonly sections - aEditInReadonlyCB.Enable(sal_True); + m_pEditInReadonlyCB->Enable(true); - aProtectCB .Enable(sal_True); - aFileCB .Enable(sal_True); + m_pProtectCB->Enable(true); + m_pFileCB->Enable(true); ::com::sun::star::uno::Sequence <sal_Int8> aCurPasswd; if( 1 < pBox->GetSelectionCount() ) { - aHideCB.EnableTriState( sal_True ); - aProtectCB.EnableTriState( sal_True ); + m_pHideCB->EnableTriState(true); + m_pProtectCB->EnableTriState(true); // edit in readonly sections - aEditInReadonlyCB.EnableTriState ( sal_True ); + m_pEditInReadonlyCB->EnableTriState(true); - aFileCB.EnableTriState( sal_True ); + m_pFileCB->EnableTriState(true); bool bHiddenValid = true; bool bProtectValid = true; @@ -649,37 +633,32 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) bFirst = false; } - aHideCB.SetState( !bHiddenValid ? STATE_DONTKNOW : + m_pHideCB->SetState(!bHiddenValid ? STATE_DONTKNOW : bHidden ? STATE_CHECK : STATE_NOCHECK); - aProtectCB.SetState( !bProtectValid ? STATE_DONTKNOW : + m_pProtectCB->SetState(!bProtectValid ? STATE_DONTKNOW : bProtect ? STATE_CHECK : STATE_NOCHECK); // edit in readonly sections - aEditInReadonlyCB.SetState( !bEditInReadonlyValid ? STATE_DONTKNOW : + m_pEditInReadonlyCB->SetState(!bEditInReadonlyValid ? STATE_DONTKNOW : bEditInReadonly ? STATE_CHECK : STATE_NOCHECK); - aFileCB.SetState(!bFileValid ? STATE_DONTKNOW : + m_pFileCB->SetState(!bFileValid ? STATE_DONTKNOW : bFile ? STATE_CHECK : STATE_NOCHECK); - if(bConditionValid) - aConditionED.SetText(sCondition); + if (bConditionValid) + m_pConditionED->SetText(sCondition); else { - aConditionFT.Enable(sal_False); - aConditionED.Enable(sal_False); + m_pConditionFT->Enable(false); + m_pConditionED->Enable(false); } - aFilePB.Enable(sal_False); - aFileNameFT .Enable(sal_False); - aFileNameED .Enable(sal_False); - aSubRegionFT.Enable(sal_False); - aSubRegionED.Enable(sal_False); - aCurName .Enable(sal_False); - aOptionsPB .Enable(sal_False); - aDDECB .Enable(sal_False); - aDDECommandFT .Enable(sal_False); - sal_Bool bPasswdEnabled = aProtectCB.GetState() == STATE_CHECK; - aPasswdCB.Enable(bPasswdEnabled); - aPasswdPB.Enable(bPasswdEnabled); + m_pCurName->Enable(false); + m_pDDECB->Enable(false); + m_pDDEFrame->Enable(false); + m_pOptionsPB->Enable(false); + bool bPasswdEnabled = m_pProtectCB->GetState() == STATE_CHECK; + m_pPasswdCB->Enable(bPasswdEnabled); + m_pPasswdPB->Enable(bPasswdEnabled); if(!bPasswdValid) { pEntry = pBox->FirstSelected(); @@ -689,59 +668,59 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) return 0; } else - aPasswdCB.Check(aCurPasswd.getLength() > 0); + m_pPasswdCB->Check(aCurPasswd.getLength() > 0); } else if (pEntry ) { - aCurName .Enable(sal_True); - aOptionsPB .Enable(sal_True); + m_pCurName->Enable(sal_True); + m_pOptionsPB->Enable(true); SectRepr* pRepr=(SectRepr*) pEntry->GetUserData(); SwSectionData const& rData( pRepr->GetSectionData() ); - aConditionED.SetText(rData.GetCondition()); - aHideCB.Enable(); - aHideCB.SetState((rData.IsHidden()) ? STATE_CHECK : STATE_NOCHECK); - sal_Bool bHide = STATE_CHECK == aHideCB.GetState(); - aConditionED.Enable(bHide); - aConditionFT.Enable(bHide); - aPasswdCB.Check(rData.GetPassword().getLength() > 0); - - aOK.Enable(); - aPasswdCB.Enable(); - aCurName.SetText(pBox->GetEntryText(pEntry)); - aCurName.Enable(); - aDismiss.Enable(); + m_pConditionED->SetText(rData.GetCondition()); + m_pHideCB->Enable(); + m_pHideCB->SetState((rData.IsHidden()) ? STATE_CHECK : STATE_NOCHECK); + bool bHide = STATE_CHECK == m_pHideCB->GetState(); + m_pConditionED->Enable(bHide); + m_pConditionFT->Enable(bHide); + m_pPasswdCB->Check(rData.GetPassword().getLength() > 0); + + m_pOK->Enable(); + m_pPasswdCB->Enable(); + m_pCurName->SetText(pBox->GetEntryText(pEntry)); + m_pCurName->Enable(); + m_pDismiss->Enable(); String aFile = pRepr->GetFile(); String sSub = pRepr->GetSubRegion(); - bSubRegionsFilled = false; - aSubRegionED.Clear(); + m_bSubRegionsFilled = false; + m_pSubRegionED->Clear(); if(aFile.Len()||sSub.Len()) { - aFileCB.Check(sal_True); - aFileNameED.SetText(aFile); - aSubRegionED.SetText(sSub); - aDDECB.Check(rData.GetType() == DDE_LINK_SECTION); + m_pFileCB->Check(true); + m_pFileNameED->SetText(aFile); + m_pSubRegionED->SetText(sSub); + m_pDDECB->Check(rData.GetType() == DDE_LINK_SECTION); } else { - aFileCB.Check(sal_False); - aFileNameED.SetText(aFile); - aDDECB.Enable(sal_False); - aDDECB.Check(sal_False); + m_pFileCB->Check(false); + m_pFileNameED->SetText(aFile); + m_pDDECB->Enable(false); + m_pDDECB->Check(false); } - UseFileHdl(&aFileCB); - DDEHdl( &aDDECB ); - aProtectCB.SetState((rData.IsProtectFlag()) + UseFileHdl(m_pFileCB); + DDEHdl(m_pDDECB); + m_pProtectCB->SetState((rData.IsProtectFlag()) ? STATE_CHECK : STATE_NOCHECK); - aProtectCB.Enable(); + m_pProtectCB->Enable(); // edit in readonly sections - aEditInReadonlyCB.SetState((rData.IsEditInReadonlyFlag()) + m_pEditInReadonlyCB->SetState((rData.IsEditInReadonlyFlag()) ? STATE_CHECK : STATE_NOCHECK); - aEditInReadonlyCB.Enable(); + m_pEditInReadonlyCB->Enable(); - sal_Bool bPasswdEnabled = aProtectCB.IsChecked(); - aPasswdCB.Enable(bPasswdEnabled); - aPasswdPB.Enable(bPasswdEnabled); + bool bPasswdEnabled = m_pProtectCB->IsChecked(); + m_pPasswdCB->Enable(bPasswdEnabled); + m_pPasswdPB->Enable(bPasswdEnabled); } bDontCheckPasswd = sal_False; return 0; @@ -751,27 +730,21 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) { if( !pBox->GetSelectionCount() ) { - aHideCB .Enable(sal_False); - aProtectCB .Enable(sal_False); + m_pHideCB->Enable(false); + m_pProtectCB->Enable(false); // edit in readonly sections - aEditInReadonlyCB.Enable(sal_False); - - aPasswdCB .Enable(sal_False); - aPasswdCB .Enable(sal_False); - aConditionFT .Enable(sal_False); - aConditionED.Enable(sal_False); - aFileCB .Enable(sal_False); - aFilePB .Enable(sal_False); - aFileNameFT .Enable(sal_False); - aFileNameED .Enable(sal_False); - aSubRegionFT .Enable(sal_False); - aSubRegionED .Enable(sal_False); - aCurName .Enable(sal_False); - aDDECB .Enable(sal_False); - aDDECommandFT .Enable(sal_False); - - UseFileHdl(&aFileCB); - DDEHdl( &aDDECB ); + m_pEditInReadonlyCB->Enable(false); + + m_pPasswdCB->Enable(false); + m_pConditionFT->Enable(false); + m_pConditionED->Enable(false); + m_pFileCB->Enable(sal_False); + m_pDDEFrame->Enable(false); + m_pDDECB->Enable(false); + m_pCurName->Enable(false); + + UseFileHdl(m_pFileCB); + DDEHdl(m_pDDECB); } return 0; } @@ -795,7 +768,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) rSh.StartAllAction(); rSh.StartUndo(); rSh.ResetSelect( 0,sal_False ); - SvTreeListEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = m_pTree->First(); while( pEntry ) { @@ -834,7 +807,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) pSet->Count() ? pSet : 0 ); delete pSet; } - pEntry = aTree.Next( pEntry ); + pEntry = m_pTree->Next( pEntry ); } for (SectReprArr::reverse_iterator aI = aSectReprArr.rbegin(), aEnd = aSectReprArr.rend(); aI != aEnd; ++aI) @@ -864,22 +837,22 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) return 0; - pBox->EnableTriState( sal_False ); - SvTreeListEntry* pEntry=aTree.FirstSelected(); + pBox->EnableTriState(false); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); sal_Bool bCheck = STATE_CHECK == pBox->GetState(); while( pEntry ) { SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData(); pRepr->GetSectionData().SetProtectFlag(bCheck); - Image aImage = BuildBitmap( bCheck, - STATE_CHECK == aHideCB.GetState()); - aTree.SetExpandedEntryBmp( pEntry, aImage ); - aTree.SetCollapsedEntryBmp( pEntry, aImage ); - pEntry = aTree.NextSelected(pEntry); - } - aPasswdCB.Enable(bCheck); - aPasswdPB.Enable(bCheck); + Image aImage = BuildBitmap(bCheck, + STATE_CHECK == m_pHideCB->GetState()); + m_pTree->SetExpandedEntryBmp( pEntry, aImage ); + m_pTree->SetCollapsedEntryBmp( pEntry, aImage ); + pEntry = m_pTree->NextSelected(pEntry); + } + m_pPasswdCB->Enable(bCheck); + m_pPasswdPB->Enable(bCheck); return 0; } @@ -890,25 +863,25 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) return 0; - pBox->EnableTriState( sal_False ); - SvTreeListEntry* pEntry=aTree.FirstSelected(); + pBox->EnableTriState(false); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData(); pRepr->GetSectionData().SetHidden(STATE_CHECK == pBox->GetState()); - Image aImage = BuildBitmap(STATE_CHECK == aProtectCB.GetState(), + Image aImage = BuildBitmap(STATE_CHECK == m_pProtectCB->GetState(), STATE_CHECK == pBox->GetState()); - aTree.SetExpandedEntryBmp( pEntry, aImage ); - aTree.SetCollapsedEntryBmp( pEntry, aImage ); + m_pTree->SetExpandedEntryBmp( pEntry, aImage ); + m_pTree->SetCollapsedEntryBmp( pEntry, aImage ); - pEntry = aTree.NextSelected(pEntry); + pEntry = m_pTree->NextSelected(pEntry); } - sal_Bool bHide = STATE_CHECK == pBox->GetState(); - aConditionED.Enable(bHide); - aConditionFT.Enable(bHide); + bool bHide = STATE_CHECK == pBox->GetState(); + m_pConditionED->Enable(bHide); + m_pConditionFT->Enable(bHide); return 0; } @@ -919,15 +892,15 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) return 0; - pBox->EnableTriState( sal_False ); - SvTreeListEntry* pEntry=aTree.FirstSelected(); + pBox->EnableTriState(false); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData(); pRepr->GetSectionData().SetEditInReadonlyFlag( STATE_CHECK == pBox->GetState()); - pEntry = aTree.NextSelected(pEntry); + pEntry = m_pTree->NextSelected(pEntry); } return 0; @@ -940,7 +913,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) { if(!CheckPasswd()) return 0; - SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); SvTreeListEntry* pChild; SvTreeListEntry* pParent; // at first mark all selected @@ -948,9 +921,9 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) { const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); pSectRepr->SetSelected(); - pEntry = aTree.NextSelected(pEntry); + pEntry = m_pTree->NextSelected(pEntry); } - pEntry = aTree.FirstSelected(); + pEntry = m_pTree->FirstSelected(); // then delete while(pEntry) { @@ -960,42 +933,42 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) if(pSectRepr->IsSelected()) { aSectReprArr.insert( pSectRepr ); - while( (pChild = aTree.FirstChild(pEntry) )!= 0 ) + while( (pChild = m_pTree->FirstChild(pEntry) )!= 0 ) { // because of the repositioning we have to start at the beginning again bRestart = true; - pParent=aTree.GetParent(pEntry); - aTree.GetModel()->Move(pChild, pParent, aTree.GetModel()->GetRelPos(pEntry)); + pParent = m_pTree->GetParent(pEntry); + m_pTree->GetModel()->Move(pChild, pParent, m_pTree->GetModel()->GetRelPos(pEntry)); } pRemove = pEntry; } if(bRestart) - pEntry = aTree.First(); + pEntry = m_pTree->First(); else - pEntry = aTree.Next(pEntry); + pEntry = m_pTree->Next(pEntry); if(pRemove) - aTree.GetModel()->Remove( pRemove ); + m_pTree->GetModel()->Remove( pRemove ); } - if ( aTree.FirstSelected() == 0 ) + if ( m_pTree->FirstSelected() == 0 ) { - aConditionFT. Enable(sal_False); - aConditionED. Enable(sal_False); - aDismiss. Enable(sal_False); - aCurName. Enable(sal_False); - aProtectCB. Enable(sal_False); - aPasswdCB. Enable(sal_False); - aHideCB. Enable(sal_False); + m_pConditionFT->Enable(false); + m_pConditionED->Enable(false); + m_pDismiss-> Enable(sal_False); + m_pCurName->Enable(false); + m_pProtectCB->Enable(false); + m_pPasswdCB->Enable(false); + m_pHideCB->Enable(false); // edit in readonly sections - aEditInReadonlyCB.Enable(sal_False); - aEditInReadonlyCB.SetState(STATE_NOCHECK); - aProtectCB. SetState(STATE_NOCHECK); - aPasswdCB. Check(sal_False); - aHideCB. SetState(STATE_NOCHECK); - aFileCB. Check(sal_False); + m_pEditInReadonlyCB->Enable(false); + m_pEditInReadonlyCB->SetState(STATE_NOCHECK); + m_pProtectCB->SetState(STATE_NOCHECK); + m_pPasswdCB->Check(false); + m_pHideCB->SetState(STATE_NOCHECK); + m_pFileCB->Check(false); // otherwise the focus would be on HelpButton - aOK.GrabFocus(); - UseFileHdl(&aFileCB); + m_pOK->GrabFocus(); + UseFileHdl(m_pFileCB); } return 0; } @@ -1007,9 +980,9 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) { if(!CheckPasswd(pBox)) return 0; - SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); pBox->EnableTriState(sal_False); - sal_Bool bMulti = 1 < aTree.GetSelectionCount(); + sal_Bool bMulti = 1 < m_pTree->GetSelectionCount(); sal_Bool bFile = pBox->IsChecked(); if(pEntry) { @@ -1031,40 +1004,30 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) pSectRepr->GetSectionData().SetLinkFilePassword(aEmptyStr); } - pEntry = aTree.NextSelected(pEntry); + pEntry = m_pTree->NextSelected(pEntry); } - aFileNameFT.Enable(bFile && ! bMulti); - aFileNameED.Enable(bFile && ! bMulti); - aFilePB.Enable(bFile && ! bMulti); - aSubRegionED.Enable(bFile && ! bMulti); - aSubRegionFT.Enable(bFile && ! bMulti); - aDDECommandFT.Enable(bFile && ! bMulti); - aDDECB.Enable(bFile && ! bMulti); + m_pDDECB->Enable(bFile && ! bMulti); + m_pDDEFrame->Enable(bFile && ! bMulti); if( bFile ) { - aProtectCB.SetState(STATE_CHECK); - aFileNameED.GrabFocus(); + m_pProtectCB->SetState(STATE_CHECK); + m_pFileNameED->GrabFocus(); } else { - aDDECB.Check(sal_False); - DDEHdl(&aDDECB); - aSubRegionED.SetText(aEmptyStr); + m_pDDECB->Check(false); + DDEHdl(m_pDDECB); + m_pSubRegionED->SetText(OUString()); } } else { - pBox->Check(sal_False); - pBox->Enable(sal_False); - aFilePB.Enable(sal_False); - aFileNameED.Enable(sal_False); - aFileNameFT.Enable(sal_False); - aSubRegionED.Enable(sal_False); - aSubRegionFT.Enable(sal_False); - aDDECB.Check(sal_False); - aDDECB.Enable(sal_False); - aDDECommandFT.Enable(sal_False); + pBox->Check(false); + pBox->Enable(false); + m_pDDECB->Check(false); + m_pDDECB->Enable(false); + m_pDDEFrame->Enable(false); } return 0; } @@ -1090,7 +1053,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) { if(!CheckPasswd()) return 0; - SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); if(pEntry) { @@ -1157,7 +1120,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) SFX_ITEM_SET == eFrmDirState|| SFX_ITEM_SET == eLRState) { - SvTreeListEntry* pSelEntry = aTree.FirstSelected(); + SvTreeListEntry* pSelEntry = m_pTree->FirstSelected(); while( pSelEntry ) { SectReprPtr pRepr = (SectReprPtr)pSelEntry->GetUserData(); @@ -1176,7 +1139,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) if( SFX_ITEM_SET == eLRState ) pRepr->GetLRSpace() = *(SvxLRSpaceItem*)pLRSpaceItem; - pSelEntry = aTree.NextSelected(pSelEntry); + pSelEntry = m_pTree->NextSelected(pSelEntry); } } } @@ -1196,14 +1159,14 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) if(!CheckPasswd()) return 0; pEdit->SetSelection(aSelect); - SvTreeListEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); - if(pEdit == &aFileNameED) + if (pEdit == m_pFileNameED) { - bSubRegionsFilled = false; - aSubRegionED.Clear(); - if( aDDECB.IsChecked() ) + m_bSubRegionsFilled = false; + m_pSubRegionED->Clear(); + if (m_pDDECB->IsChecked()) { String sLink( pEdit->GetText() ); sal_uInt16 nPos = 0; @@ -1243,64 +1206,62 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) { if(!CheckPasswd(pBox)) return 0; - SvTreeListEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); if(pEntry) { - sal_Bool bFile = aFileCB.IsChecked(); + bool bFile = m_pFileCB->IsChecked(); SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); SwSectionData & rData( pSectRepr->GetSectionData() ); sal_Bool bDDE = pBox->IsChecked(); if(bDDE) { - aFileNameFT.Hide(); - aDDECommandFT.Enable(); - aDDECommandFT.Show(); - aSubRegionFT.Hide(); - aSubRegionED.Hide(); + m_pFileNameFT->Hide(); + m_pDDECommandFT->Enable(); + m_pDDECommandFT->Show(); + m_pSubRegionFT->Hide(); + m_pSubRegionED->Hide(); if (FILE_LINK_SECTION == rData.GetType()) { - pSectRepr->SetFile(aEmptyStr); - aFileNameED.SetText(aEmptyStr); - rData.SetLinkFilePassword( aEmptyStr ); + pSectRepr->SetFile(OUString()); + m_pFileNameED->SetText(OUString()); + rData.SetLinkFilePassword(OUString()); } rData.SetType(DDE_LINK_SECTION); - aFileNameED.SetAccessibleName(aDDECommandFT.GetText()); } else { - aDDECommandFT.Hide(); - aFileNameFT.Enable(bFile); - aFileNameFT.Show(); - aSubRegionED.Show(); - aSubRegionFT.Show(); - aSubRegionED.Enable(bFile); - aSubRegionFT.Enable(bFile); - aSubRegionED.Enable(bFile); + m_pDDECommandFT->Hide(); + m_pFileNameFT->Enable(bFile); + m_pFileNameFT->Show(); + m_pSubRegionED->Show(); + m_pSubRegionFT->Show(); + m_pSubRegionED->Enable(bFile); + m_pSubRegionFT->Enable(bFile); + m_pSubRegionED->Enable(bFile); if (DDE_LINK_SECTION == rData.GetType()) { rData.SetType(FILE_LINK_SECTION); - pSectRepr->SetFile(aEmptyStr); - rData.SetLinkFilePassword( aEmptyStr ); - aFileNameED.SetText(aEmptyStr); + pSectRepr->SetFile(OUString()); + rData.SetLinkFilePassword(OUString()); + m_pFileNameED->SetText(OUString()); } - aFileNameED.SetAccessibleName(aFileNameFT.GetText()); } - aFilePB.Enable(bFile && !bDDE); + m_pFilePB->Enable(bFile && !bDDE); } return 0; } IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) { - bool bChange = pBox == &aPasswdPB; + bool bChange = pBox == m_pPasswdPB; if(!CheckPasswd(0)) { if(!bChange) - aPasswdCB.Check(!aPasswdCB.IsChecked()); + m_pPasswdCB->Check(!m_pPasswdCB->IsChecked()); return 0; } - SvTreeListEntry* pEntry=aTree.FirstSelected(); - bool bSet = bChange ? bChange : aPasswdCB.IsChecked(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); + bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { @@ -1328,7 +1289,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) else { if(!bChange) - aPasswdCB.Check(sal_False); + m_pPasswdCB->Check(false); break; } } @@ -1338,7 +1299,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) { pRepr->GetSectionData().SetPassword(uno::Sequence<sal_Int8 >()); } - pEntry = aTree.NextSelected(pEntry); + pEntry = m_pTree->NextSelected(pEntry); } return 0; } @@ -1352,16 +1313,16 @@ IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl) { if(!CheckPasswd(0)) return 0; - SvTreeListEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); if (pEntry) { - String aName = aCurName.GetText(); - aTree.SetEntryText(pEntry,aName); + OUString aName = m_pCurName->GetText(); + m_pTree->SetEntryText(pEntry,aName); SectReprPtr pRepr = (SectReprPtr) pEntry->GetUserData(); pRepr->GetSectionData().SetSectionName(aName); - aOK.Enable(aName.Len() != 0); + m_pOK->Enable(!aName.isEmpty()); } return 0; } @@ -1372,13 +1333,13 @@ IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit *, pEdit ) if(!CheckPasswd(0)) return 0; pEdit->SetSelection(aSelect); - SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { SectReprPtr pRepr = (SectReprPtr)pEntry->GetUserData(); pRepr->GetSectionData().SetCondition(pEdit->GetText()); - pEntry = aTree.NextSelected(pEntry); + pEntry = m_pTree->NextSelected(pEntry); } return 0; } @@ -1396,12 +1357,12 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) const SfxPoolItem* pItem; if ( SFX_ITEM_SET == pMedium->GetItemSet()->GetItemState( SID_PASSWORD, sal_False, &pItem ) ) sPassword = ( (SfxStringItem*)pItem )->GetValue(); - ::lcl_ReadSections( *pMedium, aSubRegionED ); + ::lcl_ReadSections(*pMedium, *m_pSubRegionED); delete pMedium; } } - SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE( pEntry, "no entry found" ); if ( pEntry ) { @@ -1409,7 +1370,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) pSectRepr->SetFile( sFileName ); pSectRepr->SetFilter( sFilterName ); pSectRepr->GetSectionData().SetLinkFilePassword(sPassword); - aFileNameED.SetText( pSectRepr->GetFile() ); + m_pFileNameED->SetText(pSectRepr->GetFile()); } Application::SetDefDialogParent( m_pOldDefDlgParent ); @@ -1418,11 +1379,11 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent ) { - if( !bSubRegionsFilled && pEvent && pEvent->GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) + if( !m_bSubRegionsFilled && pEvent && pEvent->GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) { //if necessary fill the names bookmarks/sections/tables now - OUString sFileName = aFileNameED.GetText(); + OUString sFileName = m_pFileNameED->GetText(); if(!sFileName.isEmpty()) { SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium(); @@ -1435,11 +1396,11 @@ IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent *, pEvent ) //load file and set the shell SfxMedium aMedium( sFileName, STREAM_STD_READ ); sFileName = aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); - ::lcl_ReadSections( aMedium, aSubRegionED ); + ::lcl_ReadSections(aMedium, *m_pSubRegionED); } else - lcl_FillSubRegionList( rSh, aSubRegionED, 0 ); - bSubRegionsFilled = true; + lcl_FillSubRegionList(rSh, *m_pSubRegionED, 0); + m_bSubRegionsFilled = true; } return 0; } diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index e2bdee7052eb..b55c48ba32ab 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -31,11 +31,18 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); public: - ConditionEdit( Window* pParent, const ResId& rResId ); - - inline void ShowBrackets(bool bShow) { bBrackets = bShow; } - - inline void SetDropEnable( bool bFlag ) { bEnableDrop = bFlag; } + ConditionEdit(Window* pParent, const ResId& rResId); + ConditionEdit(Window* pParent, WinBits nStyle); + + void ShowBrackets(bool bShow) + { + bBrackets = bShow; + } + + void SetDropEnable(bool bFlag) + { + bEnableDrop = bFlag; + } }; #endif diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index ef8657324ab5..14265da12b72 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -27,6 +27,7 @@ #include <vcl/fixed.hxx> #include <vcl/combobox.hxx> #include <vcl/group.hxx> +#include <vcl/layout.hxx> #include <svtools/treelistbox.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> @@ -62,40 +63,34 @@ typedef boost::ptr_set<SectRepr> SectReprArr; class SwEditRegionDlg : public SfxModalDialog { - FixedLine aNameFL; - Edit aCurName; - SvTreeListBox aTree; - - FixedLine aLinkFL; - TriStateBox aFileCB; - CheckBox aDDECB; - FixedText aFileNameFT; - FixedText aDDECommandFT; - Edit aFileNameED; - PushButton aFilePB; - FixedText aSubRegionFT; - ComboBox aSubRegionED; - bool bSubRegionsFilled; - - FixedLine aProtectFL; - TriStateBox aProtectCB; - CheckBox aPasswdCB; - PushButton aPasswdPB; - - FixedLine aHideFL; - TriStateBox aHideCB; - FixedText aConditionFT; - ConditionEdit aConditionED; + Edit* m_pCurName; + SvTreeListBox* m_pTree; + + TriStateBox* m_pFileCB; + CheckBox* m_pDDECB; + VclContainer* m_pDDEFrame; + FixedText* m_pFileNameFT; + FixedText* m_pDDECommandFT; + Edit* m_pFileNameED; + PushButton* m_pFilePB; + FixedText* m_pSubRegionFT; + ComboBox* m_pSubRegionED; + bool m_bSubRegionsFilled; + + TriStateBox* m_pProtectCB; + CheckBox* m_pPasswdCB; + PushButton* m_pPasswdPB; + + TriStateBox* m_pHideCB; + FixedText* m_pConditionFT; + ConditionEdit* m_pConditionED; // #114856# edit in readonly sections - FixedLine aPropertiesFL; - TriStateBox aEditInReadonlyCB; + TriStateBox* m_pEditInReadonlyCB; - OKButton aOK; - CancelButton aCancel; - PushButton aOptionsPB; - PushButton aDismiss; - HelpButton aHelp; + OKButton* m_pOK; + PushButton* m_pOptionsPB; + PushButton* m_pDismiss; ImageList aImageIL; SwWrtShell& rSh; diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index 4dc9956f91ff..94dca83b61c9 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -22,16 +22,30 @@ #include <condedit.hxx> #include <svx/dbaexchange.hxx> +#include <vcl/builder.hxx> + using namespace ::svx; using namespace ::com::sun::star::uno; -// STATIC DATA +ConditionEdit::ConditionEdit(Window* pParent, const ResId& rResId) + : Edit(pParent, rResId) + , DropTargetHelper(this) + , bBrackets(true) + , bEnableDrop(true) +{ +} + +ConditionEdit::ConditionEdit(Window* pParent, WinBits nStyle) + : Edit(pParent, nStyle) + , DropTargetHelper(this) + , bBrackets(true) + , bEnableDrop(true) +{ +} -ConditionEdit::ConditionEdit( Window* pParent, const ResId& rResId ) - : Edit( pParent, rResId ), - DropTargetHelper( this ), - bBrackets( true ), bEnableDrop( true ) +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeConditionEdit(Window *pParent, VclBuilder::stringmap &) { + return new ConditionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); } // Drop possible, respectively format known? diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui new file mode 100644 index 000000000000..29b2622059b5 --- /dev/null +++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui @@ -0,0 +1,746 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkDialog" id="EditSectionDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Edit Sections</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="sensitive">False</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="options"> + <property name="label">_Options...</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="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove"> + <property name="label">gtk-remove</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_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</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">False</property> + <property name="fill">True</property> + <property name="position">4</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="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="column_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="vexpand">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="vexpand">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="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkEntry" id="curname"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </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="svtlo-SvTreeListBox" id="tree:border"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Tree List-selection1"/> + </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> + </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">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="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">12</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkFrame" id="frame2"> + <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="vexpand">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="vexpand">True</property> + <property name="row_spacing">6</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="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + </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="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="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> + <child> + <object class="GtkAlignment" id="ddedepend"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid8"> + <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="GtkButton" id="file"> + <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">2</property> + <property name="top_attach">0</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="can_focus">True</property> + <property name="hexpand">True</property> + <property name="invisible_char">●</property> + <property name="invisible_char_set">True</property> + </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> + <child> + <object class="GtkLabel" id="sectionft"> + <property name="visible">True</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">section</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> + <child> + <object class="GtkComboBoxText" id="section"> + <property name="visible">True</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> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">False</property> + <property name="invisible_char">●</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</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="filenameft"> + <property name="visible">True</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="ddeft"> + <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">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </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> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label8"> + <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="frame3"> + <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="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="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">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">_Protected</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="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + </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="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <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="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="password"/> + </accessibility> + </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="GtkButton" id="password"> + <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> + <accessibility> + <relation type="labelled-by" target="withpassword"/> + </accessibility> + </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> + </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> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label6"> + <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="hideframe"> + <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="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkCheckButton" id="hide"> + <property name="label" translatable="yes">Hide</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + </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="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="conditionft"> + <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">condition</property> + </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="swuilo-ConditionEdit" id="condition"> + <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="invisible_char_set">True</property> + </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> + </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> + </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">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="frame5"> + <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="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid7"> + <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="editinro"> + <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="hexpand">True</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="inconsistent">True</property> + <property name="draw_indicator">True</property> + </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> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label9"> + <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> + <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">options</action-widget> + <action-widget response="0">remove</action-widget> + <action-widget response="0">help</action-widget> + </action-widgets> + </object> + <object class="GtkSizeGroup" id="sizegroup1"> + <widgets> + <widget name="sectionft"/> + <widget name="filenameft"/> + <widget name="ddeft"/> + <widget name="conditionft"/> + </widgets> + </object> +</interface> |