diff options
| -rw-r--r-- | cui/UIConfig_cui.mk | 2 | ||||
| -rw-r--r-- | cui/qa/unit/data/cui-dialogs-test.txt | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 10 | ||||
| -rw-r--r-- | cui/source/tabpages/tptrans.cxx | 2 | ||||
| -rw-r--r-- | cui/uiconfig/ui/areatabpage.ui | 2 | ||||
| -rw-r--r-- | cui/uiconfig/ui/imagetabpage.ui (renamed from cui/uiconfig/ui/bitmaptabpage.ui) | 78 | ||||
| -rw-r--r-- | cui/uiconfig/ui/transparencytabpage.ui | 6 | ||||
| -rw-r--r-- | solenv/sanitizers/ui/cui.suppr | 6 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 2 |
9 files changed, 55 insertions, 55 deletions
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 3af5d8e698e7..daa8a1e3d55d 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -34,7 +34,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/assigncomponentdialog \ cui/uiconfig/ui/autocorrectdialog \ cui/uiconfig/ui/baselinksdialog \ - cui/uiconfig/ui/bitmaptabpage \ + cui/uiconfig/ui/imagetabpage \ cui/uiconfig/ui/borderareatransparencydialog \ cui/uiconfig/ui/borderbackgrounddialog \ cui/uiconfig/ui/borderpage \ diff --git a/cui/qa/unit/data/cui-dialogs-test.txt b/cui/qa/unit/data/cui-dialogs-test.txt index d19d855e2fd5..cb176088446c 100644 --- a/cui/qa/unit/data/cui-dialogs-test.txt +++ b/cui/qa/unit/data/cui-dialogs-test.txt @@ -35,7 +35,7 @@ cui/ui/textdialog.ui # This is typically a hint that these should be hard-coded in the # test case since they need some document and model data to work # -# cui/ui/bitmaptabpage.ui +# cui/ui/imagetabpage.ui # cui/ui/connpooloptions.ui <- not calling DriverListControl::Init for # ConnectionPoolOptionsPage::m_pDriverList leaves its BrowseBox::mvCols empty, causing "implicit # conversion from type 'int' of value -1 (32-bit, signed) to type 'sal_uInt16' (aka 'unsigned diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index bbc763a953c8..51d382193c2f 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -67,7 +67,7 @@ enum TileOffset } SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", &rInAttrs) + : SfxTabPage(pPage, pController, "cui/ui/imagetabpage.ui", "ImageTabPage", &rInAttrs) , m_rOutAttrs(rInAttrs) , m_pnBitmapListState(nullptr) , m_fObjectWidth(0.0) @@ -76,8 +76,8 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, weld::DialogControlle , m_aXFillAttr(rInAttrs.GetPool()) , m_rXFSet(m_aXFillAttr.GetItemSet()) , mpView(nullptr) - , m_xBitmapLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("bitmapwin", true))) - , m_xBitmapStyleLB(m_xBuilder->weld_combo_box("bitmapstyle")) + , m_xBitmapLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("imagewin", true))) + , m_xBitmapStyleLB(m_xBuilder->weld_combo_box("imagestyle")) , m_xSizeBox(m_xBuilder->weld_container("sizebox")) , m_xTsbScale(m_xBuilder->weld_check_button("scaletsb")) , m_xBitmapWidth(m_xBuilder->weld_metric_spin_button("width", FieldUnit::PERCENT)) @@ -91,8 +91,8 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, weld::DialogControlle , m_xTileOffLB(m_xBuilder->weld_combo_box("tileofflb")) , m_xTileOffset(m_xBuilder->weld_metric_spin_button("tileoffmtr", FieldUnit::PERCENT)) , m_xBtnImport(m_xBuilder->weld_button("BTN_IMPORT")) - , m_xCtlBitmapPreview(new weld::CustomWeld(*m_xBuilder, "CTL_BITMAP_PREVIEW", m_aCtlBitmapPreview)) - , m_xBitmapLBWin(new weld::CustomWeld(*m_xBuilder, "BITMAP", *m_xBitmapLB)) + , m_xCtlBitmapPreview(new weld::CustomWeld(*m_xBuilder, "CTL_IMAGE_PREVIEW", m_aCtlBitmapPreview)) + , m_xBitmapLBWin(new weld::CustomWeld(*m_xBuilder, "IMAGE", *m_xBitmapLB)) { // setting the output device m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_BITMAP) ); diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index b0517ad865f1..e78fcfffe16d 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -211,7 +211,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(weld::Container* pPage, weld::Dia , m_xMtrTrgrEndValue(m_xBuilder->weld_metric_spin_button("MTR_TRGR_END_VALUE", FieldUnit::PERCENT)) , m_xCtlBitmapBorder(m_xBuilder->weld_widget("bitmap_border")) , m_xCtlXRectBorder(m_xBuilder->weld_widget("trans_border")) - , m_xCtlBitmapPreview(new weld::CustomWeld(*m_xBuilder, "CTL_BITMAP_PREVIEW", m_aCtlBitmapPreview)) + , m_xCtlBitmapPreview(new weld::CustomWeld(*m_xBuilder, "CTL_IMAGE_PREVIEW", m_aCtlBitmapPreview)) , m_xCtlXRectPreview(new weld::CustomWeld(*m_xBuilder, "CTL_TRANS_PREVIEW", m_aCtlXRectPreview)) { // main selection diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui index 52ae583c9e8c..f1c671b804bc 100644 --- a/cui/uiconfig/ui/areatabpage.ui +++ b/cui/uiconfig/ui/areatabpage.ui @@ -103,7 +103,7 @@ </child> <child> <object class="GtkToggleButton" id="btnbitmap"> - <property name="label" translatable="yes" context="areatabpage|btnbitmap">Bitmap</property> + <property name="label" translatable="yes" context="areatabpage|btnbitmap">Image</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/imagetabpage.ui index 11c85d5efe26..f4574f298560 100644 --- a/cui/uiconfig/ui/bitmaptabpage.ui +++ b/cui/uiconfig/ui/imagetabpage.ui @@ -7,7 +7,7 @@ <property name="step_increment">1</property> <property name="page_increment">10</property> </object> - <object class="GtkBox" id="BitmapTabPage"> + <object class="GtkBox" id="ImageTabPage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -29,7 +29,7 @@ <property name="margin-start">12</property> <property name="margin-top">6</property> <child> - <object class="GtkScrolledWindow" id="bitmapwin"> + <object class="GtkScrolledWindow" id="imagewin"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="vexpand">True</property> @@ -41,7 +41,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkDrawingArea" id="BITMAP"> + <object class="GtkDrawingArea" id="IMAGE"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property> @@ -59,13 +59,13 @@ </child> <child> <object class="GtkButton" id="BTN_IMPORT"> - <property name="label" translatable="yes" context="bitmaptabpage|BTN_IMPORT">Add / Import</property> + <property name="label" translatable="yes" context="imagetabpage|BTN_IMPORT">Add / Import</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <child internal-child="accessible"> <object class="AtkObject" id="BTN_IMPORT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="bitmaptabpage|extended_tip|BTN_IMPORT">Locate the bitmap that you want to import, and then click Open. The bitmap is added to the end of the list of available bitmaps.</property> + <property name="AtkObject::accessible-description" translatable="yes" context="imagetabpage|extended_tip|BTN_IMPORT">Locate the image that you want to import, and then click Open. The image is added to the end of the list of available images.</property> </object> </child> </object> @@ -81,7 +81,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label1">Bitmap</property> + <property name="label" translatable="yes" context="imagetabpage|label1">Image</property> <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> @@ -124,9 +124,9 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label3">Style:</property> + <property name="label" translatable="yes" context="imagetabpage|label3">Style:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">bitmapstyle</property> + <property name="mnemonic_widget">imagestyle</property> <property name="xalign">0</property> </object> <packing> @@ -136,13 +136,13 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="bitmapstyle"> + <object class="GtkComboBoxText" id="imagestyle"> <property name="visible">True</property> <property name="can_focus">False</property> <items> - <item translatable="yes" context="bitmaptabpage|bitmapstyle">Custom position/size</item> - <item translatable="yes" context="bitmaptabpage|bitmapstyle">Tiled</item> - <item translatable="yes" context="bitmaptabpage|bitmapstyle">Stretched</item> + <item translatable="yes" context="imagetabpage|imagestyle">Custom position/size</item> + <item translatable="yes" context="imagetabpage|imagestyle">Tiled</item> + <item translatable="yes" context="imagetabpage|imagestyle">Stretched</item> </items> </object> <packing> @@ -168,7 +168,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label4">Size:</property> + <property name="label" translatable="yes" context="imagetabpage|label4">Size:</property> <property name="xalign">0</property> </object> <packing> @@ -186,7 +186,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label5">Width:</property> + <property name="label" translatable="yes" context="imagetabpage|label5">Width:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">width</property> </object> @@ -225,7 +225,7 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label6">Height:</property> + <property name="label" translatable="yes" context="imagetabpage|label6">Height:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">height</property> </object> @@ -257,7 +257,7 @@ </child> <child> <object class="GtkCheckButton" id="scaletsb"> - <property name="label" translatable="yes" context="bitmaptabpage|scaletsb">Scale</property> + <property name="label" translatable="yes" context="imagetabpage|scaletsb">Scale</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -287,7 +287,7 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label7">Position:</property> + <property name="label" translatable="yes" context="imagetabpage|label7">Position:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">positionlb</property> <property name="xalign">0</property> @@ -303,15 +303,15 @@ <property name="visible">True</property> <property name="can_focus">False</property> <items> - <item translatable="yes" context="bitmaptabpage|positionlb">Top Left</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Top Center</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Top Right</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Center Left</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Center</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Center Right</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Bottom Left</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Bottom Center</item> - <item translatable="yes" context="bitmaptabpage|positionlb">Bottom Right</item> + <item translatable="yes" context="imagetabpage|positionlb">Top Left</item> + <item translatable="yes" context="imagetabpage|positionlb">Top Center</item> + <item translatable="yes" context="imagetabpage|positionlb">Top Right</item> + <item translatable="yes" context="imagetabpage|positionlb">Center Left</item> + <item translatable="yes" context="imagetabpage|positionlb">Center</item> + <item translatable="yes" context="imagetabpage|positionlb">Center Right</item> + <item translatable="yes" context="imagetabpage|positionlb">Bottom Left</item> + <item translatable="yes" context="imagetabpage|positionlb">Bottom Center</item> + <item translatable="yes" context="imagetabpage|positionlb">Bottom Right</item> </items> </object> <packing> @@ -337,7 +337,7 @@ <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label9">Tiling Position:</property> + <property name="label" translatable="yes" context="imagetabpage|label9">Tiling Position:</property> <property name="xalign">0</property> </object> <packing> @@ -356,7 +356,7 @@ <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label10">X-Offset:</property> + <property name="label" translatable="yes" context="imagetabpage|label10">X-Offset:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">posoffx</property> </object> @@ -395,7 +395,7 @@ <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label11">Y-Offset:</property> + <property name="label" translatable="yes" context="imagetabpage|label11">Y-Offset:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">posoffy</property> </object> @@ -441,7 +441,7 @@ <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label15">Tiling Offset:</property> + <property name="label" translatable="yes" context="imagetabpage|label15">Tiling Offset:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">tileofflb</property> <property name="xalign">0</property> @@ -464,8 +464,8 @@ <property name="hexpand">True</property> <property name="active">0</property> <items> - <item translatable="yes" context="bitmaptabpage|tileofflb">Row</item> - <item translatable="yes" context="bitmaptabpage|tileofflb">Column</item> + <item translatable="yes" context="imagetabpage|tileofflb">Row</item> + <item translatable="yes" context="imagetabpage|tileofflb">Column</item> </items> </object> <packing> @@ -508,7 +508,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label2">Options</property> + <property name="label" translatable="yes" context="imagetabpage|label2">Options</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -548,12 +548,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkDrawingArea" id="CTL_BITMAP_PREVIEW"> + <object class="GtkDrawingArea" id="CTL_IMAGE_PREVIEW"> <property name="visible">True</property> <property name="can_focus">False</property> <child internal-child="accessible"> - <object class="AtkObject" id="CTL_BITMAP_PREVIEW-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="bitmaptabpage|CTL_BITMAP_PREVIEW-atkobject">Example</property> + <object class="AtkObject" id="CTL_IMAGE_PREVIEW-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="imagetabpage|CTL_IMAGE_PREVIEW-atkobject">Example</property> </object> </child> </object> @@ -573,7 +573,7 @@ <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bitmaptabpage|label8">Preview</property> + <property name="label" translatable="yes" context="imagetabpage|label8">Preview</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -588,8 +588,8 @@ </packing> </child> <child internal-child="accessible"> - <object class="AtkObject" id="BitmapTabPage-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="bitmaptabpage|extended_tip|BitmapTabPage">Select a bitmap that you want to use as a fill image, or add your own bitmap pattern.</property> + <object class="AtkObject" id="ImageTabPage-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="imagetabpage|extended_tip|ImageTabPage">Select a image that you want to use as a fill image, or add your own image/pattern.</property> </object> </child> </object> diff --git a/cui/uiconfig/ui/transparencytabpage.ui b/cui/uiconfig/ui/transparencytabpage.ui index b13dc82cbf66..c5c9a014c649 100644 --- a/cui/uiconfig/ui/transparencytabpage.ui +++ b/cui/uiconfig/ui/transparencytabpage.ui @@ -446,14 +446,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkDrawingArea" id="CTL_BITMAP_PREVIEW"> + <object class="GtkDrawingArea" id="CTL_IMAGE_PREVIEW"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="CTL_BITMAP_PREVIEW-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="transparencytabpage|CTL_BITMAP_PREVIEW-atkobject">Example</property> + <object class="AtkObject" id="CTL_IMAGE_PREVIEW-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="transparencytabpage|CTL_IMAGE_PREVIEW-atkobject">Example</property> </object> </child> </object> diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr index e35732a47402..ef14105b364d 100644 --- a/solenv/sanitizers/ui/cui.suppr +++ b/solenv/sanitizers/ui/cui.suppr @@ -9,9 +9,9 @@ cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='TYPE2'] orphan-label cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='UPDATE'] orphan-label cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='FULL_SOURCE_NAME'] orphan-label cui/uiconfig/ui/baselinksdialog.ui://GtkLabel[@id='FULL_TYPE_NAME'] orphan-label -cui/uiconfig/ui/bitmaptabpage.ui://GtkLabel[@id='label4'] orphan-label -cui/uiconfig/ui/bitmaptabpage.ui://GtkLabel[@id='label9'] orphan-label -cui/uiconfig/ui/bitmaptabpage.ui://GtkSpinButton[@id='tileoffmtr'] no-labelled-by +cui/uiconfig/ui/imagetabpage.ui://GtkLabel[@id='label4'] orphan-label +cui/uiconfig/ui/imagetabpage.ui://GtkLabel[@id='label9'] orphan-label +cui/uiconfig/ui/imagetabpage.ui://GtkSpinButton[@id='tileoffmtr'] no-labelled-by cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_BOTTOMLOCK'] orphan-label cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_TOPLOCK'] orphan-label cui/uiconfig/ui/cellalignment.ui://GtkLabel[@id='labelSTR_CELLLOCK'] orphan-label diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index f79e3c35fbf0..29a16612c992 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -22483,7 +22483,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& rUIFile != "cui/ui/areatabpage.ui" && rUIFile != "cui/ui/asiantypography.ui" && rUIFile != "cui/ui/autocorrectdialog.ui" && - rUIFile != "cui/ui/bitmaptabpage.ui" && + rUIFile != "cui/ui/imagetabpage.ui" && rUIFile != "cui/ui/borderpage.ui" && rUIFile != "cui/ui/breaknumberoption.ui" && rUIFile != "cui/ui/bulletandposition.ui" && |