From 98a03d9b0d13b8f811ccf8fc1a9b7f9469ed079c Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Mon, 6 Mar 2017 00:28:09 +0200 Subject: [PATCH] tdf#106224 Support extra large savemodified icon For now just duplicated the large icon in Galaxy, to satisfy the resource compiler. Change-Id: Icf31df0185a1ec7f080d9600b2536bcaa5d0783e --- framework/inc/classes/resource.hrc | 1 + framework/source/classes/resource.src | 5 +++++ .../source/uielement/popuptoolbarcontroller.cxx | 8 ++++++-- .../galaxy/res/savemodified_extralarge.png | Bin 0 -> 1276 bytes 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 icon-themes/galaxy/res/savemodified_extralarge.png 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 new file mode 100644 index 0000000000000000000000000000000000000000..c1052e09743995f782c3c57ab4e755effb9ee6a4 GIT binary patch literal 1276 zcmVXbY>vYaFUxZ z=li~#-#!2Docmpc|7p@&?+5%qL|Hu;DYj1msN1-GFYx;Pf@&@k&1DixIfzIf!BcczAoPAEDw>~}UgCfR^{Pg|1GIe~N^!&0io0Gt4V5FD9AfY8N(!s%Es z2<`z#5c=MR_D-;3=tEaf8=UE}?hH6o)|MW|SC*vV=GUn1I-6tZ^c~j#y#{fRZ#vh^GwVNrRXk zF9PyG*&1l?BsS_rtBIqJU8cOF11dIB-qC?Reif}IK{zCI=^ME^T}L$On46KA1}2h4 zq|?C&gB3&km4vTcCh+VI#M=Z;KU#YWz7;{j$96GcJ&eO0$E)1N>oo6zL~K%~g@}+S zCSCLb419n-bcN~hJCt{Hq#>Tgq)*$A0BUU;^ZNSO_drFh%egdsN?4U`nQOeD@4?R^fyS(kR#)?9q zdMTgoKU|>dqHyONT=)>JCP8e}gId+XbYCCbKEiZgA8J(#Q$r3an@V_j!AV*xhEZL{ ztg5r^Y`jIw>iMes93Or8T@EKuX0ZRIVVWCtW=2cdd3HXk+n}?#3=+dsRF$#2$H1Yk zwaqJ8($ty*@;H+G7#T(VtA~R(o@8R)QYzdL!oDt+ z5+>|h%+$P1Or^@$JF%QC_G!MEc#3Eul-oynpLIncbAA8`%gw-44ev*`5I0>UEH{>v zuz&n%w#q3EOswT*vYe#lqW@MMgELjcO&8I`wZhWPwvmC$gvW;Od3Brt_7NaZ9iz6{ zm3^s%j-7i(b2nt