sd/source/ui/dlg/sdtreelb.cxx | 186 +++++++++++++++
sd/source/ui/dlg/tpaction.cxx | 349 +++++++++++++----------------
sd/source/ui/inc/sdtreelb.hxx | 76 ++++++
sd/source/ui/inc/tpaction.hxx | 43 +--
sd/uiconfig/simpress/ui/interactionpage.ui | 162 +++++++++++--
5 files changed, 583 insertions(+), 233 deletions(-)
New commits:
commit cb3e2a88aae07d9fdf354bc5569b21d78c46d20e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Mar 13 08:54:27 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Mar 14 09:59:53 2019 +0100
weld SdTPAction
Change-Id: I3c72b19f9c5343451164b5bd35dc79a3753e6a37
Reviewed-on: https://gerrit.libreoffice.org/69179
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 39d648597d97..499dc866cbb8 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1413,6 +1413,7 @@
SdPageObjsTLV::SdPageObjsTLV(std::unique_ptr<weld::TreeView> xTreeView)
, m_pMedium(nullptr)
, m_pOwnMedium(nullptr)
, m_bLinkableSelected(false)
+ , m_bShowAllPages(false)
{
m_xTreeView->connect_expanding(LINK(this, SdPageObjsTLV,
RequestingChildrenHdl));
m_xTreeView->connect_changed(LINK(this, SdPageObjsTLV, SelectHdl));
@@ -1610,6 +1611,157 @@ void SdPageObjsTLV::CloseBookmarkDoc()
m_pBookmarkDoc = nullptr;
}
+bool SdPageObjsTLV::PageBelongsToCurrentShow(const SdPage* pPage) const
+{
+ // Return <TRUE/> as default when there is no custom show or when none
+ // is used. The page does then belong to the standard show.
+ bool bBelongsToShow = true;
+
+ if (m_pDoc->getPresentationSettings().mbCustomShow)
+ {
+ // Get the current custom show.
+ SdCustomShow* pCustomShow = nullptr;
+ SdCustomShowList* pShowList =
const_cast<SdDrawDocument*>(m_pDoc)->GetCustomShowList();
+ if (pShowList != nullptr)
+ {
+ sal_uLong nCurrentShowIndex = pShowList->GetCurPos();
+ pCustomShow = (*pShowList)[nCurrentShowIndex].get();
+ }
+
+ // Check whether the given page is part of that custom show.
+ if (pCustomShow != nullptr)
+ {
+ bBelongsToShow = false;
+ size_t nPageCount = pCustomShow->PagesVector().size();
+ for (size_t i=0; i<nPageCount && !bBelongsToShow; i++)
+ if (pPage == pCustomShow->PagesVector()[i])
+ bBelongsToShow = true;
+ }
+ }
+
+ return bBelongsToShow;
+}
+
+void SdPageObjsTLV::AddShapeList (
+ const SdrObjList& rList,
+ SdrObject* pShape,
+ const OUString& rsName,
+ const bool bIsExcluded,
+ weld::TreeIter* pParentEntry)
+{
+ OUString aIcon(BMP_PAGE);
+ if (bIsExcluded)
+ aIcon = BMP_PAGE_EXCLUDED;
+ else if (pShape != nullptr)
+ aIcon = BMP_GROUP;
+
+ OUString aUserData("1");
+ if (pShape != nullptr)
+ aUserData = OUString::number(reinterpret_cast<sal_Int64>(pShape));
+
+ std::unique_ptr<weld::TreeIter> xEntry = m_xTreeView->make_iterator();
+ InsertEntry(pParentEntry, aUserData, rsName, aIcon, xEntry.get());
+
+ SdrObjListIter aIter(
+ &rList,
+ !rList.HasObjectNavigationOrder() /* use navigation order, if
available */,
+ SdrIterMode::Flat);
+
+ while( aIter.IsMore() )
+ {
+ SdrObject* pObj = aIter.Next();
+ OSL_ASSERT(pObj!=nullptr);
+
+ // Get the shape name.
+ OUString aStr (GetObjectName( pObj ) );
+ OUString sId(OUString::number(reinterpret_cast<sal_Int64>(pObj)));
+
+ if( !aStr.isEmpty() )
+ {
+ if( pObj->GetObjInventor() == SdrInventor::Default &&
pObj->GetObjIdentifier() == OBJ_OLE2 )
+ {
+ InsertEntry(xEntry.get(), sId, aStr, BMP_OLE);
+ }
+ else if( pObj->GetObjInventor() == SdrInventor::Default &&
pObj->GetObjIdentifier() == OBJ_GRAF )
+ {
+ InsertEntry(xEntry.get(), sId, aStr, BMP_GRAPHIC);
+ }
+ else if (pObj->IsGroupObject())
+ {
+ AddShapeList(
+ *pObj->GetSubList(),
+ pObj,
+ aStr,
+ false,
+ xEntry.get());
+ }
+ else
+ {
+ InsertEntry(xEntry.get(), sId, aStr, BMP_OBJECTS);
+ }
+ }
+ }
+
+ if (!m_xTreeView->iter_has_child(*xEntry))
+ return;
+
+ if (bIsExcluded)
+ m_xTreeView->set_image(*xEntry, BMP_PAGEOBJS_EXCLUDED);
+ else
+ m_xTreeView->set_image(*xEntry, BMP_PAGEOBJS);
+ m_xTreeView->expand_row(*xEntry);
+}
+
+/**
+ * Fill TreeLB with pages and objects
+ */
+void SdPageObjsTLV::Fill(const SdDrawDocument* pInDoc, bool bAllPages, const
OUString& rDocName)
+{
+ OUString aSelection = m_xTreeView->get_selected_text();
+ clear();
+
+ m_pDoc = pInDoc;
+ m_aDocName = rDocName;
+ m_bShowAllPages = bAllPages;
+ m_pMedium = nullptr;
+
+ // first insert all pages including objects
+ sal_uInt16 nPage = 0;
+ const sal_uInt16 nMaxPages = m_pDoc->GetPageCount();
+
+ while( nPage < nMaxPages )
+ {
+ const SdPage* pPage = static_cast<const SdPage*>( m_pDoc->GetPage(
nPage ) );
+ if( (m_bShowAllPages || pPage->GetPageKind() == PageKind::Standard)
+ && (pPage->GetPageKind() != PageKind::Handout) ) //#94954#
never list the normal handout page ( handout-masterpage is used instead )
+ {
+ bool bPageExluded = pPage->IsExcluded();
+
+ bool bPageBelongsToShow = PageBelongsToCurrentShow (pPage);
+ bPageExluded |= !bPageBelongsToShow;
+
+ AddShapeList(*pPage, nullptr, pPage->GetName(), bPageExluded,
nullptr);
+ }
+ nPage++;
+ }
+
+ // then insert all master pages including objects
+ if( m_bShowAllPages )
+ {
+ nPage = 0;
+ const sal_uInt16 nMaxMasterPages = m_pDoc->GetMasterPageCount();
+
+ while( nPage < nMaxMasterPages )
+ {
+ const SdPage* pPage = static_cast<const SdPage*>(
m_pDoc->GetMasterPage( nPage ) );
+ AddShapeList(*pPage, nullptr, pPage->GetName(), false, nullptr);
+ nPage++;
+ }
+ }
+ if (!aSelection.isEmpty())
+ m_xTreeView->select_text(aSelection);
+}
+
/**
* We insert only the first entry. Children are created on demand.
*/
@@ -1629,13 +1781,45 @@ void SdPageObjsTLV::Fill( const SdDrawDocument* pInDoc,
SfxMedium* pInMedium,
m_xTreeView->insert(nullptr, -1, &m_aDocName, &sId, nullptr, nullptr,
&sImgDoc, true, nullptr);
}
+/**
+ * select a entry in TreeLB
+ */
+bool SdPageObjsTLV::SelectEntry( const OUString& rName )
+{
+ bool bFound = false;
+
+ if (!rName.isEmpty())
+ {
+ std::unique_ptr<weld::TreeIter> xEntry(m_xTreeView->make_iterator());
+ OUString aTmp;
+
+ if (m_xTreeView->get_iter_first(*xEntry))
+ {
+ do
+ {
+ aTmp = m_xTreeView->get_text(*xEntry);
+ if (aTmp == rName)
+ {
+ m_xTreeView->set_cursor(*xEntry);
+ m_xTreeView->select(*xEntry);
+ bFound = true;
+ break;
+ }
+ }
+ while (m_xTreeView->iter_next(*xEntry));
+ }
+ }
+
+ return bFound;
+}
+
SdPageObjsTLV::~SdPageObjsTLV()
{
if (m_pBookmarkDoc)
CloseBookmarkDoc();
else
{
- // no document was created from mpMedium, so this object is still the
owner of it
+ // no document was created from m_pMedium, so this object is still the
owner of it
delete m_pMedium;
}
m_xAccel.reset();
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index f4d79c7997f6..031a8a64afe6 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -93,47 +93,44 @@ SdActionDlg::SdActionDlg (
/**
* Action-TabPage
*/
-SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "InteractionPage",
- "modules/simpress/ui/interactionpage.ui", &rInAttrs)
+SdTPAction::SdTPAction(TabPageParent pWindow, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pWindow, "modules/simpress/ui/interactionpage.ui",
"InteractionPage", &rInAttrs)
, mpView(nullptr)
, mpDoc(nullptr)
, bTreeUpdated(false)
+ , m_xLbAction(m_xBuilder->weld_combo_box("listbox"))
+ , m_xFtTree(m_xBuilder->weld_label("fttree"))
+ , m_xLbTree(new SdPageObjsTLV(m_xBuilder->weld_tree_view("tree")))
+ , m_xLbTreeDocument(new
SdPageObjsTLV(m_xBuilder->weld_tree_view("treedoc")))
+ , m_xLbOLEAction(m_xBuilder->weld_tree_view("oleaction"))
+ , m_xFrame(m_xBuilder->weld_frame("frame"))
+ , m_xEdtSound(m_xBuilder->weld_entry("sound"))
+ , m_xEdtBookmark(m_xBuilder->weld_entry("bookmark"))
+ , m_xEdtDocument(m_xBuilder->weld_entry("document"))
+ , m_xEdtProgram(m_xBuilder->weld_entry("program"))
+ , m_xEdtMacro(m_xBuilder->weld_entry("macro"))
+ , m_xBtnSearch(m_xBuilder->weld_button("browse"))
+ , m_xBtnSeek(m_xBuilder->weld_button("find"))
{
- get(m_pLbAction, "listbox");
- get(m_pFtTree, "fttree");
- get(m_pLbTree, "tree");
- get(m_pLbTreeDocument, "treedoc");
- get(m_pLbOLEAction, "oleaction");
- get(m_pFrame, "frame");
- get(m_pEdtSound, "sound");
- get(m_pEdtBookmark, "bookmark");
- get(m_pEdtDocument, "document");
- get(m_pEdtProgram, "program");
- get(m_pEdtMacro, "macro");
- get(m_pBtnSearch, "browse");
- get(m_pBtnSeek, "find");
-
- m_pLbOLEAction->set_width_request(m_pLbOLEAction->approximate_char_width()
* 52);
- m_pLbOLEAction->set_height_request(m_pLbOLEAction->GetTextHeight() * 12);
-
- m_pBtnSearch->SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) );
- m_pBtnSeek->SetClickHdl( LINK( this, SdTPAction, ClickSearchHdl ) );
+
m_xLbOLEAction->set_size_request(m_xLbOLEAction->get_approximate_digit_width()
* 48,
+ m_xLbOLEAction->get_height_rows(12));
+
+ m_xBtnSearch->connect_clicked( LINK( this, SdTPAction, ClickSearchHdl ) );
+ m_xBtnSeek->connect_clicked( LINK( this, SdTPAction, ClickSearchHdl ) );
// this page needs ExchangeSupport
SetExchangeSupport();
- m_pLbAction->SetSelectHdl( LINK( this, SdTPAction, ClickActionHdl ) );
- m_pLbTree->SetSelectHdl( LINK( this, SdTPAction, SelectTreeHdl ) );
- m_pEdtDocument->SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) );
- m_pEdtMacro->SetLoseFocusHdl( LINK( this, SdTPAction, CheckFileHdl ) );
+ m_xLbAction->connect_changed( LINK( this, SdTPAction, ClickActionHdl ) );
+ m_xLbTree->connect_changed( LINK( this, SdTPAction, SelectTreeHdl ) );
+ m_xEdtDocument->connect_focus_out( LINK( this, SdTPAction, CheckFileHdl )
);
+ m_xEdtMacro->connect_focus_out( LINK( this, SdTPAction, CheckFileHdl ) );
//Lock to initial max size
- Size aSize(get_preferred_size());
- set_width_request(aSize.Width());
- set_height_request(aSize.Height());
+ Size aSize(m_xContainer->get_preferred_size());
+ m_xContainer->set_size_request(aSize.Width(), aSize.Height());
- ClickActionHdl( *m_pLbAction );
+ ClickActionHdl( *m_xLbAction );
}
SdTPAction::~SdTPAction()
@@ -141,24 +138,6 @@ SdTPAction::~SdTPAction()
disposeOnce();
}
-void SdTPAction::dispose()
-{
- m_pLbAction.clear();
- m_pFtTree.clear();
- m_pLbTree.clear();
- m_pLbTreeDocument.clear();
- m_pLbOLEAction.clear();
- m_pFrame.clear();
- m_pEdtSound.clear();
- m_pEdtBookmark.clear();
- m_pEdtDocument.clear();
- m_pEdtProgram.clear();
- m_pEdtMacro.clear();
- m_pBtnSearch.clear();
- m_pBtnSeek.clear();
- SfxTabPage::dispose();
-}
-
void SdTPAction::SetView( const ::sd::View* pSdView )
{
mpView = pSdView;
@@ -169,8 +148,8 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
{
mpDoc = pDocSh->GetDoc();
SfxViewFrame* pFrame = pDocSh->GetViewShell()->GetViewFrame();
- m_pLbTree->SetViewFrame( pFrame );
- m_pLbTreeDocument->SetViewFrame( pFrame );
+ m_xLbTree->SetViewFrame( pFrame );
+ m_xLbTreeDocument->SetViewFrame( pFrame );
pColList = pDocSh->GetItem( SID_COLOR_TABLE )->GetColorList();
DBG_ASSERT( pColList.is(), "No color table available!" );
@@ -216,7 +195,7 @@ void SdTPAction::Construct()
bOLEAction = true;
aVerbVector.push_back( 0 );
- m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars(
SdResId( STR_EDIT_OBJ ) ) );
+ m_xLbOLEAction->append_text( MnemonicGenerator::EraseAllMnemonicChars(
SdResId( STR_EDIT_OBJ ) ) );
}
else if( pOleObj )
{
@@ -242,7 +221,7 @@ void SdTPAction::Construct()
{
OUString aTmp( aVerb.VerbName );
aVerbVector.push_back( aVerb.VerbID );
- m_pLbOLEAction->InsertEntry(
MnemonicGenerator::EraseAllMnemonicChars( aTmp ) );
+ m_xLbOLEAction->append_text(
MnemonicGenerator::EraseAllMnemonicChars( aTmp ) );
}
}
}
@@ -256,7 +235,7 @@ void SdTPAction::Construct()
maCurrentActions.push_back( presentation::ClickAction_BOOKMARK );
maCurrentActions.push_back( presentation::ClickAction_DOCUMENT );
maCurrentActions.push_back( presentation::ClickAction_SOUND );
- if( bOLEAction && m_pLbOLEAction->GetEntryCount() )
+ if( bOLEAction && m_xLbOLEAction->n_children() )
maCurrentActions.push_back( presentation::ClickAction_VERB );
maCurrentActions.push_back( presentation::ClickAction_PROGRAM );
maCurrentActions.push_back( presentation::ClickAction_MACRO );
@@ -266,7 +245,7 @@ void SdTPAction::Construct()
for (presentation::ClickAction & rAction : maCurrentActions)
{
const char* pRId = GetClickActionSdResId(rAction);
- m_pLbAction->InsertEntry(SdResId(pRId));
+ m_xLbAction->append_text(SdResId(pRId));
}
}
@@ -276,10 +255,10 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs )
bool bModified = false;
presentation::ClickAction eCA = presentation::ClickAction_NONE;
- if( m_pLbAction->GetSelectedEntryCount() )
+ if (m_xLbAction->get_active() != -1)
eCA = GetActualClickAction();
- if( m_pLbAction->IsValueChangedFromSaved() )
+ if( m_xLbAction->get_value_changed_from_saved() )
{
rAttrs->Put( SfxAllEnumItem( ATTR_ACTION, static_cast<sal_uInt16>(eCA)
) );
bModified = true;
@@ -319,7 +298,7 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
presentation::ClickAction eCA = presentation::ClickAction_NONE;
OUString aFileName;
- // m_pLbAction
+ // m_xLbAction
if( rAttrs->GetItemState( ATTR_ACTION ) != SfxItemState::DONTCARE )
{
eCA = static_cast<presentation::ClickAction>(static_cast<const
SfxAllEnumItem&>( rAttrs->
@@ -327,9 +306,9 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
SetActualClickAction( eCA );
}
else
- m_pLbAction->SetNoSelection();
+ m_xLbAction->set_active(-1);
- // m_pEdtSound
+ // m_xEdtSound
if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SfxItemState::DONTCARE
)
{
aFileName = static_cast<const SfxStringItem&>( rAttrs->Get(
ATTR_ACTION_FILENAME ) ).GetValue();
@@ -340,25 +319,25 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
{
case presentation::ClickAction_BOOKMARK:
{
- if( !m_pLbTree->SelectEntry( aFileName ) )
- m_pLbTree->SelectAll( false );
+ if (!m_xLbTree->SelectEntry(aFileName))
+ m_xLbTree->unselect_all();
}
break;
case presentation::ClickAction_DOCUMENT:
{
if( comphelper::string::getTokenCount(aFileName, DOCUMENT_TOKEN)
== 2 )
- m_pLbTreeDocument->SelectEntry( aFileName.getToken( 1,
DOCUMENT_TOKEN ) );
+ m_xLbTreeDocument->SelectEntry( aFileName.getToken( 1,
DOCUMENT_TOKEN ) );
}
break;
default:
break;
}
- ClickActionHdl( *m_pLbAction );
+ ClickActionHdl( *m_xLbAction );
- m_pLbAction->SaveValue();
- m_pEdtSound->SaveValue();
+ m_xLbAction->save_value();
+ m_xEdtSound->save_value();
}
void SdTPAction::ActivatePage( const SfxItemSet& )
@@ -373,18 +352,17 @@ DeactivateRC SdTPAction::DeactivatePage( SfxItemSet*
pPageSet )
return DeactivateRC::LeavePage;
}
-VclPtr<SfxTabPage> SdTPAction::Create( TabPageParent pWindow,
+VclPtr<SfxTabPage> SdTPAction::Create( TabPageParent pParent,
const SfxItemSet& rAttrs )
{
- return VclPtr<SdTPAction>::Create( pWindow.pParent, rAttrs );
+ return VclPtr<SdTPAction>::Create( pParent, rAttrs );
}
void SdTPAction::UpdateTree()
{
if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() &&
mpDoc->GetDocSh()->GetMedium() )
{
- //m_pLbTree->Clear();
- m_pLbTree->Fill( mpDoc, true,
mpDoc->GetDocSh()->GetMedium()->GetName() );
+ m_xLbTree->Fill( mpDoc, true,
mpDoc->GetDocSh()->GetMedium()->GetName() );
bTreeUpdated = true;
}
}
@@ -402,7 +380,7 @@ void SdTPAction::OpenFileDialog()
if( bPage )
{
// search in the TreeLB for the specified object
- m_pLbTree->SelectEntry( GetEditText() );
+ m_xLbTree->SelectEntry(GetEditText());
}
else
{
@@ -410,7 +388,7 @@ void SdTPAction::OpenFileDialog()
if (bSound)
{
- SdOpenSoundFileDialog aFileDialog(GetFrameWeld());
+ SdOpenSoundFileDialog aFileDialog(GetDialogFrameWeld());
if( !aFile.isEmpty() )
aFileDialog.SetPath( aFile );
@@ -424,7 +402,7 @@ void SdTPAction::OpenFileDialog()
else if (bMacro)
{
// choose macro dialog
- OUString aScriptURL = SfxApplication::ChooseScript(GetFrameWeld());
+ OUString aScriptURL =
SfxApplication::ChooseScript(GetDialogFrameWeld());
if ( !aScriptURL.isEmpty() )
{
@@ -435,7 +413,7 @@ void SdTPAction::OpenFileDialog()
{
sfx2::FileDialogHelper aFileDialog(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- FileDialogFlags::NONE, GetFrameWeld());
+ FileDialogFlags::NONE, GetDialogFrameWeld());
if (bDocument && aFile.isEmpty())
aFile = SvtPathOptions().GetWorkPath();
@@ -456,17 +434,17 @@ void SdTPAction::OpenFileDialog()
SetEditText( aFile );
}
if( bDocument )
- CheckFileHdl( *m_pEdtDocument );
+ CheckFileHdl( *m_xEdtDocument );
}
}
}
-IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl, Button*, void)
+IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl, weld::Button&, void)
{
OpenFileDialog();
}
-IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, weld::ComboBox&, void)
{
presentation::ClickAction eCA = GetActualClickAction();
@@ -481,81 +459,81 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&,
void)
case presentation::ClickAction_LASTPAGE:
case presentation::ClickAction_STOPPRESENTATION:
default:
- m_pFtTree->Hide();
- m_pLbTree->Hide();
- m_pLbTreeDocument->Hide();
- m_pLbOLEAction->Hide();
-
- m_pFrame->Hide();
- m_pEdtSound->Hide();
- m_pEdtBookmark->Hide();
- m_pEdtDocument->Hide();
- m_pEdtProgram->Hide();
- m_pEdtMacro->Hide();
- m_pBtnSearch->Hide();
- m_pBtnSeek->Hide();
+ m_xFtTree->hide();
+ m_xLbTree->hide();
+ m_xLbTreeDocument->hide();
+ m_xLbOLEAction->hide();
+
+ m_xFrame->hide();
+ m_xEdtSound->hide();
+ m_xEdtBookmark->hide();
+ m_xEdtDocument->hide();
+ m_xEdtProgram->hide();
+ m_xEdtMacro->hide();
+ m_xBtnSearch->hide();
+ m_xBtnSeek->hide();
break;
case presentation::ClickAction_SOUND:
case presentation::ClickAction_PROGRAM:
case presentation::ClickAction_MACRO:
- m_pFtTree->Hide();
- m_pLbTree->Hide();
- m_pLbTreeDocument->Hide();
- m_pLbOLEAction->Hide();
+ m_xFtTree->hide();
+ m_xLbTree->hide();
+ m_xLbTreeDocument->hide();
+ m_xLbOLEAction->hide();
- m_pEdtDocument->Hide();
+ m_xEdtDocument->hide();
if( eCA == presentation::ClickAction_MACRO )
{
- m_pEdtSound->Hide();
- m_pEdtProgram->Hide();
+ m_xEdtSound->hide();
+ m_xEdtProgram->hide();
}
else if( eCA == presentation::ClickAction_PROGRAM )
{
- m_pEdtSound->Hide();
- m_pEdtMacro->Hide();
+ m_xEdtSound->hide();
+ m_xEdtMacro->hide();
}
else if( eCA == presentation::ClickAction_SOUND )
{
- m_pEdtProgram->Hide();
- m_pEdtMacro->Hide();
+ m_xEdtProgram->hide();
+ m_xEdtMacro->hide();
}
- m_pBtnSeek->Hide();
+ m_xBtnSeek->hide();
break;
case presentation::ClickAction_DOCUMENT:
- m_pLbTree->Hide();
- m_pLbOLEAction->Hide();
-
- m_pEdtSound->Hide();
- m_pEdtProgram->Hide();
- m_pEdtMacro->Hide();
- m_pEdtBookmark->Hide();
- m_pBtnSeek->Hide();
+ m_xLbTree->hide();
+ m_xLbOLEAction->hide();
+
+ m_xEdtSound->hide();
+ m_xEdtProgram->hide();
+ m_xEdtMacro->hide();
+ m_xEdtBookmark->hide();
+ m_xBtnSeek->hide();
break;
case presentation::ClickAction_BOOKMARK:
- m_pLbTreeDocument->Hide();
- m_pLbOLEAction->Hide();
- m_pEdtSound->Hide();
- m_pEdtDocument->Hide();
- m_pEdtProgram->Hide();
- m_pEdtMacro->Hide();
- m_pBtnSearch->Hide();
+ m_xLbTreeDocument->hide();
+ m_xLbOLEAction->hide();
+ m_xEdtSound->hide();
+ m_xEdtDocument->hide();
+ m_xEdtProgram->hide();
+ m_xEdtMacro->hide();
+ m_xBtnSearch->hide();
break;
case presentation::ClickAction_VERB:
- m_pLbTree->Hide();
- m_pEdtDocument->Hide();
- m_pEdtProgram->Hide();
- m_pEdtBookmark->Hide();
- m_pEdtMacro->Hide();
- m_pBtnSearch->Hide();
- m_pFrame->Hide();
- m_pEdtSound->Hide();
- m_pBtnSeek->Hide();
+ m_xLbTree->hide();
+ m_xEdtDocument->hide();
+ m_xEdtProgram->hide();
+ m_xEdtBookmark->hide();
+ m_xEdtMacro->hide();
+ m_xBtnSearch->hide();
+ m_xFrame->hide();
+ m_xEdtSound->hide();
+ m_xBtnSeek->hide();
break;
}
@@ -573,77 +551,77 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&,
void)
break;
case presentation::ClickAction_SOUND:
- m_pFrame->Show();
- m_pEdtSound->Show();
- m_pEdtSound->Enable();
- m_pBtnSearch->Show();
- m_pBtnSearch->Enable();
- m_pFrame->set_label( SdResId( STR_EFFECTDLG_SOUND ) );
+ m_xFrame->show();
+ m_xEdtSound->show();
+ m_xEdtSound->set_sensitive(true);
+ m_xBtnSearch->show();
+ m_xBtnSearch->set_sensitive(true);
+ m_xFrame->set_label( SdResId( STR_EFFECTDLG_SOUND ) );
break;
case presentation::ClickAction_PROGRAM:
case presentation::ClickAction_MACRO:
- m_pFrame->Show();
- m_pBtnSearch->Show();
- m_pBtnSearch->Enable();
+ m_xFrame->show();
+ m_xBtnSearch->show();
+ m_xBtnSearch->set_sensitive(true);
if( eCA == presentation::ClickAction_MACRO )
{
- m_pEdtMacro->Show();
- m_pFrame->set_label( SdResId( STR_EFFECTDLG_MACRO ) );
+ m_xEdtMacro->show();
+ m_xFrame->set_label( SdResId( STR_EFFECTDLG_MACRO ) );
}
else
{
- m_pEdtProgram->Show();
- m_pFrame->set_label( SdResId( STR_EFFECTDLG_PROGRAM ) );
+ m_xEdtProgram->show();
+ m_xFrame->set_label( SdResId( STR_EFFECTDLG_PROGRAM ) );
}
break;
case presentation::ClickAction_DOCUMENT:
- m_pFtTree->Show();
- m_pLbTreeDocument->Show();
+ m_xFtTree->show();
+ m_xLbTreeDocument->show();
- m_pFrame->Show();
- m_pEdtDocument->Show();
- m_pBtnSearch->Show();
- m_pBtnSearch->Enable();
+ m_xFrame->show();
+ m_xEdtDocument->show();
+ m_xBtnSearch->show();
+ m_xBtnSearch->set_sensitive(true);
- m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
- m_pFrame->set_label( SdResId( STR_EFFECTDLG_DOCUMENT ) );
+ m_xFtTree->set_label( SdResId( STR_EFFECTDLG_JUMP ) );
+ m_xFrame->set_label( SdResId( STR_EFFECTDLG_DOCUMENT ) );
- CheckFileHdl( *m_pEdtDocument );
+ CheckFileHdl( *m_xEdtDocument );
break;
case presentation::ClickAction_VERB:
- m_pFtTree->Show();
- m_pLbOLEAction->Show();
+ m_xFtTree->show();
+ m_xLbOLEAction->show();
- m_pFtTree->SetText( SdResId( STR_EFFECTDLG_ACTION ) );
+ m_xFtTree->set_label( SdResId( STR_EFFECTDLG_ACTION ) );
break;
case presentation::ClickAction_BOOKMARK:
UpdateTree();
- m_pFtTree->Show();
- m_pLbTree->Show();
+ m_xFtTree->show();
+ m_xLbTree->show();
- m_pFrame->Show();
- m_pEdtBookmark->Show();
- m_pBtnSeek->Show();
+ m_xFrame->show();
+ m_xEdtBookmark->show();
+ m_xBtnSeek->show();
- m_pFtTree->SetText( SdResId( STR_EFFECTDLG_JUMP ) );
- m_pFrame->set_label( SdResId( STR_EFFECTDLG_PAGE_OBJECT ) );
+ m_xFtTree->set_label( SdResId( STR_EFFECTDLG_JUMP ) );
+ m_xFrame->set_label( SdResId( STR_EFFECTDLG_PAGE_OBJECT ) );
break;
default:
break;
}
}
-IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, weld::TreeView&, void)
{
- m_pEdtBookmark->SetText( m_pLbTree->GetSelectedEntry() );
+ m_xEdtBookmark->set_text( m_xLbTree->get_selected_text() );
}
-IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
+IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, weld::Widget&, void)
{
OUString aFile( GetEditText() );
@@ -677,10 +655,10 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
{
aLastFile = aFile;
- m_pLbTreeDocument->Clear();
- m_pLbTreeDocument->Fill(pBookmarkDoc, true, aFile);
+ m_xLbTreeDocument->clear();
+ m_xLbTreeDocument->Fill(pBookmarkDoc, true, aFile);
mpDoc->CloseBookmarkDoc();
- m_pLbTreeDocument->Show();
+ m_xLbTreeDocument->show();
bHideTreeDocument = false;
}
}
@@ -691,19 +669,18 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
}
if (bHideTreeDocument)
- m_pLbTreeDocument->Hide();
+ m_xLbTreeDocument->hide();
}
else
- m_pLbTreeDocument->Hide();
+ m_xLbTreeDocument->hide();
}
presentation::ClickAction SdTPAction::GetActualClickAction()
{
presentation::ClickAction eCA = presentation::ClickAction_NONE;
- sal_Int32 nPos = m_pLbAction->GetSelectedEntryPos();
-
- if (nPos != LISTBOX_ENTRY_NOTFOUND && static_cast<size_t>(nPos) <
maCurrentActions.size())
+ int nPos = m_xLbAction->get_active();
+ if (nPos != -1 && static_cast<size_t>(nPos) < maCurrentActions.size())
eCA = maCurrentActions[ nPos ];
return eCA;
}
@@ -714,7 +691,7 @@ void SdTPAction::SetActualClickAction(
presentation::ClickAction eCA )
std::find(maCurrentActions.begin(),maCurrentActions.end(),eCA);
if ( pIter != maCurrentActions.end() )
- m_pLbAction->SelectEntryPos( pIter-maCurrentActions.begin() );
+ m_xLbAction->set_active(pIter-maCurrentActions.begin());
}
void SdTPAction::SetEditText( OUString const & rStr )
@@ -750,28 +727,26 @@ void SdTPAction::SetEditText( OUString const & rStr )
switch( eCA )
{
case presentation::ClickAction_SOUND:
- m_pEdtSound->SetText(aText );
+ m_xEdtSound->set_text(aText );
break;
case presentation::ClickAction_VERB:
{
::std::vector< long >::iterator aFound( ::std::find(
aVerbVector.begin(), aVerbVector.end(), rStr.toInt32() ) );
if( aFound != aVerbVector.end() )
- m_pLbOLEAction->SelectEntryPos( static_cast< short >(
aFound - aVerbVector.begin() ) );
+ m_xLbOLEAction->select(aFound - aVerbVector.begin());
}
break;
case presentation::ClickAction_PROGRAM:
- m_pEdtProgram->SetText( aText );
+ m_xEdtProgram->set_text( aText );
break;
case presentation::ClickAction_MACRO:
- {
- m_pEdtMacro->SetText( aText );
- }
+ m_xEdtMacro->set_text( aText );
break;
case presentation::ClickAction_DOCUMENT:
- m_pEdtDocument->SetText( aText );
+ m_xEdtDocument->set_text( aText );
break;
case presentation::ClickAction_BOOKMARK:
- m_pEdtBookmark->SetText( aText );
+ m_xEdtBookmark->set_text( aText );
break;
default:
break;
@@ -786,30 +761,30 @@ OUString SdTPAction::GetEditText( bool
bFullDocDestination )
switch( eCA )
{
case presentation::ClickAction_SOUND:
- aStr = m_pEdtSound->GetText();
+ aStr = m_xEdtSound->get_text();
break;
case presentation::ClickAction_VERB:
{
- const sal_Int32 nPos = m_pLbOLEAction->GetSelectedEntryPos();
- if( static_cast<size_t>(nPos) < aVerbVector.size() )
+ const int nPos = m_xLbOLEAction->get_selected_index();
+ if (nPos != -1 && static_cast<size_t>(nPos) <
aVerbVector.size() )
aStr = OUString::number( aVerbVector[ nPos ] );
return aStr;
}
case presentation::ClickAction_DOCUMENT:
- aStr = m_pEdtDocument->GetText();
+ aStr = m_xEdtDocument->get_text();
break;
case presentation::ClickAction_PROGRAM:
- aStr = m_pEdtProgram->GetText();
+ aStr = m_xEdtProgram->get_text();
break;
case presentation::ClickAction_MACRO:
{
- return m_pEdtMacro->GetText();
+ return m_xEdtMacro->get_text();
}
case presentation::ClickAction_BOOKMARK:
- return m_pEdtBookmark->GetText();
+ return m_xEdtBookmark->get_text();
default:
break;
@@ -829,10 +804,10 @@ OUString SdTPAction::GetEditText( bool
bFullDocDestination )
if( bFullDocDestination &&
eCA == presentation::ClickAction_DOCUMENT &&
- m_pLbTreeDocument->Control::IsVisible() &&
- m_pLbTreeDocument->GetSelectionCount() > 0 )
+ m_xLbTreeDocument->get_visible() &&
+ m_xLbTreeDocument->get_selected() )
{
- OUString aTmpStr( m_pLbTreeDocument->GetSelectedEntry() );
+ OUString aTmpStr( m_xLbTreeDocument->get_selected_text() );
if( !aTmpStr.isEmpty() )
{
aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index beaa5d4b5d57..e08674568bd2 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -301,6 +301,9 @@ private:
SfxMedium* m_pMedium;
SfxMedium* m_pOwnMedium;
bool m_bLinkableSelected;
+ /** This flag controls whether to show all pages.
+ */
+ bool m_bShowAllPages;
OUString m_aDocName;
::sd::DrawDocShellRef m_xBookmarkDocShRef; ///< for the loading of
bookmarks
Link<weld::TreeView&, void> m_aChangeHdl;
@@ -321,11 +324,32 @@ private:
DECL_LINK(RequestingChildrenHdl, const weld::TreeIter&, bool);
DECL_LINK(SelectHdl, weld::TreeView&, void);
+ /** Determine whether the specified page belongs to the current show
+ which is either the standard show or a custom show.
+ @param pPage
+ Pointer to the page for which to check whether it belongs to the
+ show.
+ @return
+ Returns <FALSE/> if there is no custom show or if the current
+ show does not contain the specified page at least once.
+ */
+ bool PageBelongsToCurrentShow (const SdPage* pPage) const;
+
public:
SdPageObjsTLV(std::unique_ptr<weld::TreeView> xTreeview);
~SdPageObjsTLV();
+ void hide()
+ {
+ m_xTreeView->hide();
+ }
+
+ void show()
+ {
+ m_xTreeView->show();
+ }
+
void set_size_request(int nWidth, int nHeight)
{
m_xTreeView->set_size_request(nWidth, nHeight);
@@ -346,9 +370,16 @@ public:
m_xTreeView->set_selection_mode(eMode);
}
- std::vector<int> get_selected_rows() const
+ bool SelectEntry(const OUString& rName);
+
+ OUString get_selected_text() const
{
- return m_xTreeView->get_selected_rows();
+ return m_xTreeView->get_selected_text();
+ }
+
+ bool get_selected() const
+ {
+ return m_xTreeView->get_selected(nullptr);
}
void connect_changed(const Link<weld::TreeView&, void>& rLink)
@@ -371,10 +402,41 @@ public:
return m_xTreeView->make_iterator();
}
+ bool get_visible() const
+ {
+ return m_xTreeView->get_visible();
+ }
+
+ void unselect_all()
+ {
+ m_xTreeView->unselect_all();
+ }
+
void SetViewFrame(const SfxViewFrame* pViewFrame);
+ void Fill(const SdDrawDocument*, bool bAllPages, const OUString& rDocName);
void Fill(const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString&
rDocName);
+ /** Add one list box entry for the parent of the given shapes and one
child entry for
+ each of the given shapes.
+ @param rList
+ The container of shapes that are to be inserted.
+ @param pShape
+ The parent shape or NULL when the parent is a page.
+ @param rsName
+ The name to be displayed for the new parent node.
+ @param bIsExcluded
+ Some pages can be excluded (from the show?).
+ @param pParentEntry
+ The parent entry of the new parent entry.
+ */
+ void AddShapeList (
+ const SdrObjList& rList,
+ SdrObject* pShape,
+ const OUString& rsName,
+ const bool bIsExcluded,
+ weld::TreeIter* pParentEntry);
+
/** return selected entries
nDepth == 0 -> pages
nDepth == 1 -> objects */
@@ -389,6 +451,16 @@ public:
{
m_xTreeView->insert(nullptr, -1, &rName, nullptr, nullptr, nullptr,
&rExpander, false, nullptr);
}
+
+ void InsertEntry(weld::TreeIter* pParent, const OUString& rId, const
OUString &rName, const OUString &rExpander, weld::TreeIter* pEntry = nullptr)
+ {
+ m_xTreeView->insert(pParent, -1, &rName, &rId, nullptr, nullptr,
&rExpander, false, pEntry);
+ }
+
+ void clear()
+ {
+ m_xTreeView->clear();
+ }
};
#endif // INCLUDED_SD_SOURCE_UI_INC_SDTREELB_HXX
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 1e9ee447cffd..1bb4b5287849 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -51,22 +51,6 @@ public:
class SdTPAction : public SfxTabPage
{
private:
- VclPtr<ListBox> m_pLbAction;
-
- VclPtr<FixedText> m_pFtTree; // jump
destination controls
- VclPtr<SdPageObjsTLB> m_pLbTree;
- VclPtr<SdPageObjsTLB> m_pLbTreeDocument;
- VclPtr<ListBox> m_pLbOLEAction;
-
- VclPtr<VclFrame> m_pFrame;
- VclPtr<Edit> m_pEdtSound;
- VclPtr<Edit> m_pEdtBookmark;
- VclPtr<Edit> m_pEdtDocument;
- VclPtr<Edit> m_pEdtProgram;
- VclPtr<Edit> m_pEdtMacro;
- VclPtr<PushButton> m_pBtnSearch;
- VclPtr<PushButton> m_pBtnSeek;
-
const ::sd::View* mpView;
SdDrawDocument* mpDoc;
XColorListRef pColList;
@@ -76,10 +60,24 @@ private:
OUString aLastFile;
::std::vector< long > aVerbVector;
- DECL_LINK( ClickSearchHdl, Button*, void );
- DECL_LINK( ClickActionHdl, ListBox&, void );
- DECL_LINK( SelectTreeHdl, SvTreeListBox*, void );
- DECL_LINK( CheckFileHdl, Control&, void );
+ std::unique_ptr<weld::ComboBox> m_xLbAction;
+ std::unique_ptr<weld::Label> m_xFtTree; // jump destination
controls
+ std::unique_ptr<SdPageObjsTLV> m_xLbTree;
+ std::unique_ptr<SdPageObjsTLV> m_xLbTreeDocument;
+ std::unique_ptr<weld::TreeView> m_xLbOLEAction;
+ std::unique_ptr<weld::Frame> m_xFrame;
+ std::unique_ptr<weld::Entry> m_xEdtSound;
+ std::unique_ptr<weld::Entry> m_xEdtBookmark;
+ std::unique_ptr<weld::Entry> m_xEdtDocument;
+ std::unique_ptr<weld::Entry> m_xEdtProgram;
+ std::unique_ptr<weld::Entry> m_xEdtMacro;
+ std::unique_ptr<weld::Button> m_xBtnSearch;
+ std::unique_ptr<weld::Button> m_xBtnSeek;
+
+ DECL_LINK( ClickSearchHdl, weld::Button&, void );
+ DECL_LINK( ClickActionHdl, weld::ComboBox&, void );
+ DECL_LINK( SelectTreeHdl, weld::TreeView&, void );
+ DECL_LINK( CheckFileHdl, weld::Widget&, void );
void UpdateTree();
void OpenFileDialog();
@@ -90,9 +88,8 @@ private:
static const char*
GetClickActionSdResId(css::presentation::ClickAction eCA);
public:
- SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs );
- virtual ~SdTPAction() override;
- virtual void dispose() override;
+ SdTPAction(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ virtual ~SdTPAction() override;
static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet& );
diff --git a/sd/uiconfig/simpress/ui/interactionpage.ui
b/sd/uiconfig/simpress/ui/interactionpage.ui
index 6c921d03afc9..6c9d74d9a06d 100644
--- a/sd/uiconfig/simpress/ui/interactionpage.ui
+++ b/sd/uiconfig/simpress/ui/interactionpage.ui
@@ -1,8 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sd">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
+ <object class="GtkTreeStore" id="liststore1">
+ <columns>
+ <!-- column-name expander -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkTreeStore" id="liststore2">
+ <columns>
+ <!-- column-name expander -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkTreeStore" id="liststore3">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkGrid" id="InteractionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36,10 +63,10 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes"
context="interactionpage|label2">Action at mouse click:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">listbox</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -60,11 +87,11 @@
<object class="GtkLabel" id="fttree">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes"
context="interactionpage|fttree">Target:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">box3</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -79,13 +106,46 @@
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="sdlo-SdPageObjsTLB" id="tree:border">
- <property name="can_focus">False</property>
+ <object class="GtkScrolledWindow">
+ <property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="SdPageObjsTLB-selection1"/>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="tree">
+ <property name="width_request">-1</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <property name="show_expanders">True</property>
+ <property name="enable_tree_lines">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro
Library List-selection1"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn2">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext2"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
@@ -95,13 +155,46 @@
</packing>
</child>
<child>
- <object class="sdlo-SdPageObjsTLB" id="treedoc:border">
- <property name="can_focus">False</property>
+ <object class="GtkScrolledWindow">
+ <property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="SdPageObjsTLB-selection2"/>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treedoc">
+ <property name="width_request">-1</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <property name="show_expanders">True</property>
+ <property name="enable_tree_lines">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro
Library List-selection11"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn21">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="cellrenderertext44"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext22"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
@@ -111,14 +204,38 @@
</packing>
</child>
<child>
- <object class="GtkTreeView" id="oleaction:border">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="oleaction">
+ <property name="width_request">-1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro
Library List-selection111"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="treeviewcolumn211">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext222"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
@@ -224,6 +341,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="sound-atkobject">
<property name="AtkObject::accessible-name"
translatable="yes" context="interactionpage|sound-atkobject">Path
Name</property>
@@ -241,6 +359,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -253,6 +372,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -265,6 +385,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -277,6 +398,7 @@
<property name="can_focus">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -313,9 +435,9 @@
<object class="GtkSizeGroup" id="sizegroup1">
<property name="mode">both</property>
<widgets>
- <widget name="tree:border"/>
- <widget name="treedoc:border"/>
- <widget name="oleaction:border"/>
+ <widget name="tree"/>
+ <widget name="treedoc"/>
+ <widget name="oleaction"/>
</widgets>
</object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
