[gnome-taquin] Rename 'ui.back' as 'ui.escape'.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-taquin] Rename 'ui.back' as 'ui.escape'.
- Date: Mon, 21 Jan 2019 06:11:44 +0000 (UTC)
commit 29520206ecebdc6da941f00caeb4a48d9657a979
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Wed Jan 16 21:13:55 2019 +0100
Rename 'ui.back' as 'ui.escape'.
The 'Escape' key is quite regularly used.
data/game-headerbar.ui | 16 ++++++++--------
src/game-window.vala | 4 ++--
src/taquin-main.vala | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/data/game-headerbar.ui b/data/game-headerbar.ui
index a8d53d7..09975fd 100644
--- a/data/game-headerbar.ui
+++ b/data/game-headerbar.ui
@@ -38,7 +38,7 @@
<!-- Translators: when configuring a new game, if the user has a started game, tooltip text of the
Go back button -->
<property name="tooltip-text" translatable="yes">Go back to the current game</property>
<property name="use-underline">True</property>
- <property name="action-name">ui.back</property>
+ <property name="action-name">ui.escape</property>
<style><class name="image-button"/></style>
<child>
<object class="GtkImage">
@@ -49,7 +49,7 @@
</child>
</object>
<packing>
- <property name="pack_type">start</property>
+ <property name="pack-type">start</property>
<property name="position">1</property>
</packing>
</child>
@@ -72,19 +72,19 @@
<child>
<object class="GtkMenuButton" id="info_button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="receives_default">False</property>
- <property name="menu_model">window-menu</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">False</property>
+ <property name="menu-model">window-menu</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">open-menu-symbolic</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">open-menu-symbolic</property>
</object>
</child>
</object>
<packing>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/src/game-window.vala b/src/game-window.vala
index e4fcd0b..f1e8a74 100644
--- a/src/game-window.vala
+++ b/src/game-window.vala
@@ -187,7 +187,7 @@ private class GameWindow : ApplicationWindow
{
{ "new-game", new_game_cb },
{ "start-game", start_game_cb },
- { "back", back_cb },
+ { "escape", escape_pressed },
{ "undo", undo_cb },
{ "redo", redo_cb },
@@ -228,7 +228,7 @@ private class GameWindow : ApplicationWindow
show_view ();
}
- private void back_cb (/* SimpleAction action, Variant? variant */)
+ private void escape_pressed (/* SimpleAction action, Variant? variant */)
{
if (back_action_disabled)
return;
diff --git a/src/taquin-main.vala b/src/taquin-main.vala
index 2623f28..dd1c316 100644
--- a/src/taquin-main.vala
+++ b/src/taquin-main.vala
@@ -162,7 +162,7 @@ public class Taquin : Gtk.Application
set_accels_for_action ("app.quit", { "<Primary>q" });
set_accels_for_action ("ui.undo", { "<Primary>z" });
set_accels_for_action ("ui.redo", { "<Shift><Primary>z" });
- set_accels_for_action ("ui.back", { "Escape" });
+ set_accels_for_action ("ui.escape", { "Escape" });
set_accels_for_action ("ui.toggle-hamburger", { "F10" });
set_accels_for_action ("app.help", { "F1" });
set_accels_for_action ("app.about", { "<Shift>F1" });
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]