jsdialog: use unique ids for unobuttons

now all uno buttons with the same command will share class not id:
.unoXXX  not  #XXX

this is needed for a11y

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I4dc75854bdb396fa9214f7cae5e7fffaef035e56

5 files changed, 28 insertions, 28 deletions

diff --git a/cypress_test/integration_tests/desktop/writer/table_operation_spec.js b/cypress_test/integration_tests/desktop/writer/table_operation_spec.js
index f255f9ad17..e35a9ac4a1 100644
--- a/cypress_test/integration_tests/desktop/writer/table_operation_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/table_operation_spec.js
@@ -27,7 +27,7 @@ describe('Table operations', function() {
 
 	it('Insert row before.', function() {
 
-		helper.clickOnIdle('#table-insert #InsertRowsBefore');
+		helper.clickOnIdle('#table-insert .unoInsertRowsBefore');
 
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 4);
@@ -47,7 +47,7 @@ describe('Table operations', function() {
 
 	it('Insert row after.', function() {
 
-		helper.clickOnIdle('#table-insert #InsertRowsAfter');
+		helper.clickOnIdle('#table-insert .unoInsertRowsAfter');
 
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 4);
@@ -67,7 +67,7 @@ describe('Table operations', function() {
 
 	it('Insert column before.', function() {
 
-		helper.clickOnIdle('#table-insert #InsertColumnsBefore');
+		helper.clickOnIdle('#table-insert .unoInsertColumnsBefore');
 
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 4);
@@ -87,7 +87,7 @@ describe('Table operations', function() {
 	});
 
 	it('Insert column after.', function() {
-		helper.clickOnIdle('#table-insert #InsertColumnsAfter');
+		helper.clickOnIdle('#table-insert .unoInsertColumnsAfter');
 
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 4);
@@ -106,7 +106,7 @@ describe('Table operations', function() {
 	});
 
 	it('Delete row.', function() {
-		helper.clickOnIdle('#table-delete #DeleteRows');
+		helper.clickOnIdle('#table-delete .unoDeleteRows');
 
 		cy.get('.leaflet-marker-icon.table-row-resize-marker')
 			.should('have.length', 2);
@@ -126,20 +126,20 @@ describe('Table operations', function() {
 
 	it('Delete column.', function() {
 		// Insert column first
-		helper.clickOnIdle('#table-insert #InsertColumnsBefore');
+		helper.clickOnIdle('#table-insert .unoInsertColumnsBefore');
 
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 4);
 
 		// Then delete it
-		helper.clickOnIdle('#table-delete #DeleteColumns');
+		helper.clickOnIdle('#table-delete .unoDeleteColumns');
 
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('have.length', 3);
 	});
 
 	it('Delete table.', function() {
-		helper.clickOnIdle('#table-delete #DeleteTable');
+		helper.clickOnIdle('#table-delete .unoDeleteTable');
 
 		cy.get('.leaflet-marker-icon.table-column-resize-marker')
 			.should('not.exist');
@@ -154,7 +154,7 @@ describe('Table operations', function() {
 		// We use cursor position as the indicator of layout change.
 		helper.getCursorPos('top', 'origCursorPos');
 
-		helper.clickOnIdle('#table-split_merge #MergeCells');
+		helper.clickOnIdle('#table-split_merge .unoMergeCells');
 
 		// Cursor was in the second row originally.
 		// With merging two rows, the cursor is moved into the first row.
@@ -211,7 +211,7 @@ describe('Table operations', function() {
 		helper.moveCursor('down', 'shift');
 		helper.moveCursor('right', 'shift');
 
-		helper.clickOnIdle('#table-rowsizing #SetMinimalRowHeight');
+		helper.clickOnIdle('#table-rowsizing .unoSetMinimalRowHeight');
 
 		selectFullTable();
 
@@ -227,7 +227,7 @@ describe('Table operations', function() {
 		helper.moveCursor('down', 'shift');
 		helper.moveCursor('right', 'shift');
 
-		helper.clickOnIdle('#table-rowsizing #SetOptimalRowHeight');
+		helper.clickOnIdle('#table-rowsizing .unoSetOptimalRowHeight');
 
 		selectFullTable();
 
@@ -250,7 +250,7 @@ describe('Table operations', function() {
 		helper.moveCursor('down', 'shift');
 		helper.moveCursor('right', 'shift');
 
-		helper.clickOnIdle('#table-rowsizing #DistributeRows');
+		helper.clickOnIdle('#table-rowsizing .unoDistributeRows');
 
 		selectFullTable();
 
@@ -273,7 +273,7 @@ describe('Table operations', function() {
 		helper.moveCursor('down', 'shift');
 		helper.moveCursor('right', 'shift');
 
-		helper.clickOnIdle('#table-columnsizing #SetMinimalColumnWidth');
+		helper.clickOnIdle('#table-columnsizing .unoSetMinimalColumnWidth');
 
 		selectFullTable();
 
@@ -287,7 +287,7 @@ describe('Table operations', function() {
 		helper.moveCursor('down', 'shift');
 		helper.moveCursor('right', 'shift');
 
-		helper.clickOnIdle('#table-columnsizing #SetOptimalColumnWidth');
+		helper.clickOnIdle('#table-columnsizing .unoSetOptimalColumnWidth');
 
 		selectFullTable();
 
@@ -303,7 +303,7 @@ describe('Table operations', function() {
 		helper.moveCursor('down', 'shift');
 		helper.moveCursor('right', 'shift');
 
-		helper.clickOnIdle('#table-columnsizing #DistributeColumns');
+		helper.clickOnIdle('#table-columnsizing .unoDistributeColumns');
 
 		selectFullTable();
 
diff --git a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
index 2d6f08edf8..960bb8c8e0 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -98,13 +98,13 @@ describe('Change alignment settings.', function() {
 	it('Right-to-left and left-to-right writing mode.', function() {
 		openAlignmentPaneForFirstCell();
 
-		helper.clickOnIdle('#ParaRightToLeft');
+		helper.clickOnIdle('.unoParaRightToLeft');
 
 		// TODO: we don't have a way of testing this
 		// copy container doesn't have info about this
 		cy.wait(500);
 
-		helper.clickOnIdle('#ParaLeftToRight');
+		helper.clickOnIdle('.unoParaLeftToRight');
 
 		cy.wait(500);
 	});
diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
index 0f3a48858a..16a09f27bb 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -35,7 +35,7 @@ describe('Apply number formatting.', function() {
 	it('Select percent format from list.', function() {
 		selectFormatting('Percent');
 
-		cy.get('#NumberFormatPercentimg')
+		cy.get('.unoNumberFormatPercent img')
 			.should('have.class', 'selected');
 
 		// Decimal and leading zeros are changed.
@@ -59,7 +59,7 @@ describe('Apply number formatting.', function() {
 	it('Push percent button.', function() {
 		helper.clickOnIdle('#NumberFormatPercent');
 
-		cy.get('#NumberFormatPercentimg')
+		cy.get('.unoNumberFormatPercent img')
 			.should('have.class', 'selected');
 
 		cy.get('#numberformatcombobox .ui-header-left')
@@ -86,7 +86,7 @@ describe('Apply number formatting.', function() {
 	it('Select currency format from list.', function() {
 		selectFormatting('Currency');
 
-		cy.get('#NumberFormatCurrencyimg')
+		cy.get('.unoNumberFormatCurrency img')
 			.should('have.class', 'selected');
 
 		// Decimal and leading zeros are changed.
@@ -110,7 +110,7 @@ describe('Apply number formatting.', function() {
 	it('Push currency button.', function() {
 		helper.clickOnIdle('#NumberFormatCurrency');
 
-		cy.get('#NumberFormatCurrencyimg')
+		cy.get('.unoNumberFormatCurrency img')
 			.should('have.class', 'selected');
 
 		cy.get('#numberformatcombobox .ui-header-left')
@@ -138,7 +138,7 @@ describe('Apply number formatting.', function() {
 		// Change to currency first
 		helper.clickOnIdle('#NumberFormatCurrency');
 
-		cy.get('#NumberFormatCurrencyimg')
+		cy.get('.unoNumberFormatCurrency img')
 			.should('have.class', 'selected');
 
 		// Decimal and leading zeros are changed.
@@ -164,13 +164,13 @@ describe('Apply number formatting.', function() {
 
 		helper.clickOnIdle('#ScNumberFormatPropertyPanel');
 
-		cy.get('#NumberFormatDecimal')
+		cy.get('.unoNumberFormatDecimal')
 			.should('be.visible');
 
 		// Change to number formatting
-		helper.clickOnIdle('#NumberFormatDecimal');
+		helper.clickOnIdle('.unoNumberFormatDecimal');
 
-		cy.get('#NumberFormatDecimalimg')
+		cy.get('.unoNumberFormatDecimal img')
 			.should('have.class', 'selected');
 
 		cy.get('#numberformatcombobox .ui-header-left')
diff --git a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js
index 6d65d6031f..0f71d7323b 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js
@@ -118,7 +118,7 @@ describe('Apply paragraph properties on selected shape.', function() {
 		// Set bottom alignment first
 		openParagraphPropertiesPanel();
 
-		helper.clickOnIdle('#CellVertBottom');
+		helper.clickOnIdle('.unoCellVertBottom');
 
 		triggerNewSVG();
 
diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 75b6da2092..e51ed1ee93 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -171,9 +171,9 @@ describe('Focus tests', function() {
 		helper.assertFocus('tagName', 'BODY');
 
 		// Apply bold
-		helper.clickOnIdle('#Bold');
+		helper.clickOnIdle('.unoBold');
 
-		cy.get('#Boldimg')
+		cy.get('.unoBold img')
 			.should('have.class', 'selected');
 
 		// No focus