diff options
| -rw-r--r-- | sc/UI_scalc.mk | 1 | ||||
| -rw-r--r-- | sc/inc/scabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 17 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/namedlg.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/namemgrtable.hxx | 22 | ||||
| -rw-r--r-- | sc/source/ui/inc/namepast.hxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/namedlg/namedlg.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/namedlg/namemgrtable.cxx | 93 | ||||
| -rw-r--r-- | sc/source/ui/namedlg/namepast.cxx | 37 | ||||
| -rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/editsh.cxx | 2 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/insertname.ui | 159 |
13 files changed, 134 insertions, 217 deletions
diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk index 9c7e1dac9224..46afc890e99c 100644 --- a/sc/UI_scalc.mk +++ b/sc/UI_scalc.mk @@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,modules/scalc)) $(eval $(call gb_UI_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/cellprotectionpage \ sc/uiconfig/scalc/ui/definename \ + sc/uiconfig/scalc/ui/insertname \ sc/uiconfig/scalc/ui/insertsheet \ sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/sortcriteriapage \ diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 9873658b7edf..1683d3da812b 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -420,7 +420,7 @@ public: virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId ) = 0; //add for ScNameCreateDlg - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, int nId , bool bInsList=true ) = 0; // add for ScNamePasteDlg + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0; // add for ScNamePasteDlg virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ) = 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 52d9c58c4a5b..ca1bfd49407d 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -1119,21 +1119,10 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg ( -AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, int nId , bool bInsList ) +AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList ) { - ScNamePasteDlg * pDlg=NULL; - switch ( nId ) - { - case RID_SCDLG_NAMES_PASTE : - pDlg = new ScNamePasteDlg( pParent, pShell, bInsList ); - break; - default: - break; - } - - if ( pDlg ) - return new AbstractScNamePasteDlg_Impl( pDlg ); - return 0; + ScNamePasteDlg * pDlg = new ScNamePasteDlg( pParent, pShell, bInsList ); + return new AbstractScNamePasteDlg_Impl( pDlg ); } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 59390edffb52..f0cca3dc5136 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -489,7 +489,7 @@ public: virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId ); //add for ScNameCreateDlg - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, int nId , bool bInsList=true ); //add for ScNamePasteDlg + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ); //add for ScNamePasteDlg virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 86bb8cfff27d..933af353dacb 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -69,7 +69,7 @@ private: FixedLine maFlDiv; FixedText maFtInfo; - ScRangeManagerCtrl maNameMgrCtrl; + SvxSimpleTableContainer maNameMgrCtrl; ScRangeManagerTable* mpRangeManagerTable; const rtl::OUString maGlobalNameStr; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index f4c37c89ce59..d82ce5cd0f1e 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -26,8 +26,7 @@ * instead of those above. */ -#include <svtools/headbar.hxx> -#include <svtools/svtabbx.hxx> +#include <svx/simptabl.hxx> #include <vcl/ctrl.hxx> #include "scresid.hxx" @@ -46,24 +45,13 @@ struct ScRangeNameLine rtl::OUString aScope; }; -/** Implements the Control behind the table - * It controls the size of the table - */ -class ScRangeManagerCtrl : public Control -{ -public: - ScRangeManagerCtrl(Window* pParent, const ScResId& rResId): - Control( pParent, rResId) {} -}; - //Implements the table for the manage names dialog //TODO: cache the lines for performance improvements //otherwise handling of a large set of range names might get extremely slow //Need some sort of a filter to handle several range names -class SC_DLLPUBLIC ScRangeManagerTable : public SvTabListBox +class SC_DLLPUBLIC ScRangeManagerTable : public SvxSimpleTable { private: - HeaderBar maHeaderBar; rtl::OUString maGlobalString; // should be const because we should not modify it here @@ -79,10 +67,14 @@ private: void CheckForFormulaString(); const ScRangeData* findRangeData(const ScRangeNameLine& rLine); + void setColWidths(); + public: - ScRangeManagerTable( Window* pParent, boost::ptr_map<rtl::OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); + ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<rtl::OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); + virtual void Resize(); + void addEntry( const ScRangeNameLine& rLine, bool bSetCurEntry = true ); void DeleteSelectedEntries(); void SetEntry( const ScRangeNameLine& rLine ); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 4e245c714295..ba4098c05824 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -37,13 +37,9 @@ class ScNamePasteDlg : public ModalDialog DECL_LINK( ButtonHdl, Button * ); private: - PushButton maBtnPasteAll; - PushButton maBtnPaste; - HelpButton maHelpButton; - PushButton maBtnClose; - FixedLine maFlDiv; - - ScRangeManagerCtrl maCtrl; + PushButton* m_pBtnPasteAll; + PushButton* m_pBtnPaste; + PushButton* m_pBtnClose; ScRangeManagerTable* mpTable; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 04a44a8de18b..ec102ae66683 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -125,7 +125,7 @@ void ScNameDlg::Init() //init UI maFtInfo.SetStyle(WB_VCENTER); - mpRangeManagerTable = new ScRangeManagerTable(&maNameMgrCtrl, maRangeMap, maCursorPos); + mpRangeManagerTable = new ScRangeManagerTable(maNameMgrCtrl, maRangeMap, maCursorPos); mpRangeManagerTable->SetSelectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) ); mpRangeManagerTable->SetDeselectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) ); diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 30f4685633e2..7c9ee05e7025 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -57,38 +57,29 @@ String createEntryString(const ScRangeNameLine& rLine) return aRet; } -ScRangeManagerTable::ScRangeManagerTable( Window* pWindow, boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ): - SvTabListBox( pWindow, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), - maHeaderBar( pWindow, WB_BUTTONSTYLE | WB_BOTTOMBORDER ), +ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ): + SvxSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE)), mrRangeMap( rRangeMap ), maPos( rPos ) { - Size aBoxSize( pWindow->GetOutputSizePixel() ); + static long aStaticTabs[] = {3, 0, 0, 0 }; + SetTabs( &aStaticTabs[0], MAP_PIXEL ); - maHeaderBar.SetPosSizePixel( Point(0, 0), Size( aBoxSize.Width(), 16 ) ); + OUString aNameStr(ScGlobal::GetRscString(STR_HEADER_NAME)); + OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE)); + OUString aScopeStr(ScGlobal::GetRscString(STR_HEADER_SCOPE)); - String aNameStr(ScGlobal::GetRscString(STR_HEADER_NAME)); - String aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE)); - String aScopeStr(ScGlobal::GetRscString(STR_HEADER_SCOPE)); - - long nTabSize = aBoxSize.Width()/3; - maHeaderBar.InsertItem( ITEMID_NAME, aNameStr, nTabSize, HIB_LEFT| HIB_VCENTER ); - maHeaderBar.InsertItem( ITEMID_RANGE, aRangeStr, nTabSize, HIB_LEFT| HIB_VCENTER ); - maHeaderBar.InsertItem( ITEMID_SCOPE, aScopeStr, nTabSize, HIB_LEFT| HIB_VCENTER ); - - static long nTabs[] = {3, 0, nTabSize, 2*nTabSize }; - Size aHeadSize( maHeaderBar.GetSizePixel() ); - - //pParent->SetFocusControl( this ); - SetPosSizePixel( Point( 0, aHeadSize.Height() ), Size( aBoxSize.Width(), aBoxSize.Height() - aHeadSize.Height() ) ); - SetTabs( &nTabs[0], MAP_PIXEL ); - - maHeaderBar.SetEndDragHdl( LINK( this, ScRangeManagerTable, HeaderEndDragHdl ) ); + HeaderBar& rHeaderBar = GetTheHeaderBar(); + rHeaderBar.InsertItem( ITEMID_NAME, aNameStr, 0, HIB_LEFT| HIB_VCENTER ); + rHeaderBar.InsertItem( ITEMID_RANGE, aRangeStr, 0, HIB_LEFT| HIB_VCENTER ); + rHeaderBar.InsertItem( ITEMID_SCOPE, aScopeStr, 0, HIB_LEFT| HIB_VCENTER ); + rHeaderBar.SetEndDragHdl( LINK( this, ScRangeManagerTable, HeaderEndDragHdl ) ); + setColWidths(); + UpdateViewSize(); Init(); - Show(); - maHeaderBar.Show(); + ShowTable(); SetSelectionMode(MULTIPLE_SELECTION); if (GetEntryCount()) { @@ -100,6 +91,27 @@ ScRangeManagerTable::ScRangeManagerTable( Window* pWindow, boost::ptr_map<rtl::O HeaderEndDragHdl(pNull); } +void ScRangeManagerTable::Resize() +{ + SvxSimpleTable::Resize(); + setColWidths(); +} + +void ScRangeManagerTable::setColWidths() +{ + HeaderBar &rHeaderBar = GetTheHeaderBar(); + if (rHeaderBar.GetItemCount() < 3) + return; + long nTabSize = GetSizePixel().Width() / 3; + rHeaderBar.SetItemSize( ITEMID_NAME, nTabSize); + rHeaderBar.SetItemSize( ITEMID_RANGE, nTabSize); + rHeaderBar.SetItemSize( ITEMID_SCOPE, nTabSize); + static long aStaticTabs[] = {3, 0, nTabSize, 2*nTabSize }; + SetTabs( &aStaticTabs[0], MAP_PIXEL ); + void* pNull = NULL; + HeaderEndDragHdl(pNull); +} + ScRangeManagerTable::~ScRangeManagerTable() { Clear(); @@ -269,24 +281,25 @@ void CalculateItemSize(const long& rTableSize, long& rItemNameSize, long& rItemR IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl) { - long aTableSize = maHeaderBar.GetSizePixel().Width(); - long aItemNameSize = maHeaderBar.GetItemSize(ITEMID_NAME); - long aItemRangeSize = maHeaderBar.GetItemSize(ITEMID_RANGE); + HeaderBar& rHeaderBar = GetTheHeaderBar(); + + long nTableSize = rHeaderBar.GetSizePixel().Width(); + long nItemNameSize = rHeaderBar.GetItemSize(ITEMID_NAME); + long nItemRangeSize = rHeaderBar.GetItemSize(ITEMID_RANGE); //calculate column size based on user input and minimum size - CalculateItemSize(aTableSize, aItemNameSize, aItemRangeSize); - long aItemScopeSize = aTableSize - aItemNameSize - aItemRangeSize; - - Size aSz; - aSz.Width() = aItemNameSize; - SetTab( ITEMID_NAME, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); - maHeaderBar.SetItemSize(ITEMID_NAME, aItemNameSize); - aSz.Width() += aItemRangeSize; - SetTab( ITEMID_RANGE, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); - maHeaderBar.SetItemSize(ITEMID_RANGE, aItemRangeSize); - aSz.Width() += aItemScopeSize; - SetTab( ITEMID_SCOPE, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); - maHeaderBar.SetItemSize(ITEMID_SCOPE, aItemScopeSize); + CalculateItemSize(nTableSize, nItemNameSize, nItemRangeSize); + long nItemScopeSize = nTableSize - nItemNameSize - nItemRangeSize; + + Size aSz(nItemNameSize, 0); + rHeaderBar.SetItemSize(ITEMID_NAME, nItemNameSize); + rHeaderBar.SetItemSize(ITEMID_RANGE, nItemRangeSize); + rHeaderBar.SetItemSize(ITEMID_SCOPE, nItemScopeSize); + + SetTab(0, 0, MAP_APPFONT ); + SetTab(1, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); + aSz.Width() += nItemRangeSize; + SetTab(2, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); return 0; } diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 29b0ed2aa558..b2f0544a9085 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -35,14 +35,12 @@ //================================================================== ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) - : ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ), - maBtnPasteAll ( this, ScResId( BTN_PASTE_ALL ) ), - maBtnPaste ( this, ScResId( BTN_PASTE ) ), - maHelpButton ( this, ScResId( BTN_HELP ) ), - maBtnClose ( this, ScResId( BTN_CLOSE ) ), - maFlDiv ( this, ScResId( FL_DIV ) ), - maCtrl ( this, ScResId( CTRL_TABLE ) ) + : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) { + get(m_pBtnPasteAll, "pasteall"); + get(m_pBtnPaste, "paste"); + get(m_pBtnClose, "close"); + ScDocument* pDoc = pShell->GetDocument(); std::map<rtl::OUString, ScRangeName*> aCopyMap; pDoc->GetRangeNameMap(aCopyMap); @@ -55,19 +53,22 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) ScViewData* pViewData = pShell->GetViewData(); ScAddress aPos(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo()); - mpTable = new ScRangeManagerTable(&maCtrl, maRangeMap, aPos); + SvxSimpleTableContainer *pContainer = get<SvxSimpleTableContainer>("ctrl"); + Size aControlSize(210, 0); + aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); + pContainer->set_width_request(aControlSize.Width()); + pContainer->set_height_request(10 * GetTextHeight()); + mpTable = new ScRangeManagerTable(*pContainer, maRangeMap, aPos); - maBtnPaste.SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl) ); - maBtnPasteAll.SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl)); - maBtnClose.SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl)); + m_pBtnPaste->SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl) ); + m_pBtnPasteAll->SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl)); + m_pBtnClose->SetClickHdl( LINK( this, ScNamePasteDlg, ButtonHdl)); if (!mpTable->GetEntryCount()) { - maBtnPaste.Disable(); - maBtnPasteAll.Disable(); + m_pBtnPaste->Disable(); + m_pBtnPasteAll->Disable(); } - - FreeResource(); } ScNamePasteDlg::~ScNamePasteDlg() @@ -79,11 +80,11 @@ ScNamePasteDlg::~ScNamePasteDlg() IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) { - if( pButton == &maBtnPasteAll ) + if( pButton == m_pBtnPasteAll ) { EndDialog( BTN_PASTE_LIST ); } - else if( pButton == &maBtnPaste ) + else if( pButton == m_pBtnPaste ) { std::vector<ScRangeNameLine> aSelectedLines = mpTable->GetSelectedEntries(); for (std::vector<ScRangeNameLine>::const_iterator itr = aSelectedLines.begin(); @@ -93,7 +94,7 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) } EndDialog( BTN_PASTE_NAME ); } - else if( pButton == &maBtnClose ) + else if( pButton == m_pBtnClose ) { EndDialog( BTN_PASTE_CLOSE ); } diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index c32ed5de0572..93353d610729 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1995,7 +1995,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pTabViewShell->GetDialogParent(), GetViewData()->GetDocShell(), RID_SCDLG_NAMES_PASTE ); + AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pTabViewShell->GetDialogParent(), GetViewData()->GetDocShell() ); OSL_ENSURE(pDlg, "Dialog create fail!"); switch( pDlg->Execute() ) { diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 4a9a1495d455..20c33cef5111 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -399,7 +399,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); - AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pViewData->GetDocShell(), RID_SCDLG_NAMES_PASTE, false ); + AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pViewData->GetDocShell(), false ); OSL_ENSURE(pDlg, "Dialog create fail!"); short nRet = pDlg->Execute(); // pDlg is needed below diff --git a/sc/uiconfig/scalc/ui/insertname.ui b/sc/uiconfig/scalc/ui/insertname.ui index 5986ec7eabbf..c4e8e33b52d7 100644 --- a/sc/uiconfig/scalc/ui/insertname.ui +++ b/sc/uiconfig/scalc/ui/insertname.ui @@ -1,78 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> - <object class="GtkAction" id="action1"/> - <object class="GtkWindow" id="Paste Names"> + <object class="GtkDialog" id="InsertNameDialog"> <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Paste Names</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="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox" id="box4"> - <property name="visible">True</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">end</property> <child> - <object class="GtkBox" id="box5"> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">100</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Name</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="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Range</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Scope</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> + <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> + <property name="secondary">True</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkButton" id="pasteall"> + <property name="label" translatable="yes">_Paste All</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> + <property name="receives_default">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -80,34 +44,26 @@ <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box2"> - <property name="visible">True</property> - <property name="can_focus">False</property> <child> - <object class="GtkButton" id="button1"> - <property name="label" translatable="yes">_Paste All</property> + <object class="GtkButton" id="paste"> + <property name="label">gtk-paste</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_underline">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> + <property name="pack_type">end</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkButton" id="paste"> - <property name="label">gtk-paste</property> + <object class="GtkButton" id="close"> + <property name="label">gtk-close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -117,68 +73,37 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">3</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="separator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="pack_type">end</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="box3"> + <object class="svxcorelo-SvxSimpleTableContainer" id="ctrl"> <property name="visible">True</property> <property name="can_focus">False</property> - <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">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="close"> - <property name="label">gtk-close</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="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> + <property name="hexpand">True</property> + <property name="vexpand">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> </object> </child> + <action-widgets> + <action-widget response="0">help</action-widget> + <action-widget response="0">pasteall</action-widget> + <action-widget response="0">paste</action-widget> + <action-widget response="0">close</action-widget> + </action-widgets> </object> </interface> |