From ae4e84fd51daa868f6f5f457935c2c186a2bb659 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 21 Jun 2016 08:58:38 -0400 Subject: [PATCH] provide some Keyboard:: methods to get access to other versions of modifier names --- libs/gtkmm2ext/gtkmm2ext/keyboard.h | 5 +++++ libs/gtkmm2ext/keyboard.cc | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h index 34be6e44ab..58af25f9d2 100644 --- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h +++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h @@ -74,6 +74,11 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful static const char* tertiary_modifier_name (); static const char* level4_modifier_name (); + static const char* primary_modifier_short_name (); + static const char* secondary_modifier_short_name (); + static const char* tertiary_modifier_short_name (); + static const char* level4_modifier_short_name (); + static void set_primary_modifier (uint32_t newval) { set_modifier (newval, PrimaryModifier); } diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 08b0393d49..1abe69f9f0 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -72,6 +72,11 @@ const char* Keyboard::secondary_modifier_name() { return _("Control"); } const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); } const char* Keyboard::level4_modifier_name() { return _("Option"); } +const char* Keyboard::primary_modifier_short_name() { return _("Cmd"); } +const char* Keyboard::secondary_modifier_short_name() { return _("Ctrl"); } +const char* Keyboard::tertiary_modifier_short_name() { return S_("Key|Shift"); } +const char* Keyboard::level4_modifier_short_name() { return _("Opt"); } + guint Keyboard::snap_mod = Keyboard::Level4Modifier|Keyboard::TertiaryModifier; // XXX this is probably completely wrong guint Keyboard::snap_delta_mod = Keyboard::Level4Modifier; @@ -90,6 +95,11 @@ const char* Keyboard::secondary_modifier_name() { return _("Alt"); } const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); } const char* Keyboard::level4_modifier_name() { return _("Windows"); } +const char* Keyboard::primary_modifier_short_name() { return _("Ctrl"); } +const char* Keyboard::secondary_modifier_short_name() { return _("Alt"); } +const char* Keyboard::tertiary_modifier_short_name() { return S_("Key|Shift"); } +const char* Keyboard::level4_modifier_short_name() { return _("Win"); } + guint Keyboard::snap_mod = Keyboard::SecondaryModifier; guint Keyboard::snap_delta_mod = Keyboard::SecondaryModifier|Keyboard::Level4Modifier; -- 2.30.2