Skip to content

C
core
Kaydet (Commit) 08dc9757 authored tarafından Krisztian Pinter's avatar Krisztian Pinter Kaydeden (comit) Jan Holesovsky
Dosyalara gözat
Seçenekler

startcenter: Add new document buttons to "All" tab 

Change-Id: I39154f74e126826daeb74345c0712156b89a6d02
Reviewed-on: https://gerrit.libreoffice.org/5456Reviewed-by: 's avatarJan Holesovsky <kendy@suse.cz>
Tested-by: 's avatarJan Holesovsky <kendy@suse.cz>
üst 1ece204b
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 36 deletions
sfx2/source/dialog/backingwindow.cxx
Dosyayı görüntüle @ 08dc9757
...@@ -82,6 +82,13 @@ BackingWindow::BackingWindow( Window* i_pParent ) : ...@@ -82,6 +82,13 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get(mpDBButton, "database"); get(mpDBButton, "database");
get(mpMathButton, "math"); 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(mpExtensionsButton, "extension");
get(mpInfoButton, "info"); get(mpInfoButton, "info");
get(mpTplRepButton, "add_temp"); get(mpTplRepButton, "add_temp");
...@@ -226,6 +233,13 @@ void BackingWindow::initControls() ...@@ -226,6 +233,13 @@ void BackingWindow::initControls()
setupButton( mpImpressButton ); setupButton( mpImpressButton );
setupButton( mpMathButton ); setupButton( mpMathButton );
setupButton( mpWriterAllButton );
setupButton( mpDrawAllButton );
setupButton( mpCalcAllButton );
setupButton( mpDBAllButton );
setupButton( mpImpressAllButton );
setupButton( mpMathAllButton );
setupButton( mpOpenButton ); setupButton( mpOpenButton );
setupButton( mpTemplateButton ); setupButton( mpTemplateButton );
...@@ -234,8 +248,6 @@ void BackingWindow::initControls() ...@@ -234,8 +248,6 @@ void BackingWindow::initControls()
setupExternalLink( mpTplRepButton ); setupExternalLink( mpTplRepButton );
Resize(); Resize();
mpWriterButton->GrabFocus();
} }
void BackingWindow::setupModuleTab(const OString& rTabName, RecentDocsView* pRecView, int nFileTypes, void BackingWindow::setupModuleTab(const OString& rTabName, RecentDocsView* pRecView, int nFileTypes,
...@@ -392,17 +404,17 @@ IMPL_LINK( BackingWindow, ExtLinkClickHdl, Button*, pButton ) ...@@ -392,17 +404,17 @@ IMPL_LINK( BackingWindow, ExtLinkClickHdl, Button*, pButton )
IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
{ {
// dispatch the appropriate URL and end the dialog // dispatch the appropriate URL and end the dialog
if( pButton == mpWriterButton ) if( pButton == mpWriterButton || pButton == mpWriterAllButton )
dispatchURL( WRITER_URL ); dispatchURL( WRITER_URL );
else if( pButton == mpCalcButton ) else if( pButton == mpCalcButton || pButton == mpCalcAllButton )
dispatchURL( CALC_URL ); dispatchURL( CALC_URL );
else if( pButton == mpImpressButton ) else if( pButton == mpImpressButton || pButton == mpImpressAllButton )
dispatchURL( IMPRESS_WIZARD_URL ); dispatchURL( IMPRESS_WIZARD_URL );
else if( pButton == mpDrawButton ) else if( pButton == mpDrawButton || pButton == mpDrawAllButton )
dispatchURL( DRAW_URL ); dispatchURL( DRAW_URL );
else if( pButton == mpDBButton ) else if( pButton == mpDBButton || pButton == mpDBAllButton )
dispatchURL( BASE_URL ); dispatchURL( BASE_URL );
else if( pButton == mpMathButton ) else if( pButton == mpMathButton || pButton == mpMathAllButton )
dispatchURL( MATH_URL ); dispatchURL( MATH_URL );
else if( pButton == mpOpenButton ) else if( pButton == mpOpenButton )
{ {
......
sfx2/source/dialog/backingwindow.hxx
Dosyayı görüntüle @ 08dc9757
...@@ -59,6 +59,13 @@ class BackingWindow ...@@ -59,6 +59,13 @@ class BackingWindow
PushButton* mpDBButton; PushButton* mpDBButton;
PushButton* mpMathButton; PushButton* mpMathButton;
PushButton* mpWriterAllButton;
PushButton* mpCalcAllButton;
PushButton* mpImpressAllButton;
PushButton* mpDrawAllButton;
PushButton* mpDBAllButton;
PushButton* mpMathAllButton;
PushButton* mpExtensionsButton; PushButton* mpExtensionsButton;
PushButton* mpInfoButton; PushButton* mpInfoButton;
PushButton* mpTplRepButton; PushButton* mpTplRepButton;
......
sfx2/uiconfig/ui/startcenter.ui
Dosyayı görüntüle @ 08dc9757
...@@ -7,31 +7,6 @@ ...@@ -7,31 +7,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="pixbuf">framework/res/addtemplate_32.png</property> <property name="pixbuf">framework/res/addtemplate_32.png</property>
</object> </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"> <object class="GtkBox" id="StartCenter">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
...@@ -71,11 +46,101 @@ ...@@ -71,11 +46,101 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="label8"> <object class="GtkGrid" id="grid16">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="hexpand">True</property>
<property name="xalign">0</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> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -631,11 +696,62 @@ ...@@ -631,11 +696,62 @@
</packing> </packing>
</child> </child>
</object> </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"> <object class="GtkImage" id="info_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="pixbuf">framework/res/info_26.png</property> <property name="pixbuf">framework/res/info_26.png</property>
</object> </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"> <object class="GtkImage" id="math_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -651,6 +767,11 @@ ...@@ -651,6 +767,11 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="pixbuf">framework/res/templates_32.png</property> <property name="pixbuf">framework/res/templates_32.png</property>
</object> </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"> <object class="GtkImage" id="writer_image">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
......
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