sfx2/inc/templatedlg.hxx | 1 - sfx2/source/doc/templatedlg.cxx | 15 +++++---------- sfx2/source/doc/templatedlg.src | 6 ------ 3 files changed, 5 insertions(+), 17 deletions(-)
New commits: commit eff94128b8434501a6f9c26a5a47cfd7d408f472 Author: Cédric Bosdonnat <[email protected]> Date: Tue Mar 19 10:13:16 2013 +0100 Template Manager: fixed TabStops for the toolbars Change-Id: Iab2dd8ef71fd84e9d147d90e9cad46d69a8fe650 diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx index 6b2d4bc..0a6be50 100644 --- a/sfx2/inc/templatedlg.hxx +++ b/sfx2/inc/templatedlg.hxx @@ -130,7 +130,6 @@ private: TabControl maTabControl; TabPage maTabPage; - Control *mpToolbars; Edit *mpSearchEdit; ToolBox *mpViewBar; diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 54bfdbc..6a828ce 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -114,11 +114,10 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) : ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)), maTabControl(this,SfxResId(TAB_CONTROL)), maTabPage(&maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)), - mpToolbars( new Control(&maTabPage,SfxResId(TOOLBARS))), mpSearchEdit(new Edit(&maTabPage,WB_HIDE | WB_BORDER)), - mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))), - mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))), - mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))), + mpViewBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_VIEW))), + mpActionBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_ACTION))), + mpTemplateBar( new ToolBox(&maTabPage, SfxResId(TBX_ACTION_TEMPLATES))), mpSearchView(new TemplateSearchView(&maTabPage)), maView(new TemplateLocalView(&maTabPage,SfxResId(TEMPLATE_VIEW))), mpOnlineView(new TemplateRemoteView(&maTabPage, WB_VSCROLL,false)), @@ -240,7 +239,6 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg () delete mpTemplateDefaultMenu; delete mpActionMenu; delete mpRepositoryMenu; - delete mpToolbars; } void SfxTemplateManagerDlg::setSaveMode(bool bMode) @@ -319,9 +317,6 @@ void SfxTemplateManagerDlg::Resize() long nToolbarsHeight = std::max(std::max(aViewSize.getHeight(), aActionSize.getHeight()), aTemplateSize.getHeight()); - Size aToolbarsSize (aWinSize.getWidth(), nToolbarsHeight); - mpToolbars->SetSizePixel(aToolbarsSize); - aActionSize.setWidth(3*aActionSize.getWidth()); aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar->GetPosPixel().X()); aTemplateSize.setWidth(aWinSize.getWidth()); @@ -335,7 +330,7 @@ void SfxTemplateManagerDlg::Resize() // Set view position below toolbox Point aViewPos = maView->GetPosPixel(); - aViewPos.setY(aToolbarsSize.getHeight()); + aViewPos.setY(nToolbarsHeight); aViewPos.setX(0); Size aThumbSize(aWinSize.getWidth(), maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY()); maView->SetPosSizePixel(aViewPos, aThumbSize); diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src index 3de2c42..1761118 100644 --- a/sfx2/source/doc/templatedlg.src +++ b/sfx2/source/doc/templatedlg.src @@ -112,12 +112,6 @@ TabPage TAB_TEMPLATE_MANAGER Size = MAP_APPFONT( 290, 220 ); Hide = TRUE; - Control TOOLBARS - { - Size = MAP_APPFONT( 290 , 20 ); - TabStop = False; - }; - Control TEMPLATE_VIEW { Pos = MAP_APPFONT( 0, 20 ); commit b6ba04639b9922f6717f79ac4be215e09691d7a9 Author: Cédric Bosdonnat <[email protected]> Date: Tue Mar 19 09:53:43 2013 +0100 Template Manager: fixed search edit field position Change-Id: Ic5ef64ba3ed4c98397b0c4911de491df4c79946a diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index ce815bb..54bfdbc 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -115,7 +115,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) maTabControl(this,SfxResId(TAB_CONTROL)), maTabPage(&maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)), mpToolbars( new Control(&maTabPage,SfxResId(TOOLBARS))), - mpSearchEdit(new Edit(this,WB_HIDE | WB_BORDER)), + mpSearchEdit(new Edit(&maTabPage,WB_HIDE | WB_BORDER)), mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))), mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))), mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))),
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
