diff options
author | Jan Holesovsky <kendy@suse.cz> | 2013-07-17 17:14:14 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2013-07-18 11:25:51 +0200 |
commit | 82b4dbf25ed6641f4baf6d3fa5183bdc00baca69 (patch) | |
tree | 39a3b7481d63ea16240c0518db11034322d588bb /framework | |
parent | startcenter: The images have moved to .ui, remove from .src. (diff) | |
download | core-82b4dbf25ed6641f4baf6d3fa5183bdc00baca69.tar.gz core-82b4dbf25ed6641f4baf6d3fa5183bdc00baca69.zip |
startcenter: The window & strings are initialized in .ui, remove from .src.
Change-Id: I951e4bc12696a2cb5b1b93f28de25cd4783b9387
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/framework.hrc | 10 | ||||
-rw-r--r-- | framework/source/services/backingwindow.cxx | 14 | ||||
-rw-r--r-- | framework/source/services/backingwindow.hxx | 4 | ||||
-rw-r--r-- | framework/source/services/fwk_services.src | 32 | ||||
-rw-r--r-- | framework/uiconfig/startmodule/ui/startcenter.ui | 13 |
5 files changed, 11 insertions, 62 deletions
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 12c995419d05..1e9728067213 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -31,16 +31,6 @@ #define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) - -// ResIds for BackingWindow -#define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100) -#define STR_BACKING_CREATE 1 -#define STR_BACKING_TEMPLATE 2 -#define STR_BACKING_FILE 3 -#define STR_BACKING_EXTHELP 4 -#define STR_BACKING_INFOHELP 5 -#define STR_BACKING_TPLREP 6 - // Ids of TabWindow #define WIN_TABWINDOW (RID_FWK_DIALOG_START_CORRECT+101) #define TC_TABCONTROL 1 diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 8604d819f49e..61f1328fa945 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -18,9 +18,6 @@ */ #include "backingwindow.hxx" -#include "classes/resource.hrc" -#include "framework.hrc" -#include "classes/fwkresid.hxx" #include <services.h> #include <sal/macros.h> @@ -36,7 +33,6 @@ #include "unotools/dynamicmenuoptions.hxx" #include "unotools/historyoptions.hxx" #include "svtools/imagemgr.hxx" -#include "svtools/svtools.hrc" #include "svtools/langhelp.hxx" #include "svtools/colorcfg.hxx" @@ -81,9 +77,7 @@ using namespace framework; #define OPEN_URL ".uno:Open" BackingWindow::BackingWindow( Window* i_pParent ) : - Window( i_pParent , FwkResId( DLG_BACKING ) ), - maOpenString( FwkResId( STR_BACKING_FILE ) ), - maTemplateString( FwkResId( STR_BACKING_TEMPLATE ) ), + Window( i_pParent ), mbInitControls( false ), mnHideExternalLinks( 0 ), mpAccExec( NULL ) @@ -330,8 +324,6 @@ void BackingWindow::initControls() // create mnemonics on the fly, preregister the mnemonics of the menu MnemonicGenerator aMnemns; - maTemplateString = MnemonicGenerator::EraseAllMnemonicChars( maTemplateString ); - maOpenString = MnemonicGenerator::EraseAllMnemonicChars( maOpenString ); SystemWindow* pSysWin = GetSystemWindow(); if( pSysWin ) @@ -372,10 +364,10 @@ void BackingWindow::initControls() layoutButton( NULL, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, - *mpOpenButton, aMnemns, maOpenString ); + *mpOpenButton, aMnemns ); layoutButton( NULL, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, - *mpTemplateButton, aMnemns, maTemplateString ); + *mpTemplateButton, aMnemns ); layoutExternalLink( *mpExtensionsButton ); layoutExternalLink( *mpInfoButton ); diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index d52a8cbc383e..2c41356b45da 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -86,10 +86,6 @@ namespace framework BitmapEx maBackgroundMiddle; BitmapEx maBackgroundRight; - String maCreateString; - String maOpenString; - String maTemplateString; - Font maTextFont; Rectangle maControlRect; diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src index eadba8194fa6..00f6b16f9f66 100644 --- a/framework/source/services/fwk_services.src +++ b/framework/source/services/fwk_services.src @@ -19,38 +19,6 @@ #include "framework.hrc" -Window DLG_BACKING -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Border = FALSE; - - String STR_BACKING_CREATE - { - Text [ en-US ] = "Create a new document"; - }; - String STR_BACKING_TEMPLATE - { - Text [ en-US ] = "~Templates..."; - }; - String STR_BACKING_FILE - { - Text [ en-US ] = "~Open..."; - }; - String STR_BACKING_EXTHELP - { - Text [ en-US ] = "Add new features to %PRODUCTNAME"; - }; - String STR_BACKING_INFOHELP - { - Text [ en-US ] = "Get more information about %PRODUCTNAME"; - }; - String STR_BACKING_TPLREP - { - Text [ en-US ] = "Get more templates for %PRODUCTNAME"; - }; -}; - Window WIN_TABWINDOW { OutputSize = TRUE ; diff --git a/framework/uiconfig/startmodule/ui/startcenter.ui b/framework/uiconfig/startmodule/ui/startcenter.ui index 8839a631ce92..1a4d9d6a4895 100644 --- a/framework/uiconfig/startmodule/ui/startcenter.ui +++ b/framework/uiconfig/startmodule/ui/startcenter.ui @@ -46,6 +46,11 @@ <property name="can_focus">False</property> <property name="pixbuf">framework/res/folder_32.png</property> </object> + <object class="GtkImage" id="templates_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">framework/res/templates_32.png</property> + </object> <object class="GtkImage" id="writer_image"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -236,6 +241,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Add new features to %PRODUCTNAME</property> <property name="image">extension_image</property> <property name="relief">none</property> <property name="always_show_image">True</property> @@ -252,6 +258,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Get more information about %PRODUCTNAME</property> <property name="image">info_image</property> <property name="relief">none</property> <property name="always_show_image">True</property> @@ -268,6 +275,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Get more templates for %PRODUCTNAME</property> <property name="image">add_temp_image</property> <property name="relief">none</property> <property name="always_show_image">True</property> @@ -295,9 +303,4 @@ </packing> </child> </object> - <object class="GtkImage" id="templates_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixbuf">framework/res/templates_32.png</property> - </object> </interface> |