[gtk/wip/matthiasc/can-focus: 41/42] Fix the tools tests to not set can-focus
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/can-focus: 41/42] Fix the tools tests to not set can-focus
- Date: Thu, 9 Apr 2020 04:46:10 +0000 (UTC)
commit 831c497d5cf20a2342c149d1fd476a115a727b47
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Apr 9 00:08:48 2020 -0400
Fix the tools tests to not set can-focus
.../tools/simplify-data-3to4/assistant.expected | 2 --
testsuite/tools/simplify-data-3to4/assistant.ui | 3 ---
testsuite/tools/simplify-data-3to4/grid.expected | 9 ---------
testsuite/tools/simplify-data-3to4/grid.ui | 4 ----
testsuite/tools/simplify-data-3to4/notebook.ui | 1 -
.../tools/simplify-data-3to4/office-runner.expected | 1 -
testsuite/tools/simplify-data-3to4/office-runner.ui | 21 ---------------------
testsuite/tools/simplify-data-3to4/stack.ui | 1 -
8 files changed, 42 deletions(-)
---
diff --git a/testsuite/tools/simplify-data-3to4/assistant.expected
b/testsuite/tools/simplify-data-3to4/assistant.expected
index 1c63dcb936..906c68c4b2 100644
--- a/testsuite/tools/simplify-data-3to4/assistant.expected
+++ b/testsuite/tools/simplify-data-3to4/assistant.expected
@@ -7,7 +7,6 @@
<property name="child">
<object class="GtkButton" id="button1">
<property name="label" translatable="yes">Button 1</property>
- <property name="can_focus">1</property>
</object>
</property>
</object>
@@ -18,7 +17,6 @@
<property name="child">
<object class="GtkButton" id="button2">
<property name="label" translatable="yes">Button 2</property>
- <property name="can_focus">1</property>
</object>
</property>
</object>
diff --git a/testsuite/tools/simplify-data-3to4/assistant.ui b/testsuite/tools/simplify-data-3to4/assistant.ui
index 6a5454393a..e731f51245 100644
--- a/testsuite/tools/simplify-data-3to4/assistant.ui
+++ b/testsuite/tools/simplify-data-3to4/assistant.ui
@@ -2,12 +2,10 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAssistant" id="window1">
- <property name="can_focus">False</property>
<child>
<object class="GtkButton" id="button1">
<property name="label" translatable="yes">Button 1</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
</object>
<packing>
<property name="title" translatable="yes">Page 1</property>
@@ -17,7 +15,6 @@
<object class="GtkButton" id="button2">
<property name="label" translatable="yes">Button 2</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
</object>
<packing>
<property name="title" translatable="yes">Page 2</property>
diff --git a/testsuite/tools/simplify-data-3to4/grid.expected
b/testsuite/tools/simplify-data-3to4/grid.expected
index 12db5c21e2..bf48a55268 100644
--- a/testsuite/tools/simplify-data-3to4/grid.expected
+++ b/testsuite/tools/simplify-data-3to4/grid.expected
@@ -7,7 +7,6 @@
<object class="GtkToggleButton" id="button1">
<property name="label" translatable="yes">Hello World!</property>
<property name="active">1</property>
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="vexpand">1</property>
<property name="hexpand">1</property>
@@ -24,7 +23,6 @@
<child>
<object class="GtkCheckButton" id="button2">
<property name="label" translatable="yes">Hello World!</property>
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<layout>
<property name="left_attach">1</property>
@@ -35,7 +33,6 @@
<child>
<object class="GtkRadioButton" id="button3">
<property name="label" translatable="yes">Hello World!</property>
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<layout>
<property name="left_attach">2</property>
@@ -48,7 +45,6 @@
<property name="label" translatable="yes">Hello World!</property>
<property name="active">1</property>
<property name="group">button3</property>
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<layout>
<property name="left_attach">3</property>
@@ -59,7 +55,6 @@
<child>
<object class="GtkSwitch" id="button5">
<property name="active">1</property>
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<layout>
<property name="left_attach">4</property>
@@ -69,7 +64,6 @@
</child>
<child>
<object class="GtkSwitch" id="button6">
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<child internal-child="accessible">
<object class="AtkObject" id="button6-accessible">
@@ -84,7 +78,6 @@
</child>
<child>
<object class="GtkButton" id="button7">
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="label">Text Button</property>
<layout>
@@ -95,7 +88,6 @@
</child>
<child>
<object class="GtkButton" id="button8">
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="halign">center</property>
<property name="valign">center</property>
@@ -107,7 +99,6 @@
</child>
<child>
<object class="GtkButton" id="button9">
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="halign">center</property>
<property name="valign">center</property>
diff --git a/testsuite/tools/simplify-data-3to4/grid.ui b/testsuite/tools/simplify-data-3to4/grid.ui
index 5a4fd2831a..29a723c0a7 100644
--- a/testsuite/tools/simplify-data-3to4/grid.ui
+++ b/testsuite/tools/simplify-data-3to4/grid.ui
@@ -2,7 +2,6 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1">
- <property name="can_focus">False</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
@@ -11,7 +10,6 @@
<property name="label" translatable="yes">Hello World!</property>
<property name="visible">True</property>
<property name="active">True</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="expand">True</property>
<property name="margin">10</property>
@@ -26,7 +24,6 @@
<property name="label" translatable="yes">Hello World!</property>
<property name="visible">True</property>
<property name="active">False</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
@@ -39,7 +36,6 @@
<property name="label" translatable="yes">Hello World!</property>
<property name="visible">True</property>
<property name="active">False</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
diff --git a/testsuite/tools/simplify-data-3to4/notebook.ui b/testsuite/tools/simplify-data-3to4/notebook.ui
index 0766f69366..ce3ce2cbad 100644
--- a/testsuite/tools/simplify-data-3to4/notebook.ui
+++ b/testsuite/tools/simplify-data-3to4/notebook.ui
@@ -2,7 +2,6 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1">
- <property name="can_focus">False</property>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
diff --git a/testsuite/tools/simplify-data-3to4/office-runner.expected
b/testsuite/tools/simplify-data-3to4/office-runner.expected
index fe60c0cd2a..80d6e36587 100644
--- a/testsuite/tools/simplify-data-3to4/office-runner.expected
+++ b/testsuite/tools/simplify-data-3to4/office-runner.expected
@@ -198,7 +198,6 @@
</child>
<child>
<object class="GtkButton" id="run_button">
- <property name="can_focus">1</property>
<property name="receives_default">1</property>
<property name="hexpand">1</property>
<property name="vexpand">1</property>
diff --git a/testsuite/tools/simplify-data-3to4/office-runner.ui
b/testsuite/tools/simplify-data-3to4/office-runner.ui
index e4a237f78f..9f417cefbb 100644
--- a/testsuite/tools/simplify-data-3to4/office-runner.ui
+++ b/testsuite/tools/simplify-data-3to4/office-runner.ui
@@ -2,7 +2,6 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1">
- <property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Office Runner</property>
<property name="resizable">False</property>
@@ -10,7 +9,6 @@
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_bottom">12</property>
@@ -19,19 +17,16 @@
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="run_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="vexpand">True</property>
</object>
<packing>
@@ -44,7 +39,6 @@
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
@@ -63,7 +57,6 @@
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Rules</property>
<attributes>
<attribute name="scale" value="2"/>
@@ -84,7 +77,6 @@
<child type="tab">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="no">page 1</property>
</object>
<packing>
@@ -94,13 +86,11 @@
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="time_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="vexpand">True</property>
</object>
<packing>
@@ -113,7 +103,6 @@
<child>
<object class="GtkLabel" id="time_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label" translatable="no">00:00.00</property>
@@ -137,7 +126,6 @@
<child type="tab">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="no">page 2</property>
</object>
<packing>
@@ -148,14 +136,12 @@
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="trophy_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -167,13 +153,11 @@
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="result_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="no">Silver Trophy!</property>
@@ -195,7 +179,6 @@
<child>
<object class="GtkLabel" id="current_time_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="no">You managed to finish the route with the
2nd best time ever, <b>48.15 seconds!</b> </property>
@@ -211,7 +194,6 @@
<child>
<object class="GtkLabel" id="better_time_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="valign">start</property>
<property name="xalign">0</property>
<property name="label" translatable="no">Only <b>3.75 seconds</b>
separate you from the gold trophy!</property>
@@ -240,7 +222,6 @@
<child type="tab">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="no">page 3</property>
</object>
<packing>
@@ -258,7 +239,6 @@
<child>
<object class="GtkButton" id="run_button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
@@ -266,7 +246,6 @@
<child>
<object class="GtkLabel" id="run_button_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Run!</property>
<attributes>
<attribute name="scale" value="3"/>
diff --git a/testsuite/tools/simplify-data-3to4/stack.ui b/testsuite/tools/simplify-data-3to4/stack.ui
index aa3b60e567..090100f26d 100644
--- a/testsuite/tools/simplify-data-3to4/stack.ui
+++ b/testsuite/tools/simplify-data-3to4/stack.ui
@@ -2,7 +2,6 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window1">
- <property name="can_focus">False</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]