diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2018-09-06 11:32:36 +0200 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-09-06 15:31:45 +0200 |
| commit | 77a9df09adfcb04a3d49a621d568694657969fd7 (patch) | |
| tree | ce554be8ff10147b2f7f7ad2c596547d55195ea5 | |
| parent | c289c25523496f58b81e061cea82757c99e99957 (diff) | |
tdf#119293 - UI Consistency for inserting rows in Writer table"
Labels are set now depending on row/col as before/after and above/below
.uno:InsertColumnsBefore and .uno:InsertColumnsAfter are captioned Before/After
Change-Id: Ifb4f791b62e3c96f50d457c785b6f793deb4fce9
Reviewed-on: https://gerrit.libreoffice.org/60080
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
| -rw-r--r-- | cui/inc/strings.hrc | 6 | ||||
| -rw-r--r-- | cui/source/dialogs/insrc.cxx | 10 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 8 |
3 files changed, 20 insertions, 4 deletions
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index 99e0b1b69030..06347dea6bcc 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -96,12 +96,18 @@ #define RID_SVXSTR_SELECTOR_ADD_COMMANDS NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands") #define RID_SVXSTR_SELECTOR_RUN NC_("RID_SVXSTR_SELECTOR_RUN", "Run") #define RID_SVXSTR_ROW NC_("RID_SVXSTR_ROW", "Insert Rows") +// tdf#119293 Labels depending on row/col +#define RID_SVXSTR_INSERTROW_BEFORE NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above selection") +#define RID_SVXSTR_INSERTROW_AFTER NC_("RID_SVXSTR_INSERTROW_AFTER", "Below selection") #define RID_SVXSTR_REMOVE_FAVORITES NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites") #define RID_SVXSTR_MISSING_GLYPH NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph") #define RID_SVXSTR_ADD_FAVORITES NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites") // PPI is pixel per inch, %1 is a number #define RID_SVXSTR_PPI NC_("RID_SVXSTR_PPI", "(%1 PPI)") #define RID_SVXSTR_COL NC_("RID_SVXSTR_COL", "Insert Columns") +// tdf#119293 Labels depending on row/col +#define RID_SVXSTR_INSERTCOL_BEFORE NC_("RID_SVXSTR_INSERTCOL_BEFORE", "Before selection") +#define RID_SVXSTR_INSERTCOL_AFTER NC_("RID_SVXSTR_INSERTCOL_AFTER", "After selection") #define RID_SVXSTR_AUTO_ENTRY NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic") #define RID_SVXSTR_EDIT_GRAPHIC NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link") #define RID_SVXSTR_LOADACCELCONFIG NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration") diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 5cecafd62c82..3da4c32eab5d 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -40,6 +40,16 @@ SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OStr , m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after")) { m_xDialog->set_title(bColumn ? CuiResId(RID_SVXSTR_COL) : CuiResId(RID_SVXSTR_ROW)); + + // tdf#119293 + if (bColumn) { + m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_BEFORE)); + m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_AFTER)); + } else { + m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_BEFORE)); + m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_AFTER)); + } + m_xDialog->set_help_id(rHelpId); } diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 8b3db77534c8..aa69deff81de 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1441,10 +1441,10 @@ </node> <node oor:name=".uno:InsertColumnsBefore" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Insert Columns Left</value> + <value xml:lang="en-US">Insert Columns Before</value> </prop> <prop oor:name="ContextLabel" oor:type="xs:string"> - <value xml:lang="en-US">Columns ~Left</value> + <value xml:lang="en-US">Columns ~Before</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> @@ -1461,10 +1461,10 @@ </node> <node oor:name=".uno:InsertColumnsAfter" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Insert Columns Right</value> + <value xml:lang="en-US">Insert Columns After</value> </prop> <prop oor:name="ContextLabel" oor:type="xs:string"> - <value xml:lang="en-US">Columns R~ight</value> + <value xml:lang="en-US">Columns ~After</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> |