device selection background

data/key-mapper.glade

@@ -135,11 +135,6 @@
     <property name="can-focus">False</property>
     <property name="icon-name">gtk-delete</property>
   </object>
-  <object class="GtkImage" id="gtk-redo-icon">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="stock">gtk-redo</property>
-  </object>
   <object class="GtkDialog" id="unsaved_changes">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Key Mapper</property>
@@ -181,7 +176,6 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
-                <property name="image">gtk-redo-icon</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -249,7 +243,7 @@
       <action-widget response="-6">go_ahead</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="gtk-redo-icon-2">
+  <object class="GtkImage" id="gtk-redo-icon">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="stock">gtk-redo</property>
@@ -276,16 +270,38 @@
     <property name="title" translatable="yes">Key Mapper</property>
     <property name="icon">key-mapper.svg</property>
     <signal name="delete-event" handler="on_close" swapped="no"/>
+    <signal name="key-press-event" handler="key_press" swapped="no"/>
+    <signal name="key-release-event" handler="key_release" swapped="no"/>
     <child>
       <object class="GtkBox" id="vertical-wrapper">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkMenuBar">
+                <property name="height-request">20</property>
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkBox" id="devices">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-            <property name="border-width">20</property>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
+                <property name="margin-bottom">20</property>
+                <property name="border-width">0</property>
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkLabel">
@@ -316,13 +332,13 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="apply_system_layout">
-                <property name="label" translatable="yes">Apply Defaults</property>
+                    <property name="label" translatable="yes">Restore Defaults</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">True</property>
                     <property name="tooltip-text" translatable="yes">To give your keys back their original mapping.</property>
                     <property name="halign">end</property>
-                <property name="image">gtk-redo-icon-2</property>
+                    <property name="image">gtk-redo-icon</property>
                     <property name="always-show-image">True</property>
                     <signal name="clicked" handler="on_apply_system_layout_clicked" swapped="no"/>
                   </object>
@@ -336,18 +352,17 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-            <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>