From c958a35bef2d123b3e45c80bd7d1cf8d48986a9a Mon Sep 17 00:00:00 2001 From: Krisztian Pinter Date: Thu, 8 Aug 2013 17:00:57 +0200 Subject: Move startcenter.ui from framework to sfx2 In a previos move BackingWindow was moved, but startcenter.ui was left behind by accident. Change-Id: I7d9669df9b2b65311e119640ba2a7a331b6336e9 Reviewed-on: https://gerrit.libreoffice.org/5316 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky --- framework/UIConfig_startmodule.mk | 4 - framework/uiconfig/startmodule/ui/startcenter.ui | 306 ----------------------- sfx2/UIConfig_sfx.mk | 1 + sfx2/source/dialog/backingwindow.cxx | 2 +- sfx2/uiconfig/ui/startcenter.ui | 306 +++++++++++++++++++++++ 5 files changed, 308 insertions(+), 311 deletions(-) delete mode 100644 framework/uiconfig/startmodule/ui/startcenter.ui create mode 100644 sfx2/uiconfig/ui/startcenter.ui diff --git a/framework/UIConfig_startmodule.mk b/framework/UIConfig_startmodule.mk index 7447b998c143..6bbb68d93798 100644 --- a/framework/UIConfig_startmodule.mk +++ b/framework/UIConfig_startmodule.mk @@ -21,8 +21,4 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/StartModule,\ framework/uiconfig/startmodule/toolbar/standardbar \ )) -$(eval $(call gb_UIConfig_add_uifiles,modules/StartModule,\ - framework/uiconfig/startmodule/ui/startcenter \ -)) - # vim: set noet sw=4 ts=4: diff --git a/framework/uiconfig/startmodule/ui/startcenter.ui b/framework/uiconfig/startmodule/ui/startcenter.ui deleted file mode 100644 index 33c6e17dce0d..000000000000 --- a/framework/uiconfig/startmodule/ui/startcenter.ui +++ /dev/null @@ -1,306 +0,0 @@ - - - - - True - False - framework/res/addtemplate_32.png - - - True - False - res/ods_32_8.png - - - True - False - res/odb_32_8.png - - - True - False - res/odg_32_8.png - - - True - False - framework/res/extension.png - - - True - False - framework/res/info_26.png - - - True - False - res/odp_32_8.png - - - True - False - res/odf_32_8.png - - - True - False - framework/res/folder_32.png - - - True - False - framework/res/templates_32.png - - - True - False - res/odt_32_8.png - - - False - - - True - False - True - True - 12 - 12 - 12 - True - - - True - False - True - 12 - 12 - True - - - Text _Document - True - True - True - writer_image - none - True - 0 - - - 0 - 0 - 1 - 1 - - - - - D_rawing - True - True - True - draw_image - none - True - 0 - - - 1 - 0 - 1 - 1 - - - - - _Spreadsheet - True - True - True - calc_image - none - True - 0 - - - 0 - 1 - 1 - 1 - - - - - D_atabase - True - True - True - database_image - none - True - 0 - - - 1 - 1 - 1 - 1 - - - - - _Presentation - True - True - True - impress_image - none - True - 0 - - - 0 - 2 - 1 - 1 - - - - - F_ormula - True - True - True - math_image - none - True - 0 - - - 1 - 2 - 1 - 1 - - - - - Ope_n... - True - True - True - open_image - none - True - 0 - - - 0 - 3 - 1 - 1 - - - - - Te_mplates... - True - True - True - templates_image - none - True - 0 - - - 1 - 3 - 1 - 1 - - - - - 0 - 0 - 1 - 1 - - - - - True - False - end - True - 12 - 12 - - - True - True - True - Add new features to %PRODUCTNAME - extension_image - none - True - - - 1 - 0 - 1 - 1 - - - - - True - True - True - Get more information about %PRODUCTNAME - info_image - none - True - - - 2 - 0 - 1 - 1 - - - - - True - True - True - Get more templates for %PRODUCTNAME - add_temp_image - none - True - - - 0 - 0 - 1 - 1 - - - - - 0 - 1 - 1 - 1 - - - - - False - True - 0 - - - - diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk index f2cc39d50927..bda13f50472d 100644 --- a/sfx2/UIConfig_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -26,6 +26,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/singletabdialog \ sfx2/uiconfig/ui/versionsofdialog \ sfx2/uiconfig/ui/versioncommentdialog \ + sfx2/uiconfig/ui/startcenter \ )) # vim: set noet sw=4 ts=4: diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index be49bd2cf463..8d6781a53b77 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -80,7 +80,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : mpAccExec( NULL ) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), - "modules/StartModule/ui/startcenter.ui", + "sfx/ui/startcenter.ui", "StartCenter" ); get(mpWriterButton, "writer"); get(mpCalcButton, "calc"); diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui new file mode 100644 index 000000000000..33c6e17dce0d --- /dev/null +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -0,0 +1,306 @@ + + + + + True + False + framework/res/addtemplate_32.png + + + True + False + res/ods_32_8.png + + + True + False + res/odb_32_8.png + + + True + False + res/odg_32_8.png + + + True + False + framework/res/extension.png + + + True + False + framework/res/info_26.png + + + True + False + res/odp_32_8.png + + + True + False + res/odf_32_8.png + + + True + False + framework/res/folder_32.png + + + True + False + framework/res/templates_32.png + + + True + False + res/odt_32_8.png + + + False + + + True + False + True + True + 12 + 12 + 12 + True + + + True + False + True + 12 + 12 + True + + + Text _Document + True + True + True + writer_image + none + True + 0 + + + 0 + 0 + 1 + 1 + + + + + D_rawing + True + True + True + draw_image + none + True + 0 + + + 1 + 0 + 1 + 1 + + + + + _Spreadsheet + True + True + True + calc_image + none + True + 0 + + + 0 + 1 + 1 + 1 + + + + + D_atabase + True + True + True + database_image + none + True + 0 + + + 1 + 1 + 1 + 1 + + + + + _Presentation + True + True + True + impress_image + none + True + 0 + + + 0 + 2 + 1 + 1 + + + + + F_ormula + True + True + True + math_image + none + True + 0 + + + 1 + 2 + 1 + 1 + + + + + Ope_n... + True + True + True + open_image + none + True + 0 + + + 0 + 3 + 1 + 1 + + + + + Te_mplates... + True + True + True + templates_image + none + True + 0 + + + 1 + 3 + 1 + 1 + + + + + 0 + 0 + 1 + 1 + + + + + True + False + end + True + 12 + 12 + + + True + True + True + Add new features to %PRODUCTNAME + extension_image + none + True + + + 1 + 0 + 1 + 1 + + + + + True + True + True + Get more information about %PRODUCTNAME + info_image + none + True + + + 2 + 0 + 1 + 1 + + + + + True + True + True + Get more templates for %PRODUCTNAME + add_temp_image + none + True + + + 0 + 0 + 1 + 1 + + + + + 0 + 1 + 1 + 1 + + + + + False + True + 0 + + + + -- cgit