[gtk] assistant: Fix button order in ui file
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] assistant: Fix button order in ui file
- Date: Thu, 24 Jan 2019 02:16:53 +0000 (UTC)
commit 99738e7059a19ada76e5add6093c95d3fb1f27f6
Author: Timm Bäder <mail baedert org>
Date: Wed Dec 26 09:23:45 2018 +0100
assistant: Fix button order in ui file
gtk/ui/gtkassistant.ui | 65 ++++++++++++++++----------------------------------
1 file changed, 21 insertions(+), 44 deletions(-)
---
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index 920071d2d8..969c3c1a8e 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -35,9 +35,9 @@
<property name="spacing">6</property>
<property name="margin">6</property>
<child>
- <object class="GtkButton" id="apply">
+ <object class="GtkButton" id="close">
<property name="visible">0</property>
- <property name="label" translatable="yes">_Apply</property>
+ <property name="label" translatable="yes">_Close</property>
<property name="can-focus">1</property>
<property name="can-default">1</property>
<property name="receives-default">1</property>
@@ -45,83 +45,64 @@
<style>
<class name="text-button"/>
</style>
- <signal name="clicked" handler="on_assistant_apply" swapped="no"/>
+ <signal name="clicked" handler="on_assistant_close" swapped="no"/>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
<child>
- <object class="GtkButton" id="forward">
- <property name="label" translatable="yes">_Next</property>
+ <object class="GtkButton" id="cancel">
+ <property name="visible">0</property>
+ <property name="label" translatable="yes">_Cancel</property>
<property name="can-focus">1</property>
- <property name="can-default">1</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
- <signal name="clicked" handler="on_assistant_forward" swapped="no"/>
+ <signal name="clicked" handler="on_assistant_cancel" swapped="no"/>
</object>
- <packing>
- <property name="pack-type">end</property>
- <property name="position">1</property>
- </packing>
</child>
<child>
- <object class="GtkButton" id="back">
- <property name="label" translatable="yes">_Back</property>
+ <object class="GtkButton" id="last">
+ <property name="visible">0</property>
+ <property name="label" translatable="yes">_Finish</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
- <signal name="clicked" handler="on_assistant_back" swapped="no"/>
+ <signal name="clicked" handler="on_assistant_last" swapped="no"/>
</object>
- <packing>
- <property name="pack-type">end</property>
- <property name="position">2</property>
- </packing>
</child>
<child>
- <object class="GtkButton" id="last">
- <property name="visible">0</property>
- <property name="label" translatable="yes">_Finish</property>
+ <object class="GtkButton" id="back">
+ <property name="label" translatable="yes">_Back</property>
<property name="can-focus">1</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
- <signal name="clicked" handler="on_assistant_last" swapped="no"/>
+ <signal name="clicked" handler="on_assistant_back" swapped="no"/>
</object>
- <packing>
- <property name="pack-type">end</property>
- <property name="position">3</property>
- </packing>
</child>
<child>
- <object class="GtkButton" id="cancel">
- <property name="visible">0</property>
- <property name="label" translatable="yes">_Cancel</property>
+ <object class="GtkButton" id="forward">
+ <property name="label" translatable="yes">_Next</property>
<property name="can-focus">1</property>
+ <property name="can-default">1</property>
<property name="receives-default">1</property>
<property name="use-underline">1</property>
<style>
<class name="text-button"/>
</style>
- <signal name="clicked" handler="on_assistant_cancel" swapped="no"/>
+ <signal name="clicked" handler="on_assistant_forward" swapped="no"/>
</object>
- <packing>
- <property name="pack-type">end</property>
- <property name="position">4</property>
- </packing>
</child>
<child>
- <object class="GtkButton" id="close">
+ <object class="GtkButton" id="apply">
<property name="visible">0</property>
- <property name="label" translatable="yes">_Close</property>
+ <property name="label" translatable="yes">_Apply</property>
<property name="can-focus">1</property>
<property name="can-default">1</property>
<property name="receives-default">1</property>
@@ -129,12 +110,8 @@
<style>
<class name="text-button"/>
</style>
- <signal name="clicked" handler="on_assistant_close" swapped="no"/>
+ <signal name="clicked" handler="on_assistant_apply" swapped="no"/>
</object>
- <packing>
- <property name="pack-type">end</property>
- <property name="position">5</property>
- </packing>
</child>
</object>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]