[Libreoffice-commits] core.git: cui/qa sd/qa sfx2/uiconfig svx/qa sw/qa uitest/impress_tests
Seth Chaiklin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Dec 17 10:26:24 UTC 2020
cui/qa/uitest/dialogs/chardlg.py | 2 +-
cui/qa/uitest/dialogs/pastedlg.py | 2 +-
sd/qa/uitest/impress_tests/autocorrectOptions.py | 2 +-
sd/qa/uitest/impress_tests/customSlideShow.py | 2 +-
sd/qa/uitest/impress_tests/documentProperties.py | 2 +-
sd/qa/uitest/impress_tests/insertSlide.py | 4 ++--
sd/qa/uitest/impress_tests/masterElements.py | 2 +-
sd/qa/uitest/impress_tests/renameSlide.py | 2 +-
sd/qa/uitest/impress_tests/slideShowSettings.py | 2 +-
sd/qa/uitest/impress_tests/tdf126605.py | 2 +-
sd/qa/uitest/impress_tests/tdf130440.py | 2 +-
sd/qa/uitest/impress_tests/tdf91762.py | 2 +-
sfx2/uiconfig/ui/templatedlg.ui | 7 ++++---
svx/qa/uitest/table/tablecontroller.py | 2 +-
sw/qa/uitest/writer_dialogs/openDialogs.py | 2 +-
uitest/impress_tests/backgrounds.py | 2 +-
uitest/impress_tests/drawinglayer.py | 4 ++--
uitest/impress_tests/layouts.py | 2 +-
uitest/impress_tests/start.py | 4 ++--
19 files changed, 25 insertions(+), 24 deletions(-)
New commits:
commit 4484accf4d331a95ebf8475d6cd91950f4c27bcc
Author: Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Tue Dec 15 15:37:31 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 17 11:25:49 2020 +0100
tdf#138976 change "Cancel" button to "Close" in Template Manager dialog
Change-Id: I3e8cbdb70f70002f1fe2b873e899f25a72463358
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107704
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py
index 2545d268274a..fb1c1286cbae 100644
--- a/cui/qa/uitest/dialogs/chardlg.py
+++ b/cui/qa/uitest/dialogs/chardlg.py
@@ -16,7 +16,7 @@ class Test(UITestCase):
# Start Impress.
self.ui_test.create_doc_in_start_center("impress")
template = self.xUITest.getTopFocusWindow()
- self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+ self.ui_test.close_dialog_through_button(template.getChild("close"))
doc = self.xUITest.getTopFocusWindow()
editWin = doc.getChild("impress_win")
# Select the title shape.
diff --git a/cui/qa/uitest/dialogs/pastedlg.py b/cui/qa/uitest/dialogs/pastedlg.py
index ccd33e02d11e..9ac40c55d2b6 100644
--- a/cui/qa/uitest/dialogs/pastedlg.py
+++ b/cui/qa/uitest/dialogs/pastedlg.py
@@ -16,7 +16,7 @@ class Test(UITestCase):
# Copy a string in Impress.
self.ui_test.create_doc_in_start_center("impress")
template = self.xUITest.getTopFocusWindow()
- self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+ self.ui_test.close_dialog_through_button(template.getChild("close"))
doc = self.xUITest.getTopFocusWindow()
editWin = doc.getChild("impress_win")
# Select the title shape.
diff --git a/sd/qa/uitest/impress_tests/autocorrectOptions.py b/sd/qa/uitest/impress_tests/autocorrectOptions.py
index feeabe5435b2..d386aa8b189c 100644
--- a/sd/qa/uitest/impress_tests/autocorrectOptions.py
+++ b/sd/qa/uitest/impress_tests/autocorrectOptions.py
@@ -16,7 +16,7 @@ class autocorrectOptions(UITestCase):
def test_autocorrect_options_impress(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
document = self.ui_test.get_component()
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py b/sd/qa/uitest/impress_tests/customSlideShow.py
index 61b15cda8743..9feef4a12a81 100644
--- a/sd/qa/uitest/impress_tests/customSlideShow.py
+++ b/sd/qa/uitest/impress_tests/customSlideShow.py
@@ -12,7 +12,7 @@ class customSlideShow(UITestCase):
MainDoc = self.ui_test.create_doc_in_start_center("impress")
MainWindow = self.xUITest.getTopFocusWindow()
TemplateDialog = self.xUITest.getTopFocusWindow()
- cancel = TemplateDialog.getChild("cancel")
+ cancel = TemplateDialog.getChild("close")
self.ui_test.close_dialog_through_button(cancel)
self.ui_test.execute_dialog_through_command(".uno:CustomShowDialog")
CustomSlideShows = self.xUITest.getTopFocusWindow()
diff --git a/sd/qa/uitest/impress_tests/documentProperties.py b/sd/qa/uitest/impress_tests/documentProperties.py
index 54ad2947b6bf..811feb106aab 100644
--- a/sd/qa/uitest/impress_tests/documentProperties.py
+++ b/sd/qa/uitest/impress_tests/documentProperties.py
@@ -17,7 +17,7 @@ class ImpressDocumentProperties(UITestCase):
def test_open_document_properties_impress(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties")
diff --git a/sd/qa/uitest/impress_tests/insertSlide.py b/sd/qa/uitest/impress_tests/insertSlide.py
index 396079d3fa7d..d33f3212cb5a 100644
--- a/sd/qa/uitest/impress_tests/insertSlide.py
+++ b/sd/qa/uitest/impress_tests/insertSlide.py
@@ -17,7 +17,7 @@ class insertSlide(UITestCase):
def test_insert_slide(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
document = self.ui_test.get_component()
self.assertEqual(document.DrawPages.getCount(), 1) #nr. of pages
@@ -34,7 +34,7 @@ class insertSlide(UITestCase):
def test_tdf85360_insert_4th_slide(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
document = self.ui_test.get_component()
self.assertEqual(document.DrawPages.getCount(), 1) #nr. of pages
diff --git a/sd/qa/uitest/impress_tests/masterElements.py b/sd/qa/uitest/impress_tests/masterElements.py
index 73c944074f07..00e865d269d5 100644
--- a/sd/qa/uitest/impress_tests/masterElements.py
+++ b/sd/qa/uitest/impress_tests/masterElements.py
@@ -16,7 +16,7 @@ class masterElements(UITestCase):
def test_master_elements(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
document = self.ui_test.get_component()
diff --git a/sd/qa/uitest/impress_tests/renameSlide.py b/sd/qa/uitest/impress_tests/renameSlide.py
index da203fd21269..964f6a7c712b 100644
--- a/sd/qa/uitest/impress_tests/renameSlide.py
+++ b/sd/qa/uitest/impress_tests/renameSlide.py
@@ -16,7 +16,7 @@ class renameSlide(UITestCase):
def test_rename_slide(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
self.ui_test.execute_dialog_through_command(".uno:RenamePage")
diff --git a/sd/qa/uitest/impress_tests/slideShowSettings.py b/sd/qa/uitest/impress_tests/slideShowSettings.py
index 2d2a5920da86..5b9e44ffa1cc 100644
--- a/sd/qa/uitest/impress_tests/slideShowSettings.py
+++ b/sd/qa/uitest/impress_tests/slideShowSettings.py
@@ -11,7 +11,7 @@ class slideShowSettings(UITestCase):
MainDoc = self.ui_test.create_doc_in_start_center("impress")
MainWindow = self.xUITest.getTopFocusWindow()
TemplateDialog = self.xUITest.getTopFocusWindow()
- cancel = TemplateDialog.getChild("cancel")
+ cancel = TemplateDialog.getChild("close")
self.ui_test.close_dialog_through_button(cancel)
self.xUITest.executeCommand(".uno:InsertPage")
self.ui_test.execute_dialog_through_command(".uno:PresentationDialog")
diff --git a/sd/qa/uitest/impress_tests/tdf126605.py b/sd/qa/uitest/impress_tests/tdf126605.py
index 744324717a6b..b4a2668a1952 100644
--- a/sd/qa/uitest/impress_tests/tdf126605.py
+++ b/sd/qa/uitest/impress_tests/tdf126605.py
@@ -12,7 +12,7 @@ class tdf126605(UITestCase):
def test_run(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
xDoc = self.xUITest.getTopFocusWindow()
diff --git a/sd/qa/uitest/impress_tests/tdf130440.py b/sd/qa/uitest/impress_tests/tdf130440.py
index 348feb33c0fa..60ea610206e1 100644
--- a/sd/qa/uitest/impress_tests/tdf130440.py
+++ b/sd/qa/uitest/impress_tests/tdf130440.py
@@ -12,7 +12,7 @@ class tdf129346(UITestCase):
def test_run(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
xToolkit = self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
diff --git a/sd/qa/uitest/impress_tests/tdf91762.py b/sd/qa/uitest/impress_tests/tdf91762.py
index 2487bc2a4726..92a23de6b101 100644
--- a/sd/qa/uitest/impress_tests/tdf91762.py
+++ b/sd/qa/uitest/impress_tests/tdf91762.py
@@ -13,7 +13,7 @@ class tdf91762(UITestCase):
def test_tdf91762(self):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
self.xUITest.executeCommand(".uno:AssignLayout?WhatLayout:long=1")
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index 5939f851f542..b6fccf20ef6d 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -148,10 +148,11 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="label">gtk-cancel</property>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="can_default">True</property>
<property name="receives-default">True</property>
<property name="use-stock">True</property>
</object>
@@ -770,7 +771,7 @@
<action-widgets>
<action-widget response="-11">help</action-widget>
<action-widget response="-5">ok</action-widget>
- <action-widget response="-6">cancel</action-widget>
+ <action-widget response="-7">close</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/svx/qa/uitest/table/tablecontroller.py b/svx/qa/uitest/table/tablecontroller.py
index 27ed4a1d7ccb..afc5de807fde 100644
--- a/svx/qa/uitest/table/tablecontroller.py
+++ b/svx/qa/uitest/table/tablecontroller.py
@@ -15,7 +15,7 @@ class SvxTableControllerTest(UITestCase):
# Create an Impress document with a single table in it.
self.ui_test.create_doc_in_start_center("impress")
template = self.xUITest.getTopFocusWindow()
- self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+ self.ui_test.close_dialog_through_button(template.getChild("close"))
self.xUITest.executeCommand(".uno:SelectAll")
self.xUITest.executeCommand(".uno:Delete")
self.xUITest.executeCommand(".uno:InsertTable?Columns:short=2&Rows:short=2")
diff --git a/sw/qa/uitest/writer_dialogs/openDialogs.py b/sw/qa/uitest/writer_dialogs/openDialogs.py
index 4dbacaa1215e..343c2aec8f60 100644
--- a/sw/qa/uitest/writer_dialogs/openDialogs.py
+++ b/sw/qa/uitest/writer_dialogs/openDialogs.py
@@ -11,7 +11,7 @@ from uitest.uihelper.testDialog import testDialog
dialogs = [
{"command": ".uno:OpenRemote", "closeButton": "cancel"},
- {"command": ".uno:NewDoc", "closeButton": "cancel"},
+ {"command": ".uno:NewDoc", "closeButton": "close"},
{"command": ".uno:SaveAsTemplate", "closeButton": "cancel"},
{"command": ".uno:ExportToPDF", "closeButton": "cancel", "skipTestOK": True},
# export needs filesystem
diff --git a/uitest/impress_tests/backgrounds.py b/uitest/impress_tests/backgrounds.py
index 6e2493b063f1..de4a34951758 100644
--- a/uitest/impress_tests/backgrounds.py
+++ b/uitest/impress_tests/backgrounds.py
@@ -108,7 +108,7 @@ class ImpressBackgrounds(UITestCase):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
buttons = ['btnbitmap', 'btncolor', 'btngradient', 'btnhatch', 'btnpattern']
diff --git a/uitest/impress_tests/drawinglayer.py b/uitest/impress_tests/drawinglayer.py
index d4de9f32a7a4..2a0bcf45f548 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -16,7 +16,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
change_measurement_unit(self, 'Centimeter')
@@ -67,7 +67,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
change_measurement_unit(self, 'Centimeter')
diff --git a/uitest/impress_tests/layouts.py b/uitest/impress_tests/layouts.py
index 8e108913d021..ebbe8e2ec266 100644
--- a/uitest/impress_tests/layouts.py
+++ b/uitest/impress_tests/layouts.py
@@ -14,7 +14,7 @@ class ImpressLayouts(UITestCase):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
layouts= (".uno:AssignLayout?WhatLayout:long=20", ".uno:AssignLayout?WhatLayout:long=19",
diff --git a/uitest/impress_tests/start.py b/uitest/impress_tests/start.py
index 6406ceb1a8f8..b6f5cbc517c9 100644
--- a/uitest/impress_tests/start.py
+++ b/uitest/impress_tests/start.py
@@ -15,7 +15,7 @@ class SimpleImpressTest(UITestCase):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
xImpressDoc = self.xUITest.getTopFocusWindow()
@@ -32,7 +32,7 @@ class SimpleImpressTest(UITestCase):
self.ui_test.create_doc_in_start_center("impress")
xTemplateDlg = self.xUITest.getTopFocusWindow()
- xCancelBtn = xTemplateDlg.getChild("cancel")
+ xCancelBtn = xTemplateDlg.getChild("close")
self.ui_test.close_dialog_through_button(xCancelBtn)
xImpressDoc = self.xUITest.getTopFocusWindow()
More information about the Libreoffice-commits
mailing list