diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-03-06 00:28:09 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-03-06 01:20:16 +0200 |
commit | 98a03d9b0d13b8f811ccf8fc1a9b7f9469ed079c (patch) | |
tree | 6c9910cece8f25cb1d7d88b399e69190b472d2ce | |
parent | b398dacbb471913e573e9b0b4cd31d94a9109223 (diff) |
tdf#106224 Support extra large savemodified icon
For now just duplicated the large icon in Galaxy,
to satisfy the resource compiler.
Change-Id: Icf31df0185a1ec7f080d9600b2536bcaa5d0783e
-rw-r--r-- | framework/inc/classes/resource.hrc | 1 | ||||
-rw-r--r-- | framework/source/classes/resource.src | 5 | ||||
-rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 8 | ||||
-rw-r--r-- | icon-themes/galaxy/res/savemodified_extralarge.png | bin | 0 -> 1276 bytes |
4 files changed, 12 insertions, 2 deletions
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index 83656e5f31f5..ad3d9849d039 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -55,6 +55,7 @@ #define BMP_SAVEMODIFIED_SMALL (RID_IMAGE_START+0) #define BMP_SAVEMODIFIED_LARGE (RID_IMAGE_START+1) +#define BMP_SAVEMODIFIED_EXTRALARGE (RID_IMAGE_START+2) #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0) diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 745e10e5c8c7..0d3b02dd1f55 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -214,4 +214,9 @@ Bitmap BMP_SAVEMODIFIED_LARGE File = "savemodified_large.png"; }; +Bitmap BMP_SAVEMODIFIED_EXTRALARGE +{ + File = "savemodified_extralarge.png"; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 3fa27a805abf..74ff9da3f400 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -507,8 +507,12 @@ void SaveToolbarController::updateImage() } else if ( m_bModified ) { - Image aResImage(BitmapEx(eImageType == vcl::ImageType::Size16 ? FwkResId(BMP_SAVEMODIFIED_SMALL) : FwkResId(BMP_SAVEMODIFIED_LARGE))); - aImage = aResImage; + if (eImageType == vcl::ImageType::Size26) + aImage = Image(BitmapEx(FwkResId(BMP_SAVEMODIFIED_LARGE))); + else if (eImageType == vcl::ImageType::Size32) + aImage = Image(BitmapEx(FwkResId(BMP_SAVEMODIFIED_EXTRALARGE))); + else + aImage = Image(BitmapEx(FwkResId(BMP_SAVEMODIFIED_SMALL))); } if ( !aImage ) diff --git a/icon-themes/galaxy/res/savemodified_extralarge.png b/icon-themes/galaxy/res/savemodified_extralarge.png Binary files differnew file mode 100644 index 000000000000..c1052e097439 --- /dev/null +++ b/icon-themes/galaxy/res/savemodified_extralarge.png |