summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-06 17:32:45 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-07 18:17:44 +0200
commit0593afe5606b6388a705f3e8b19e427fcbf7555b (patch)
treea3e95f1bedb3fa25a6809da1e5f19203af43d5b8 /sw
parentda8617d69a7b27a3eeb3f26e207ddf1b4de3eeb3 (diff)
just edit Entry to readonly, instead of a shadow ro widget
Change-Id: I28d6d3cceec5224a6b38bd44ec380974cd3bae12 Reviewed-on: https://gerrit.libreoffice.org/60104 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/uitest/writer_tests2/horizontalLine.py4
-rw-r--r--sw/uiconfig/swriter/ui/footnoteareapage.ui4
-rw-r--r--sw/uiconfig/swriter/ui/textgridpage.ui1
3 files changed, 4 insertions, 5 deletions
diff --git a/sw/qa/uitest/writer_tests2/horizontalLine.py b/sw/qa/uitest/writer_tests2/horizontalLine.py
index 7a25d36ee19e..c102f603157d 100644
--- a/sw/qa/uitest/writer_tests2/horizontalLine.py
+++ b/sw/qa/uitest/writer_tests2/horizontalLine.py
@@ -23,7 +23,7 @@ class WriterInsertHorizontalLine(UITestCase):
self.ui_test.execute_dialog_through_command(".uno:EditStyle") #open style dialog
xDialog = self.xUITest.getTopFocusWindow()
- xStyleNametxt = xDialog.getChild("namerw")
+ xStyleNametxt = xDialog.getChild("name")
self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal Line") #check style name
xCancBtn = xDialog.getChild("cancel")
self.ui_test.close_dialog_through_button(xCancBtn)
@@ -33,7 +33,7 @@ class WriterInsertHorizontalLine(UITestCase):
self.ui_test.execute_dialog_through_command(".uno:EditStyle") #open style dialog
xDialog = self.xUITest.getTopFocusWindow()
- xStyleNametxt = xDialog.getChild("namerw")
+ xStyleNametxt = xDialog.getChild("name")
self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal Line") #check style name
xCancBtn = xDialog.getChild("cancel")
self.ui_test.close_dialog_through_button(xCancBtn)
diff --git a/sw/uiconfig/swriter/ui/footnoteareapage.ui b/sw/uiconfig/swriter/ui/footnoteareapage.ui
index 47c4db80c019..ec0e9c253d18 100644
--- a/sw/uiconfig/swriter/ui/footnoteareapage.ui
+++ b/sw/uiconfig/swriter/ui/footnoteareapage.ui
@@ -297,7 +297,7 @@
<child>
<object class="GtkMenuButton" id="style">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
@@ -314,7 +314,7 @@
<child>
<object class="GtkMenuButton" id="color">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui
index 76cc6d1435d0..811f68ee9a30 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -293,7 +293,6 @@
<property name="valign">start</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
- <property name="row_homogeneous">True</property>
<child>
<object class="GtkSpinButton" id="spinMF_CHARWIDTH">
<property name="visible">True</property>