This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new db990016e8 Graphics for StartCenter - new revision
db990016e8 is described below
commit db990016e8a3b2a5d6f9b604975b8226260a0692
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Nov 1 16:44:35 2024 +0100
Graphics for StartCenter - new revision
(cherry picked from commit 0af133014c99632b2f692ee537aeca22afd2b581)
---
main/default_images/framework/res/backing.png | Bin 16596 -> 16444 bytes
main/default_images/framework/res/backing_hc.png | Bin 16632 -> 16228 bytes
.../default_images/framework/res/backing_right.png | Bin 7899 -> 7725 bytes
.../framework/res/backing_right_hc.png | Bin 7958 -> 7475 bytes
.../framework/res/backing_rtl_left.png | Bin 14004 -> 13863 bytes
.../framework/res/backing_rtl_left_hc.png | Bin 14027 -> 13641 bytes
.../framework/res/backing_rtl_right.png | Bin 7887 -> 7725 bytes
.../framework/res/backing_rtl_right_hc.png | Bin 7953 -> 7475 bytes
.../default_images/framework/res/backing_space.png | Bin 335 -> 294 bytes
.../framework/res/backing_space_hc.png | Bin 325 -> 284 bytes
main/default_images/framework/res/beta/backing.png | Bin 18726 -> 18635 bytes
.../framework/res/beta/backing_hc.png | Bin 18746 -> 18398 bytes
.../framework/res/beta/backing_rtl_left.png | Bin 15894 -> 15787 bytes
.../framework/res/beta/backing_rtl_left_hc.png | Bin 15920 -> 15519 bytes
main/default_images/framework/res/dev/backing.png | Bin 19061 -> 18964 bytes
.../framework/res/dev/backing_hc.png | Bin 19095 -> 18970 bytes
.../framework/res/dev/backing_rtl_left.png | Bin 16068 -> 15939 bytes
.../framework/res/dev/backing_rtl_left_hc.png | Bin 16026 -> 15784 bytes
main/framework/source/services/backingwindow.hxx | 176 ++++++++++-----------
19 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/main/default_images/framework/res/backing.png
b/main/default_images/framework/res/backing.png
index be49d34461..0b321fe41e 100644
Binary files a/main/default_images/framework/res/backing.png and
b/main/default_images/framework/res/backing.png differ
diff --git a/main/default_images/framework/res/backing_hc.png
b/main/default_images/framework/res/backing_hc.png
index 65611ef382..7ab5c2c8d0 100644
Binary files a/main/default_images/framework/res/backing_hc.png and
b/main/default_images/framework/res/backing_hc.png differ
diff --git a/main/default_images/framework/res/backing_right.png
b/main/default_images/framework/res/backing_right.png
index fbdffa7907..315d6e4bdf 100644
Binary files a/main/default_images/framework/res/backing_right.png and
b/main/default_images/framework/res/backing_right.png differ
diff --git a/main/default_images/framework/res/backing_right_hc.png
b/main/default_images/framework/res/backing_right_hc.png
index 8f3f556363..31c334c5f1 100644
Binary files a/main/default_images/framework/res/backing_right_hc.png and
b/main/default_images/framework/res/backing_right_hc.png differ
diff --git a/main/default_images/framework/res/backing_rtl_left.png
b/main/default_images/framework/res/backing_rtl_left.png
index cdfb609ed3..c1946e8d3a 100644
Binary files a/main/default_images/framework/res/backing_rtl_left.png and
b/main/default_images/framework/res/backing_rtl_left.png differ
diff --git a/main/default_images/framework/res/backing_rtl_left_hc.png
b/main/default_images/framework/res/backing_rtl_left_hc.png
index 3ab543f482..64b9f95e06 100644
Binary files a/main/default_images/framework/res/backing_rtl_left_hc.png and
b/main/default_images/framework/res/backing_rtl_left_hc.png differ
diff --git a/main/default_images/framework/res/backing_rtl_right.png
b/main/default_images/framework/res/backing_rtl_right.png
index 1f7a0bb021..798e11bbd4 100644
Binary files a/main/default_images/framework/res/backing_rtl_right.png and
b/main/default_images/framework/res/backing_rtl_right.png differ
diff --git a/main/default_images/framework/res/backing_rtl_right_hc.png
b/main/default_images/framework/res/backing_rtl_right_hc.png
index 7153cb62fa..b20c37ff4a 100644
Binary files a/main/default_images/framework/res/backing_rtl_right_hc.png and
b/main/default_images/framework/res/backing_rtl_right_hc.png differ
diff --git a/main/default_images/framework/res/backing_space.png
b/main/default_images/framework/res/backing_space.png
index 955d672422..d950c88665 100644
Binary files a/main/default_images/framework/res/backing_space.png and
b/main/default_images/framework/res/backing_space.png differ
diff --git a/main/default_images/framework/res/backing_space_hc.png
b/main/default_images/framework/res/backing_space_hc.png
index 5fe0389bc0..0d833d2380 100644
Binary files a/main/default_images/framework/res/backing_space_hc.png and
b/main/default_images/framework/res/backing_space_hc.png differ
diff --git a/main/default_images/framework/res/beta/backing.png
b/main/default_images/framework/res/beta/backing.png
index 790837fe72..1e06b89537 100644
Binary files a/main/default_images/framework/res/beta/backing.png and
b/main/default_images/framework/res/beta/backing.png differ
diff --git a/main/default_images/framework/res/beta/backing_hc.png
b/main/default_images/framework/res/beta/backing_hc.png
index 6941e9dec2..de3bcc013a 100644
Binary files a/main/default_images/framework/res/beta/backing_hc.png and
b/main/default_images/framework/res/beta/backing_hc.png differ
diff --git a/main/default_images/framework/res/beta/backing_rtl_left.png
b/main/default_images/framework/res/beta/backing_rtl_left.png
index b570b247a2..db74df05ec 100644
Binary files a/main/default_images/framework/res/beta/backing_rtl_left.png and
b/main/default_images/framework/res/beta/backing_rtl_left.png differ
diff --git a/main/default_images/framework/res/beta/backing_rtl_left_hc.png
b/main/default_images/framework/res/beta/backing_rtl_left_hc.png
index 6fb84462ed..ff512d78b8 100644
Binary files a/main/default_images/framework/res/beta/backing_rtl_left_hc.png
and b/main/default_images/framework/res/beta/backing_rtl_left_hc.png differ
diff --git a/main/default_images/framework/res/dev/backing.png
b/main/default_images/framework/res/dev/backing.png
index d56f9bd496..0f0cc0c820 100644
Binary files a/main/default_images/framework/res/dev/backing.png and
b/main/default_images/framework/res/dev/backing.png differ
diff --git a/main/default_images/framework/res/dev/backing_hc.png
b/main/default_images/framework/res/dev/backing_hc.png
index 5f9355f05d..b7248a9113 100644
Binary files a/main/default_images/framework/res/dev/backing_hc.png and
b/main/default_images/framework/res/dev/backing_hc.png differ
diff --git a/main/default_images/framework/res/dev/backing_rtl_left.png
b/main/default_images/framework/res/dev/backing_rtl_left.png
index 11b9171f18..3a43bd49bb 100644
Binary files a/main/default_images/framework/res/dev/backing_rtl_left.png and
b/main/default_images/framework/res/dev/backing_rtl_left.png differ
diff --git a/main/default_images/framework/res/dev/backing_rtl_left_hc.png
b/main/default_images/framework/res/dev/backing_rtl_left_hc.png
index d0b3f64964..e5f66d4f1c 100644
Binary files a/main/default_images/framework/res/dev/backing_rtl_left_hc.png
and b/main/default_images/framework/res/dev/backing_rtl_left_hc.png differ
diff --git a/main/framework/source/services/backingwindow.hxx
b/main/framework/source/services/backingwindow.hxx
index ba14bca4de..5a0ab5cae2 100644
--- a/main/framework/source/services/backingwindow.hxx
+++ b/main/framework/source/services/backingwindow.hxx
@@ -65,110 +65,110 @@ namespace framework
using Window::ImplInit;
public:
- DecoToolBox( Window* pParent, WinBits nStyle = 0 );
- DecoToolBox( Window* pParent, const ResId& rResId );
+ DecoToolBox( Window* pParent, WinBits nStyle =
0 );
+ DecoToolBox( Window* pParent, const ResId&
rResId );
- void DataChanged( const DataChangedEvent& rDCEvt );
+ void DataChanged( const DataChangedEvent& rDCEvt );
- void calcMinSize();
- Size getMinSize();
+ void calcMinSize();
+ Size getMinSize();
};
class BackingWindow : public Window
{
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext
> mxContext;
- com::sun::star::uno::Reference<com::sun::star::frame::XDesktop>
mxDesktop;
-
com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider >
mxDesktopDispatchProvider;
- com::sun::star::uno::Reference<com::sun::star::frame::XFrame>
mxFrame;
- com::sun::star::uno::Reference<
com::sun::star::frame::XUIControllerFactory > mxPopupMenuFactory;
- com::sun::star::uno::Reference<
com::sun::star::frame::XPopupMenuController > mxPopupMenuController;
- com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >
mxPopupMenu;
-
- FixedText maWelcome;
- Size maWelcomeSize;
- FixedText maProduct;
- Size maProductSize;
- ImageButton maWriterButton;
- ImageButton maCalcButton;
- ImageButton maImpressButton;
- MenuButton maOpenButton;
- ImageButton maDrawButton;
- ImageButton maDBButton;
- ImageButton maMathButton;
- ImageButton maTemplateButton;
-
- DecoToolBox maToolbox;
-
- BitmapEx maBackgroundLeft;
- BitmapEx maBackgroundMiddle;
- BitmapEx maBackgroundRight;
-
- String maWelcomeString;
- String maProductString;
- String maCreateString;
- String maOpenString;
- String maTemplateString;
-
- Font maTextFont;
- Rectangle maControlRect;
-
- long mnColumnWidth[2];
- long mnTextColumnWidth[2];
- Color maLabelTextColor;
- Color maWelcomeTextColor;
-
- Size maButtonImageSize;
-
- bool mbInitControls;
- sal_Int32 mnLayoutStyle;
- svt::AcceleratorExecute* mpAccExec;
- long mnBtnPos;
- long mnBtnTop;
+ com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext > mxContext;
+ com::sun::star::uno::Reference<com::sun::star::frame::XDesktop>
mxDesktop;
+
com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider >
mxDesktopDispatchProvider;
+ com::sun::star::uno::Reference<com::sun::star::frame::XFrame>
mxFrame;
+ com::sun::star::uno::Reference<
com::sun::star::frame::XUIControllerFactory > mxPopupMenuFactory;
+ com::sun::star::uno::Reference<
com::sun::star::frame::XPopupMenuController > mxPopupMenuController;
+ com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu
> mxPopupMenu;
+
+ FixedText
maWelcome;
+ Size
maWelcomeSize;
+ FixedText
maProduct;
+ Size
maProductSize;
+ ImageButton
maWriterButton;
+ ImageButton
maCalcButton;
+ ImageButton
maImpressButton;
+ MenuButton
maOpenButton;
+ ImageButton
maDrawButton;
+ ImageButton
maDBButton;
+ ImageButton
maMathButton;
+ ImageButton
maTemplateButton;
+
+ DecoToolBox
maToolbox;
+
+ BitmapEx
maBackgroundLeft;
+ BitmapEx
maBackgroundMiddle;
+ BitmapEx
maBackgroundRight;
+
+ String
maWelcomeString;
+ String
maProductString;
+ String
maCreateString;
+ String
maOpenString;
+ String
maTemplateString;
+
+ Font
maTextFont;
+ Rectangle
maControlRect;
+
+ long
mnColumnWidth[2];
+ long
mnTextColumnWidth[2];
+ Color
maLabelTextColor;
+ Color
maWelcomeTextColor;
+
+ Size
maButtonImageSize;
+
+ bool
mbInitControls;
+ sal_Int32
mnLayoutStyle;
+ svt::AcceleratorExecute* mpAccExec;
+ long
mnBtnPos;
+ long
mnBtnTop;
static const int nItemId_Extensions = 1;
// static const int nItemId_Reg = 2;
static const int nItemId_Info = 3;
static const int nItemId_TplRep = 4;
static const int nShadowTop = 32;
- static const int nShadowLeft = 36;
- static const int nShadowRight = 46;
- static const int nShadowBottom = 50;
+ static const int nShadowLeft = 32;
+ static const int nShadowRight = 32;
+ static const int nShadowBottom = 32;
void loadImage( const ResId& i_rId, PushButton& i_rButton );
- void layoutButton( const char* i_pURL, int nColumn, const
std::set<rtl::OUString>& i_rURLS,
- SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule
i_eMod,
- PushButton& i_rBtn,
- MnemonicGenerator& i_rMnemonicGen,
- const String& i_rStr = String()
- );
-
- void dispatchURL( const rtl::OUString& i_rURL,
- const rtl::OUString& i_rTarget = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "_default" ) ),
- const com::sun::star::uno::Reference<
com::sun::star::frame::XDispatchProvider >& i_xProv =
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >(),
- const com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& = com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >()
- );
-
- DECL_LINK( ClickHdl, Button* );
- DECL_LINK( ActivateHdl, Button* );
- DECL_LINK( ToolboxHdl, void* );
-
- void initControls();
- void initBackground();
- void prepareRecentFileMenu();
- public:
- BackingWindow( Window* pParent );
- ~BackingWindow();
-
- virtual void Paint( const Rectangle& rRect );
- virtual void Resize();
- virtual long Notify( NotifyEvent& rNEvt );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual void GetFocus();
-
- void setOwningFrame( const com::sun::star::uno::Reference<
com::sun::star::frame::XFrame >& xFrame );
- };
+ void layoutButton( const char* i_pURL, int nColumn, const
std::set<rtl::OUString>& i_rURLS,
+ SvtModuleOptions& i_rOpt,
SvtModuleOptions::EModule i_eMod,
+ PushButton& i_rBtn,
+ MnemonicGenerator&
i_rMnemonicGen,
+ const String& i_rStr =
String()
+ );
+
+ void dispatchURL( const rtl::OUString& i_rURL,
+ const rtl::OUString&
i_rTarget = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ),
+ const
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >&
i_xProv = com::sun::star::uno::Reference<
com::sun::star::frame::XDispatchProvider >(),
+ const
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& =
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >()
+ );
+
+ DECL_LINK( ClickHdl, Button* );
+ DECL_LINK( ActivateHdl, Button* );
+ DECL_LINK( ToolboxHdl, void* );
+
+ void initControls();
+ void initBackground();
+ void prepareRecentFileMenu();
+ public:
+ BackingWindow( Window* pParent );
+ ~BackingWindow();
+
+ virtual void Paint( const Rectangle& rRect );
+ virtual void Resize();
+ virtual long Notify( NotifyEvent& rNEvt );
+ virtual void DataChanged( const DataChangedEvent&
rDCEvt );
+ virtual void GetFocus();
+
+ void setOwningFrame( const com::sun::star::uno::Reference<
com::sun::star::frame::XFrame >& xFrame );
+ };
}
