sfx2/source/dialog/backingwindow.cxx | 28 +++-- sfx2/source/dialog/backingwindow.hxx | 7 + sfx2/uiconfig/ui/startcenter.ui | 177 +++++++++++++++++++++++++++++------ 3 files changed, 176 insertions(+), 36 deletions(-)
New commits: commit 08dc975721d7837bf9611104a7052b5384685167 Author: Krisztian Pinter <pin.termina...@gmail.com> Date: Fri Aug 16 19:16:45 2013 +0200 startcenter: Add new document buttons to "All" tab Change-Id: I39154f74e126826daeb74345c0712156b89a6d02 Reviewed-on: https://gerrit.libreoffice.org/5456 Reviewed-by: Jan Holesovsky <ke...@suse.cz> Tested-by: Jan Holesovsky <ke...@suse.cz> diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 2e8afdf..d69b2fb 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -82,6 +82,13 @@ BackingWindow::BackingWindow( Window* i_pParent ) : get(mpDBButton, "database"); get(mpMathButton, "math"); + get(mpWriterAllButton, "writer_all"); + get(mpCalcAllButton, "calc_all"); + get(mpImpressAllButton, "impress_all"); + get(mpDrawAllButton, "draw_all"); + get(mpDBAllButton, "database_all"); + get(mpMathAllButton, "math_all"); + get(mpExtensionsButton, "extension"); get(mpInfoButton, "info"); get(mpTplRepButton, "add_temp"); @@ -226,6 +233,13 @@ void BackingWindow::initControls() setupButton( mpImpressButton ); setupButton( mpMathButton ); + setupButton( mpWriterAllButton ); + setupButton( mpDrawAllButton ); + setupButton( mpCalcAllButton ); + setupButton( mpDBAllButton ); + setupButton( mpImpressAllButton ); + setupButton( mpMathAllButton ); + setupButton( mpOpenButton ); setupButton( mpTemplateButton ); @@ -234,8 +248,6 @@ void BackingWindow::initControls() setupExternalLink( mpTplRepButton ); Resize(); - - mpWriterButton->GrabFocus(); } void BackingWindow::setupModuleTab(const OString& rTabName, RecentDocsView* pRecView, int nFileTypes, @@ -392,17 +404,17 @@ IMPL_LINK( BackingWindow, ExtLinkClickHdl, Button*, pButton ) IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) { // dispatch the appropriate URL and end the dialog - if( pButton == mpWriterButton ) + if( pButton == mpWriterButton || pButton == mpWriterAllButton ) dispatchURL( WRITER_URL ); - else if( pButton == mpCalcButton ) + else if( pButton == mpCalcButton || pButton == mpCalcAllButton ) dispatchURL( CALC_URL ); - else if( pButton == mpImpressButton ) + else if( pButton == mpImpressButton || pButton == mpImpressAllButton ) dispatchURL( IMPRESS_WIZARD_URL ); - else if( pButton == mpDrawButton ) + else if( pButton == mpDrawButton || pButton == mpDrawAllButton ) dispatchURL( DRAW_URL ); - else if( pButton == mpDBButton ) + else if( pButton == mpDBButton || pButton == mpDBAllButton ) dispatchURL( BASE_URL ); - else if( pButton == mpMathButton ) + else if( pButton == mpMathButton || pButton == mpMathAllButton ) dispatchURL( MATH_URL ); else if( pButton == mpOpenButton ) { diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 7fbcabd..9bacbc8 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -59,6 +59,13 @@ class BackingWindow PushButton* mpDBButton; PushButton* mpMathButton; + PushButton* mpWriterAllButton; + PushButton* mpCalcAllButton; + PushButton* mpImpressAllButton; + PushButton* mpDrawAllButton; + PushButton* mpDBAllButton; + PushButton* mpMathAllButton; + PushButton* mpExtensionsButton; PushButton* mpInfoButton; PushButton* mpTplRepButton; diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 05d4bdb..2274155 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -7,31 +7,6 @@ <property name="can_focus">False</property> <property name="pixbuf">framework/res/addtemplate_32.png</property> </object> - <object class="GtkImage" id="calc_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">res/ods_32_8.png</property> - </object> - <object class="GtkImage" id="database_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">res/odb_32_8.png</property> - </object> - <object class="GtkImage" id="draw_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">res/odg_32_8.png</property> - </object> - <object class="GtkImage" id="extension_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">framework/res/extension.png</property> - </object> - <object class="GtkImage" id="impress_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">res/odp_32_8.png</property> - </object> <object class="GtkBox" id="StartCenter"> <property name="can_focus">False</property> <child> @@ -71,11 +46,101 @@ </packing> </child> <child> - <object class="GtkLabel" id="label8"> + <object class="GtkGrid" id="grid16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="xalign">0</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkButton" id="writer_all"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">New Document</property> + <property name="image">writer_all_image</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="calc_all"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">New Spreadsheet</property> + <property name="image">calc_all_image</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="impress_all"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="image">impress_all_image</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="draw_all"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">New Drawing</property> + <property name="image">draw_all_image</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="database_all"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">New Database</property> + <property name="image">database_all_image</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="math_all"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">New Formula</property> + <property name="image">math_all_image</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> @@ -631,11 +696,62 @@ </packing> </child> </object> + <object class="GtkImage" id="calc_all_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/ods_32_8.png</property> + </object> + <object class="GtkImage" id="calc_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/ods_32_8.png</property> + </object> + <object class="GtkImage" id="database_all_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/odb_32_8.png</property> + </object> + <object class="GtkImage" id="database_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/odb_32_8.png</property> + </object> + <object class="GtkImage" id="draw_all_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/odg_32_8.png</property> + </object> + <object class="GtkImage" id="draw_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/odg_32_8.png</property> + </object> + <object class="GtkImage" id="extension_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">framework/res/extension.png</property> + </object> + <object class="GtkImage" id="impress_all_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">New Presentation</property> + <property name="pixbuf">res/odp_32_8.png</property> + </object> + <object class="GtkImage" id="impress_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/odp_32_8.png</property> + </object> <object class="GtkImage" id="info_image"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="pixbuf">framework/res/info_26.png</property> </object> + <object class="GtkImage" id="math_all_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/odf_32_8.png</property> + </object> <object class="GtkImage" id="math_image"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -651,6 +767,11 @@ <property name="can_focus">False</property> <property name="pixbuf">framework/res/templates_32.png</property> </object> + <object class="GtkImage" id="writer_all_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/odt_32_8.png</property> + </object> <object class="GtkImage" id="writer_image"> <property name="visible">True</property> <property name="can_focus">False</property> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits