diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-02-15 12:25:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-02-15 15:27:00 +0000 |
| commit | 67446d9bf896f7196d796c62d29a1f7cc815d765 (patch) | |
| tree | b643704a64eb67fe0625d4293a795566bf176e67 /cui | |
| parent | 657c1a388dfcc638fd39cbd761b4f82d047a29e9 (diff) | |
move the sc_additionsdialog.png into the .ui
the mechanism for determining that an image is in use in order
to not pack unused icons only scans .ui and .hlst files, not all
source code, so this was fragile
Change-Id: Ic06c6a451cff3def8547b3ab085be70f6870054e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147080
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 1 | ||||
| -rw-r--r-- | cui/uiconfig/ui/colorpage.ui | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 9c0b5b457525..694fce496f96 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -131,7 +131,6 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController* m_xBtnDelete->set_sensitive(false); m_xBtnDelete->set_tooltip_text( CuiResId(RID_CUISTR_DELETEUSERCOLOR1) ); - m_xMoreColors->set_from_icon_name("cmd/sc_additionsdialog.png"); m_xMoreColors->connect_clicked(LINK(this, SvxColorTabPage, OnMoreColorsClick)); // disable preset color values diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index ac680de34ef0..db84f206a57d 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> @@ -37,6 +37,11 @@ <property name="step-increment">1</property> <property name="page-increment">10</property> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/sc_additionsdialog.png</property> + </object> <object class="GtkImage" id="image3"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -105,9 +110,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes" context="colorpage|btnMoreColors">Add color palettes via extension</property> - <child> - <placeholder/> - </child> + <property name="image">image1</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> |