Skip to content

C
core
Kaydet (Commit) 6243704c authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert condition page to .ui 

Change-Id: Ifd05bdb46cd0cbbce09bd91a3fbf78d6eac0d8c5
üst 209ca76f
Hide whitespace changes
Inline Side-by-side
Showing with 366 additions and 308 deletions
sw/AllLangResTarget_sw.mk
Dosyayı görüntüle @ 6243704c
...@@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ ...@@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/app/app.src \ sw/source/ui/app/app.src \
sw/source/ui/app/error.src \ sw/source/ui/app/error.src \
sw/source/ui/app/mn.src \ sw/source/ui/app/mn.src \
sw/source/ui/chrdlg/ccoll.src \
sw/source/ui/chrdlg/chrdlg.src \ sw/source/ui/chrdlg/chrdlg.src \
sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/mailconfigpage.src \
sw/source/ui/config/optcomp.src \ sw/source/ui/config/optcomp.src \
......
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 6243704c
...@@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ ...@@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/columndialog \ sw/uiconfig/swriter/ui/columndialog \
sw/uiconfig/swriter/ui/columnpage \ sw/uiconfig/swriter/ui/columnpage \
sw/uiconfig/swriter/ui/columnwidth \ sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/conditionpage \
sw/uiconfig/swriter/ui/converttexttable \ sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/createauthorentry \ sw/uiconfig/swriter/ui/createauthorentry \
sw/uiconfig/swriter/ui/createautomarkdialog \ sw/uiconfig/swriter/ui/createautomarkdialog \
......
sw/inc/globals.hrc
Dosyayı görüntüle @ 6243704c
...@@ -129,7 +129,6 @@ ...@@ -129,7 +129,6 @@
#define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) #define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45)
#define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) #define TP_STD_FONT (RC_GLOBALS_BEGIN + 47)
#define TP_CONDCOLL (RC_GLOBALS_BEGIN + 48)
#define TP_NUMBER (RC_GLOBALS_BEGIN + 57) #define TP_NUMBER (RC_GLOBALS_BEGIN + 57)
......
sw/inc/helpid.h
Dosyayı görüntüle @ 6243704c
...@@ -136,8 +136,6 @@ ...@@ -136,8 +136,6 @@
// TabPage Help-IDs // TabPage Help-IDs
#define HID_COND_COLL "SW_HID_COND_COLL"
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL" #define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE" #define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE"
#define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT" #define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT"
...@@ -307,8 +305,6 @@ ...@@ -307,8 +305,6 @@
#define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX" #define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX"
#define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX" #define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX"
#define HID_COND_COLL_TABLIST "SW_HID_COND_COLL_TABLIST"
#define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE" #define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE"
#define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL" #define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL"
......
sw/source/ui/chrdlg/ccoll.cxx
Dosyayı görüntüle @ 6243704c
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "hints.hxx" #include "hints.hxx"
#include "chrdlg.hrc" #include "chrdlg.hrc"
#include "ccoll.hrc"
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <unomid.h> #include <unomid.h>
......
sw/source/ui/chrdlg/ccoll.hrc deleted 100644 → 0
Dosyayı görüntüle @ 209ca76f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _CCOLL_HRC
#define _CCOLL_HRC
// #define ******************************************************************
#define CB_CONDITION 1
#define FL_CONDITION 2
#define FT_CONTEXT 3
#define FT_USED 4
#define TB_CONDCOLLS 5
#define FT_STYLE 6
#define LB_STYLE 7
#define LB_FILTER 8
#define PB_REMOVE 9
#define PB_ASSIGN 10
#define STR_REGIONS 11
#define STR_NOTEMPL 12
// ********************************************************************** EOF
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/chrdlg/ccoll.src deleted 100644 → 0
Dosyayı görüntüle @ 209ca76f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "globals.hrc"
#include "chrdlg.hrc"
#include "ccoll.hrc"
#include "helpid.h"
// TabPage ******************************************************************
TabPage TP_CONDCOLL
{
HelpID = HID_COND_COLL ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_CONDITION
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Options";
};
CheckBox CB_CONDITION
{
HelpID = "sw:CheckBox:TP_CONDCOLL:CB_CONDITION";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "~Conditional Style" ;
};
FixedText FT_CONTEXT
{
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Disable = TRUE ;
Text [ en-US ] = "Conte~xt" ;
};
FixedText FT_USED
{
Pos = MAP_APPFONT ( 100 , 28 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Disable = TRUE ;
Text [ en-US ] = "Applied Styles" ;
};
Control TB_CONDCOLLS
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 39 ) ;
Size = MAP_APPFONT ( 173 , 123 ) ;
TabStop = TRUE ;
ClipChildren = TRUE ;
Disable = TRUE ;
Border = TRUE ;
};
FixedText FT_STYLE
{
Pos = MAP_APPFONT ( 190 , 28 ) ;
Size = MAP_APPFONT ( 58 , 8 ) ;
Disable = TRUE ;
Text [ en-US ] = "~Paragraph Styles" ;
};
ListBox LB_STYLE
{
HelpID = "sw:ListBox:TP_CONDCOLL:LB_STYLE";
Pos = MAP_APPFONT ( 188 , 39 ) ;
Size = MAP_APPFONT ( 60 , 108 ) ;
TabStop = TRUE ;
Border = TRUE ;
Sort = TRUE ;
Disable = TRUE ;
HScroll = TRUE ;
};
ListBox LB_FILTER
{
HelpID = "sw:ListBox:TP_CONDCOLL:LB_FILTER";
Pos = MAP_APPFONT ( 188 , 150 ) ;
Size = MAP_APPFONT ( 60 , 50 ) ;
DropDown = TRUE ;
TabStop = TRUE ;
Border = TRUE ;
Disable = TRUE ;
HScroll = TRUE ;
};
PushButton PB_REMOVE
{
HelpID = "sw:PushButton:TP_CONDCOLL:PB_REMOVE";
Pos = MAP_APPFONT ( 129 , 165 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "Re~move" ;
};
PushButton PB_ASSIGN
{
HelpID = "sw:PushButton:TP_CONDCOLL:PB_ASSIGN";
Pos = MAP_APPFONT ( 185 , 165 ) ;
Size = MAP_APPFONT ( 50 , 12 ) ;
TabStop = TRUE ;
Disable = TRUE ;
Text [ en-US ] = "~Apply" ;
};
StringArray STR_REGIONS
{
ItemList [ en-US ] =
{
< "Table Header" ; > ;
< "Table" ; > ;
< "Frame" ; > ;
< "Section" ; > ;
< "Footnote" ; > ;
< "Endnote" ; > ;
< "Header" ; > ;
< "Footer" ; > ;
< " 1st Outline Level" ; > ;
< " 2nd Outline Level" ; > ;
< " 3rd Outline Level" ; > ;
< " 4th Outline Level" ; > ;
< " 5th Outline Level" ; > ;
< " 6th Outline Level" ; > ;
< " 7th Outline Level" ; > ;
< " 8th Outline Level" ; > ;
< " 9th Outline Level" ; > ;
< "10th Outline Level" ; > ;
< " 1st Numbering Level" ; > ;
< " 2nd Numbering Level" ; > ;
< " 3rd Numbering Level" ; > ;
< " 4th Numbering Level" ; > ;
< " 5th Numbering Level" ; > ;
< " 6th Numbering Level" ; > ;
< " 7th Numbering Level" ; > ;
< " 8th Numbering Level" ; > ;
< " 9th Numbering Level" ; > ;
< "10th Numbering Level" ; > ;
};
};
String STR_NOTEMPL
{
Text [ en-US ] = "<none>" ;
};
};
// ********************************************************************** EOF
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/chrdlg/swuiccoll.cxx
Dosyayı görüntüle @ 6243704c
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "hints.hxx" #include "hints.hxx"
#include "chrdlg.hrc" #include "chrdlg.hrc"
#include "ccoll.hrc"
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include "swuiccoll.hxx" #include "swuiccoll.hxx"
...@@ -52,49 +51,50 @@ static long nTabs[] = ...@@ -52,49 +51,50 @@ static long nTabs[] =
}; };
SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, "ConditionPage",
: SfxTabPage(pParent, SW_RES(TP_CONDCOLL), rSet), "modules/swriter/ui/conditionpage.ui", rSet)
aConditionFL( this, SW_RES( FL_CONDITION )), ,
aConditionCB( this, SW_RES( CB_CONDITION ) ),
aContextFT ( this, SW_RES( FT_CONTEXT ) ),
aUsedFT ( this, SW_RES( FT_USED ) ),
aTbLinks( this, SW_RES( TB_CONDCOLLS ) ),
aStyleFT ( this, SW_RES( FT_STYLE ) ),
aStyleLB ( this, SW_RES( LB_STYLE ) ),
aFilterLB ( this, SW_RES( LB_FILTER ) ),
aRemovePB ( this, SW_RES( PB_REMOVE ) ),
aAssignPB ( this, SW_RES( PB_ASSIGN ) ),
sNoTmpl ( SW_RES( STR_NOTEMPL ) ),
aStrArr ( SW_RES( STR_REGIONS ) ),
rSh(::GetActiveView()->GetWrtShell()), rSh(::GetActiveView()->GetWrtShell()),
pCmds( SwCondCollItem::GetCmds() ), pCmds( SwCondCollItem::GetCmds() ),
pFmt(0), pFmt(0),
bNewTemplate(sal_False) bNewTemplate(sal_False)
{ {
FreeResource(); get(m_pConditionCB, "condstyle");
SetExchangeSupport(); get(m_pContextFT, "contextft");
get(m_pUsedFT, "usedft");
get(m_pStyleFT, "styleft");
get(m_pTbLinks, "links");
get(m_pStyleLB, "styles");
m_pStyleLB->SetStyle(m_pStyleLB->GetStyle() | WB_SORT);
m_pStyleLB->SetDropDownLineCount(12);
m_pTbLinks->set_height_request(m_pStyleLB->GetOptimalSize().Height());
get(m_pFilterLB, "filter");
get(m_pRemovePB, "remove");
get(m_pAssignPB, "apply");
sal_uInt16 nStrCount = m_pFilterLB->GetEntryCount();
for (sal_uInt16 i = 0; i < nStrCount; ++i)
m_aStrArr.push_back(m_pFilterLB->GetEntry(i));
m_pFilterLB->Clear();
aRemovePB.SetAccessibleRelationMemberOf(&aConditionFL); SetExchangeSupport();
aAssignPB.SetAccessibleRelationMemberOf(&aConditionFL);
aTbLinks.SetAccessibleRelationLabeledBy(&aConditionCB);
// Install handlers // Install handlers
aConditionCB.SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl)); m_pConditionCB->SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl));
aTbLinks.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
aStyleLB.SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); m_pStyleLB->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
aRemovePB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); m_pRemovePB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
aAssignPB.SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); m_pAssignPB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
aTbLinks.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); m_pTbLinks->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
aStyleLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); m_pStyleLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
aFilterLB.SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); m_pFilterLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl));
aTbLinks.SetStyle(aTbLinks.GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN); m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
aTbLinks.SetSelectionMode( SINGLE_SELECTION ); m_pTbLinks->SetSelectionMode( SINGLE_SELECTION );
aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT );
aTbLinks.Resize(); // OS: Hack for the right selection m_pTbLinks->Resize(); // OS: Hack for the right selection
aTbLinks.SetSpaceBetweenEntries( 0 ); m_pTbLinks->SetSpaceBetweenEntries( 0 );
aTbLinks.SetHelpId(HID_COND_COLL_TABLIST);
SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER)); SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER));
const SfxStyleFamilyItem* pFamilyItem = 0; const SfxStyleFamilyItem* pFamilyItem = 0;
...@@ -109,13 +109,13 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) ...@@ -109,13 +109,13 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList(); const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList();
for( size_t i = 0; i < rFilterList.size(); ++i ) for( size_t i = 0; i < rFilterList.size(); ++i )
{ {
aFilterLB.InsertEntry( rFilterList[ i ]->aName); m_pFilterLB->InsertEntry( rFilterList[ i ]->aName);
sal_uInt16* pFilter = new sal_uInt16(rFilterList[i]->nFlags); sal_uInt16* pFilter = new sal_uInt16(rFilterList[i]->nFlags);
aFilterLB.SetEntryData(i, pFilter); m_pFilterLB->SetEntryData(i, pFilter);
} }
aFilterLB.SelectEntryPos(1); m_pFilterLB->SelectEntryPos(1);
aTbLinks.Show(); m_pTbLinks->Show();
} }
...@@ -126,8 +126,8 @@ Page: Dtor ...@@ -126,8 +126,8 @@ Page: Dtor
SwCondCollPage::~SwCondCollPage() SwCondCollPage::~SwCondCollPage()
{ {
for(sal_uInt16 i = 0; i < aFilterLB.GetEntryCount(); ++i) for(sal_uInt16 i = 0; i < m_pFilterLB->GetEntryCount(); ++i)
delete (sal_uInt16*)aFilterLB.GetEntryData(i); delete (sal_uInt16*)m_pFilterLB->GetEntryData(i);
} }
...@@ -159,9 +159,9 @@ sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) ...@@ -159,9 +159,9 @@ sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet)
{ {
sal_Bool bModified = sal_True; sal_Bool bModified = sal_True;
SwCondCollItem aCondItem; SwCondCollItem aCondItem;
for(sal_uInt16 i = 0; i < aStrArr.Count(); i++) for (size_t i = 0; i < m_aStrArr.size(); ++i)
{ {
OUString sEntry = aTbLinks.GetEntryText(i, 1); OUString sEntry = m_pTbLinks->GetEntryText(i, 1);
aCondItem.SetStyle( &sEntry, i); aCondItem.SetStyle( &sEntry, i);
} }
rSet.Put(aCondItem); rSet.Put(aCondItem);
...@@ -176,28 +176,28 @@ Page: Reset-Overload ...@@ -176,28 +176,28 @@ Page: Reset-Overload
void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/)
{ {
if(bNewTemplate) if(bNewTemplate)
aConditionCB.Enable(); m_pConditionCB->Enable();
if(RES_CONDTXTFMTCOLL == pFmt->Which()) if(RES_CONDTXTFMTCOLL == pFmt->Which())
aConditionCB.Check(); m_pConditionCB->Check();
OnOffHdl(&aConditionCB); OnOffHdl(m_pConditionCB);
aTbLinks.Clear(); m_pTbLinks->Clear();
SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool(); SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL); pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL);
aStyleLB.Clear(); m_pStyleLB->Clear();
const SfxStyleSheetBase* pBase = pPool->First(); const SfxStyleSheetBase* pBase = pPool->First();
while( pBase ) while( pBase )
{ {
if(!pFmt || pBase->GetName() != pFmt->GetName()) if(!pFmt || pBase->GetName() != pFmt->GetName())
aStyleLB.InsertEntry(pBase->GetName()); m_pStyleLB->InsertEntry(pBase->GetName());
pBase = pPool->Next(); pBase = pPool->Next();
} }
aStyleLB.SelectEntryPos(0); m_pStyleLB->SelectEntryPos(0);
for( sal_uInt16 n = 0; n < aStrArr.Count(); n++) for (size_t n = 0; n < m_aStrArr.size(); ++n)
{ {
OUString aEntry( aStrArr.GetString(n) + "\t" ); OUString aEntry( m_aStrArr[n] + "\t" );
const SwCollCondition* pCond = 0; const SwCollCondition* pCond = 0;
if( pFmt && RES_CONDTXTFMTCOLL == pFmt->Which() && if( pFmt && RES_CONDTXTFMTCOLL == pFmt->Which() &&
...@@ -208,9 +208,9 @@ void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) ...@@ -208,9 +208,9 @@ void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/)
aEntry += pCond->GetTxtFmtColl()->GetName(); aEntry += pCond->GetTxtFmtColl()->GetName();
} }
SvTreeListEntry* pE = aTbLinks.InsertEntryToColumn( aEntry, n ); SvTreeListEntry* pE = m_pTbLinks->InsertEntryToColumn( aEntry, n );
if(0 == n) if(0 == n)
aTbLinks.Select(pE); m_pTbLinks->Select(pE);
} }
} }
...@@ -223,14 +223,14 @@ sal_uInt16* SwCondCollPage::GetRanges() ...@@ -223,14 +223,14 @@ sal_uInt16* SwCondCollPage::GetRanges()
IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox )
{ {
const sal_Bool bEnable = pBox->IsChecked(); const sal_Bool bEnable = pBox->IsChecked();
aContextFT.Enable( bEnable ); m_pContextFT->Enable( bEnable );
aUsedFT .Enable( bEnable ); m_pUsedFT->Enable( bEnable );
aTbLinks .EnableList( bEnable != sal_False ); m_pTbLinks->EnableList( bEnable != sal_False );
aStyleFT .Enable( bEnable ); m_pStyleFT->Enable( bEnable );
aStyleLB .Enable( bEnable ); m_pStyleLB->Enable( bEnable );
aFilterLB .Enable( bEnable ); m_pFilterLB->Enable( bEnable );
aRemovePB .Enable( bEnable ); m_pRemovePB->Enable( bEnable );
aAssignPB .Enable( bEnable ); m_pAssignPB->Enable( bEnable );
if( bEnable ) if( bEnable )
SelectHdl(0); SelectHdl(0);
return 0; return 0;
...@@ -238,40 +238,40 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) ...@@ -238,40 +238,40 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox )
IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn)
{ {
SvTreeListEntry* pE = aTbLinks.FirstSelected(); SvTreeListEntry* pE = m_pTbLinks->FirstSelected();
sal_uLong nPos; sal_uLong nPos;
if( !pE || LISTBOX_ENTRY_NOTFOUND == if( !pE || LISTBOX_ENTRY_NOTFOUND ==
( nPos = aTbLinks.GetModel()->GetAbsPos( pE ) ) ) ( nPos = m_pTbLinks->GetModel()->GetAbsPos( pE ) ) )
{ {
OSL_ENSURE( pE, "where's the empty entry from?" ); OSL_ENSURE( pE, "where's the empty entry from?" );
return 0; return 0;
} }
String sSel = aStrArr.GetString( sal_uInt16(nPos) ); OUString sSel = m_aStrArr[nPos];
sSel += '\t'; sSel += "\t";
const sal_Bool bAssEnabled = pBtn != &aRemovePB && aAssignPB.IsEnabled(); const sal_Bool bAssEnabled = pBtn != m_pRemovePB && m_pAssignPB->IsEnabled();
aAssignPB.Enable( !bAssEnabled ); m_pAssignPB->Enable( !bAssEnabled );
aRemovePB.Enable( bAssEnabled ); m_pRemovePB->Enable( bAssEnabled );
if ( bAssEnabled ) if ( bAssEnabled )
sSel += aStyleLB.GetSelectEntry(); sSel += m_pStyleLB->GetSelectEntry();
aTbLinks.SetUpdateMode(sal_False); m_pTbLinks->SetUpdateMode(sal_False);
aTbLinks.GetModel()->Remove(pE); m_pTbLinks->GetModel()->Remove(pE);
pE = aTbLinks.InsertEntryToColumn(sSel, nPos); pE = m_pTbLinks->InsertEntryToColumn(sSel, nPos);
aTbLinks.Select(pE); m_pTbLinks->Select(pE);
aTbLinks.MakeVisible(pE); m_pTbLinks->MakeVisible(pE);
aTbLinks.SetUpdateMode(sal_True); m_pTbLinks->SetUpdateMode(sal_True);
return 0; return 0;
} }
IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
{ {
if(pBox == &aFilterLB) if (pBox == m_pFilterLB)
{ {
aStyleLB.Clear(); m_pStyleLB->Clear();
sal_uInt16 nSearchFlags = pBox->GetSelectEntryPos(); sal_uInt16 nSearchFlags = pBox->GetSelectEntryPos();
nSearchFlags = *(sal_uInt16*)aFilterLB.GetEntryData(nSearchFlags); nSearchFlags = *(sal_uInt16*)m_pFilterLB->GetEntryData(nSearchFlags);
SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool(); SfxStyleSheetBasePool* pPool = rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags); pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags);
const SfxStyleSheetBase* pBase = pPool->First(); const SfxStyleSheetBase* pBase = pPool->First();
...@@ -279,26 +279,26 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) ...@@ -279,26 +279,26 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox)
while( pBase ) while( pBase )
{ {
if(!pFmt || pBase->GetName() != pFmt->GetName()) if(!pFmt || pBase->GetName() != pFmt->GetName())
aStyleLB.InsertEntry(pBase->GetName()); m_pStyleLB->InsertEntry(pBase->GetName());
pBase = pPool->Next(); pBase = pPool->Next();
} }
aStyleLB.SelectEntryPos(0); m_pStyleLB->SelectEntryPos(0);
SelectHdl(&aStyleLB); SelectHdl(m_pStyleLB);
} }
else else
{ {
String sTbEntry; String sTbEntry;
SvTreeListEntry* pE = aTbLinks.FirstSelected(); SvTreeListEntry* pE = m_pTbLinks->FirstSelected();
if(pE) if(pE)
sTbEntry = aTbLinks.GetEntryText(pE); sTbEntry = m_pTbLinks->GetEntryText(pE);
sTbEntry = sTbEntry.GetToken(1, '\t'); sTbEntry = sTbEntry.GetToken(1, '\t');
String sStyle = aStyleLB.GetSelectEntry(); String sStyle = m_pStyleLB->GetSelectEntry();
aAssignPB.Enable( sStyle != sTbEntry && aConditionCB.IsChecked() ); m_pAssignPB->Enable( sStyle != sTbEntry && m_pConditionCB->IsChecked() );
if(pBox != &aStyleLB) if(pBox != m_pStyleLB)
aRemovePB.Enable( aConditionCB.IsChecked() && sTbEntry.Len() ); m_pRemovePB->Enable( m_pConditionCB->IsChecked() && sTbEntry.Len() );
} }
return 0; return 0;
} }
......
sw/source/ui/inc/swuiccoll.hxx
Dosyayı görüntüle @ 6243704c
...@@ -26,22 +26,20 @@ class SwFmt; ...@@ -26,22 +26,20 @@ class SwFmt;
class SwCondCollPage : public SfxTabPage class SwCondCollPage : public SfxTabPage
{ {
FixedLine aConditionFL; CheckBox* m_pConditionCB;
CheckBox aConditionCB;
FixedText aContextFT; FixedText* m_pContextFT;
FixedText aUsedFT; FixedText* m_pUsedFT;
SvTabListBox aTbLinks; SvTabListBox* m_pTbLinks;
FixedText aStyleFT; FixedText* m_pStyleFT;
ListBox aStyleLB; ListBox* m_pStyleLB;
ListBox aFilterLB; ListBox* m_pFilterLB;
PushButton aRemovePB; PushButton* m_pRemovePB;
PushButton aAssignPB; PushButton* m_pAssignPB;
String sNoTmpl; std::vector<OUString> m_aStrArr;
ResStringArray aStrArr;
SwWrtShell &rSh; SwWrtShell &rSh;
const CommandStruct*pCmds; const CommandStruct*pCmds;
......
sw/uiconfig/swriter/ui/conditionpage.ui 0 → 100644
Dosyayı görüntüle @ 6243704c
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="ConditionPage">
<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="row_spacing">18</property>
<child>
<object class="GtkFrame" id="frame4">
<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="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="grid1">
<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>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="condstyle">
<property name="label" translatable="yes">_Conditional Style</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>
<accessibility>
<relation type="label-for" target="links:border"/>
</accessibility>
</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="GtkLabel" id="contextft">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Conte_xt</property>
<property name="use_underline">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="GtkLabel" id="usedft">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Applied Styles</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="GtkLabel" id="styleft">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Paragraph Styles</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="links:border">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<accessibility>
<relation type="labelled-by" target="condstyle"/>
</accessibility>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Tab List-selection1"/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="spacing">12</property>
<property name="layout_style">start</property>
<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">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="apply">
<property name="label">gtk-apply</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">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">3</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>
<property name="spacing">6</property>
<child>
<object class="GtkTreeView" id="styles:border">
<property name="visible">True</property>
<property name="sensitive">False</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="treeview-selection1"/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="filter">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">Table Header</item>
<item translatable="yes">Table</item>
<item translatable="yes">Frame</item>
<item translatable="yes">Section</item>
<item translatable="yes">Footnote</item>
<item translatable="yes">Endnote</item>
<item translatable="yes">Header</item>
<item translatable="yes">Footer</item>
<item translatable="yes"> 1st Outline Level</item>
<item translatable="yes"> 2nd Outline Level</item>
<item translatable="yes"> 3rd Outline Level</item>
<item translatable="yes"> 4th Outline Level</item>
<item translatable="yes"> 5th Outline Level</item>
<item translatable="yes"> 6th Outline Level</item>
<item translatable="yes"> 7th Outline Level</item>
<item translatable="yes"> 8th Outline Level</item>
<item translatable="yes"> 9th Outline Level</item>
<item translatable="yes">10th Outline Level</item>
<item translatable="yes"> 1st Numbering Level</item>
<item translatable="yes"> 2nd Numbering Level</item>
<item translatable="yes"> 3rd Numbering Level</item>
<item translatable="yes"> 4th Numbering Level</item>
<item translatable="yes"> 5th Numbering Level</item>
<item translatable="yes"> 6th Numbering Level</item>
<item translatable="yes"> 7th Numbering Level</item>
<item translatable="yes"> 8th Numbering Level</item>
<item translatable="yes"> 9th Numbering Level</item>
<item translatable="yes">10th Numbering Level</item>
</items>
</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">2</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="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</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>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment