Merge commit 'upstream/0.4.0'

1 files changed, 11 insertions, 7 deletions

diff --git a/src/actions/keyAction.vala b/src/actions/keyAction.vala
index ddeebb5..3816686 100644
--- a/src/actions/keyAction.vala
+++ b/src/actions/keyAction.vala
@@ -29,10 +29,14 @@ public class KeyAction : Action {
     /// used in the pies.conf file for this kind of Actions.
     /////////////////////////////////////////////////////////////////////
 
-    public static void register(out string name, out bool icon_name_editable, out string settings_name) {
-        name = _("Press hotkey");
-        icon_name_editable = true;
-        settings_name = "key";
+    public static ActionRegistry.TypeDescription register() {
+        var description = new ActionRegistry.TypeDescription();
+        description.name = _("Press hotkey");
+        description.icon = "preferences-desktop-keyboard-shortcuts";
+        description.description = _("Simulates the activation of a hotkey.");
+        description.icon_name_editable = true;
+        description.id = "key";
+        return description;
     }   
     
     /////////////////////////////////////////////////////////////////////
@@ -57,12 +61,12 @@ public class KeyAction : Action {
     /// C'tor, initializes all members.
     /////////////////////////////////////////////////////////////////////
 
-    public KeyAction(string name, string icon, string command, bool is_quick_action = false) {
-        GLib.Object(name : name, icon : icon, real_command : command, is_quick_action : is_quick_action);
+    public KeyAction(string name, string icon, string command, bool is_quickaction = false) {
+        GLib.Object(name : name, icon : icon, real_command : command, is_quickaction : is_quickaction);
     }
     
     construct {
-        this.key = new Key(real_command);
+        this.key = new Key.from_string(real_command);
     }
     
     /////////////////////////////////////////////////////////////////////